Tm 86 options to apply for transfers

src/SFA.DAS.EmployerFinance.UnitTests/Infrastructure/OuterApiRequests/WhenBuildingGetPledgesRequest.cs

@@ -1,6 +1,6 @@
 using FluentAssertions;
 using NUnit.Framework;
-using SFA.DAS.EmployerFinance.Infrastructure.OuterApiRequests;
+using SFA.DAS.EmployerFinance.Infrastructure.OuterApiRequests.Transfers;
 
 namespace SFA.DAS.EmployerFinance.UnitTests.Infrastructure.OuterApiRequests
 {
@@ -9,11 +9,11 @@ public class WhenBuildingGetPledgesRequest
         [Test]
         public void Then_The_Url_Is_Correctly_Constructed()
         {
-            var accountId = 123;
+            long accountId = 123;
 
-            var actual = new GetPledgesRequest(accountId);
+            var actual = new GetIndexRequest(accountId);
 
-            actual.GetUrl.Should().Be($"Pledges?accountId={accountId}");
+            actual.GetUrl.Should().Be($"Transfers/{accountId}");
         }
     }
 }

src/SFA.DAS.EmployerFinance.UnitTests/Infrastructure/WhenHandlingAGetRequest.cs

@@ -33,7 +33,7 @@ public async Task Then_The_Endpoint_Is_Called_With_Authentication_Header_And_Dat
             };
             var httpMessageHandler = MessageHandler.SetupMessageHandlerMock(response, $"{config.BaseUrl}{getTestRequest.GetUrl}", config.Key);
             var client = new HttpClient(httpMessageHandler.Object);
-            var apiClient = new ApiClient(client, config);
+            var apiClient = new ManageApprenticeshipsApiClient(client, config);
 
             //Act
             var actual = await apiClient.Get<List<string>>(getTestRequest);
@@ -57,7 +57,7 @@ public void Then_If_It_Is_Not_Successful_An_Exception_Is_Thrown()
 
             var httpMessageHandler = MessageHandler.SetupMessageHandlerMock(response, $"{config.BaseUrl}{getTestRequest.GetUrl}", config.Key);
             var client = new HttpClient(httpMessageHandler.Object);
-            var apiClient = new ApiClient(client, config);
+            var apiClient = new ManageApprenticeshipsApiClient(client, config);
 
             //Act Assert
             Assert.ThrowsAsync<HttpRequestException>(() => apiClient.Get<List<string>>(getTestRequest));

src/SFA.DAS.EmployerFinance.UnitTests/Services/CohortsServiceTests/WhenIGetACohortsCount.cs

@@ -0,0 +1,73 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using DocumentFormat.OpenXml.Office2010.CustomUI;
+using Moq;
+using NUnit.Framework;
+using SFA.DAS.CommitmentsV2.Types;
+using SFA.DAS.EmployerFinance.Infrastructure.OuterApiRequests;
+using SFA.DAS.EmployerFinance.Infrastructure.OuterApiResponses;
+using SFA.DAS.EmployerFinance.Interfaces.OuterApi;
+using SFA.DAS.EmployerFinance.Services;
+
+namespace SFA.DAS.EmployerFinance.UnitTests.Services.CohortsServiceTests
+{
+    public class WhenIGetACohortsCount
+    {
+        private Mock<IApiClient> _apiClient;
+        private CohortsService _service;
+
+        [SetUp]
+        public void Setup()
+        {
+            _apiClient = new Mock<IApiClient>();
+            _service = new CohortsService(_apiClient.Object);
+        }
+
+        [Test]
+        public async Task ThenTheApiIsCalledWithAValidAccountIdAndTheCohortsCountIsReturned()
+        {
+            SetupApiClient(1);
+
+            var actual = await _service.GetCohortsCount(1);
+
+            Assert.AreEqual(1, actual);
+        }
+
+        [Test]
+        public async Task ThenTheApiIsCalledWithAnInvalidAccountIdAndTheCohortsCountIsZero()
+        {
+            SetupApiClient(0, false);
+
+            var actual = await _service.GetCohortsCount(0);
+
+            Assert.AreEqual(0, actual);
+        }
+
+        private void SetupApiClient(long accountId, bool addItem = true)
+        {
+            var items = new List<CohortSummary>();
+
+            if (addItem)
+            {
+                items = new List<CohortSummary>
+                {
+                    new CohortSummary
+                    {
+                        AccountId = accountId
+                    }
+                };
+            }
+
+            _apiClient.Setup(o =>
+                    o.Get<GetCohortsResponse>(
+                        It.Is<GetCohortsRequest>(i => i.GetUrl.Equals($"api/cohorts?accountId={accountId}"))))
+                .ReturnsAsync(new GetCohortsResponse
+                {
+                    Cohorts = items
+                });
+        }
+    }
+}

src/SFA.DAS.EmployerFinance.UnitTests/Services/LevyTransferMatchingServiceTests/WhenIGetAPledgesCount.cs

@@ -1,8 +1,8 @@
 using System.Threading.Tasks;
 using Moq;
 using NUnit.Framework;
-using SFA.DAS.EmployerFinance.Infrastructure.OuterApiRequests;
-using SFA.DAS.EmployerFinance.Infrastructure.OuterApiResponses;
+using SFA.DAS.EmployerFinance.Infrastructure.OuterApiRequests.Transfers;
+using SFA.DAS.EmployerFinance.Infrastructure.OuterApiResponses.Transfers;
 using SFA.DAS.EmployerFinance.Interfaces.OuterApi;
 using SFA.DAS.EmployerFinance.Services;
 
@@ -11,14 +11,14 @@ namespace SFA.DAS.EmployerFinance.UnitTests.Services.LevyTransferMatchingService
     public class WhenIGetAPledgesCount
     {
         private Mock<IApiClient> _mockApiClient;
-        private LevyTransferMatchingService _levyTransferMatchingService;
+        private ManageApprenticeshipsService _levyTransferMatchingService;
 
         [SetUp]
         public void Arrange()
         {
             _mockApiClient = new Mock<IApiClient>();
 
-            _levyTransferMatchingService = new LevyTransferMatchingService(_mockApiClient.Object);
+            _levyTransferMatchingService = new ManageApprenticeshipsService(_mockApiClient.Object);
         }
 
         [Test]
@@ -29,13 +29,13 @@ public async Task ThenTheOuterApiIsCalledAndTotalPledgesForAccountReturned()
             var accountId = 123;
 
             _mockApiClient
-                .Setup(x => x.Get<GetPledgesResponse>(It.Is<GetPledgesRequest>(y => y.GetUrl.EndsWith(accountId.ToString()))))
-                .ReturnsAsync(new GetPledgesResponse()
+                .Setup(x => x.Get<GetIndexResponse>(It.Is<GetIndexRequest>(y => y.GetUrl.EndsWith(accountId.ToString()))))
+                .ReturnsAsync(new GetIndexResponse()
                 {
-                    TotalPledges = expectedResult,
+                    PledgesCount = expectedResult,
                 });
 
-            var actualResult = await _levyTransferMatchingService.GetPledgesCount(accountId);
+            var actualResult = await _levyTransferMatchingService.GetIndex(accountId);
 
             Assert.AreEqual(expectedResult, actualResult);
         }

src/SFA.DAS.EmployerFinance.Web/Controllers/TransfersController.cs

@@ -19,7 +19,7 @@ public TransfersController(TransfersOrchestrator transfersOrchestrator)
         [Route("transfers")]
         public async Task<ActionResult> Index(string hashedAccountId)
         {
-            var viewModel = await _transfersOrchestrator.Index(hashedAccountId);
+            var viewModel = await _transfersOrchestrator.GetIndexViewModel(hashedAccountId);
 
             return View(viewModel);
         }

src/SFA.DAS.EmployerFinance.Web/Orchestrators/TransfersOrchestrator.cs

@@ -2,16 +2,16 @@
 using SFA.DAS.Authorization.EmployerUserRoles.Options;
 using SFA.DAS.Authorization.Services;
 using SFA.DAS.EmployerFinance.Services;
-using SFA.DAS.EmployerFinance.Web.ViewModels;
 using SFA.DAS.HashingService;
+using SFA.DAS.EmployerFinance.Web.ViewModels.Transfers;
 
 namespace SFA.DAS.EmployerFinance.Web.Orchestrators
 {
     public class TransfersOrchestrator
     {
         private readonly IAuthorizationService _authorizationService;
         private readonly IHashingService _hashingService;
-        private readonly ILevyTransferMatchingService _levyTransferMatchingService;
+        private readonly IManageApprenticeshipsService _manageApprenticeshipsService;
 
         protected TransfersOrchestrator()
         {
@@ -21,31 +21,31 @@ protected TransfersOrchestrator()
         public TransfersOrchestrator(
             IAuthorizationService authorizationService,
             IHashingService hashingService,
-            ILevyTransferMatchingService levyTransferMatchingService)
+            IManageApprenticeshipsService manageApprenticeshipsService)
         {
             _authorizationService = authorizationService;
             _hashingService = hashingService;
-            _levyTransferMatchingService = levyTransferMatchingService;
+            _manageApprenticeshipsService = manageApprenticeshipsService;
         }
 
-        public async Task<OrchestratorResponse<TransfersIndexViewModel>> Index(string hashedAccountId)
+        public async Task<OrchestratorResponse<IndexViewModel>> GetIndexViewModel(string hashedAccountId)
         {
-            bool renderCreateTransfersPledgeButton = await _authorizationService.IsAuthorizedAsync(EmployerUserRole.OwnerOrTransactor);
-
             var accountId = _hashingService.DecodeValue(hashedAccountId);
+            var indexTask = _manageApprenticeshipsService.GetIndex(accountId);
+            var renderCreateTransfersPledgeButtonTask = _authorizationService.IsAuthorizedAsync(EmployerUserRole.OwnerOrTransactor);
 
-            var pledgesCount = await _levyTransferMatchingService.GetPledgesCount(accountId);
+            await Task.WhenAll(indexTask, renderCreateTransfersPledgeButtonTask);
 
-            var viewModel = new OrchestratorResponse<TransfersIndexViewModel>()
+            return new OrchestratorResponse<IndexViewModel>
             {
-                Data = new TransfersIndexViewModel()
+                Data = new IndexViewModel
                 {
-                    RenderCreateTransfersPledgeButton = renderCreateTransfersPledgeButton,
-                    PledgesCount = pledgesCount,
+                    PledgesCount = indexTask.Result.PledgesCount,
+                    ApplicationsCount = indexTask.Result.ApplicationsCount,
+                    IsTransferReceiver = indexTask.Result.IsTransferReceiver,
+                    IsTransferSender = indexTask.Result.IsTransferSender
                 }
             };
-
-            return viewModel;
         }
     }
 }

src/SFA.DAS.EmployerFinance.Web/SFA.DAS.EmployerFinance.Web.csproj

@@ -211,7 +211,7 @@
     <Compile Include="ViewModels\TransactionLineViewModel.cs" />
     <Compile Include="ViewModels\TransactionViewModel.cs" />
     <Compile Include="ViewModels\TransactionViewResultViewModel.cs" />
-    <Compile Include="ViewModels\TransfersIndexViewModel.cs" />
+    <Compile Include="ViewModels\Transfers\IndexViewModel.cs" />
     <Compile Include="ViewModels\TransferTransactionDetailsViewModel.cs" />
   </ItemGroup>
   <ItemGroup>

src/SFA.DAS.EmployerFinance.Web/ViewModels/Transfers/IndexViewModel.cs

@@ -0,0 +1,11 @@
+namespace SFA.DAS.EmployerFinance.Web.ViewModels.Transfers
+{
+    public class IndexViewModel
+    {
+        public bool IsTransferReceiver { get; set; }
+        public bool IsTransferSender { get; set; }
+        public bool RenderCreateTransfersPledgeButton { get; set; }
+        public int PledgesCount { get; set; }
+        public int ApplicationsCount { get; set; }
+    }
+}

src/SFA.DAS.EmployerFinance.Web/Views/Transfers/Index.cshtml

@@ -1,4 +1,4 @@
-@model OrchestratorResponse<TransfersIndexViewModel>
+@model OrchestratorResponse<SFA.DAS.EmployerFinance.Web.ViewModels.Transfers.IndexViewModel>
 
 @{
     ViewBag.PageID = "transfers";
@@ -9,21 +9,40 @@
 }
 
 <h1 class="heading-xlarge">Transfers</h1>
+
 <div class="govuk-grid-row">
-    <div class="govuk-grid-column-two-thirds">
-        <h2 class="govuk-heading-m">My pledges</h2>
-        <p>Create a public funding pledge which is shown online so that businesses can apply to you for a transfer of funds.</p>
-        <div class="panel panel-border-wide">
-            You have <strong>@Model.Data.PledgesCount</strong> transfer pledges.
+    @if (Model.Data.IsTransferReceiver)
+    {
+        <div class="govuk-grid-column-two-thirds">
+            <h2 class="govuk-heading-m">My pledges</h2>
+            <p>Create a public funding pledge which is shown online so that businesses can apply to you for a transfer of funds.</p>
+            <div class="panel panel-border-wide">
+                You have <strong>@Model.Data.PledgesCount</strong> transfer pledges.
+            </div>
+            <div class="">
+                @if (Model.Data.RenderCreateTransfersPledgeButton)
+                {
+                    <a class="button" href="@Url.LevyMatchingTransfersAction("pledges/create/inform")" id="CreateTransfersPledgeButton">Create a transfers pledge</a>
+                }
+                <a href="@Url.LevyMatchingTransfersAction("pledges")" class="button button-secondary">View my transfer pledges and applications</a>
+            </div>
         </div>
-        <div class="">
-            @if (Model.Data.RenderCreateTransfersPledgeButton)
-            {
-                <a class="button" href="@Url.LevyMatchingTransfersAction("pledges/create/inform")" id="CreateTransfersPledgeButton">Create a transfers pledge</a>
-            }
-            <a href="@Url.LevyMatchingTransfersAction("pledges")" class="button button-secondary">View my transfer pledges and applications</a>
+    }
+
+    @if (Model.Data.IsTransferSender)
+    {
+        <div class="govuk-grid-column-two-thirds">
+            <h2 class="govuk-heading-m">Apply for transfers funding</h2>
+            <p>Search transfers funding opportunities and apply for a transfer of funds.</p>
+            <div class="panel panel-border-wide">
+                You have <strong>@Model.Data.ApplicationsCount</strong> transfer applications.
+            </div>
+            <div class="govuk-button-group">
+                <a class="button" href="@Url.LevyMatchingTransfersAction("opportunities")" id="ApplyForTransfersButton">Apply for transfer opportunities</a>
+                <a href="@Url.LevyMatchingTransfersAction("applications")" class="button button-secondary">View applications I've submitted</a>
+            </div>
         </div>
-    </div>
+    }
 </div>
 
 @section breadcrumb {

src/SFA.DAS.EmployerFinance/DependencyResolution/ManageApprenticeshipsOuterApiRegistry.cs

@@ -2,6 +2,7 @@
 using SFA.DAS.EmployerFinance.Configuration;
 using SFA.DAS.EmployerFinance.Infrastructure;
 using SFA.DAS.EmployerFinance.Interfaces.OuterApi;
+using SFA.DAS.EmployerFinance.Services;
 using StructureMap;
 
 namespace SFA.DAS.EmployerFinance.DependencyResolution
@@ -11,7 +12,9 @@ public class ManageApprenticeshipsOuterApiRegistry : Registry
         public ManageApprenticeshipsOuterApiRegistry ()
         {
             For<ManageApprenticeshipsOuterApiConfiguration>().Use(c => c.GetInstance<EmployerFinanceConfiguration>().ManageApprenticeshipsOuterApiConfiguration).Singleton();
-            For<IApiClient>().Use<ApiClient>().Ctor<HttpClient>().Is(new HttpClient()).Singleton();
+            For<IApiClient>().Use<ManageApprenticeshipsApiClient>().Ctor<HttpClient>().Is(new HttpClient()).Singleton(); 
+            For<IApiClient>().Add<CommitmentsApiClient>().Named("CAPI").Ctor<HttpClient>().Is(new HttpClient()).Singleton();
+            For<ICohortsService>().Use<CohortsService>().Ctor<IApiClient>().IsNamedInstance("CAPI").Singleton();
         }
     }
 }

src/SFA.DAS.EmployerFinance/Infrastructure/ApiClient.cs

@@ -7,18 +7,16 @@
 
 namespace SFA.DAS.EmployerFinance.Infrastructure
 {
-    public class ApiClient : IApiClient
+    public abstract class ApiClient : IApiClient
     {
         private readonly HttpClient _httpClient;
-        private readonly ManageApprenticeshipsOuterApiConfiguration _config;
 
-        public ApiClient (
-            HttpClient httpClient, 
-            ManageApprenticeshipsOuterApiConfiguration options)
+        protected HttpClient HttpClient => _httpClient;
+
+        protected ApiClient (
+            HttpClient httpClient)
         {
             _httpClient = httpClient;
-            _config = options;
-            _httpClient.BaseAddress = new Uri(_config.BaseUrl);
         }
 
         public async Task<TResponse> Get<TResponse>(IGetApiRequest request)
@@ -32,10 +30,6 @@ public async Task<TResponse> Get<TResponse>(IGetApiRequest request)
             return JsonConvert.DeserializeObject<TResponse>(json);
         }
 
-        private void AddHeaders()
-        {
-            _httpClient.DefaultRequestHeaders.Add("Ocp-Apim-Subscription-Key", _config.Key);
-            _httpClient.DefaultRequestHeaders.Add("X-Version", "1");
-        }
+        protected abstract void AddHeaders();
     }
 }