diff --git a/src/SFA.DAS.EmployerFinance.Web/Orchestrators/TransfersOrchestrator.cs b/src/SFA.DAS.EmployerFinance.Web/Orchestrators/TransfersOrchestrator.cs index fe7b85862f..2b27ef87b4 100644 --- a/src/SFA.DAS.EmployerFinance.Web/Orchestrators/TransfersOrchestrator.cs +++ b/src/SFA.DAS.EmployerFinance.Web/Orchestrators/TransfersOrchestrator.cs @@ -1,6 +1,8 @@ -using System.Threading.Tasks; +using System; +using System.Threading.Tasks; using SFA.DAS.Authorization.EmployerUserRoles.Options; using SFA.DAS.Authorization.Services; +using SFA.DAS.EAS.Account.Api.Client; using SFA.DAS.EmployerFinance.Services; using SFA.DAS.EmployerFinance.Web.ViewModels; using SFA.DAS.HashingService; @@ -12,6 +14,8 @@ public class TransfersOrchestrator private readonly IAuthorizationService _authorizationService; private readonly IHashingService _hashingService; private readonly ILevyTransferMatchingService _levyTransferMatchingService; + private readonly IAccountApiClient _accountApiClient; + private readonly ICohortsService _cohortsService; protected TransfersOrchestrator() { @@ -21,16 +25,40 @@ protected TransfersOrchestrator() public TransfersOrchestrator( IAuthorizationService authorizationService, IHashingService hashingService, - ILevyTransferMatchingService levyTransferMatchingService) + ILevyTransferMatchingService levyTransferMatchingService, + IAccountApiClient accountApiClient, + ICohortsService cohortsService) { _authorizationService = authorizationService; _hashingService = hashingService; _levyTransferMatchingService = levyTransferMatchingService; + _accountApiClient = accountApiClient; + _cohortsService = cohortsService; } public async Task> Index(string hashedAccountId) { - bool renderCreateTransfersPledgeButton = await _authorizationService.IsAuthorizedAsync(EmployerUserRole.OwnerOrTransactor); + var accountDetail = await _accountApiClient.GetAccount(hashedAccountId).ConfigureAwait(false); + var cohortsCount = await _cohortsService.GetCohortsCount(accountDetail.AccountId).ConfigureAwait(false); + + if (string.Compare(accountDetail.ApprenticeshipEmployerType, "Levy", StringComparison.OrdinalIgnoreCase) != 0 || cohortsCount > 0) + { + return new OrchestratorResponse() + { + Data = new TransfersIndexViewModel() + { + CanViewTransfersSection = false + } + }; + } + + return await GenerateTransfersViewIndexModelForLevyAccounts(hashedAccountId); + } + + private async Task> GenerateTransfersViewIndexModelForLevyAccounts(string hashedAccountId) + { + bool renderCreateTransfersPledgeButton = + await _authorizationService.IsAuthorizedAsync(EmployerUserRole.OwnerOrTransactor); var accountId = _hashingService.DecodeValue(hashedAccountId); @@ -42,6 +70,7 @@ public async Task> Index(string ha { RenderCreateTransfersPledgeButton = renderCreateTransfersPledgeButton, PledgesCount = pledgesCount, + CanViewTransfersSection = true } }; diff --git a/src/SFA.DAS.EmployerFinance.Web/ViewModels/TransfersIndexViewModel.cs b/src/SFA.DAS.EmployerFinance.Web/ViewModels/TransfersIndexViewModel.cs index 145b8b11dc..dc266fdf8a 100644 --- a/src/SFA.DAS.EmployerFinance.Web/ViewModels/TransfersIndexViewModel.cs +++ b/src/SFA.DAS.EmployerFinance.Web/ViewModels/TransfersIndexViewModel.cs @@ -2,6 +2,7 @@ { public class TransfersIndexViewModel { + public bool CanViewTransfersSection { get; set; } public bool RenderCreateTransfersPledgeButton { get; set; } public int PledgesCount { get; set; } } diff --git a/src/SFA.DAS.EmployerFinance.Web/Views/Transfers/Index.cshtml b/src/SFA.DAS.EmployerFinance.Web/Views/Transfers/Index.cshtml index f5d4fb7d94..9dc83ead31 100644 --- a/src/SFA.DAS.EmployerFinance.Web/Views/Transfers/Index.cshtml +++ b/src/SFA.DAS.EmployerFinance.Web/Views/Transfers/Index.cshtml @@ -8,23 +8,26 @@ ViewBag.ZenDeskLabel = "eas-finance"; } -

Transfers

-
-
-

My pledges

-

Create a public funding pledge which is shown online so that businesses can apply to you for a transfer of funds.

-
- You have @Model.Data.PledgesCount transfer pledges. -
-
- @if (Model.Data.RenderCreateTransfersPledgeButton) - { - Create a transfers pledge - } - View my transfer pledges and applications +@if (Model.Data.CanViewTransfersSection) +{ +

Transfers

+
+
+

My pledges

+

Create a public funding pledge which is shown online so that businesses can apply to you for a transfer of funds.

+
+ You have @Model.Data.PledgesCount transfer pledges. +
+
+ @if (Model.Data.RenderCreateTransfersPledgeButton) + { + Create a transfers pledge + } + View my transfer pledges and applications +
-
+} @section breadcrumb {
diff --git a/src/SFA.DAS.EmployerFinance/DependencyResolution/ManageApprenticeshipsOuterApiRegistry.cs b/src/SFA.DAS.EmployerFinance/DependencyResolution/ManageApprenticeshipsOuterApiRegistry.cs index fb8bdcbad8..66fc784c67 100644 --- a/src/SFA.DAS.EmployerFinance/DependencyResolution/ManageApprenticeshipsOuterApiRegistry.cs +++ b/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 @@ -12,6 +13,7 @@ public ManageApprenticeshipsOuterApiRegistry () { For().Use(c => c.GetInstance().ManageApprenticeshipsOuterApiConfiguration).Singleton(); For().Use().Ctor().Is(new HttpClient()).Singleton(); + For().Use().Ctor().Is(new HttpClient()).Ctor().Is(c => c.GetInstance().EmployerCommitmentsBaseUrl).Singleton(); } } } \ No newline at end of file diff --git a/src/SFA.DAS.EmployerFinance/Infrastructure/OuterApiRequests/GetCohortsRequest.cs b/src/SFA.DAS.EmployerFinance/Infrastructure/OuterApiRequests/GetCohortsRequest.cs new file mode 100644 index 0000000000..bb5ba69ed0 --- /dev/null +++ b/src/SFA.DAS.EmployerFinance/Infrastructure/OuterApiRequests/GetCohortsRequest.cs @@ -0,0 +1,21 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using SFA.DAS.EmployerFinance.Interfaces.OuterApi; + +namespace SFA.DAS.EmployerFinance.Infrastructure.OuterApiRequests +{ + public class GetCohortsRequest : IGetApiRequest + { + private readonly long _accountId; + + public GetCohortsRequest(long accountId) + { + _accountId = accountId; + } + + public string GetUrl => $"api/cohorts?accountId={_accountId}"; + } +} diff --git a/src/SFA.DAS.EmployerFinance/Models/Cohort/CurrentCohorts.cs b/src/SFA.DAS.EmployerFinance/Models/Cohort/CurrentCohorts.cs new file mode 100644 index 0000000000..1773786c4e --- /dev/null +++ b/src/SFA.DAS.EmployerFinance/Models/Cohort/CurrentCohorts.cs @@ -0,0 +1,14 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using SFA.DAS.CommitmentsV2.Types; + +namespace SFA.DAS.EmployerFinance.Models.Cohort +{ + public class CurrentCohorts + { + public List Cohorts { get; set; } + } +} diff --git a/src/SFA.DAS.EmployerFinance/SFA.DAS.EmployerFinance.csproj b/src/SFA.DAS.EmployerFinance/SFA.DAS.EmployerFinance.csproj index 843910423d..7ebefc3cd5 100644 --- a/src/SFA.DAS.EmployerFinance/SFA.DAS.EmployerFinance.csproj +++ b/src/SFA.DAS.EmployerFinance/SFA.DAS.EmployerFinance.csproj @@ -26,6 +26,7 @@ + diff --git a/src/SFA.DAS.EmployerFinance/Services/CohortsService.cs b/src/SFA.DAS.EmployerFinance/Services/CohortsService.cs new file mode 100644 index 0000000000..30eaef1f4e --- /dev/null +++ b/src/SFA.DAS.EmployerFinance/Services/CohortsService.cs @@ -0,0 +1,38 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Net.Http; +using System.Text; +using System.Threading.Tasks; +using Newtonsoft.Json; +using SFA.DAS.CommitmentsV2.Types; +using SFA.DAS.EmployerFinance.Configuration; +using SFA.DAS.EmployerFinance.Infrastructure.OuterApiRequests; +using SFA.DAS.EmployerFinance.Infrastructure.OuterApiResponses; +using SFA.DAS.EmployerFinance.Interfaces.OuterApi; +using SFA.DAS.EmployerFinance.Models.Cohort; + +namespace SFA.DAS.EmployerFinance.Services +{ + public class CohortsService : ICohortsService + { + private readonly HttpClient _httpClient; + + public CohortsService(HttpClient httpClient, string cohortsBaseUrl) + { + _httpClient = httpClient; + _httpClient.BaseAddress = new Uri(cohortsBaseUrl); + } + + public async Task GetCohortsCount(long accountId) + { + var cohortsCountResponse = await _httpClient.GetAsync(new GetCohortsRequest(accountId).GetUrl).ConfigureAwait(false); + + cohortsCountResponse.EnsureSuccessStatusCode(); + var json = await cohortsCountResponse.Content.ReadAsStringAsync().ConfigureAwait(false); + var currentCohorts = JsonConvert.DeserializeObject(json); + + return currentCohorts.Cohorts.Count; + } + } +} diff --git a/src/SFA.DAS.EmployerFinance/Services/ICohortsService.cs b/src/SFA.DAS.EmployerFinance/Services/ICohortsService.cs new file mode 100644 index 0000000000..5134c420ec --- /dev/null +++ b/src/SFA.DAS.EmployerFinance/Services/ICohortsService.cs @@ -0,0 +1,9 @@ +using System.Threading.Tasks; + +namespace SFA.DAS.EmployerFinance.Services +{ + public interface ICohortsService + { + Task GetCohortsCount(long accountId); + } +} \ No newline at end of file