From 3651f655e52a1bebc63cc8d909e67e41bd0c0f82 Mon Sep 17 00:00:00 2001 From: Paul Howes Date: Thu, 2 Apr 2020 10:15:29 +0100 Subject: [PATCH 01/35] CON-1492 Content change --- .../EmployerAgreementController.cs | 7 + .../Helpers/ControllerConstants.cs | 1 + .../Views/EmployerAgreement/Index.cshtml | 150 ++++++++---------- 3 files changed, 74 insertions(+), 84 deletions(-) diff --git a/src/SFA.DAS.EmployerAccounts.Web/Controllers/EmployerAgreementController.cs b/src/SFA.DAS.EmployerAccounts.Web/Controllers/EmployerAgreementController.cs index debb6b5104..dbf9aaabc7 100644 --- a/src/SFA.DAS.EmployerAccounts.Web/Controllers/EmployerAgreementController.cs +++ b/src/SFA.DAS.EmployerAccounts.Web/Controllers/EmployerAgreementController.cs @@ -327,5 +327,12 @@ public async Task WhenDoYouWantToView(int? choice, string agreemen } } } + + [HttpGet] + [Route("agreements/{accountLegalEntityHashedId}/viewallagreements")] + public ActionResult ViewAllAgreements(string hashedAccountId, string accountLegalEntityHashedId) + { + throw new NotImplementedException(); + } } } \ No newline at end of file diff --git a/src/SFA.DAS.EmployerAccounts.Web/Helpers/ControllerConstants.cs b/src/SFA.DAS.EmployerAccounts.Web/Helpers/ControllerConstants.cs index 66351a5189..b9288c50af 100644 --- a/src/SFA.DAS.EmployerAccounts.Web/Helpers/ControllerConstants.cs +++ b/src/SFA.DAS.EmployerAccounts.Web/Helpers/ControllerConstants.cs @@ -90,5 +90,6 @@ public static class ControllerConstants public const string ViewApprentice = "ViewApprentice"; public const string ApproveOrRejectApprentice = "ApproveOrRejectApprentice"; public const string ViewApprenticeBeforeApprove = "ViewApprenticeBeforeApprove"; + public const string ViewAllAgreementActionName = "ViewAllAgreements"; } } \ No newline at end of file diff --git a/src/SFA.DAS.EmployerAccounts.Web/Views/EmployerAgreement/Index.cshtml b/src/SFA.DAS.EmployerAccounts.Web/Views/EmployerAgreement/Index.cshtml index 3de5088281..7c9f499e32 100644 --- a/src/SFA.DAS.EmployerAccounts.Web/Views/EmployerAgreement/Index.cshtml +++ b/src/SFA.DAS.EmployerAccounts.Web/Views/EmployerAgreement/Index.cshtml @@ -15,110 +15,92 @@ } } -
-
-

Your organisations and agreements

-
-
-
- -
-
-
-
-
-

Add each organisation that will contract with your training providers.

-

There is no restriction on the number of connected organisations you can add.

-
-
-
-
-
- - Transfers status: - - @{ - var authorizationResult = Html.GetAuthorizationResult("EmployerFeature.TransferConnectionRequests"); - if (authorizationResult.IsAuthorized) - { - @:Enabled - } - else if (authorizationResult.HasError()) - { - @:Disabled - } - else - { - throw new ArgumentOutOfRangeException(); - } - } - - - -
-

You must sign the most up-to-date agreement for all organisations to use transfers functionality.

-
-
+@{Layout = "~/Views/Shared/_Layout_CDN.cshtml"; } + +
+
+

Your organisations and agreements

+

You must add each organisation that will contract with your training providers.

+

You can add as many connected organisations as you need to.

+

Transfers status:  + + @{ + var authorizationResult = Html.GetAuthorizationResult("EmployerFeature.TransferConnectionRequests"); + if (authorizationResult.IsAuthorized) + { + @:enabled. + } + else if (authorizationResult.HasError()) + { + @:disabled. + } + else + { + throw new ArgumentOutOfRangeException(); + } + } + +

+

+ Add an organisation +

-
-
- - - - - - - - +
+
+
OrganisationAgreement statusActionAgreement ID
+ + + + + + + - + @foreach (var employerAgreement in Model.Data.EmployerAgreementsData.EmployerAgreements) { - - - + + - - }
Organisations
Organisation nameLatest agreement statusActions
@employerAgreement.LegalEntity.Name +
@employerAgreement.LegalEntity.Name @if (employerAgreement.HasPendingAgreement) { - if (employerAgreement.HasSignedAgreement) - { - @:Updated agreement available - } - else - { - @:Agreement not accepted - } + @:Not yet accepted } else if (employerAgreement.HasSignedAgreement) { - @:Accepted by @employerAgreement.Signed.SignedByName + @:Accepted } - @if (employerAgreement.HasPendingAgreement) - { - Accept agreement - } - else if (employerAgreement.HasSignedAgreement) - { - View - } + + + View all agreements + - @if (employerAgreement.HasSignedAgreement) + + @if (Model.Data.EmployerAgreementsData.EmployerAgreements.Any()) { - @employerAgreement.LegalEntity.AccountLegalEntityPublicHashedId - } - else - { - Accept agreement to receive an agreement ID + Remove organisation }
- +
+ + + How transfers status is worked out + + +
+ Transfers are enabled if all the organisations in your account have accepted the latest agreement. +
+
+
+
+
+
@if (Model.Data.EmployerAgreementsData.EmployerAgreements.Any()) {

Remove an organisation from your account

From 7f7f78e6a68ac663a1d4010191ddfae688257f39 Mon Sep 17 00:00:00 2001 From: Paul Howes Date: Thu, 2 Apr 2020 12:44:04 +0100 Subject: [PATCH 02/35] Fixed breadcrumbs --- .../Views/EmployerAgreement/Index.cshtml | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/SFA.DAS.EmployerAccounts.Web/Views/EmployerAgreement/Index.cshtml b/src/SFA.DAS.EmployerAccounts.Web/Views/EmployerAgreement/Index.cshtml index 7c9f499e32..d6f772a49d 100644 --- a/src/SFA.DAS.EmployerAccounts.Web/Views/EmployerAgreement/Index.cshtml +++ b/src/SFA.DAS.EmployerAccounts.Web/Views/EmployerAgreement/Index.cshtml @@ -80,7 +80,7 @@ @if (Model.Data.EmployerAgreementsData.EmployerAgreements.Any()) { - Remove organisation + Remove organisation } @@ -109,10 +109,12 @@
@section breadcrumb { -
-
    -
  1. Home
    2. -
  2. Your organisations and agreements
    3. +
    +
      +
    1. + Home +
      2. +
    2. Your organisations and agreements
    } \ No newline at end of file From 78bcc6b419936ed878dff43d818bc00257c76bf7 Mon Sep 17 00:00:00 2001 From: Paul Howes Date: Tue, 7 Apr 2020 09:38:37 +0100 Subject: [PATCH 03/35] Completed remove legal entity refactor --- .../EmployerAgreementController.cs | 55 +++------ .../Helpers/ControllerConstants.cs | 3 + .../EmployerAgreementOrchestrator.cs | 86 +++----------- .../SFA.DAS.EmployerAccounts.Web.csproj | 3 +- .../ConfirmOrganisationToRemoveViewModel.cs | 17 +++ .../CannotRemoveOrganisation.cshtml | 38 ++++++ .../ConfirmRemoveOrganisation.cshtml | 110 +++++++++++------- .../GetOrganisationsToRemove.cshtml | 65 ----------- .../Views/EmployerAgreement/Index.cshtml | 17 +-- .../RemoveLegalEntityCommand.cs | 10 +- .../RemoveLegalEntityCommandHandler.cs | 30 +++-- .../RemoveLegalEntityCommandValidator.cs | 13 +-- .../Data/EmployerAgreementRepository.cs | 7 ++ .../Data/IEmployerAgreementRepository.cs | 1 + ...untEmployerAgreementsRemoveQueryHandler.cs | 8 ++ ...etAccountOrganisationRemoveQueryHandler.cs | 99 ++++++++++++++++ .../GetAccountOrganisationRemoveRequest.cs | 11 ++ .../GetAccountOrganisationRemoveResponse.cs | 11 ++ .../GetAccountOrganisationRemoveValidator.cs | 55 +++++++++ 19 files changed, 383 insertions(+), 256 deletions(-) create mode 100644 src/SFA.DAS.EmployerAccounts.Web/ViewModels/ConfirmOrganisationToRemoveViewModel.cs create mode 100644 src/SFA.DAS.EmployerAccounts.Web/Views/EmployerAgreement/CannotRemoveOrganisation.cshtml delete mode 100644 src/SFA.DAS.EmployerAccounts.Web/Views/EmployerAgreement/GetOrganisationsToRemove.cshtml create mode 100644 src/SFA.DAS.EmployerAccounts/Queries/GetAccountOrganisationRemove/GetAccountOrganisationRemoveQueryHandler.cs create mode 100644 src/SFA.DAS.EmployerAccounts/Queries/GetAccountOrganisationRemove/GetAccountOrganisationRemoveRequest.cs create mode 100644 src/SFA.DAS.EmployerAccounts/Queries/GetAccountOrganisationRemove/GetAccountOrganisationRemoveResponse.cs create mode 100644 src/SFA.DAS.EmployerAccounts/Queries/GetAccountOrganisationRemove/GetAccountOrganisationRemoveValidator.cs diff --git a/src/SFA.DAS.EmployerAccounts.Web/Controllers/EmployerAgreementController.cs b/src/SFA.DAS.EmployerAccounts.Web/Controllers/EmployerAgreementController.cs index dbf9aaabc7..c7cedc84ed 100644 --- a/src/SFA.DAS.EmployerAccounts.Web/Controllers/EmployerAgreementController.cs +++ b/src/SFA.DAS.EmployerAccounts.Web/Controllers/EmployerAgreementController.cs @@ -240,63 +240,46 @@ public async Task GetSignedPdfAgreement(string agreementId, string } [HttpGet] - [Route("agreements/remove")] - public async Task GetOrganisationsToRemove(string hashedAccountId) + [Route("agreements/{accountLegalEntityHashedId}/remove")] + public async Task ConfirmRemoveOrganisation(string accountLegalEntityHashedId, string hashedAccountId) { - var model = await _orchestrator.GetLegalAgreementsToRemove(hashedAccountId, OwinWrapper.GetClaimValue(ControllerConstants.UserRefClaimKeyName)); - return View(model); + var model = await _orchestrator.GetConfirmRemoveOrganisationViewModel(accountLegalEntityHashedId, hashedAccountId, OwinWrapper.GetClaimValue(ControllerConstants.UserRefClaimKeyName)); + + return View(model.Data.CanBeRemoved ? ControllerConstants.ConfirmRemoveOrganisationActionName : ControllerConstants.CannotRemoveOrganisationViewName, model.Data); } - [HttpGet] - [Route("agreements/remove/{agreementId}")] - public async Task ConfirmRemoveOrganisation(string agreementId, string hashedAccountId) + [HttpPost] + [Route("agreements/{accountLegalEntityHashedId}/remove")] + [ValidateAntiForgeryToken] + public async Task RemoveOrganisation(string accountLegalEntityHashedId, string hashedAccountId, ConfirmOrganisationToRemoveViewModel model) { - var model = await _orchestrator.GetConfirmRemoveOrganisationViewModel(agreementId, hashedAccountId, OwinWrapper.GetClaimValue(ControllerConstants.UserRefClaimKeyName)); - - var flashMessage = GetFlashMessageViewModelFromCookie(); - if (flashMessage != null) + if (!ModelState.IsValid) { - model.FlashMessage = flashMessage; - model.Data.ErrorDictionary = model.FlashMessage.ErrorMessages; + return View(ControllerConstants.ConfirmRemoveOrganisationViewName, model); } - return View(model); - } + if (!model.Remove.HasValue || !model.Remove.Value) return RedirectToAction(ControllerConstants.IndexActionName); - [HttpPost] - [Route("agreements/remove/{agreementId}")] - [ValidateAntiForgeryToken] - public async Task RemoveOrganisation(string hashedAccountId, string agreementId, ConfirmLegalAgreementToRemoveViewModel model) - - { var response = await _orchestrator.RemoveLegalAgreement(model, OwinWrapper.GetClaimValue(ControllerConstants.UserRefClaimKeyName)); if (response.Status == HttpStatusCode.OK) { AddFlashMessageToCookie(response.FlashMessage); - - return RedirectToAction(ControllerConstants.IndexActionName, new { hashedAccountId }); - } - - if (response.Status == HttpStatusCode.BadRequest) - { - AddFlashMessageToCookie(response.FlashMessage); - return RedirectToAction(ControllerConstants.ConfirmRemoveOrganisationActionName, new { hashedAccountId, agreementId }); + return RedirectToAction(ControllerConstants.IndexActionName); } - return RedirectToAction(ControllerConstants.IndexActionName, new { hashedAccountId }); + AddFlashMessageToCookie(response.FlashMessage); + return View(ControllerConstants.ConfirmRemoveOrganisationViewName, model); } - private async Task GetSignedAgreementViewModel( - GetEmployerAgreementRequest request) + private async Task GetSignedAgreementViewModel(GetEmployerAgreementRequest request) { var response = await _mediator.SendAsync(request); var viewModel = _mapper.Map(response); - var signedAgreementResponse = await _mediator.SendAsync(new GetLastSignedAgreementRequest - {AccountLegalEntityId = response.EmployerAgreement.LegalEntity.AccountLegalEntityId}); - viewModel.PreviouslySignedEmployerAgreement = - _mapper.Map(signedAgreementResponse.LastSignedAgreement); + var signedAgreementResponse = await _mediator.SendAsync(new GetLastSignedAgreementRequest {AccountLegalEntityId = response.EmployerAgreement.LegalEntity.AccountLegalEntityId}); + viewModel.PreviouslySignedEmployerAgreement = _mapper.Map(signedAgreementResponse.LastSignedAgreement); + return viewModel; } diff --git a/src/SFA.DAS.EmployerAccounts.Web/Helpers/ControllerConstants.cs b/src/SFA.DAS.EmployerAccounts.Web/Helpers/ControllerConstants.cs index b9288c50af..376104b77d 100644 --- a/src/SFA.DAS.EmployerAccounts.Web/Helpers/ControllerConstants.cs +++ b/src/SFA.DAS.EmployerAccounts.Web/Helpers/ControllerConstants.cs @@ -14,11 +14,13 @@ public static class ControllerConstants public const string AddOtherOrganisationDetailsViewName = "AddOtherOrganisationDetails"; public const string AmendOrganisationActionName = "AmendOrganisation"; public const string AmendPayeActionName = "AmendPaye"; + public const string CannotRemoveOrganisationViewName = "CannotRemoveOrganisation"; public const string CodeKeyName = "code"; public const string ControllerKeyName = "Controller"; public const string ConfirmOrganisationDetailsViewName = "../OrganisationShared/ConfirmOrganisationDetails"; public const string ConfirmPayeSchemeActionName = "ConfirmPayeScheme"; public const string ConfirmRemoveOrganisationActionName = "ConfirmRemoveOrganisation"; + public const string ConfirmRemoveOrganisationViewName = "ConfirmRemoveOrganisation"; public const string DetailsActionName = "Details"; public const string EmailClaimKeyName = "email"; public const string EmployerAccountControllerName = "EmployerAccount"; @@ -57,6 +59,7 @@ public static class ControllerConstants public const string RegisterUserActionName = "RegisterUser"; public const string RenameAccountActionName = "RenameAccount"; public const string RemoveViewName = "Remove"; + public const string RemoveOrganisationActionName = "ConfirmRemoveOrganisation"; public const string ReportTrainingProviderViewName = "ReportTrainingProvider"; public const string SearchOrganisationControllerName = "SearchOrganisation"; public const string SearchForOrganisationActionName = "SearchForOrganisation"; diff --git a/src/SFA.DAS.EmployerAccounts.Web/Orchestrators/EmployerAgreementOrchestrator.cs b/src/SFA.DAS.EmployerAccounts.Web/Orchestrators/EmployerAgreementOrchestrator.cs index f184176337..b0e9402f0c 100644 --- a/src/SFA.DAS.EmployerAccounts.Web/Orchestrators/EmployerAgreementOrchestrator.cs +++ b/src/SFA.DAS.EmployerAccounts.Web/Orchestrators/EmployerAgreementOrchestrator.cs @@ -9,9 +9,8 @@ using SFA.DAS.EmployerAccounts.Dtos; using SFA.DAS.EmployerAccounts.Interfaces; using SFA.DAS.EmployerAccounts.Models.EmployerAgreement; -using SFA.DAS.EmployerAccounts.Queries.GetAccountEmployerAgreementRemove; using SFA.DAS.EmployerAccounts.Queries.GetAccountEmployerAgreements; -using SFA.DAS.EmployerAccounts.Queries.GetAccountEmployerAgreementsRemove; +using SFA.DAS.EmployerAccounts.Queries.GetAccountOrganisationRemove; using SFA.DAS.EmployerAccounts.Queries.GetEmployerAgreement; using SFA.DAS.EmployerAccounts.Queries.GetEmployerAgreementPdf; using SFA.DAS.EmployerAccounts.Queries.GetEmployerAgreementType; @@ -161,33 +160,18 @@ await _mediator.SendAsync(new SignEmployerAgreementCommand }; } } - public virtual async Task> RemoveLegalAgreement(ConfirmLegalAgreementToRemoveViewModel model, string userId) + public virtual async Task> RemoveLegalAgreement(ConfirmOrganisationToRemoveViewModel model, string userId) { var response = new OrchestratorResponse(); + try { - if (model.RemoveOrganisation == null) - { - response.Status = HttpStatusCode.BadRequest; - response.FlashMessage = - FlashMessageViewModel.CreateErrorFlashMessageViewModel(new Dictionary - { - {"RemoveOrganisation", "Confirm you wish to remove the organisation"} - }); - return response; - } - - if (model.RemoveOrganisation == 1) - { - response.Status = HttpStatusCode.Continue; - return response; - } - await _mediator.SendAsync(new RemoveLegalEntityCommand { HashedAccountId = model.HashedAccountId, UserId = userId, - HashedLegalAgreementId = model.HashedAgreementId + HashedAccountLegalEntityId = model. + HashedAccountLegalEntitytId = model.HashedAccountLegalEntitytId }); response.FlashMessage = new FlashMessageViewModel @@ -195,6 +179,8 @@ await _mediator.SendAsync(new RemoveLegalEntityCommand Headline = $"You have removed {model.Name}.", Severity = FlashMessageSeverityLevel.Success }; + + response.Status = HttpStatusCode.OK; response.Data = true; } catch (InvalidRequestException ex) @@ -290,66 +276,32 @@ public async Task> GetSigned } - public virtual async Task> GetLegalAgreementsToRemove(string hashedAccountId, string userId) + public virtual async Task> GetConfirmRemoveOrganisationViewModel(string accountLegalEntityHashedId, string hashedAccountId, string userId) { - var response = new OrchestratorResponse(); - try - { - var result = await _mediator.SendAsync(new GetAccountEmployerAgreementsRemoveRequest - { - HashedAccountId = hashedAccountId, - UserId = userId - }); + var response = new OrchestratorResponse(); - response.Data = new LegalAgreementsToRemoveViewModel - { - Agreements = result.Agreements - - }; - } - catch (InvalidRequestException ex) - { - response.Status = HttpStatusCode.BadRequest; - response.FlashMessage = new FlashMessageViewModel - { - Headline = "Errors to fix", - Message = "Check the following details:", - ErrorMessages = ex.ErrorMessages, - Severity = FlashMessageSeverityLevel.Error - }; - response.Exception = ex; - } - catch (UnauthorizedAccessException ex) - { - response.Status = HttpStatusCode.Unauthorized; - response.Exception = ex; - } - return response; - } - - public virtual async Task> GetConfirmRemoveOrganisationViewModel(string agreementId, string hashedAccountId, string userId) - { - var response = new OrchestratorResponse(); try { - var result = await _mediator.SendAsync(new GetAccountEmployerAgreementRemoveRequest + var result = await _mediator.SendAsync(new GetAccountOrganisationRemoveRequest { HashedAccountId = hashedAccountId, UserId = userId, - HashedAgreementId = agreementId + HashedAccountLegalEntityId = accountLegalEntityHashedId }); - response.Data = new ConfirmLegalAgreementToRemoveViewModel + + response.Data = new ConfirmOrganisationToRemoveViewModel { - HashedAccountId = result.Agreement.HashedAccountId, - HashedAgreementId = result.Agreement.HashedAgreementId, - Id = result.Agreement.Id, - Name = result.Agreement.Name, - AgreementStatus = result.Agreement.Status + HashedAccountId = hashedAccountId, + HashedAccountLegalEntitytId = accountLegalEntityHashedId, + HasSignedAgreement = result.HasSignedAgreement, + CanBeRemoved = result.CanBeRemoved, + Name = result.Name }; } catch (InvalidRequestException ex) { response.Status = HttpStatusCode.BadRequest; + response.FlashMessage = new FlashMessageViewModel { Headline = "Errors to fix", diff --git a/src/SFA.DAS.EmployerAccounts.Web/SFA.DAS.EmployerAccounts.Web.csproj b/src/SFA.DAS.EmployerAccounts.Web/SFA.DAS.EmployerAccounts.Web.csproj index db2aad7080..169fa0aac4 100644 --- a/src/SFA.DAS.EmployerAccounts.Web/SFA.DAS.EmployerAccounts.Web.csproj +++ b/src/SFA.DAS.EmployerAccounts.Web/SFA.DAS.EmployerAccounts.Web.csproj @@ -280,6 +280,7 @@ + @@ -798,7 +799,6 @@ - @@ -882,6 +882,7 @@ + diff --git a/src/SFA.DAS.EmployerAccounts.Web/ViewModels/ConfirmOrganisationToRemoveViewModel.cs b/src/SFA.DAS.EmployerAccounts.Web/ViewModels/ConfirmOrganisationToRemoveViewModel.cs new file mode 100644 index 0000000000..f3a174d342 --- /dev/null +++ b/src/SFA.DAS.EmployerAccounts.Web/ViewModels/ConfirmOrganisationToRemoveViewModel.cs @@ -0,0 +1,17 @@ +using System.ComponentModel.DataAnnotations; +using SFA.DAS.EmployerAccounts.Models.EmployerAgreement; + +namespace SFA.DAS.EmployerAccounts.Web.ViewModels +{ + public class ConfirmOrganisationToRemoveViewModel : ViewModelBase + { + public string Name { get; set; } + public string HashedAccountLegalEntitytId { get; set; } + public string HashedAccountId { get; set; } + public bool CanBeRemoved { get; set; } + public bool HasSignedAgreement { get; set; } + + [Required] + public bool? Remove { get; set; } + } +} \ No newline at end of file diff --git a/src/SFA.DAS.EmployerAccounts.Web/Views/EmployerAgreement/CannotRemoveOrganisation.cshtml b/src/SFA.DAS.EmployerAccounts.Web/Views/EmployerAgreement/CannotRemoveOrganisation.cshtml new file mode 100644 index 0000000000..0c9c5d4582 --- /dev/null +++ b/src/SFA.DAS.EmployerAccounts.Web/Views/EmployerAgreement/CannotRemoveOrganisation.cshtml @@ -0,0 +1,38 @@ +@using SFA.DAS.EmployerAccounts.Web.Helpers +@model ConfirmOrganisationToRemoveViewModel + +@{ + ViewBag.PageID = "organisations-remove-cannot"; + ViewBag.Title = "Cannot Remove organisation"; + ViewBag.Section = "organisations"; + ViewBag.ZenDeskLabel = "eas-remove-organisation"; +} + +@{ + ViewBag.GaData.Vpv = "/accounts/agreements/remove/organisation-remove-cannot"; +} + +@{Layout = "~/Views/Shared/_Layout_CDN.cshtml"; } + +
    +
    +

    You cannot remove @Model.Name

    +

    This is because @Model.Name has apprenticeships in progress.

    +

    Return to your organisations and agreements

    +
    +
    + +@section breadcrumb +{ +
    +
      +
    1. + Home +
      2. +
    2. + Your organisations and agreements +
      3. +
    3. Remove organisation
      4. +
    +
    +} \ No newline at end of file diff --git a/src/SFA.DAS.EmployerAccounts.Web/Views/EmployerAgreement/ConfirmRemoveOrganisation.cshtml b/src/SFA.DAS.EmployerAccounts.Web/Views/EmployerAgreement/ConfirmRemoveOrganisation.cshtml index b9886254c2..505ac9924e 100644 --- a/src/SFA.DAS.EmployerAccounts.Web/Views/EmployerAgreement/ConfirmRemoveOrganisation.cshtml +++ b/src/SFA.DAS.EmployerAccounts.Web/Views/EmployerAgreement/ConfirmRemoveOrganisation.cshtml @@ -1,66 +1,88 @@ -@using SFA.DAS.EmployerAccounts.Models.EmployerAgreement -@model OrchestratorResponse - +@using SFA.DAS.EmployerAccounts.Web.Helpers +@model ConfirmOrganisationToRemoveViewModel @{ ViewBag.PageID = "organisations-remove-confirmation"; ViewBag.Title = "Remove organisation"; ViewBag.Section = "organisations"; ViewBag.ZenDeskLabel = "eas-remove-organisation"; -} - -@{ ViewBag.GaData.Vpv = "/accounts/agreements/remove/organisation-remove-confirmation"; + Layout = "~/Views/Shared/_Layout_CDN.cshtml"; } -
    -
    -

    - @Model.Data.Name - Remove organisation -

    - - @if (Model.Data.AgreementStatus == EmployerAgreementStatus.Signed) +
    +
    + @if (!ViewData.ModelState.IsValid) { -

    @Model.Data.Name will end its agreement with the ESFA.

    + } - -
    + +

    Are you sure you want to remove @Model.Name?

    + @Html.AntiForgeryToken() - - - -
    -
    - - Are you sure? - @if (!string.IsNullOrEmpty(Model.Data.RemoveOrganisationError)) - { - @Model.Data.RemoveOrganisationError - } - - - + @Html.HiddenFor(m => m.Name) + @Html.HiddenFor(m => m.CanBeRemoved) + @Html.HiddenFor(m => m.HasSignedAgreement) + @Html.HiddenFor(m => m.HashedAccountId) + @Html.HiddenFor(m => m.HashedAccountLegalEntitytId) +
    +
    + @if (Model.HasSignedAgreement) + { + +

    This will end @Model.Name’s agreement with ESFA.

    +     + } + + @if (!ViewData.ModelState.IsValid) + { + + Select yes if you want to remove @Model.Name + + } + +
    +
    + @Html.RadioButtonFor(m => m.Remove, true, new { @class = "govuk-radios__input", id = "yes" }) + +
    +
    + @Html.RadioButtonFor(m => m.Remove, false, new { @class = "govuk-radios__input", id = "no" }) + +
    +
    -
    - + +
    +
    - -@section breadcrumb { -
    -
      -
    1. Back to your organisations
      2. +@section breadcrumb +{ +
      +
        +
      1. + Home +
        2. +
      2. + Your organisations and agreements +
        3. +
      3. Remove organisation
      } \ No newline at end of file diff --git a/src/SFA.DAS.EmployerAccounts.Web/Views/EmployerAgreement/GetOrganisationsToRemove.cshtml b/src/SFA.DAS.EmployerAccounts.Web/Views/EmployerAgreement/GetOrganisationsToRemove.cshtml deleted file mode 100644 index e670fd911f..0000000000 --- a/src/SFA.DAS.EmployerAccounts.Web/Views/EmployerAgreement/GetOrganisationsToRemove.cshtml +++ /dev/null @@ -1,65 +0,0 @@ -@model OrchestratorResponse - -@{ - ViewBag.PageID = "organisations-remove"; - ViewBag.Title = "Remove an organisation"; - ViewBag.Section = "organisations"; - ViewBag.ZenDeskLabel = "eas-remove-an-organisation"; -} - -@{ - ViewBag.GaData.Vpv = "/accounts/agreements/remove/organisation-remove"; -} - -
      -
      -

      @ViewBag.Title

      -
      -
      - -
      -
      - - - - - - - - @foreach (var org in Model.Data.Agreements) - { - - - @if (org.CanBeRemoved) - { - - } - else - { - if (Model.Data.Agreements.Count == 1) - { - - } - else - { - - } - } - - - } - - - -
      OrganisationStatus
      @org.NameRemove @org.NameCan't be removed because it's the only organisation on your account.Can't be removed because it has ongoing apprenticeships.
      -
      -
      - - -@section breadcrumb { -
      -
        -
      1. Back to your organisations
        2. -
      -
      -} diff --git a/src/SFA.DAS.EmployerAccounts.Web/Views/EmployerAgreement/Index.cshtml b/src/SFA.DAS.EmployerAccounts.Web/Views/EmployerAgreement/Index.cshtml index d6f772a49d..88131712e6 100644 --- a/src/SFA.DAS.EmployerAccounts.Web/Views/EmployerAgreement/Index.cshtml +++ b/src/SFA.DAS.EmployerAccounts.Web/Views/EmployerAgreement/Index.cshtml @@ -78,9 +78,9 @@ - @if (Model.Data.EmployerAgreementsData.EmployerAgreements.Any()) + @if (Model.Data.EmployerAgreementsData.EmployerAgreements.Count > 1) { - Remove organisation + Remove organisation } @@ -99,20 +99,13 @@
    -
    -
    - @if (Model.Data.EmployerAgreementsData.EmployerAgreements.Any()) - { -

    Remove an organisation from your account

    - } -
    -
    -@section breadcrumb { +@section breadcrumb +{
    1. - Home + Home
    2. Your organisations and agreements
    diff --git a/src/SFA.DAS.EmployerAccounts/Commands/RemoveLegalEntity/RemoveLegalEntityCommand.cs b/src/SFA.DAS.EmployerAccounts/Commands/RemoveLegalEntity/RemoveLegalEntityCommand.cs index 981a9c8085..9abb1bf83b 100644 --- a/src/SFA.DAS.EmployerAccounts/Commands/RemoveLegalEntity/RemoveLegalEntityCommand.cs +++ b/src/SFA.DAS.EmployerAccounts/Commands/RemoveLegalEntity/RemoveLegalEntityCommand.cs @@ -5,15 +5,7 @@ namespace SFA.DAS.EmployerAccounts.Commands.RemoveLegalEntity public class RemoveLegalEntityCommand : IAsyncRequest { public string HashedAccountId { get; set; } - - /// - /// The UserRef of the user. - /// - /// - /// This is not the Id of the user. Not renaming it as UserId seems to be used - /// comprehensively for UserRef. - /// + public string HashedAccountLegalEntityId { get; set; } public string UserId { get; set; } - public string HashedLegalAgreementId { get; set; } } } diff --git a/src/SFA.DAS.EmployerAccounts/Commands/RemoveLegalEntity/RemoveLegalEntityCommandHandler.cs b/src/SFA.DAS.EmployerAccounts/Commands/RemoveLegalEntity/RemoveLegalEntityCommandHandler.cs index ad0a88c969..ee54df375a 100644 --- a/src/SFA.DAS.EmployerAccounts/Commands/RemoveLegalEntity/RemoveLegalEntityCommandHandler.cs +++ b/src/SFA.DAS.EmployerAccounts/Commands/RemoveLegalEntity/RemoveLegalEntityCommandHandler.cs @@ -9,6 +9,7 @@ using SFA.DAS.EmployerAccounts.Commands.PublishGenericEvent; using SFA.DAS.EmployerAccounts.Data; using SFA.DAS.EmployerAccounts.Factories; +using SFA.DAS.EmployerAccounts.MarkerInterfaces; using SFA.DAS.EmployerAccounts.Messages.Events; using SFA.DAS.EmployerAccounts.Models; using SFA.DAS.EmployerAccounts.Models.EmployerAgreement; @@ -27,6 +28,7 @@ public class RemoveLegalEntityCommandHandler : AsyncRequestHandler a.TemplateId).First(); + var HashedLegalAgreementId = _hashingService.HashValue((long)legalAgreement.Id); + + var agreement = await _employerAgreementRepository.GetEmployerAgreement(legalAgreement.Id); await ValidateLegalEntityHasNoCommitments(agreement, accountId, validationResult); - await _employerAgreementRepository.RemoveLegalEntityFromAccount(legalAgreementId); + await _employerAgreementRepository.RemoveLegalEntityFromAccount(legalAgreement.Id); await Task.WhenAll( - AddAuditEntry(accountId, message.HashedLegalAgreementId), - CreateEvent(message.HashedLegalAgreementId) + AddAuditEntry(accountId, HashedLegalAgreementId), + CreateEvent(HashedLegalAgreementId) ); // it appears that an agreement is created whenever we create a legal entity, so there should always be an agreement associated with a legal entity @@ -95,11 +103,11 @@ await Task.WhenAll( var createdByName = caller.FullName(); await PublishLegalEntityRemovedMessage( - accountId, - legalAgreementId, - agreementSigned, - createdByName, - agreement.LegalEntityId, + accountId, + legalAgreement.Id, + agreementSigned, + createdByName, + agreement.LegalEntityId, agreement.LegalEntityName, agreement.AccountLegalEntityId, message.UserId); diff --git a/src/SFA.DAS.EmployerAccounts/Commands/RemoveLegalEntity/RemoveLegalEntityCommandValidator.cs b/src/SFA.DAS.EmployerAccounts/Commands/RemoveLegalEntity/RemoveLegalEntityCommandValidator.cs index 08ca672be8..198f7d3ef9 100644 --- a/src/SFA.DAS.EmployerAccounts/Commands/RemoveLegalEntity/RemoveLegalEntityCommandValidator.cs +++ b/src/SFA.DAS.EmployerAccounts/Commands/RemoveLegalEntity/RemoveLegalEntityCommandValidator.cs @@ -37,9 +37,9 @@ public async Task ValidateAsync(RemoveLegalEntityCommand item) { validationResult.AddError(nameof(item.UserId)); } - if (string.IsNullOrEmpty(item.HashedLegalAgreementId)) + if (string.IsNullOrEmpty(item.HashedAccountLegalEntityId)) { - validationResult.AddError(nameof(item.HashedLegalAgreementId)); + validationResult.AddError(nameof(item.HashedAccountLegalEntityId)); } if (!validationResult.IsValid()) @@ -55,15 +55,6 @@ public async Task ValidateAsync(RemoveLegalEntityCommand item) return validationResult; } - var accountId = _hashingService.DecodeValue(item.HashedAccountId); - var legalEntities = await _employerAgreementRepository.GetLegalEntitiesLinkedToAccount(accountId, false); - - if (legalEntities != null && legalEntities.Count == 1) - { - validationResult.AddError(nameof(item.HashedLegalAgreementId), "There must be at least one legal entity on the account"); - return validationResult; - } - return validationResult; } } diff --git a/src/SFA.DAS.EmployerAccounts/Data/EmployerAgreementRepository.cs b/src/SFA.DAS.EmployerAccounts/Data/EmployerAgreementRepository.cs index b4e9753470..d59f026e86 100644 --- a/src/SFA.DAS.EmployerAccounts/Data/EmployerAgreementRepository.cs +++ b/src/SFA.DAS.EmployerAccounts/Data/EmployerAgreementRepository.cs @@ -154,6 +154,13 @@ public async Task> GetAccountAgreements(long acco return agreements; } + public async Task> GetAccountLegalEntityAgreements(long accountLegalEntityId) + { + return await _db.Value.Agreements.Where(ea => ea.AccountLegalEntityId == accountLegalEntityId) + .ToListAsync() + .ConfigureAwait(false); + } + public async Task GetEmployerAgreementStatus(long agreementId) { return await _db.Value.Agreements.Where(x => x.Id == agreementId).Select(x => x.StatusId).SingleOrDefaultAsync(); diff --git a/src/SFA.DAS.EmployerAccounts/Data/IEmployerAgreementRepository.cs b/src/SFA.DAS.EmployerAccounts/Data/IEmployerAgreementRepository.cs index 46fb9f4ced..453dfe1b3f 100644 --- a/src/SFA.DAS.EmployerAccounts/Data/IEmployerAgreementRepository.cs +++ b/src/SFA.DAS.EmployerAccounts/Data/IEmployerAgreementRepository.cs @@ -17,6 +17,7 @@ public interface IEmployerAgreementRepository Task> GetEmployerAgreementsToRemove(long accountId); Task GetAccountLegalEntity(long accountLegalEntityId); Task> GetAccountAgreements(long accountId); + Task> GetAccountLegalEntityAgreements(long accountLegalEntityId); Task GetEmployerAgreementStatus(long agreementId); Task SetAccountLegalEntityAgreementDetails(long accountLegalEntityId, long? pendingAgreementId, int? pendingAgreementVersion, long? signedAgreementId, int? signedAgreementVersion); } diff --git a/src/SFA.DAS.EmployerAccounts/Queries/GetAccountEmployerAgreementsRemove/GetAccountEmployerAgreementsRemoveQueryHandler.cs b/src/SFA.DAS.EmployerAccounts/Queries/GetAccountEmployerAgreementsRemove/GetAccountEmployerAgreementsRemoveQueryHandler.cs index ebaff275b2..fa0e0ed608 100644 --- a/src/SFA.DAS.EmployerAccounts/Queries/GetAccountEmployerAgreementsRemove/GetAccountEmployerAgreementsRemoveQueryHandler.cs +++ b/src/SFA.DAS.EmployerAccounts/Queries/GetAccountEmployerAgreementsRemove/GetAccountEmployerAgreementsRemoveQueryHandler.cs @@ -9,6 +9,7 @@ using SFA.DAS.EmployerAccounts.Models.EmployerAgreement; using SFA.DAS.HashingService; using SFA.DAS.Validation; +using OrganisationType = SFA.DAS.Common.Domain.Types.OrganisationType; namespace SFA.DAS.EmployerAccounts.Queries.GetAccountEmployerAgreementsRemove { @@ -86,6 +87,13 @@ private async Task SetSignedAgreementsCanBeRemovedBasedOnCommitments(long accoun var commitments = await _employerCommitmentApi.GetEmployerAccountSummary(accountId); + commitments.Add(new ApprenticeshipStatusSummary + { + ActiveCount = 1, + LegalEntityIdentifier = "12107942", + LegalEntityOrganisationType = OrganisationType.CompaniesHouse + }); + foreach (var removeEmployerAgreementView in result.Where(x => x.Status == EmployerAgreementStatus.Signed)) { var commitmentConnectedToEntity = commitments.FirstOrDefault(c => diff --git a/src/SFA.DAS.EmployerAccounts/Queries/GetAccountOrganisationRemove/GetAccountOrganisationRemoveQueryHandler.cs b/src/SFA.DAS.EmployerAccounts/Queries/GetAccountOrganisationRemove/GetAccountOrganisationRemoveQueryHandler.cs new file mode 100644 index 0000000000..504885cfe1 --- /dev/null +++ b/src/SFA.DAS.EmployerAccounts/Queries/GetAccountOrganisationRemove/GetAccountOrganisationRemoveQueryHandler.cs @@ -0,0 +1,99 @@ +using MediatR; +using SFA.DAS.Commitments.Api.Client.Interfaces; +using SFA.DAS.EmployerAccounts.Data; +using SFA.DAS.HashingService; +using SFA.DAS.Validation; +using System; +using System.Linq; +using System.Threading.Tasks; +using SFA.DAS.Commitments.Api.Types; +using SFA.DAS.EmployerAccounts.MarkerInterfaces; +using SFA.DAS.EmployerAccounts.Models.EmployerAgreement; +using SFA.DAS.EmployerAccounts.Models.Organisation; +using OrganisationType = SFA.DAS.Common.Domain.Types.OrganisationType; + +namespace SFA.DAS.EmployerAccounts.Queries.GetAccountOrganisationRemove +{ + public class GetAccountOrganisationRemoveQueryHandler : IAsyncRequestHandler + { + private readonly IValidator _validator; + private readonly IEmployerAgreementRepository _employerAgreementRepository; + private readonly IHashingService _hashingService; + private readonly IAccountLegalEntityPublicHashingService _accountLegalEntityHashingService; + private readonly IEmployerCommitmentApi _employerCommitmentApi; + + public GetAccountOrganisationRemoveQueryHandler( + IValidator validator, + IEmployerAgreementRepository employerAgreementRepository, + IHashingService hashingService, + IAccountLegalEntityPublicHashingService accountLegalEntityHashingService, + IEmployerCommitmentApi employerCommitmentApi) + { + _validator = validator; + _employerAgreementRepository = employerAgreementRepository; + _hashingService = hashingService; + _accountLegalEntityHashingService = accountLegalEntityHashingService; + _employerCommitmentApi = employerCommitmentApi; + } + + public async Task Handle(GetAccountOrganisationRemoveRequest message) + { + var validationResult = await _validator.ValidateAsync(message); + + if (!validationResult.IsValid()) + { + throw new InvalidRequestException(validationResult.ValidationDictionary); + } + + if (validationResult.IsUnauthorized) + { + throw new UnauthorizedAccessException(); + } + + var accountId = _hashingService.DecodeValue(message.HashedAccountId); + var accountLegalEntityId = _accountLegalEntityHashingService.DecodeValue(message.HashedAccountLegalEntityId); + var accountLegalEntity = await _employerAgreementRepository.GetAccountLegalEntity(accountLegalEntityId); + + var result = await _employerAgreementRepository.GetAccountLegalEntityAgreements(accountLegalEntityId); + if (result == null) return new GetAccountOrganisationRemoveResponse(); + + if (result.Any(x => x.StatusId == EmployerAgreementStatus.Signed)) + { + return new GetAccountOrganisationRemoveResponse + { + CanBeRemoved = await SetRemovedStatusBasedOnCommitments(accountId, accountLegalEntity), + HasSignedAgreement = true, + Name = accountLegalEntity.Name + }; + } + + return new GetAccountOrganisationRemoveResponse + { + CanBeRemoved = true, + HasSignedAgreement = false, + Name = accountLegalEntity.Name + }; + } + + private async Task SetRemovedStatusBasedOnCommitments(long accountId, AccountLegalEntityModel accountLegalEntityModel) + { + var commitments = await _employerCommitmentApi.GetEmployerAccountSummary(accountId); + + commitments.Add(new ApprenticeshipStatusSummary + { + ActiveCount = 1, + LegalEntityIdentifier = "12107942", + LegalEntityOrganisationType = OrganisationType.CompaniesHouse + }); + + var commitmentConnectedToEntity = commitments.FirstOrDefault(c => + !string.IsNullOrEmpty(c.LegalEntityIdentifier) + && c.LegalEntityIdentifier.Equals(accountLegalEntityModel.Identifier) + && c.LegalEntityOrganisationType == accountLegalEntityModel.OrganisationType); + + return commitmentConnectedToEntity == null || (commitmentConnectedToEntity.ActiveCount + + commitmentConnectedToEntity.PendingApprovalCount + + commitmentConnectedToEntity.PausedCount) == 0; + } + } +} \ No newline at end of file diff --git a/src/SFA.DAS.EmployerAccounts/Queries/GetAccountOrganisationRemove/GetAccountOrganisationRemoveRequest.cs b/src/SFA.DAS.EmployerAccounts/Queries/GetAccountOrganisationRemove/GetAccountOrganisationRemoveRequest.cs new file mode 100644 index 0000000000..f0e55f483f --- /dev/null +++ b/src/SFA.DAS.EmployerAccounts/Queries/GetAccountOrganisationRemove/GetAccountOrganisationRemoveRequest.cs @@ -0,0 +1,11 @@ +using MediatR; + +namespace SFA.DAS.EmployerAccounts.Queries.GetAccountOrganisationRemove +{ + public class GetAccountOrganisationRemoveRequest : IAsyncRequest + { + public string HashedAccountId { get; set; } + public string UserId { get; set; } + public string HashedAccountLegalEntityId { get; set; } + } +} \ No newline at end of file diff --git a/src/SFA.DAS.EmployerAccounts/Queries/GetAccountOrganisationRemove/GetAccountOrganisationRemoveResponse.cs b/src/SFA.DAS.EmployerAccounts/Queries/GetAccountOrganisationRemove/GetAccountOrganisationRemoveResponse.cs new file mode 100644 index 0000000000..67274c674e --- /dev/null +++ b/src/SFA.DAS.EmployerAccounts/Queries/GetAccountOrganisationRemove/GetAccountOrganisationRemoveResponse.cs @@ -0,0 +1,11 @@ +using SFA.DAS.EmployerAccounts.Models.EmployerAgreement; + +namespace SFA.DAS.EmployerAccounts.Queries.GetAccountOrganisationRemove +{ + public class GetAccountOrganisationRemoveResponse + { + public string Name { get; set; } + public bool CanBeRemoved { get; set; } + public bool HasSignedAgreement { get; set; } + } +} \ No newline at end of file diff --git a/src/SFA.DAS.EmployerAccounts/Queries/GetAccountOrganisationRemove/GetAccountOrganisationRemoveValidator.cs b/src/SFA.DAS.EmployerAccounts/Queries/GetAccountOrganisationRemove/GetAccountOrganisationRemoveValidator.cs new file mode 100644 index 0000000000..e73e24f91e --- /dev/null +++ b/src/SFA.DAS.EmployerAccounts/Queries/GetAccountOrganisationRemove/GetAccountOrganisationRemoveValidator.cs @@ -0,0 +1,55 @@ +using System; +using System.Threading.Tasks; +using SFA.DAS.EmployerAccounts.Data; +using SFA.DAS.EmployerAccounts.Models; +using SFA.DAS.Validation; + +namespace SFA.DAS.EmployerAccounts.Queries.GetAccountOrganisationRemove +{ + public class GetAccountOrganisationRemoveValidator : IValidator + { + private readonly IMembershipRepository _membershipRepository; + + public GetAccountOrganisationRemoveValidator(IMembershipRepository membershipRepository) + { + _membershipRepository = membershipRepository; + } + + public ValidationResult Validate(GetAccountOrganisationRemoveRequest item) + { + throw new NotImplementedException(); + } + + public async Task ValidateAsync(GetAccountOrganisationRemoveRequest item) + { + var validationResult = new ValidationResult(); + + if (string.IsNullOrEmpty(item.HashedAccountId)) + { + validationResult.AddError(nameof(item.HashedAccountId)); + } + if (string.IsNullOrEmpty(item.UserId)) + { + validationResult.AddError(nameof(item.UserId)); + } + if (string.IsNullOrEmpty(item.HashedAccountLegalEntityId)) + { + validationResult.AddError(nameof(item.HashedAccountLegalEntityId)); + } + + if (!validationResult.IsValid()) + { + return validationResult; + } + + var user = await _membershipRepository.GetCaller(item.HashedAccountId, item.UserId); + + if (user == null || user.Role != Role.Owner) + { + validationResult.IsUnauthorized = true; + } + + return validationResult; + } + } +} \ No newline at end of file From e22dead03b04faa6eec5f40e8de0309f7979f91c Mon Sep 17 00:00:00 2001 From: Paul Howes Date: Tue, 7 Apr 2020 16:05:16 +0100 Subject: [PATCH 04/35] Updated unit test --- ....DAS.EAS.Employer_Account.Database.sqlproj | 1 - ...EmployerAgreementsToRemove_ByAccountId.sql | 19 -- .../WhenIRemoveALegalEntity.cs | 27 ++- .../WhenIValidateTheCommand.cs | 12 +- ...henIGetAccountEmployerAgreementToRemove.cs | 82 -------- ...enIGetAccountEmployerAgreementsToRemove.cs | 187 ------------------ .../WhenIValidateTheQuery.cs | 75 ------- .../WhenIGetAccountLegalEntityRemove.cs | 112 +++++++++++ .../WhenIValidateTheQuery.cs | 16 +- .../EmployerAgreementControllerTests.cs | 59 +----- .../WhenIGetAListOfAgreementsToRemove.cs | 96 --------- ...heConfirmRemoveAccountLegalEntityModel.cs} | 41 ++-- .../WhenIRemoveTheLegalAgreement.cs | 44 +---- .../EmployerAgreementController.cs | 2 +- .../EmployerAgreementOrchestrator.cs | 7 +- .../Orchestrators/OrganisationOrchestrator.cs | 2 +- .../SFA.DAS.EmployerAccounts.Web.csproj | 1 - .../ConfirmLegalAgreementToRemoveViewModel.cs | 16 -- .../ConfirmOrganisationToRemoveViewModel.cs | 1 - .../RemoveLegalEntityCommandHandler.cs | 10 +- .../RemoveLegalEntityCommandValidator.cs | 9 + .../Data/EmployerAgreementRepository.cs | 17 +- .../Data/IEmployerAgreementRepository.cs | 1 - ...ountEmployerAgreementRemoveQueryHandler.cs | 61 ------ ...etAccountEmployerAgreementRemoveRequest.cs | 11 -- ...tAccountEmployerAgreementRemoveResponse.cs | 9 - ...AccountEmployerAgreementRemoveValidator.cs | 56 ------ ...untEmployerAgreementsRemoveQueryHandler.cs | 126 ------------ ...tAccountEmployerAgreementsRemoveRequest.cs | 10 - ...AccountEmployerAgreementsRemoveResponse.cs | 10 - ...ccountEmployerAgreementsRemoveValidator.cs | 53 ----- .../GetAccountLegalEntityHandler.cs | 2 +- .../GetAccountLegalEntityRequest.cs | 2 +- .../GetAccountLegalEntityResponse.cs | 2 +- .../GetAccountLegalEntityValidator.cs | 2 +- ...etAccountLegalEntityRemoveQueryHandler.cs} | 39 ++-- .../GetAccountLegalEntityRemoveRequest.cs} | 4 +- .../GetAccountLegalEntityRemoveResponse.cs | 9 + .../GetAccountLegalEntityRemoveValidator.cs} | 10 +- .../GetAccountOrganisationRemoveResponse.cs | 11 -- 40 files changed, 243 insertions(+), 1011 deletions(-) delete mode 100644 src/SFA.DAS.EAS.Employer_Account.Database/StoredProcedures/GetEmployerAgreementsToRemove_ByAccountId.sql delete mode 100644 src/SFA.DAS.EmployerAccounts.UnitTests/Queries/GetAccountEmployerAgreementRemove/WhenIGetAccountEmployerAgreementToRemove.cs delete mode 100644 src/SFA.DAS.EmployerAccounts.UnitTests/Queries/GetAccountEmployerAgreementsRemove/WhenIGetAccountEmployerAgreementsToRemove.cs delete mode 100644 src/SFA.DAS.EmployerAccounts.UnitTests/Queries/GetAccountEmployerAgreementsRemove/WhenIValidateTheQuery.cs create mode 100644 src/SFA.DAS.EmployerAccounts.UnitTests/Queries/GetAccountLegalEntityRemove/WhenIGetAccountLegalEntityRemove.cs rename src/SFA.DAS.EmployerAccounts.UnitTests/Queries/{GetAccountEmployerAgreementRemove => GetAccountLegalEntityRemove}/WhenIValidateTheQuery.cs (78%) delete mode 100644 src/SFA.DAS.EmployerAccounts.Web.UnitTests/Orchestrators/EmployerAgreementOrchestratorTests/WhenIGetAListOfAgreementsToRemove.cs rename src/SFA.DAS.EmployerAccounts.Web.UnitTests/Orchestrators/EmployerAgreementOrchestratorTests/{WhenIGetTheConfirmRemoveAgreementModel.cs => WhenIGetTheConfirmRemoveAccountLegalEntityModel.cs} (64%) delete mode 100644 src/SFA.DAS.EmployerAccounts.Web/ViewModels/ConfirmLegalAgreementToRemoveViewModel.cs delete mode 100644 src/SFA.DAS.EmployerAccounts/Queries/GetAccountEmployerAgreementRemove/GetAccountEmployerAgreementRemoveQueryHandler.cs delete mode 100644 src/SFA.DAS.EmployerAccounts/Queries/GetAccountEmployerAgreementRemove/GetAccountEmployerAgreementRemoveRequest.cs delete mode 100644 src/SFA.DAS.EmployerAccounts/Queries/GetAccountEmployerAgreementRemove/GetAccountEmployerAgreementRemoveResponse.cs delete mode 100644 src/SFA.DAS.EmployerAccounts/Queries/GetAccountEmployerAgreementRemove/GetAccountEmployerAgreementRemoveValidator.cs delete mode 100644 src/SFA.DAS.EmployerAccounts/Queries/GetAccountEmployerAgreementsRemove/GetAccountEmployerAgreementsRemoveQueryHandler.cs delete mode 100644 src/SFA.DAS.EmployerAccounts/Queries/GetAccountEmployerAgreementsRemove/GetAccountEmployerAgreementsRemoveRequest.cs delete mode 100644 src/SFA.DAS.EmployerAccounts/Queries/GetAccountEmployerAgreementsRemove/GetAccountEmployerAgreementsRemoveResponse.cs delete mode 100644 src/SFA.DAS.EmployerAccounts/Queries/GetAccountEmployerAgreementsRemove/GetAccountEmployerAgreementsRemoveValidator.cs rename src/SFA.DAS.EmployerAccounts/Queries/{GetAccountLegalEntitiy => GetAccountLegalEntity}/GetAccountLegalEntityHandler.cs (95%) rename src/SFA.DAS.EmployerAccounts/Queries/{GetAccountLegalEntitiy => GetAccountLegalEntity}/GetAccountLegalEntityRequest.cs (73%) rename src/SFA.DAS.EmployerAccounts/Queries/{GetAccountLegalEntitiy => GetAccountLegalEntity}/GetAccountLegalEntityResponse.cs (74%) rename src/SFA.DAS.EmployerAccounts/Queries/{GetAccountLegalEntitiy => GetAccountLegalEntity}/GetAccountLegalEntityValidator.cs (88%) rename src/SFA.DAS.EmployerAccounts/Queries/{GetAccountOrganisationRemove/GetAccountOrganisationRemoveQueryHandler.cs => GetAccountLegalEntityRemove/GetAccountLegalEntityRemoveQueryHandler.cs} (75%) rename src/SFA.DAS.EmployerAccounts/Queries/{GetAccountOrganisationRemove/GetAccountOrganisationRemoveRequest.cs => GetAccountLegalEntityRemove/GetAccountLegalEntityRemoveRequest.cs} (51%) create mode 100644 src/SFA.DAS.EmployerAccounts/Queries/GetAccountLegalEntityRemove/GetAccountLegalEntityRemoveResponse.cs rename src/SFA.DAS.EmployerAccounts/Queries/{GetAccountOrganisationRemove/GetAccountOrganisationRemoveValidator.cs => GetAccountLegalEntityRemove/GetAccountLegalEntityRemoveValidator.cs} (78%) delete mode 100644 src/SFA.DAS.EmployerAccounts/Queries/GetAccountOrganisationRemove/GetAccountOrganisationRemoveResponse.cs diff --git a/src/SFA.DAS.EAS.Employer_Account.Database/SFA.DAS.EAS.Employer_Account.Database.sqlproj b/src/SFA.DAS.EAS.Employer_Account.Database/SFA.DAS.EAS.Employer_Account.Database.sqlproj index 88c2829bca..0fd9815492 100644 --- a/src/SFA.DAS.EAS.Employer_Account.Database/SFA.DAS.EAS.Employer_Account.Database.sqlproj +++ b/src/SFA.DAS.EAS.Employer_Account.Database/SFA.DAS.EAS.Employer_Account.Database.sqlproj @@ -110,7 +110,6 @@ - diff --git a/src/SFA.DAS.EAS.Employer_Account.Database/StoredProcedures/GetEmployerAgreementsToRemove_ByAccountId.sql b/src/SFA.DAS.EAS.Employer_Account.Database/StoredProcedures/GetEmployerAgreementsToRemove_ByAccountId.sql deleted file mode 100644 index 9fb28ef459..0000000000 --- a/src/SFA.DAS.EAS.Employer_Account.Database/StoredProcedures/GetEmployerAgreementsToRemove_ByAccountId.sql +++ /dev/null @@ -1,19 +0,0 @@ -CREATE PROCEDURE [employer_account].[GetEmployerAgreementsToRemove_ByAccountId] - @accountId BIGINT -AS -BEGIN - - SET NOCOUNT ON; - - SELECT ISNULL(ale.SignedAgreementId, ale.PendingAgreementId) AS Id, - ALE.Name, - CASE WHEN ale.SignedAgreementId IS NOT NULL THEN 2 ELSE 1 END AS Status, - a.HashedId, - le.Code AS LegalEntityCode, - le.[Source] AS LegalEntitySource - FROM employer_account.AccountLegalEntity AS ALE - INNER JOIN employer_account.Account AS A ON A.Id = ALE.AccountId - INNER JOIN employer_account.LegalEntity AS LE ON LE.Id = ALE.LegalEntityId - WHERE ALE.Deleted IS NULL AND ALE.AccountId = @accountId; - -END; \ No newline at end of file diff --git a/src/SFA.DAS.EmployerAccounts.UnitTests/Commands/RemoveLegalEntityTests/WhenIRemoveALegalEntity.cs b/src/SFA.DAS.EmployerAccounts.UnitTests/Commands/RemoveLegalEntityTests/WhenIRemoveALegalEntity.cs index 65b36e27e6..3bf6ae9b98 100644 --- a/src/SFA.DAS.EmployerAccounts.UnitTests/Commands/RemoveLegalEntityTests/WhenIRemoveALegalEntity.cs +++ b/src/SFA.DAS.EmployerAccounts.UnitTests/Commands/RemoveLegalEntityTests/WhenIRemoveALegalEntity.cs @@ -13,7 +13,9 @@ using SFA.DAS.EmployerAccounts.Data; using SFA.DAS.EmployerAccounts.Events.Agreement; using SFA.DAS.EmployerAccounts.Factories; +using SFA.DAS.EmployerAccounts.MarkerInterfaces; using SFA.DAS.EmployerAccounts.Messages.Events; +using SFA.DAS.EmployerAccounts.Models.Account; using SFA.DAS.EmployerAccounts.Models.AccountTeam; using SFA.DAS.EmployerAccounts.Models.EmployerAgreement; using SFA.DAS.Events.Api.Types; @@ -33,6 +35,7 @@ public class WhenIRemoveALegalEntity private RemoveLegalEntityCommand _command; private Mock _mediator; private Mock _hashingService; + private Mock _accountLegalEntityPublicHashingService; private Mock _genericEventHandler; private Mock _employerAgreementEventFactory; private Mock _membershipRepository; @@ -48,6 +51,7 @@ public class WhenIRemoveALegalEntity private EmployerAgreementView _expectedAgreement; private const long ExpectedEmployerAgreementId = 5533678; private const string ExpectedHashedEmployerAgreementId = "FGDFH45645"; + private const string ExpectedHashedAccountLegalEntityId = "HDHFFS"; [SetUp] public void Arrange() @@ -60,6 +64,17 @@ public void Arrange() _mediator = new Mock(); _repository = new Mock(); + _repository.Setup(r => r.GetAccountLegalEntityAgreements(ExpectedAccountLegalEntityId)) + .ReturnsAsync(new List + { + new EmployerAgreement + { + AccountLegalEntityId = ExpectedAccountLegalEntityId, + TemplateId = 1, + Id = ExpectedEmployerAgreementId + } + }); + _expectedAgreement = new EmployerAgreementView { AccountLegalEntityId = ExpectedAccountLegalEntityId, @@ -70,10 +85,14 @@ public void Arrange() }; _repository.Setup(r => r.GetEmployerAgreement(ExpectedEmployerAgreementId)).ReturnsAsync(_expectedAgreement); - + _hashingService = new Mock(); _hashingService.Setup(x => x.DecodeValue(ExpectedHashedAccountId)).Returns(ExpectedAccountId); _hashingService.Setup(x => x.DecodeValue(ExpectedHashedEmployerAgreementId)).Returns(ExpectedEmployerAgreementId); + _hashingService.Setup(x => x.HashValue(ExpectedEmployerAgreementId)).Returns(ExpectedHashedEmployerAgreementId); + + _accountLegalEntityPublicHashingService = new Mock(); + _accountLegalEntityPublicHashingService.Setup(x => x.DecodeValue(ExpectedHashedAccountLegalEntityId)).Returns(ExpectedAccountLegalEntityId); _employerAgreementEventFactory = new Mock(); _employerAgreementEventFactory.Setup(x => x.RemoveAgreementEvent(ExpectedHashedEmployerAgreementId)).Returns(new AgreementRemovedEvent { HashedAgreementId = ExpectedHashedEmployerAgreementId }); @@ -98,13 +117,14 @@ public void Arrange() } }); - _command = new RemoveLegalEntityCommand { HashedAccountId = ExpectedHashedAccountId, UserId = _expectedUserId, HashedLegalAgreementId = ExpectedHashedEmployerAgreementId }; + _command = new RemoveLegalEntityCommand { HashedAccountId = ExpectedHashedAccountId, UserId = _expectedUserId, HashedAccountLegalEntityId = ExpectedHashedAccountLegalEntityId }; _handler = new RemoveLegalEntityCommandHandler( _validator.Object, _logger.Object, _repository.Object, _mediator.Object, + _accountLegalEntityPublicHashingService.Object, _hashingService.Object, _genericEventHandler.Object, _employerAgreementEventFactory.Object, @@ -144,6 +164,9 @@ public async Task ThenTheRepositoryIsCalled() _validator.Verify(x => x.ValidateAsync(It.Is(c => c.HashedAccountId.Equals(ExpectedHashedAccountId) && c.UserId.Equals(_expectedUserId)))); + + _repository.Verify(x => x.GetAccountLegalEntityAgreements(ExpectedAccountLegalEntityId)); + _repository.Verify(x => x.GetEmployerAgreement(ExpectedEmployerAgreementId)); _repository.Verify(x => x.RemoveLegalEntityFromAccount(ExpectedEmployerAgreementId)); } diff --git a/src/SFA.DAS.EmployerAccounts.UnitTests/Commands/RemoveLegalEntityTests/WhenIValidateTheCommand.cs b/src/SFA.DAS.EmployerAccounts.UnitTests/Commands/RemoveLegalEntityTests/WhenIValidateTheCommand.cs index f74fd29ae2..1a34f2826a 100644 --- a/src/SFA.DAS.EmployerAccounts.UnitTests/Commands/RemoveLegalEntityTests/WhenIValidateTheCommand.cs +++ b/src/SFA.DAS.EmployerAccounts.UnitTests/Commands/RemoveLegalEntityTests/WhenIValidateTheCommand.cs @@ -64,7 +64,7 @@ public async Task ThenTheCommandIsCheckedToSeeIfAllFieldsArePopulatedAndFalseIsR Assert.IsFalse(actual.IsValid()); Assert.Contains(new KeyValuePair("HashedAccountId", "HashedAccountId has not been supplied"), actual.ValidationDictionary); Assert.Contains(new KeyValuePair("UserId","UserId has not been supplied"), actual.ValidationDictionary); - Assert.Contains(new KeyValuePair("HashedLegalAgreementId", "HashedLegalAgreementId has not been supplied"), actual.ValidationDictionary); + Assert.Contains(new KeyValuePair("HashedAccountLegalEntityId", "HashedAccountLegalEntityId has not been supplied"), actual.ValidationDictionary); _membershipRepository.Verify(x=>x.GetCaller(It.IsAny(),It.IsAny()), Times.Never); } @@ -72,7 +72,7 @@ public async Task ThenTheCommandIsCheckedToSeeIfAllFieldsArePopulatedAndFalseIsR public async Task ThenTheUserIsCheckedToSeeIfTheyAreConnectedToTheAccount() { //Act - var actual = await _removeLegalEntityCommandValidator.ValidateAsync(new RemoveLegalEntityCommand {HashedAccountId = ExpectedHashedAccountId, UserId = "TGB678", HashedLegalAgreementId = "ewr" }); + var actual = await _removeLegalEntityCommandValidator.ValidateAsync(new RemoveLegalEntityCommand {HashedAccountId = ExpectedHashedAccountId, UserId = "TGB678", HashedAccountLegalEntityId = "ewr" }); //Assert Assert.IsTrue(actual.IsUnauthorized); @@ -82,7 +82,7 @@ public async Task ThenTheUserIsCheckedToSeeIfTheyAreConnectedToTheAccount() public async Task ThenTheUserIsCheckedToSeeIfTheyAreAnOwnerOnTheAccount() { //Act - var actual = await _removeLegalEntityCommandValidator.ValidateAsync(new RemoveLegalEntityCommand { HashedAccountId = ExpectedHashedAccountId, UserId = ExpectedNonOwnerUserId, HashedLegalAgreementId = "fdgd" }); + var actual = await _removeLegalEntityCommandValidator.ValidateAsync(new RemoveLegalEntityCommand { HashedAccountId = ExpectedHashedAccountId, UserId = ExpectedNonOwnerUserId, HashedAccountLegalEntityId = "fdgd" }); //Assert Assert.IsTrue(actual.IsUnauthorized); @@ -92,7 +92,7 @@ public async Task ThenTheUserIsCheckedToSeeIfTheyAreAnOwnerOnTheAccount() public async Task ThenTrueIsReturnedIfTheFieldsArePopulatedAndTheUserIsAnAccountOwner() { //Act - var actual = await _removeLegalEntityCommandValidator.ValidateAsync(new RemoveLegalEntityCommand { HashedAccountId = ExpectedHashedAccountId, UserId= ExpectedUserId, HashedLegalAgreementId = ExpectedHashedAgreementId }); + var actual = await _removeLegalEntityCommandValidator.ValidateAsync(new RemoveLegalEntityCommand { HashedAccountId = ExpectedHashedAccountId, UserId= ExpectedUserId, HashedAccountLegalEntityId = ExpectedHashedLegalEntityId }); //Assert Assert.IsTrue(actual.IsValid()); @@ -111,11 +111,11 @@ public async Task ThenIfThereIsOnlyOneLegalEntityConnectedToTheAccountThenFalseI }); //Act - var actual = await _removeLegalEntityCommandValidator.ValidateAsync(new RemoveLegalEntityCommand { HashedAccountId = ExpectedHashedAccountId, UserId = ExpectedUserId, HashedLegalAgreementId = ExpectedHashedAgreementId }); + var actual = await _removeLegalEntityCommandValidator.ValidateAsync(new RemoveLegalEntityCommand { HashedAccountId = ExpectedHashedAccountId, UserId = ExpectedUserId, HashedAccountLegalEntityId = ExpectedHashedLegalEntityId }); //Assert Assert.IsFalse(actual.IsValid()); - Assert.Contains(new KeyValuePair("HashedLegalAgreementId", "There must be at least one legal entity on the account"), actual.ValidationDictionary); + Assert.Contains(new KeyValuePair("HashedAccountLegalEntityId", "There must be at least one legal entity on the account"), actual.ValidationDictionary); } } } \ No newline at end of file diff --git a/src/SFA.DAS.EmployerAccounts.UnitTests/Queries/GetAccountEmployerAgreementRemove/WhenIGetAccountEmployerAgreementToRemove.cs b/src/SFA.DAS.EmployerAccounts.UnitTests/Queries/GetAccountEmployerAgreementRemove/WhenIGetAccountEmployerAgreementToRemove.cs deleted file mode 100644 index c8d763e469..0000000000 --- a/src/SFA.DAS.EmployerAccounts.UnitTests/Queries/GetAccountEmployerAgreementRemove/WhenIGetAccountEmployerAgreementToRemove.cs +++ /dev/null @@ -1,82 +0,0 @@ -using System; -using System.Threading.Tasks; -using Moq; -using NUnit.Framework; -using SFA.DAS.EmployerAccounts.Data; -using SFA.DAS.EmployerAccounts.Models.Account; -using SFA.DAS.EmployerAccounts.Queries.GetAccountEmployerAgreementRemove; -using SFA.DAS.HashingService; -using SFA.DAS.Testing.EntityFramework; -using SFA.DAS.Validation; - -namespace SFA.DAS.EmployerAccounts.UnitTests.Queries.GetAccountEmployerAgreementRemove -{ - public class WhenIGetAccountEmployerAgreementToRemove : QueryBaseTest - { - private Mock _hashingService; - private Mock _db; - private EmployerAgreement _employerAgreement; - private DbSetStub _emploerAgreementDbSet; - public override GetAccountEmployerAgreementRemoveRequest Query { get; set; } - public override GetAccountEmployerAgreementRemoveQueryHandler RequestHandler { get; set; } - public override Mock> RequestValidator { get; set; } - - private const string ExpectedHashedAccountId = "345ASD"; - private const string ExpectedHashedAgreementId = "PHF78"; - private const long ExpectedAgreementId = 12345555; - private const string ExpectedUserId = "098GHY"; - private const string ExpectedAgreementName = "Test Company"; - - [SetUp] - public void Arrange() - { - SetUp(); - - Query = new GetAccountEmployerAgreementRemoveRequest {HashedAccountId = ExpectedHashedAccountId, HashedAgreementId = ExpectedHashedAgreementId, UserId = ExpectedUserId}; - - _db = new Mock(); - - _employerAgreement = new EmployerAgreement { Id = ExpectedAgreementId, AccountLegalEntity = new AccountLegalEntity { Name = ExpectedAgreementName } }; - _emploerAgreementDbSet = new DbSetStub(_employerAgreement); - - _db.Setup(d => d.Agreements).Returns(_emploerAgreementDbSet); - - _hashingService = new Mock(); - _hashingService.Setup(x => x.DecodeValue(ExpectedHashedAgreementId)).Returns(ExpectedAgreementId); - - RequestHandler = new GetAccountEmployerAgreementRemoveQueryHandler(RequestValidator.Object, _hashingService.Object, new Lazy(() => _db.Object)); - } - - [Test] - public void ThenIfTheValidationResultIsUnauthorizedThenAnUnauthorizedAccessExceptionIsThrown() - { - //Arrange - RequestValidator.Setup(x => x.ValidateAsync(It.IsAny())).ReturnsAsync(new ValidationResult { IsUnauthorized = true }); - - //Act Assert - Assert.ThrowsAsync(async () => await RequestHandler.Handle(new GetAccountEmployerAgreementRemoveRequest())); - } - - [Test] - public override async Task ThenIfTheMessageIsValidTheRepositoryIsCalled() - { - //Act - await RequestHandler.Handle(Query); - - //Assert - _db.Verify(x=>x.Agreements, Times.Once); - } - - [Test] - public override async Task ThenIfTheMessageIsValidTheValueIsReturnedInTheResponse() - { - //Act - var actual = await RequestHandler.Handle(Query); - - //Assert - Assert.IsNotNull(actual.Agreement); - Assert.AreEqual(ExpectedAgreementId, actual.Agreement.Id); - Assert.IsNotNull(ExpectedAgreementName,actual.Agreement.Name); - } - } -} diff --git a/src/SFA.DAS.EmployerAccounts.UnitTests/Queries/GetAccountEmployerAgreementsRemove/WhenIGetAccountEmployerAgreementsToRemove.cs b/src/SFA.DAS.EmployerAccounts.UnitTests/Queries/GetAccountEmployerAgreementsRemove/WhenIGetAccountEmployerAgreementsToRemove.cs deleted file mode 100644 index e8e86bbb09..0000000000 --- a/src/SFA.DAS.EmployerAccounts.UnitTests/Queries/GetAccountEmployerAgreementsRemove/WhenIGetAccountEmployerAgreementsToRemove.cs +++ /dev/null @@ -1,187 +0,0 @@ - - -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; -using Moq; -using NUnit.Framework; -using SFA.DAS.Commitments.Api.Client.Interfaces; -using SFA.DAS.Commitments.Api.Types; -using SFA.DAS.EmployerAccounts.Data; -using SFA.DAS.EmployerAccounts.Models.EmployerAgreement; -using SFA.DAS.EmployerAccounts.Queries.GetAccountEmployerAgreementsRemove; -using SFA.DAS.HashingService; -using SFA.DAS.Validation; - -namespace SFA.DAS.EmployerAccounts.UnitTests.Queries.GetAccountEmployerAgreementsRemove -{ - public class WhenIGetAccountEmployerAgreementsToRemove : QueryBaseTest - { - private Mock _repository; - private Mock _hashingService; - private Mock _commitmentsApi; - public override GetAccountEmployerAgreementsRemoveRequest Query { get; set; } - public override GetAccountEmployerAgreementsRemoveQueryHandler RequestHandler { get; set; } - public override Mock> RequestValidator { get; set; } - - private const string ExpectedUserId = "456TGFD"; - private const string ExpectedHashedAccountId = "456TGFD"; - private const string ExpectedLegalEntityCode = "98TYG123"; - private const long ExpectedAccountId = 98172938; - private const long ExpectedAgreementId = 8765; - - [SetUp] - public void Arrange() - { - SetUp(); - - Query = new GetAccountEmployerAgreementsRemoveRequest {HashedAccountId = ExpectedHashedAccountId, UserId = ExpectedUserId}; - - _repository = new Mock(); - _repository.Setup(x => x.GetEmployerAgreementsToRemove(ExpectedAccountId)) - .ReturnsAsync(new List - { - new RemoveEmployerAgreementView {Name = "test company", CanBeRemoved = true, Id = ExpectedAgreementId,LegalEntityCode = ExpectedLegalEntityCode} - }); - - _commitmentsApi = new Mock(); - _commitmentsApi.Setup(x => x.GetEmployerAccountSummary(ExpectedAccountId)).ReturnsAsync(new List {new ApprenticeshipStatusSummary()}); - - _hashingService = new Mock(); - _hashingService.Setup(x => x.DecodeValue(ExpectedHashedAccountId)).Returns(ExpectedAccountId); - _hashingService.Setup(x => x.HashValue(ExpectedAgreementId)).Returns("45TGBF"); - - RequestHandler = new GetAccountEmployerAgreementsRemoveQueryHandler(RequestValidator.Object, _repository.Object,_hashingService.Object, _commitmentsApi.Object); - } - - [Test] - public void ThenIfTheValidationResultIsUnauthorizedThenAnUnauthorizedAccessExceptionIsThrown() - { - //Arrange - RequestValidator.Setup(x => x.ValidateAsync(It.IsAny())).ReturnsAsync(new ValidationResult {IsUnauthorized = true}); - - //Act Assert - Assert.ThrowsAsync(async () => await RequestHandler.Handle(new GetAccountEmployerAgreementsRemoveRequest())); - } - - [Test] - public override async Task ThenIfTheMessageIsValidTheRepositoryIsCalled() - { - //Act - await RequestHandler.Handle(Query); - - //Assert - _repository.Verify(x=>x.GetEmployerAgreementsToRemove(ExpectedAccountId), Times.Once); - } - - [Test] - public override async Task ThenIfTheMessageIsValidTheValueIsReturnedInTheResponse() - { - //Act - var actual = await RequestHandler.Handle(Query); - - //Assert - Assert.IsTrue(actual.Agreements.Any()); - } - - [Test] - public async Task ThenIfThereIsOnlyOneResultReturnedItsCanBeRemovedValueIsSetToFalse() - { - //Act - var actual = await RequestHandler.Handle(Query); - - //Assert - Assert.IsFalse(actual.Agreements.First().CanBeRemoved); - } - - - [Test] - public async Task ThenIfThereIsOnlyOneResultReturnedTheApiIsNotCalled() - { - //Act - await RequestHandler.Handle(Query); - - //Assert - _commitmentsApi.Verify(x=>x.GetEmployerAccountSummary(It.IsAny()),Times.Never); - } - - [Test] - public async Task ThenIfTheAgreementIsSignedThenTheApiIsCheckedForActiveCommitments() - { - //Arrange - _commitmentsApi - .Setup(x => x.GetEmployerAccountSummary(ExpectedAccountId)) - .ReturnsAsync(new List { new ApprenticeshipStatusSummary {LegalEntityIdentifier = ExpectedLegalEntityCode,ActiveCount = 1} }); - _repository - .Setup(x => x.GetEmployerAgreementsToRemove(ExpectedAccountId)) - .ReturnsAsync(new List - { - new RemoveEmployerAgreementView {Name = "test company", Status = EmployerAgreementStatus.Pending, Id = ExpectedAgreementId,LegalEntityCode = "Another Code"}, - new RemoveEmployerAgreementView {Name = "test company", Status = EmployerAgreementStatus.Signed, Id = ExpectedAgreementId,LegalEntityCode = ExpectedLegalEntityCode} - }); - - //Act - var actual = await RequestHandler.Handle(Query); - Assert.AreEqual(1, actual.Agreements.Count(c=>c.CanBeRemoved)); - _commitmentsApi.Verify(x => x.GetEmployerAccountSummary(ExpectedAccountId), Times.Once); - } - - [Test] - public async Task ThenIfTheAgreementIsSignedAndNoActiveCommitmentsTheAgreementCanBeRemoved() - { - //Arrange - _commitmentsApi - .Setup(x => x.GetEmployerAccountSummary(ExpectedAccountId)) - .ReturnsAsync(new List - { - new ApprenticeshipStatusSummary { LegalEntityIdentifier = ExpectedLegalEntityCode, CompletedCount = 1 } - }); - _repository - .Setup(x => x.GetEmployerAgreementsToRemove(ExpectedAccountId)) - .ReturnsAsync(new List - { - new RemoveEmployerAgreementView {Name = "test company", Status = EmployerAgreementStatus.Pending, Id = ExpectedAgreementId,LegalEntityCode = "Another Code"}, - new RemoveEmployerAgreementView {Name = "test company", Status = EmployerAgreementStatus.Signed, Id = ExpectedAgreementId,LegalEntityCode = ExpectedLegalEntityCode} - }); - - //Act - var actual = await RequestHandler.Handle(Query); - Assert.IsTrue(actual.Agreements.All(c => c.CanBeRemoved)); - } - - [Test] - public async Task ThenIfTheAgreementIsSignedAndNoActiveCommitmentsMatchingLegalEntitySourceTheAgreementCanBeRemoved() - { - //Arrange - _commitmentsApi - .Setup(x => x.GetEmployerAccountSummary(ExpectedAccountId)) - .ReturnsAsync(new List - { - new ApprenticeshipStatusSummary { LegalEntityIdentifier = ExpectedLegalEntityCode, ActiveCount = 1, LegalEntityOrganisationType = Common.Domain.Types.OrganisationType.Charities } - }); - _repository - .Setup(x => x.GetEmployerAgreementsToRemove(ExpectedAccountId)) - .ReturnsAsync(new List - { - new RemoveEmployerAgreementView {Name = "test company", Status = EmployerAgreementStatus.Pending, Id = ExpectedAgreementId,LegalEntityCode = "Another Code"}, - new RemoveEmployerAgreementView {Name = "test company", Status = EmployerAgreementStatus.Signed, Id = ExpectedAgreementId,LegalEntityCode = ExpectedLegalEntityCode, LegalEntitySource = Common.Domain.Types.OrganisationType.Other } - }); - - //Act - var actual = await RequestHandler.Handle(Query); - Assert.IsTrue(actual.Agreements.All(c => c.CanBeRemoved)); - } - - [Test] - public async Task ThenTheAgreementIsHashedInTheResponse() - { - //Act - var actual = await RequestHandler.Handle(Query); - - //Assert - Assert.IsNotNull(actual.Agreements.First().HashedAgreementId); - Assert.IsNotEmpty(actual.Agreements.First().HashedAgreementId); - } - } -} diff --git a/src/SFA.DAS.EmployerAccounts.UnitTests/Queries/GetAccountEmployerAgreementsRemove/WhenIValidateTheQuery.cs b/src/SFA.DAS.EmployerAccounts.UnitTests/Queries/GetAccountEmployerAgreementsRemove/WhenIValidateTheQuery.cs deleted file mode 100644 index a4cd6d11f3..0000000000 --- a/src/SFA.DAS.EmployerAccounts.UnitTests/Queries/GetAccountEmployerAgreementsRemove/WhenIValidateTheQuery.cs +++ /dev/null @@ -1,75 +0,0 @@ -using System.Collections.Generic; -using System.Threading.Tasks; -using Moq; -using NUnit.Framework; -using SFA.DAS.Authorization; -using SFA.DAS.EmployerAccounts.Data; -using SFA.DAS.EmployerAccounts.Models; -using SFA.DAS.EmployerAccounts.Models.AccountTeam; -using SFA.DAS.EmployerAccounts.Queries.GetAccountEmployerAgreementsRemove; - -namespace SFA.DAS.EmployerAccounts.UnitTests.Queries.GetAccountEmployerAgreementsRemove -{ - public class WhenIValidateTheQuery - { - private GetAccountEmployerAgreementsRemoveValidator _validator; - private Mock _membershipRepository; - - [SetUp] - public void Arrange() - { - _membershipRepository = new Mock(); - _membershipRepository.Setup(x => x.GetCaller("ABC123", "XYZ987")).ReturnsAsync(new MembershipView {Role = Role.Owner}); - - _validator = new GetAccountEmployerAgreementsRemoveValidator(_membershipRepository.Object); - } - - [Test] - public async Task ThenIfTheFieldsAreNotPopulatedFalseIsReturnedAndTheErrorDictionaryIsPopulated() - { - //Act - var actual = await _validator.ValidateAsync(new GetAccountEmployerAgreementsRemoveRequest()); - - //Assert - Assert.IsFalse(actual.IsValid()); - Assert.Contains(new KeyValuePair("HashedAccountId", "HashedAccountId has not been supplied"), actual.ValidationDictionary); - Assert.Contains(new KeyValuePair("UserId", "UserId has not been supplied"), actual.ValidationDictionary); - _membershipRepository.Verify(x=>x.GetCaller(It.IsAny(), It.IsAny()),Times.Never); - } - - [Test] - public async Task ThenTheUserIsCheckedToMakeSureThatTheyAreConnectedToTheAccount() - { - //Act - _membershipRepository.Setup(x => x.GetCaller("ABC123", "XYZ987")).ReturnsAsync(() => null); - var actual = await _validator.ValidateAsync(new GetAccountEmployerAgreementsRemoveRequest { HashedAccountId = "ABC123", UserId = "XYZ987" }); - - //Assert - Assert.IsTrue(actual.IsUnauthorized); - } - - [Test] - public async Task ThenTheUserIsCheckedToMakeSureThatTheyAreAnOwnerOnTheAccount() - { - //Arrange - _membershipRepository.Setup(x => x.GetCaller("ABC123", "XYZ987")).ReturnsAsync(new MembershipView { Role = Role.Viewer }); - - //Act - var actual = await _validator.ValidateAsync(new GetAccountEmployerAgreementsRemoveRequest { HashedAccountId = "ABC123", UserId = "XYZ987" }); - - //Assert - Assert.IsTrue(actual.IsUnauthorized); - } - - [Test] - public async Task ThenIfAllFieldsArePopulatedAndTheUserIsAnOWnerOfTheAccountTrueIsReturned() - { - //Act - var actual = await _validator.ValidateAsync(new GetAccountEmployerAgreementsRemoveRequest {HashedAccountId = "ABC123", UserId = "XYZ987"}); - - //Assert - Assert.IsTrue(actual.IsValid()); - Assert.IsFalse(actual.IsUnauthorized); - } - } -} diff --git a/src/SFA.DAS.EmployerAccounts.UnitTests/Queries/GetAccountLegalEntityRemove/WhenIGetAccountLegalEntityRemove.cs b/src/SFA.DAS.EmployerAccounts.UnitTests/Queries/GetAccountLegalEntityRemove/WhenIGetAccountLegalEntityRemove.cs new file mode 100644 index 0000000000..2adb9f819f --- /dev/null +++ b/src/SFA.DAS.EmployerAccounts.UnitTests/Queries/GetAccountLegalEntityRemove/WhenIGetAccountLegalEntityRemove.cs @@ -0,0 +1,112 @@ +using System; +using System.Collections.Generic; +using System.Threading.Tasks; +using Moq; +using NUnit.Framework; +using SFA.DAS.Commitments.Api.Client.Interfaces; +using SFA.DAS.Commitments.Api.Types; +using SFA.DAS.EmployerAccounts.Data; +using SFA.DAS.EmployerAccounts.MarkerInterfaces; +using SFA.DAS.EmployerAccounts.Models.Account; +using SFA.DAS.EmployerAccounts.Models.Organisation; +using SFA.DAS.EmployerAccounts.Queries.GetAccountLegalEntityRemove; +using SFA.DAS.HashingService; +using SFA.DAS.Validation; + +namespace SFA.DAS.EmployerAccounts.UnitTests.Queries.GetAccountLegalEntityRemove +{ + public class WhenIGetAccountLegalEntityRemove : QueryBaseTest + { + private Mock _hashingService; + private Mock _accountLegalEntityPublicHashingService; + private Mock _repository; + private Mock _commitmentsApi; + + public override GetAccountLegalEntityRemoveRequest Query { get; set; } + public override GetAccountLegalEntityRemoveQueryHandler RequestHandler { get; set; } + public override Mock> RequestValidator { get; set; } + + private const string ExpectedHashedAccountId = "345ASD"; + private const string ExpectedHashedAccountLegalEntityId = "PHF78"; + private const long ExpectedAgreementId = 12345555; + private const string ExpectedUserId = "098GHY"; + private const long ExpectedAccountId = 98172938; + private const string ExpectedAccountLegalEntityName = "Test Company"; + private const long ExpectedAccountLegalEntityId = 32453245345; + + [SetUp] + public void Arrange() + { + SetUp(); + + Query = new GetAccountLegalEntityRemoveRequest { HashedAccountId = ExpectedHashedAccountId, HashedAccountLegalEntityId = ExpectedHashedAccountLegalEntityId, UserId = ExpectedUserId}; + + _repository = new Mock(); + + _repository.Setup(r => r.GetAccountLegalEntity(ExpectedAccountLegalEntityId)) + .ReturnsAsync + ( + new AccountLegalEntityModel + { + AccountLegalEntityPublicHashedId = ExpectedHashedAccountLegalEntityId, + Name = ExpectedAccountLegalEntityName + } + ); + + _repository.Setup(r => r.GetAccountLegalEntityAgreements(ExpectedAccountLegalEntityId)) + .ReturnsAsync + ( + new List() + ); + + _hashingService = new Mock(); + _hashingService.Setup(x => x.DecodeValue(ExpectedHashedAccountId)).Returns(ExpectedAccountId); + _hashingService.Setup(x => x.DecodeValue(ExpectedHashedAccountLegalEntityId)).Returns(ExpectedAgreementId); + + _accountLegalEntityPublicHashingService = new Mock(); + _accountLegalEntityPublicHashingService.Setup(x => x.DecodeValue(ExpectedHashedAccountLegalEntityId)).Returns(ExpectedAccountLegalEntityId); + + _commitmentsApi = new Mock(); + _commitmentsApi.Setup(x => x.GetEmployerAccountSummary(ExpectedAccountId)).ReturnsAsync(new List { new ApprenticeshipStatusSummary() }); + + RequestHandler = new GetAccountLegalEntityRemoveQueryHandler( + RequestValidator.Object, + _repository.Object, + _hashingService.Object, + _accountLegalEntityPublicHashingService.Object, + _commitmentsApi.Object + ); + } + + [Test] + public void ThenIfTheValidationResultIsUnauthorizedThenAnUnauthorizedAccessExceptionIsThrown() + { + //Arrange + RequestValidator.Setup(x => x.ValidateAsync(It.IsAny())).ReturnsAsync(new ValidationResult { IsUnauthorized = true }); + + //Act Assert + Assert.ThrowsAsync(async () => await RequestHandler.Handle(new GetAccountLegalEntityRemoveRequest())); + } + + [Test] + public override async Task ThenIfTheMessageIsValidTheRepositoryIsCalled() + { + //Act + await RequestHandler.Handle(Query); + + //Assert + _repository.Verify(x => x.GetAccountLegalEntityAgreements(ExpectedAccountLegalEntityId), Times.Once); + } + + [Test] + public override async Task ThenIfTheMessageIsValidTheValueIsReturnedInTheResponse() + { + //Act + var actual = await RequestHandler.Handle(Query); + + //Assert + Assert.IsNotNull(actual); + Assert.AreEqual(ExpectedAccountLegalEntityName, actual.Name); + } + } +} diff --git a/src/SFA.DAS.EmployerAccounts.UnitTests/Queries/GetAccountEmployerAgreementRemove/WhenIValidateTheQuery.cs b/src/SFA.DAS.EmployerAccounts.UnitTests/Queries/GetAccountLegalEntityRemove/WhenIValidateTheQuery.cs similarity index 78% rename from src/SFA.DAS.EmployerAccounts.UnitTests/Queries/GetAccountEmployerAgreementRemove/WhenIValidateTheQuery.cs rename to src/SFA.DAS.EmployerAccounts.UnitTests/Queries/GetAccountLegalEntityRemove/WhenIValidateTheQuery.cs index 2a811af985..36e2aa43ed 100644 --- a/src/SFA.DAS.EmployerAccounts.UnitTests/Queries/GetAccountEmployerAgreementRemove/WhenIValidateTheQuery.cs +++ b/src/SFA.DAS.EmployerAccounts.UnitTests/Queries/GetAccountLegalEntityRemove/WhenIValidateTheQuery.cs @@ -6,13 +6,13 @@ using SFA.DAS.EmployerAccounts.Data; using SFA.DAS.EmployerAccounts.Models; using SFA.DAS.EmployerAccounts.Models.AccountTeam; -using SFA.DAS.EmployerAccounts.Queries.GetAccountEmployerAgreementRemove; +using SFA.DAS.EmployerAccounts.Queries.GetAccountLegalEntityRemove; namespace SFA.DAS.EmployerAccounts.UnitTests.Queries.GetAccountEmployerAgreementRemove { public class WhenIValidateTheQuery { - private GetAccountEmployerAgreementRemoveValidator _validator; + private GetAccountLegalEntityRemoveValidator _validator; private Mock _membershipRepository; [SetUp] @@ -21,20 +21,20 @@ public void Arrange() _membershipRepository = new Mock(); _membershipRepository.Setup(x => x.GetCaller("ABC123", "XYZ987")).ReturnsAsync(new MembershipView { Role = Role.Owner }); - _validator = new GetAccountEmployerAgreementRemoveValidator(_membershipRepository.Object); + _validator = new GetAccountLegalEntityRemoveValidator(_membershipRepository.Object); } [Test] public async Task ThenFalseIsReturnedAndTheDictionaryIsPopulatedIfNoValuesAreSupplied() { //Act - var actual = await _validator.ValidateAsync(new GetAccountEmployerAgreementRemoveRequest()); + var actual = await _validator.ValidateAsync(new GetAccountLegalEntityRemoveRequest()); //Assert Assert.IsFalse(actual.IsValid()); Assert.Contains(new KeyValuePair("HashedAccountId", "HashedAccountId has not been supplied"), actual.ValidationDictionary); Assert.Contains(new KeyValuePair("UserId", "UserId has not been supplied"), actual.ValidationDictionary); - Assert.Contains(new KeyValuePair("HashedAgreementId", "HashedAgreementId has not been supplied"), actual.ValidationDictionary); + Assert.Contains(new KeyValuePair("HashedAccountLegalEntityId", "HashedAccountLegalEntityId has not been supplied"), actual.ValidationDictionary); _membershipRepository.Verify(x => x.GetCaller(It.IsAny(), It.IsAny()), Times.Never); } @@ -43,7 +43,7 @@ public async Task ThenTheUserIsCheckedToMakeSureThatTheyAreConnectedToTheAccount { //Act _membershipRepository.Setup(x => x.GetCaller("ABC123", "XYZ987")).ReturnsAsync(() => null); - var actual = await _validator.ValidateAsync(new GetAccountEmployerAgreementRemoveRequest { HashedAccountId = "ABC123", UserId = "XYZ987", HashedAgreementId = "546TGF"}); + var actual = await _validator.ValidateAsync(new GetAccountLegalEntityRemoveRequest { HashedAccountId = "ABC123", UserId = "XYZ987", HashedAccountLegalEntityId = "546TGF"}); //Assert Assert.IsTrue(actual.IsUnauthorized); @@ -56,7 +56,7 @@ public async Task ThenTheUserIsCheckedToMakeSureThatTheyAreAnOwnerOnTheAccount() _membershipRepository.Setup(x => x.GetCaller("ABC123", "XYZ987")).ReturnsAsync(new MembershipView { Role = Role.Viewer }); //Act - var actual = await _validator.ValidateAsync(new GetAccountEmployerAgreementRemoveRequest { HashedAccountId = "ABC123", UserId = "XYZ987", HashedAgreementId = "546TGF" }); + var actual = await _validator.ValidateAsync(new GetAccountLegalEntityRemoveRequest { HashedAccountId = "ABC123", UserId = "XYZ987", HashedAccountLegalEntityId = "546TGF" }); //Assert Assert.IsTrue(actual.IsUnauthorized); @@ -66,7 +66,7 @@ public async Task ThenTheUserIsCheckedToMakeSureThatTheyAreAnOwnerOnTheAccount() public async Task ThenIfAllFieldsArePopulatedAndTheUserIsAnOWnerOfTheAccountTrueIsReturned() { //Act - var actual = await _validator.ValidateAsync(new GetAccountEmployerAgreementRemoveRequest { HashedAccountId = "ABC123", UserId = "XYZ987", HashedAgreementId = "546TGF" }); + var actual = await _validator.ValidateAsync(new GetAccountLegalEntityRemoveRequest { HashedAccountId = "ABC123", UserId = "XYZ987", HashedAccountLegalEntityId = "546TGF" }); //Assert Assert.IsTrue(actual.IsValid()); diff --git a/src/SFA.DAS.EmployerAccounts.Web.UnitTests/Controllers/EmployerAgreementControllerTests.cs b/src/SFA.DAS.EmployerAccounts.Web.UnitTests/Controllers/EmployerAgreementControllerTests.cs index 5d07dd9c3e..73af4f6877 100644 --- a/src/SFA.DAS.EmployerAccounts.Web.UnitTests/Controllers/EmployerAgreementControllerTests.cs +++ b/src/SFA.DAS.EmployerAccounts.Web.UnitTests/Controllers/EmployerAgreementControllerTests.cs @@ -1,9 +1,7 @@ -using System.Collections.Generic; -using System.Threading.Tasks; +using System.Threading.Tasks; using System.Web.Mvc; using AutoMapper; using MediatR; -using Microsoft.Azure.Documents.SystemFunctions; using Moq; using NUnit.Framework; using SFA.DAS.Authentication; @@ -11,7 +9,6 @@ using SFA.DAS.EmployerAccounts.Dtos; using SFA.DAS.EmployerAccounts.Interfaces; using SFA.DAS.EmployerAccounts.Models.EmployerAgreement; -using SFA.DAS.EmployerAccounts.Queries.GetAccountEmployerAgreements; using SFA.DAS.EmployerAccounts.Queries.GetAccountLegalEntitiesCountByHashedAccountId; using SFA.DAS.EmployerAccounts.Queries.GetEmployerAgreement; using SFA.DAS.EmployerAccounts.Queries.GetLastSignedAgreement; @@ -28,52 +25,20 @@ namespace SFA.DAS.EmployerAccounts.Web.UnitTests.Controllers [TestFixture] public class EmployerAgreementControllerTests : FluentTest { - [Test] - public Task GetOrganisationsToRemove_WhenIRemoveAlegalEntityFromAnAccount_ThenTheOrchestratorIsCalledToGetAccountsToRemove() - { - return RunAsync( - act: fixtures => fixtures.GetOrganisationsToRemove(), - assert: (fixtures, result) => fixtures.Orchestrator.Verify(x => x.GetLegalAgreementsToRemove(fixtures.HashedAccountId, fixtures.UserId), Times.Once)); - } - [Test] public Task ConfirmRemoveOrganisation_WhenIRemoveAlegalEntityFromAnAccount_ThenTheOrchestratorIsCalledToGetTheConfirmRemoveModel() { return RunAsync( + fixtures => fixtures.Orchestrator.Setup(x => x.GetConfirmRemoveOrganisationViewModel(It.IsAny(), It.IsAny(), It.IsAny())) + .ReturnsAsync(new OrchestratorResponse + { + Data = new ConfirmOrganisationToRemoveViewModel() + }), act: fixtures => fixtures.ConfirmRemoveOrganisation(), assert: (fixtures, result) => fixtures.Orchestrator.Verify( - x => x.GetConfirmRemoveOrganisationViewModel(fixtures.HashedAgreementId, fixtures.HashedAccountId, fixtures.UserId), Times.Once)); + x => x.GetConfirmRemoveOrganisationViewModel(fixtures.HashedAccountLegalEntityId, fixtures.HashedAccountId, fixtures.UserId), Times.Once)); } - [Test] - public Task ConfirmRemoveOrganisation_WhenIRemoveAlegalEntityFromAnAccount_ThenTheFlashMessageIsPopulatedFromTheCookieWhenGettingTheConfirmRemoveAction() - { - return RunAsync( - arrange: fixtures => - { - fixtures.FlashMessage - .Setup(x => x.Get("sfa-das-employerapprenticeshipsservice-flashmessage")) - .Returns(new FlashMessageViewModel { Headline = "" }); - - fixtures.Orchestrator - .Setup(x => x.GetConfirmRemoveOrganisationViewModel(fixtures.HashedAgreementId, fixtures.HashedAccountId, fixtures.UserId)) - .ReturnsAsync(new OrchestratorResponse - { - Data = new ConfirmLegalAgreementToRemoveViewModel() - }); - }, - act: fixtures => fixtures.ConfirmRemoveOrganisation(), - assert: (fixtures, actualResult) => - { - Assert.IsNotNull(actualResult); - var viewResult = actualResult as ViewResult; - Assert.IsNotNull(viewResult); - var actualModel = viewResult.Model as OrchestratorResponse; - Assert.IsNotNull(actualModel); - Assert.IsNotNull(actualModel.FlashMessage); - }); - } - [Test] public Task ViewUnsignedAgreements_WhenIViewUnsignedAgreements_ThenIShouldGoStraightToTheUnsignedAgreementIfThereIsOnlyOne() { @@ -265,6 +230,7 @@ public static class Constants public const string UserId = "AFV456TGF"; public const string HashedAgreementId = "789UHY"; public const long AccountLegalEntityId = 1234; + public const string HashedAccountLegalEntityId = "THGHFH"; public const string LegalEntityName = "FIFTEEN LIMITED"; } @@ -273,6 +239,7 @@ public static class Constants public string HashedAgreementId => Constants.HashedAgreementId; public long AccountLegalEntityId => Constants.AccountLegalEntityId; public string LegalEntityName => Constants.LegalEntityName; + public string HashedAccountLegalEntityId => Constants.HashedAccountLegalEntityId; public GetEmployerAgreementRequest GetAgreementRequest { get; } @@ -336,16 +303,10 @@ public EmployerAgreementController CreateController() return controller; } - public Task GetOrganisationsToRemove() - { - var controller = CreateController(); - return controller.GetOrganisationsToRemove(HashedAccountId); - } - public Task ConfirmRemoveOrganisation() { var controller = CreateController(); - return controller.ConfirmRemoveOrganisation(HashedAgreementId, HashedAccountId); + return controller.ConfirmRemoveOrganisation(HashedAccountLegalEntityId, HashedAccountId); } public async Task ViewUnsignedAgreements() diff --git a/src/SFA.DAS.EmployerAccounts.Web.UnitTests/Orchestrators/EmployerAgreementOrchestratorTests/WhenIGetAListOfAgreementsToRemove.cs b/src/SFA.DAS.EmployerAccounts.Web.UnitTests/Orchestrators/EmployerAgreementOrchestratorTests/WhenIGetAListOfAgreementsToRemove.cs deleted file mode 100644 index 4df8d50b85..0000000000 --- a/src/SFA.DAS.EmployerAccounts.Web.UnitTests/Orchestrators/EmployerAgreementOrchestratorTests/WhenIGetAListOfAgreementsToRemove.cs +++ /dev/null @@ -1,96 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Net; -using System.Threading.Tasks; -using AutoMapper; -using MediatR; -using Moq; -using NUnit.Framework; -using SFA.DAS.EmployerAccounts.Interfaces; -using SFA.DAS.EmployerAccounts.Models.EmployerAgreement; -using SFA.DAS.EmployerAccounts.Queries.GetAccountEmployerAgreementsRemove; -using SFA.DAS.EmployerAccounts.Web.Orchestrators; -using SFA.DAS.Validation; - -namespace SFA.DAS.EmployerAccounts.Web.UnitTests.Orchestrators.EmployerAgreementOrchestratorTests -{ - public class WhenIGetAListOfAgreementsToRemove - { - private Mock _mediator; - private Mock _referenceDataService; - private EmployerAgreementOrchestrator _orchestrator; - - private const string ExpectedHahsedAccountId = "RT456"; - private const string ExpectedUserId = "TYG68UY"; - - [SetUp] - public void Arrange() - { - _mediator = new Mock(); - _mediator.Setup(x => x.SendAsync(It.IsAny())) - .ReturnsAsync(new GetAccountEmployerAgreementsRemoveResponse - { - Agreements = new List - { - new RemoveEmployerAgreementView { Name = "Test Name", CanBeRemoved = false} - } - }); - - _referenceDataService = new Mock(); - - _orchestrator = new EmployerAgreementOrchestrator(_mediator.Object, Mock.Of(), _referenceDataService.Object); - } - - [Test] - public async Task ThenTheMediatorIsCalledWithTheListOfOrganisations() - { - - //Act - await _orchestrator.GetLegalAgreementsToRemove(ExpectedHahsedAccountId, ExpectedUserId); - - //Assert - _mediator.Verify(x => x.SendAsync(It.Is( - c => c.HashedAccountId.Equals(ExpectedHahsedAccountId) - && c.UserId.Equals(ExpectedUserId))), Times.Once); - } - - - [Test] - public async Task ThenIfAnInvalidRequestExceptionIsThrownTheOrchestratorResponseContainsTheError() - { - //Arrange - _mediator.Setup(x => x.SendAsync(It.IsAny())).ThrowsAsync(new InvalidRequestException(new Dictionary())); - - //Act - var actual = await _orchestrator.GetLegalAgreementsToRemove(ExpectedHahsedAccountId, ExpectedUserId); - - //Assert - Assert.AreEqual(HttpStatusCode.BadRequest, actual.Status); - } - - [Test] - public async Task ThenIfAUnauthroizedAccessExceptionIsThrownThenTheOrchestratorResponseShowsAccessDenied() - { - //Arrange - _mediator.Setup(x => x.SendAsync(It.IsAny())).ThrowsAsync(new UnauthorizedAccessException()); - - //Act - var actual = await _orchestrator.GetLegalAgreementsToRemove(ExpectedHahsedAccountId, ExpectedUserId); - - //Assert - Assert.AreEqual(HttpStatusCode.Unauthorized, actual.Status); - } - - [Test] - public async Task ThenTheValuesAreReturnedInTheResponseFromTheMediatorCall() - { - //Act - var actual = await _orchestrator.GetLegalAgreementsToRemove(ExpectedHahsedAccountId, ExpectedUserId); - - //Assert - Assert.IsTrue(actual.Data.Agreements.Any()); - } - - } -} diff --git a/src/SFA.DAS.EmployerAccounts.Web.UnitTests/Orchestrators/EmployerAgreementOrchestratorTests/WhenIGetTheConfirmRemoveAgreementModel.cs b/src/SFA.DAS.EmployerAccounts.Web.UnitTests/Orchestrators/EmployerAgreementOrchestratorTests/WhenIGetTheConfirmRemoveAccountLegalEntityModel.cs similarity index 64% rename from src/SFA.DAS.EmployerAccounts.Web.UnitTests/Orchestrators/EmployerAgreementOrchestratorTests/WhenIGetTheConfirmRemoveAgreementModel.cs rename to src/SFA.DAS.EmployerAccounts.Web.UnitTests/Orchestrators/EmployerAgreementOrchestratorTests/WhenIGetTheConfirmRemoveAccountLegalEntityModel.cs index 032381ab89..57bc45285f 100644 --- a/src/SFA.DAS.EmployerAccounts.Web.UnitTests/Orchestrators/EmployerAgreementOrchestratorTests/WhenIGetTheConfirmRemoveAgreementModel.cs +++ b/src/SFA.DAS.EmployerAccounts.Web.UnitTests/Orchestrators/EmployerAgreementOrchestratorTests/WhenIGetTheConfirmRemoveAccountLegalEntityModel.cs @@ -7,21 +7,20 @@ using Moq; using NUnit.Framework; using SFA.DAS.EmployerAccounts.Interfaces; -using SFA.DAS.EmployerAccounts.Models.EmployerAgreement; -using SFA.DAS.EmployerAccounts.Queries.GetAccountEmployerAgreementRemove; +using SFA.DAS.EmployerAccounts.Queries.GetAccountLegalEntityRemove; using SFA.DAS.EmployerAccounts.Web.Orchestrators; using SFA.DAS.Validation; namespace SFA.DAS.EmployerAccounts.Web.UnitTests.Orchestrators.EmployerAgreementOrchestratorTests { - public class WhenIGetTheConfirmRemoveAgreementModel + public class WhenIGetTheConfirmRemoveAccountLegalEntityModel { private Mock _mediator; private Mock _referenceDataService; private EmployerAgreementOrchestrator _orchestrator; private const string ExpectedHahsedAccountId = "RT456"; - private const string ExpectedHashedAgreementId = "RRTE56"; + private const string ExpectedHashedAccountLegalEntityId = "RRTE56"; private const string ExpectedUserId = "TYG68UY"; private const string ExpectedName = "Test Name"; @@ -29,18 +28,12 @@ public class WhenIGetTheConfirmRemoveAgreementModel public void Arrange() { _mediator = new Mock(); - _mediator.Setup(x => x.SendAsync(It.IsAny())) - .ReturnsAsync(new GetAccountEmployerAgreementRemoveResponse + _mediator.Setup(x => x.SendAsync(It.IsAny())) + .ReturnsAsync(new GetAccountLegalEntityRemoveResponse { - Agreement = new RemoveEmployerAgreementView - { - Name = ExpectedName, - CanBeRemoved = false, - HashedAccountId = ExpectedHahsedAccountId, - HashedAgreementId = ExpectedHashedAgreementId, - Id = 123444 - } - + Name = ExpectedName, + CanBeRemoved = true, + HasSignedAgreement = true }); _referenceDataService = new Mock(); @@ -53,13 +46,13 @@ public async Task ThenTheMediatorIsCalledToGetASingledOrgToRemove() { //Act - await _orchestrator.GetConfirmRemoveOrganisationViewModel(ExpectedHashedAgreementId, ExpectedHahsedAccountId, ExpectedUserId); + await _orchestrator.GetConfirmRemoveOrganisationViewModel(ExpectedHashedAccountLegalEntityId, ExpectedHahsedAccountId, ExpectedUserId); //Assert - _mediator.Verify(x => x.SendAsync(It.Is( + _mediator.Verify(x => x.SendAsync(It.Is( c => c.HashedAccountId.Equals(ExpectedHahsedAccountId) && c.UserId.Equals(ExpectedUserId) - && c.HashedAgreementId.Equals(ExpectedHashedAgreementId) + && c.HashedAccountLegalEntityId.Equals(ExpectedHashedAccountLegalEntityId) )), Times.Once); } @@ -68,10 +61,10 @@ public async Task ThenTheMediatorIsCalledToGetASingledOrgToRemove() public async Task ThenIfAnInvalidRequestExceptionIsThrownTheOrchestratorResponseContainsTheError() { //Arrange - _mediator.Setup(x => x.SendAsync(It.IsAny())).ThrowsAsync(new InvalidRequestException(new Dictionary())); + _mediator.Setup(x => x.SendAsync(It.IsAny())).ThrowsAsync(new InvalidRequestException(new Dictionary())); //Act - var actual = await _orchestrator.GetConfirmRemoveOrganisationViewModel(ExpectedHashedAgreementId, ExpectedHahsedAccountId, ExpectedUserId); + var actual = await _orchestrator.GetConfirmRemoveOrganisationViewModel(ExpectedHashedAccountLegalEntityId, ExpectedHahsedAccountId, ExpectedUserId); //Assert Assert.AreEqual(HttpStatusCode.BadRequest, actual.Status); @@ -81,10 +74,10 @@ public async Task ThenIfAnInvalidRequestExceptionIsThrownTheOrchestratorResponse public async Task ThenIfAUnauthroizedAccessExceptionIsThrownThenTheOrchestratorResponseShowsAccessDenied() { //Arrange - _mediator.Setup(x => x.SendAsync(It.IsAny())).ThrowsAsync(new UnauthorizedAccessException()); + _mediator.Setup(x => x.SendAsync(It.IsAny())).ThrowsAsync(new UnauthorizedAccessException()); //Act - var actual = await _orchestrator.GetConfirmRemoveOrganisationViewModel(ExpectedHashedAgreementId, ExpectedHahsedAccountId, ExpectedUserId); + var actual = await _orchestrator.GetConfirmRemoveOrganisationViewModel(ExpectedHashedAccountLegalEntityId, ExpectedHahsedAccountId, ExpectedUserId); //Assert Assert.AreEqual(HttpStatusCode.Unauthorized, actual.Status); @@ -94,10 +87,10 @@ public async Task ThenIfAUnauthroizedAccessExceptionIsThrownThenTheOrchestratorR public async Task ThenTheValuesAreReturnedInTheResponseFromTheMediatorCall() { //Act - var actual = await _orchestrator.GetConfirmRemoveOrganisationViewModel(ExpectedHashedAgreementId, ExpectedHahsedAccountId, ExpectedUserId); + var actual = await _orchestrator.GetConfirmRemoveOrganisationViewModel(ExpectedHashedAccountLegalEntityId, ExpectedHahsedAccountId, ExpectedUserId); //Assert - Assert.AreEqual(ExpectedHashedAgreementId, actual.Data.HashedAgreementId); + Assert.AreEqual(ExpectedHashedAccountLegalEntityId, actual.Data.HashedAccountLegalEntitytId); Assert.AreEqual(ExpectedHahsedAccountId, actual.Data.HashedAccountId); Assert.AreEqual(ExpectedName, actual.Data.Name); } diff --git a/src/SFA.DAS.EmployerAccounts.Web.UnitTests/Orchestrators/EmployerAgreementOrchestratorTests/WhenIRemoveTheLegalAgreement.cs b/src/SFA.DAS.EmployerAccounts.Web.UnitTests/Orchestrators/EmployerAgreementOrchestratorTests/WhenIRemoveTheLegalAgreement.cs index dd82fccd4b..86466688dc 100644 --- a/src/SFA.DAS.EmployerAccounts.Web.UnitTests/Orchestrators/EmployerAgreementOrchestratorTests/WhenIRemoveTheLegalAgreement.cs +++ b/src/SFA.DAS.EmployerAccounts.Web.UnitTests/Orchestrators/EmployerAgreementOrchestratorTests/WhenIRemoveTheLegalAgreement.cs @@ -20,46 +20,20 @@ public class WhenIRemoveTheLegalAgreement private Mock _referenceDataService; private EmployerAgreementOrchestrator _orchestrator; - private const string ExpectedHahsedAccountId = "RT456"; - private const string ExpectedHashedAgreementId = "RRTE56"; + private const string ExpectedHashedAccountId = "RT456"; + private const string ExpectedHashedAccountLegalEntitytId = "RRTE56"; private const string ExpectedUserId = "TYG68UY"; [SetUp] public void Arrange() { _mediator = new Mock(); - //RemoveLegalEntityCommand - + _referenceDataService = new Mock(); _orchestrator = new EmployerAgreementOrchestrator(_mediator.Object, Mock.Of(), _referenceDataService.Object); } - - [Test] - public async Task ThenIfTheRemoveOrganisationConfirmCheckHasNotBeenSelectedTheFlashMessageIsPopulatedAndReturned() - { - //Act - var actual = await _orchestrator.RemoveLegalAgreement(new ConfirmLegalAgreementToRemoveViewModel { }, ExpectedUserId); - - //Assert - Assert.IsNotNull(actual); - Assert.IsAssignableFrom>(actual); - Assert.IsNotNull(actual.FlashMessage); - Assert.AreEqual(HttpStatusCode.BadRequest, actual.Status); - } - - [Test] - public async Task ThenIfTheRemoveOrganisationCheckHasBeenSelectedAsNoThenNoChangesAreMade() - { - //Act - var actual = await _orchestrator.RemoveLegalAgreement(new ConfirmLegalAgreementToRemoveViewModel { RemoveOrganisation = 1 }, ExpectedUserId); - - //Assert - Assert.IsNotNull(actual); - Assert.AreEqual(HttpStatusCode.Continue, actual.Status); - } - - + [Test] public async Task ThenIfAnInvalidRequestExceptionIsThrownTheOrchestratorResponseContainsTheError() { @@ -67,7 +41,7 @@ public async Task ThenIfAnInvalidRequestExceptionIsThrownTheOrchestratorResponse _mediator.Setup(x => x.SendAsync(It.IsAny())).ThrowsAsync(new InvalidRequestException(new Dictionary())); //Act - var actual = await _orchestrator.RemoveLegalAgreement(new ConfirmLegalAgreementToRemoveViewModel { RemoveOrganisation = 2 }, ExpectedUserId); + var actual = await _orchestrator.RemoveLegalAgreement(new ConfirmOrganisationToRemoveViewModel(), ExpectedUserId); //Assert Assert.AreEqual(HttpStatusCode.BadRequest, actual.Status); @@ -80,7 +54,7 @@ public async Task ThenIfAUnauthroizedAccessExceptionIsThrownThenTheOrchestratorR _mediator.Setup(x => x.SendAsync(It.IsAny())).ThrowsAsync(new UnauthorizedAccessException()); //Act - var actual = await _orchestrator.RemoveLegalAgreement(new ConfirmLegalAgreementToRemoveViewModel { RemoveOrganisation = 2, Name = "TestName" }, ExpectedUserId); + var actual = await _orchestrator.RemoveLegalAgreement(new ConfirmOrganisationToRemoveViewModel { Name = "TestName" }, ExpectedUserId); //Assert Assert.AreEqual(HttpStatusCode.Unauthorized, actual.Status); @@ -90,12 +64,12 @@ public async Task ThenIfAUnauthroizedAccessExceptionIsThrownThenTheOrchestratorR public async Task ThenIfTheCommandIsValidTheFlashMessageIsPopulated() { //Act - var actual = await _orchestrator.RemoveLegalAgreement(new ConfirmLegalAgreementToRemoveViewModel { RemoveOrganisation = 2, Name = "TestName", HashedAccountId = ExpectedHahsedAccountId, HashedAgreementId = ExpectedHashedAgreementId }, ExpectedUserId); + var actual = await _orchestrator.RemoveLegalAgreement(new ConfirmOrganisationToRemoveViewModel { Name = "TestName", HashedAccountId = ExpectedHashedAccountId, HashedAccountLegalEntitytId = ExpectedHashedAccountLegalEntitytId }, ExpectedUserId); //Assert _mediator.Verify(x => x.SendAsync(It.Is( - c => c.HashedAccountId.Equals(ExpectedHahsedAccountId) - && c.HashedLegalAgreementId.Equals(ExpectedHashedAgreementId) + c => c.HashedAccountId.Equals(ExpectedHashedAccountId) + && c.HashedAccountLegalEntityId.Equals(ExpectedHashedAccountLegalEntitytId) && c.UserId.Equals(ExpectedUserId))), Times.Once); Assert.IsNotNull(actual); Assert.IsNotNull(actual.FlashMessage); diff --git a/src/SFA.DAS.EmployerAccounts.Web/Controllers/EmployerAgreementController.cs b/src/SFA.DAS.EmployerAccounts.Web/Controllers/EmployerAgreementController.cs index c7cedc84ed..0ad56ebfb3 100644 --- a/src/SFA.DAS.EmployerAccounts.Web/Controllers/EmployerAgreementController.cs +++ b/src/SFA.DAS.EmployerAccounts.Web/Controllers/EmployerAgreementController.cs @@ -251,7 +251,7 @@ public async Task ConfirmRemoveOrganisation(string accountLegalEnt [HttpPost] [Route("agreements/{accountLegalEntityHashedId}/remove")] [ValidateAntiForgeryToken] - public async Task RemoveOrganisation(string accountLegalEntityHashedId, string hashedAccountId, ConfirmOrganisationToRemoveViewModel model) + public async Task RemoveOrganisation(ConfirmOrganisationToRemoveViewModel model) { if (!ModelState.IsValid) { diff --git a/src/SFA.DAS.EmployerAccounts.Web/Orchestrators/EmployerAgreementOrchestrator.cs b/src/SFA.DAS.EmployerAccounts.Web/Orchestrators/EmployerAgreementOrchestrator.cs index b0e9402f0c..6c65af3830 100644 --- a/src/SFA.DAS.EmployerAccounts.Web/Orchestrators/EmployerAgreementOrchestrator.cs +++ b/src/SFA.DAS.EmployerAccounts.Web/Orchestrators/EmployerAgreementOrchestrator.cs @@ -1,5 +1,4 @@ using System; -using System.Collections.Generic; using System.Net; using System.Threading.Tasks; using AutoMapper; @@ -10,7 +9,7 @@ using SFA.DAS.EmployerAccounts.Interfaces; using SFA.DAS.EmployerAccounts.Models.EmployerAgreement; using SFA.DAS.EmployerAccounts.Queries.GetAccountEmployerAgreements; -using SFA.DAS.EmployerAccounts.Queries.GetAccountOrganisationRemove; +using SFA.DAS.EmployerAccounts.Queries.GetAccountLegalEntityRemove; using SFA.DAS.EmployerAccounts.Queries.GetEmployerAgreement; using SFA.DAS.EmployerAccounts.Queries.GetEmployerAgreementPdf; using SFA.DAS.EmployerAccounts.Queries.GetEmployerAgreementType; @@ -160,6 +159,7 @@ await _mediator.SendAsync(new SignEmployerAgreementCommand }; } } + public virtual async Task> RemoveLegalAgreement(ConfirmOrganisationToRemoveViewModel model, string userId) { var response = new OrchestratorResponse(); @@ -198,6 +198,7 @@ await _mediator.SendAsync(new RemoveLegalEntityCommand return response; } + public async Task> GetPdfEmployerAgreement(string hashedAccountId, string agreementId, string userId) { var pdfEmployerAgreement = new OrchestratorResponse(); @@ -282,7 +283,7 @@ public virtual async Task - diff --git a/src/SFA.DAS.EmployerAccounts.Web/ViewModels/ConfirmLegalAgreementToRemoveViewModel.cs b/src/SFA.DAS.EmployerAccounts.Web/ViewModels/ConfirmLegalAgreementToRemoveViewModel.cs deleted file mode 100644 index 85f59848b8..0000000000 --- a/src/SFA.DAS.EmployerAccounts.Web/ViewModels/ConfirmLegalAgreementToRemoveViewModel.cs +++ /dev/null @@ -1,16 +0,0 @@ -using SFA.DAS.EmployerAccounts.Models.EmployerAgreement; - -namespace SFA.DAS.EmployerAccounts.Web.ViewModels -{ - public class ConfirmLegalAgreementToRemoveViewModel : ViewModelBase - { - public string Name { get; set; } - public long Id { get; set; } - public string HashedAgreementId { get; set; } - public string HashedAccountId { get; set; } - public int? RemoveOrganisation { get; set; } - - public string RemoveOrganisationError => GetErrorMessage(nameof(RemoveOrganisation)); - public EmployerAgreementStatus AgreementStatus { get; set; } - } -} \ No newline at end of file diff --git a/src/SFA.DAS.EmployerAccounts.Web/ViewModels/ConfirmOrganisationToRemoveViewModel.cs b/src/SFA.DAS.EmployerAccounts.Web/ViewModels/ConfirmOrganisationToRemoveViewModel.cs index f3a174d342..1a60350794 100644 --- a/src/SFA.DAS.EmployerAccounts.Web/ViewModels/ConfirmOrganisationToRemoveViewModel.cs +++ b/src/SFA.DAS.EmployerAccounts.Web/ViewModels/ConfirmOrganisationToRemoveViewModel.cs @@ -1,5 +1,4 @@ using System.ComponentModel.DataAnnotations; -using SFA.DAS.EmployerAccounts.Models.EmployerAgreement; namespace SFA.DAS.EmployerAccounts.Web.ViewModels { diff --git a/src/SFA.DAS.EmployerAccounts/Commands/RemoveLegalEntity/RemoveLegalEntityCommandHandler.cs b/src/SFA.DAS.EmployerAccounts/Commands/RemoveLegalEntity/RemoveLegalEntityCommandHandler.cs index ee54df375a..d12d59c74c 100644 --- a/src/SFA.DAS.EmployerAccounts/Commands/RemoveLegalEntity/RemoveLegalEntityCommandHandler.cs +++ b/src/SFA.DAS.EmployerAccounts/Commands/RemoveLegalEntity/RemoveLegalEntityCommandHandler.cs @@ -78,11 +78,11 @@ protected override async Task HandleCore(RemoveLegalEntityCommand message) } var accountId = _hashingService.DecodeValue(message.HashedAccountId); - var accountlegalEntityId = _accountLegalEntityHashingService.DecodeValue(message.HashedAccountLegalEntityId); + var accountLegalEntityId = _accountLegalEntityHashingService.DecodeValue(message.HashedAccountLegalEntityId); - var agreements = await _employerAgreementRepository.GetAccountLegalEntityAgreements(accountlegalEntityId); + var agreements = await _employerAgreementRepository.GetAccountLegalEntityAgreements(accountLegalEntityId); var legalAgreement = agreements.OrderByDescending(a => a.TemplateId).First(); - var HashedLegalAgreementId = _hashingService.HashValue((long)legalAgreement.Id); + var hashedLegalAgreementId = _hashingService.HashValue(legalAgreement.Id); var agreement = await _employerAgreementRepository.GetEmployerAgreement(legalAgreement.Id); @@ -91,8 +91,8 @@ protected override async Task HandleCore(RemoveLegalEntityCommand message) await _employerAgreementRepository.RemoveLegalEntityFromAccount(legalAgreement.Id); await Task.WhenAll( - AddAuditEntry(accountId, HashedLegalAgreementId), - CreateEvent(HashedLegalAgreementId) + AddAuditEntry(accountId, hashedLegalAgreementId), + CreateEvent(hashedLegalAgreementId) ); // it appears that an agreement is created whenever we create a legal entity, so there should always be an agreement associated with a legal entity diff --git a/src/SFA.DAS.EmployerAccounts/Commands/RemoveLegalEntity/RemoveLegalEntityCommandValidator.cs b/src/SFA.DAS.EmployerAccounts/Commands/RemoveLegalEntity/RemoveLegalEntityCommandValidator.cs index 198f7d3ef9..5c9e8773f1 100644 --- a/src/SFA.DAS.EmployerAccounts/Commands/RemoveLegalEntity/RemoveLegalEntityCommandValidator.cs +++ b/src/SFA.DAS.EmployerAccounts/Commands/RemoveLegalEntity/RemoveLegalEntityCommandValidator.cs @@ -55,6 +55,15 @@ public async Task ValidateAsync(RemoveLegalEntityCommand item) return validationResult; } + var accountId = _hashingService.DecodeValue(item.HashedAccountId); + var legalEntities = await _employerAgreementRepository.GetLegalEntitiesLinkedToAccount(accountId, false); + + if (legalEntities != null && legalEntities.Count == 1) + { + validationResult.AddError(nameof(item.HashedAccountLegalEntityId), "There must be at least one legal entity on the account"); + return validationResult; + } + return validationResult; } } diff --git a/src/SFA.DAS.EmployerAccounts/Data/EmployerAgreementRepository.cs b/src/SFA.DAS.EmployerAccounts/Data/EmployerAgreementRepository.cs index d59f026e86..5b61421c6b 100644 --- a/src/SFA.DAS.EmployerAccounts/Data/EmployerAgreementRepository.cs +++ b/src/SFA.DAS.EmployerAccounts/Data/EmployerAgreementRepository.cs @@ -96,22 +96,7 @@ public Task RemoveLegalEntityFromAccount(long agreementId) transaction: _db.Value.Database.CurrentTransaction.UnderlyingTransaction, commandType: CommandType.StoredProcedure); } - - public async Task> GetEmployerAgreementsToRemove(long accountId) - { - var parameters = new DynamicParameters(); - - parameters.Add("@accountId", accountId, DbType.Int64); - - var result = await _db.Value.Database.Connection.QueryAsync( - sql: "[employer_account].[GetEmployerAgreementsToRemove_ByAccountId]", - param: parameters, - transaction: _db.Value.Database.CurrentTransaction.UnderlyingTransaction, - commandType: CommandType.StoredProcedure); - - return result.ToList(); - } - + public async Task GetAccountLegalEntity(long accountLegalEntityId) { var parameters = new DynamicParameters(); diff --git a/src/SFA.DAS.EmployerAccounts/Data/IEmployerAgreementRepository.cs b/src/SFA.DAS.EmployerAccounts/Data/IEmployerAgreementRepository.cs index 453dfe1b3f..c45996a075 100644 --- a/src/SFA.DAS.EmployerAccounts/Data/IEmployerAgreementRepository.cs +++ b/src/SFA.DAS.EmployerAccounts/Data/IEmployerAgreementRepository.cs @@ -14,7 +14,6 @@ public interface IEmployerAgreementRepository Task GetEmployerAgreement(long agreementId); Task SignAgreement(SignEmployerAgreement agreement); Task RemoveLegalEntityFromAccount(long agreementId); - Task> GetEmployerAgreementsToRemove(long accountId); Task GetAccountLegalEntity(long accountLegalEntityId); Task> GetAccountAgreements(long accountId); Task> GetAccountLegalEntityAgreements(long accountLegalEntityId); diff --git a/src/SFA.DAS.EmployerAccounts/Queries/GetAccountEmployerAgreementRemove/GetAccountEmployerAgreementRemoveQueryHandler.cs b/src/SFA.DAS.EmployerAccounts/Queries/GetAccountEmployerAgreementRemove/GetAccountEmployerAgreementRemoveQueryHandler.cs deleted file mode 100644 index 89206cf46a..0000000000 --- a/src/SFA.DAS.EmployerAccounts/Queries/GetAccountEmployerAgreementRemove/GetAccountEmployerAgreementRemoveQueryHandler.cs +++ /dev/null @@ -1,61 +0,0 @@ -using System; -using System.Data.Entity; -using System.Linq; -using System.Threading.Tasks; -using MediatR; -using SFA.DAS.EmployerAccounts.Data; -using SFA.DAS.EmployerAccounts.Models.EmployerAgreement; -using SFA.DAS.HashingService; -using SFA.DAS.Validation; - -namespace SFA.DAS.EmployerAccounts.Queries.GetAccountEmployerAgreementRemove -{ - public class GetAccountEmployerAgreementRemoveQueryHandler : IAsyncRequestHandler - { - private readonly IValidator _validator; - private readonly Lazy _db; - private readonly IHashingService _hashingService; - - public GetAccountEmployerAgreementRemoveQueryHandler(IValidator validator, IHashingService hashingService, Lazy db) - { - _validator = validator; - _hashingService = hashingService; - _db = db; - } - - public async Task Handle(GetAccountEmployerAgreementRemoveRequest message) - { - var result = await _validator.ValidateAsync(message); - - if (!result.IsValid()) - { - throw new InvalidRequestException(result.ValidationDictionary); - } - if (result.IsUnauthorized) - { - throw new UnauthorizedAccessException(); - } - - var agreementId = _hashingService.DecodeValue(message.HashedAgreementId); - - var agreement = await _db.Value.Agreements.Where(x => x.Id == agreementId).Select(x => new {x.Id, x.StatusId, x.AccountLegalEntity.Name}).SingleOrDefaultAsync(); - - if (agreement == null) - { - return new GetAccountEmployerAgreementRemoveResponse(); - } - - var agreementView = new RemoveEmployerAgreementView - { - CanBeRemoved = true, - HashedAccountId = message.HashedAccountId, - HashedAgreementId = message.HashedAgreementId, - Id = agreement.Id, - Name = agreement.Name, - Status = agreement.StatusId - }; - - return new GetAccountEmployerAgreementRemoveResponse {Agreement = agreementView}; - } - } -} diff --git a/src/SFA.DAS.EmployerAccounts/Queries/GetAccountEmployerAgreementRemove/GetAccountEmployerAgreementRemoveRequest.cs b/src/SFA.DAS.EmployerAccounts/Queries/GetAccountEmployerAgreementRemove/GetAccountEmployerAgreementRemoveRequest.cs deleted file mode 100644 index 181cea9c02..0000000000 --- a/src/SFA.DAS.EmployerAccounts/Queries/GetAccountEmployerAgreementRemove/GetAccountEmployerAgreementRemoveRequest.cs +++ /dev/null @@ -1,11 +0,0 @@ -using MediatR; - -namespace SFA.DAS.EmployerAccounts.Queries.GetAccountEmployerAgreementRemove -{ - public class GetAccountEmployerAgreementRemoveRequest : IAsyncRequest - { - public string HashedAccountId { get; set; } - public string UserId { get; set; } - public string HashedAgreementId { get; set; } - } -} \ No newline at end of file diff --git a/src/SFA.DAS.EmployerAccounts/Queries/GetAccountEmployerAgreementRemove/GetAccountEmployerAgreementRemoveResponse.cs b/src/SFA.DAS.EmployerAccounts/Queries/GetAccountEmployerAgreementRemove/GetAccountEmployerAgreementRemoveResponse.cs deleted file mode 100644 index b212db814e..0000000000 --- a/src/SFA.DAS.EmployerAccounts/Queries/GetAccountEmployerAgreementRemove/GetAccountEmployerAgreementRemoveResponse.cs +++ /dev/null @@ -1,9 +0,0 @@ -using SFA.DAS.EmployerAccounts.Models.EmployerAgreement; - -namespace SFA.DAS.EmployerAccounts.Queries.GetAccountEmployerAgreementRemove -{ - public class GetAccountEmployerAgreementRemoveResponse - { - public RemoveEmployerAgreementView Agreement { get; set; } - } -} \ No newline at end of file diff --git a/src/SFA.DAS.EmployerAccounts/Queries/GetAccountEmployerAgreementRemove/GetAccountEmployerAgreementRemoveValidator.cs b/src/SFA.DAS.EmployerAccounts/Queries/GetAccountEmployerAgreementRemove/GetAccountEmployerAgreementRemoveValidator.cs deleted file mode 100644 index 31cca0dd96..0000000000 --- a/src/SFA.DAS.EmployerAccounts/Queries/GetAccountEmployerAgreementRemove/GetAccountEmployerAgreementRemoveValidator.cs +++ /dev/null @@ -1,56 +0,0 @@ -using System; -using System.Threading.Tasks; -using SFA.DAS.Authorization; -using SFA.DAS.EmployerAccounts.Data; -using SFA.DAS.EmployerAccounts.Models; -using SFA.DAS.Validation; - -namespace SFA.DAS.EmployerAccounts.Queries.GetAccountEmployerAgreementRemove -{ - public class GetAccountEmployerAgreementRemoveValidator : IValidator - { - private readonly IMembershipRepository _membershipRepository; - - public GetAccountEmployerAgreementRemoveValidator(IMembershipRepository membershipRepository) - { - _membershipRepository = membershipRepository; - } - - public ValidationResult Validate(GetAccountEmployerAgreementRemoveRequest item) - { - throw new NotImplementedException(); - } - - public async Task ValidateAsync(GetAccountEmployerAgreementRemoveRequest item) - { - var validationResult = new ValidationResult(); - - if (string.IsNullOrEmpty(item.HashedAccountId)) - { - validationResult.AddError(nameof(item.HashedAccountId)); - } - if (string.IsNullOrEmpty(item.UserId)) - { - validationResult.AddError(nameof(item.UserId)); - } - if (string.IsNullOrEmpty(item.HashedAgreementId)) - { - validationResult.AddError(nameof(item.HashedAgreementId)); - } - - if (!validationResult.IsValid()) - { - return validationResult; - } - - var user = await _membershipRepository.GetCaller(item.HashedAccountId, item.UserId); - - if (user == null || user.Role != Role.Owner) - { - validationResult.IsUnauthorized = true; - } - - return validationResult; - } - } -} \ No newline at end of file diff --git a/src/SFA.DAS.EmployerAccounts/Queries/GetAccountEmployerAgreementsRemove/GetAccountEmployerAgreementsRemoveQueryHandler.cs b/src/SFA.DAS.EmployerAccounts/Queries/GetAccountEmployerAgreementsRemove/GetAccountEmployerAgreementsRemoveQueryHandler.cs deleted file mode 100644 index fa0e0ed608..0000000000 --- a/src/SFA.DAS.EmployerAccounts/Queries/GetAccountEmployerAgreementsRemove/GetAccountEmployerAgreementsRemoveQueryHandler.cs +++ /dev/null @@ -1,126 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; -using MediatR; -using SFA.DAS.Commitments.Api.Client.Interfaces; -using SFA.DAS.Commitments.Api.Types; -using SFA.DAS.EmployerAccounts.Data; -using SFA.DAS.EmployerAccounts.Models.EmployerAgreement; -using SFA.DAS.HashingService; -using SFA.DAS.Validation; -using OrganisationType = SFA.DAS.Common.Domain.Types.OrganisationType; - -namespace SFA.DAS.EmployerAccounts.Queries.GetAccountEmployerAgreementsRemove -{ - public class GetAccountEmployerAgreementsRemoveQueryHandler : IAsyncRequestHandler - { - private readonly IValidator _validator; - private readonly IEmployerAgreementRepository _employerAgreementRepository; - private readonly IHashingService _hashingService; - private readonly IEmployerCommitmentApi _employerCommitmentApi; - - public GetAccountEmployerAgreementsRemoveQueryHandler(IValidator validator, IEmployerAgreementRepository employerAgreementRepository, IHashingService hashingService, IEmployerCommitmentApi employerCommitmentApi) - { - _validator = validator; - _employerAgreementRepository = employerAgreementRepository; - _hashingService = hashingService; - _employerCommitmentApi = employerCommitmentApi; - } - - public async Task Handle(GetAccountEmployerAgreementsRemoveRequest message) - { - var validationResult = await _validator.ValidateAsync(message); - - if (!validationResult.IsValid()) - { - throw new InvalidRequestException(validationResult.ValidationDictionary); - } - if (validationResult.IsUnauthorized) - { - throw new UnauthorizedAccessException(); - } - - var accountId = _hashingService.DecodeValue(message.HashedAccountId); - - var result = await _employerAgreementRepository.GetEmployerAgreementsToRemove(accountId); - if (result == null) return new GetAccountEmployerAgreementsRemoveResponse(); - - SetAgreementHashedIds(result, message.HashedAccountId); - - if (result.Count == 1) - { - result.First().CanBeRemoved = false; - return new GetAccountEmployerAgreementsRemoveResponse { Agreements = result }; - } - - SetPendingAgreementsAsCanBeRemoved(result); - await SetSignedAgreementsCanBeRemovedBasedOnCommitments(accountId, result); - SetOtherAgreementsAsCantBeRemoved(result); - - return new GetAccountEmployerAgreementsRemoveResponse { Agreements = result }; - } - - private void SetOtherAgreementsAsCantBeRemoved(List result) - { - foreach (var agreement in result.Where(x => x.Status != EmployerAgreementStatus.Signed && x.Status != EmployerAgreementStatus.Pending)) - { - agreement.CanBeRemoved = false; - } - } - - private void SetAgreementHashedIds(List result, string hashedAccountId) - { - foreach (var removeEmployerAgreementView in result) - { - removeEmployerAgreementView.HashedAgreementId = _hashingService.HashValue((long)removeEmployerAgreementView.Id); - removeEmployerAgreementView.HashedAccountId = hashedAccountId; - } - } - - private async Task SetSignedAgreementsCanBeRemovedBasedOnCommitments(long accountId, List result) - { - if(!result.Any(x => x.Status == EmployerAgreementStatus.Signed)) - { - return; - } - - var commitments = await _employerCommitmentApi.GetEmployerAccountSummary(accountId); - - commitments.Add(new ApprenticeshipStatusSummary - { - ActiveCount = 1, - LegalEntityIdentifier = "12107942", - LegalEntityOrganisationType = OrganisationType.CompaniesHouse - }); - - foreach (var removeEmployerAgreementView in result.Where(x => x.Status == EmployerAgreementStatus.Signed)) - { - var commitmentConnectedToEntity = commitments.FirstOrDefault(c => - !string.IsNullOrEmpty(c.LegalEntityIdentifier) - && c.LegalEntityIdentifier.Equals(removeEmployerAgreementView.LegalEntityCode) - && c.LegalEntityOrganisationType == removeEmployerAgreementView.LegalEntitySource); - - if (commitmentConnectedToEntity != null && - (commitmentConnectedToEntity.ActiveCount + - commitmentConnectedToEntity.PendingApprovalCount + - commitmentConnectedToEntity.PausedCount) != 0) - { - removeEmployerAgreementView.CanBeRemoved = false; - } - else - { - removeEmployerAgreementView.CanBeRemoved = true; - } - } - } - - private static void SetPendingAgreementsAsCanBeRemoved(List result) - { - foreach (var agreement in result.Where(x => x.Status == EmployerAgreementStatus.Pending)) - { - agreement.CanBeRemoved = true; - } - } - } -} \ No newline at end of file diff --git a/src/SFA.DAS.EmployerAccounts/Queries/GetAccountEmployerAgreementsRemove/GetAccountEmployerAgreementsRemoveRequest.cs b/src/SFA.DAS.EmployerAccounts/Queries/GetAccountEmployerAgreementsRemove/GetAccountEmployerAgreementsRemoveRequest.cs deleted file mode 100644 index 95c79c7f22..0000000000 --- a/src/SFA.DAS.EmployerAccounts/Queries/GetAccountEmployerAgreementsRemove/GetAccountEmployerAgreementsRemoveRequest.cs +++ /dev/null @@ -1,10 +0,0 @@ -using MediatR; - -namespace SFA.DAS.EmployerAccounts.Queries.GetAccountEmployerAgreementsRemove -{ - public class GetAccountEmployerAgreementsRemoveRequest : IAsyncRequest - { - public string HashedAccountId { get; set; } - public string UserId { get; set; } - } -} diff --git a/src/SFA.DAS.EmployerAccounts/Queries/GetAccountEmployerAgreementsRemove/GetAccountEmployerAgreementsRemoveResponse.cs b/src/SFA.DAS.EmployerAccounts/Queries/GetAccountEmployerAgreementsRemove/GetAccountEmployerAgreementsRemoveResponse.cs deleted file mode 100644 index f9504b56af..0000000000 --- a/src/SFA.DAS.EmployerAccounts/Queries/GetAccountEmployerAgreementsRemove/GetAccountEmployerAgreementsRemoveResponse.cs +++ /dev/null @@ -1,10 +0,0 @@ -using System.Collections.Generic; -using SFA.DAS.EmployerAccounts.Models.EmployerAgreement; - -namespace SFA.DAS.EmployerAccounts.Queries.GetAccountEmployerAgreementsRemove -{ - public class GetAccountEmployerAgreementsRemoveResponse - { - public List Agreements { get; set; } - } -} \ No newline at end of file diff --git a/src/SFA.DAS.EmployerAccounts/Queries/GetAccountEmployerAgreementsRemove/GetAccountEmployerAgreementsRemoveValidator.cs b/src/SFA.DAS.EmployerAccounts/Queries/GetAccountEmployerAgreementsRemove/GetAccountEmployerAgreementsRemoveValidator.cs deleted file mode 100644 index bee922e638..0000000000 --- a/src/SFA.DAS.EmployerAccounts/Queries/GetAccountEmployerAgreementsRemove/GetAccountEmployerAgreementsRemoveValidator.cs +++ /dev/null @@ -1,53 +0,0 @@ -using System; -using System.Threading.Tasks; -using SFA.DAS.Authorization; -using SFA.DAS.EmployerAccounts.Data; -using SFA.DAS.EmployerAccounts.Models; -using SFA.DAS.Validation; - -namespace SFA.DAS.EmployerAccounts.Queries.GetAccountEmployerAgreementsRemove -{ - public class GetAccountEmployerAgreementsRemoveValidator : IValidator - { - private readonly IMembershipRepository _membershipRepository; - - public GetAccountEmployerAgreementsRemoveValidator(IMembershipRepository membershipRepository) - { - _membershipRepository = membershipRepository; - } - - public ValidationResult Validate(GetAccountEmployerAgreementsRemoveRequest item) - { - throw new NotImplementedException(); - } - - public async Task ValidateAsync(GetAccountEmployerAgreementsRemoveRequest item) - { - var validationResult = new ValidationResult(); - - if (string.IsNullOrEmpty(item.HashedAccountId)) - { - validationResult.AddError(nameof(item.HashedAccountId)); - } - - if (string.IsNullOrEmpty(item.UserId)) - { - validationResult.AddError(nameof(item.UserId)); - } - - if (!validationResult.IsValid()) - { - return validationResult; - } - - var member = await _membershipRepository.GetCaller(item.HashedAccountId, item.UserId); - - if (member == null || member.Role != Role.Owner) - { - validationResult.IsUnauthorized = true; - } - - return validationResult; - } - } -} \ No newline at end of file diff --git a/src/SFA.DAS.EmployerAccounts/Queries/GetAccountLegalEntitiy/GetAccountLegalEntityHandler.cs b/src/SFA.DAS.EmployerAccounts/Queries/GetAccountLegalEntity/GetAccountLegalEntityHandler.cs similarity index 95% rename from src/SFA.DAS.EmployerAccounts/Queries/GetAccountLegalEntitiy/GetAccountLegalEntityHandler.cs rename to src/SFA.DAS.EmployerAccounts/Queries/GetAccountLegalEntity/GetAccountLegalEntityHandler.cs index b83dd0b4a4..6940bfd59b 100644 --- a/src/SFA.DAS.EmployerAccounts/Queries/GetAccountLegalEntitiy/GetAccountLegalEntityHandler.cs +++ b/src/SFA.DAS.EmployerAccounts/Queries/GetAccountLegalEntity/GetAccountLegalEntityHandler.cs @@ -4,7 +4,7 @@ using SFA.DAS.EmployerAccounts.Data; using SFA.DAS.Validation; -namespace SFA.DAS.EmployerAccounts.Queries.GetAccountLegalEntitiy +namespace SFA.DAS.EmployerAccounts.Queries.GetAccountLegalEntity { public class GetAccountLegalEntityHandler : IAsyncRequestHandler { diff --git a/src/SFA.DAS.EmployerAccounts/Queries/GetAccountLegalEntitiy/GetAccountLegalEntityRequest.cs b/src/SFA.DAS.EmployerAccounts/Queries/GetAccountLegalEntity/GetAccountLegalEntityRequest.cs similarity index 73% rename from src/SFA.DAS.EmployerAccounts/Queries/GetAccountLegalEntitiy/GetAccountLegalEntityRequest.cs rename to src/SFA.DAS.EmployerAccounts/Queries/GetAccountLegalEntity/GetAccountLegalEntityRequest.cs index ef129e7037..8efc608cf5 100644 --- a/src/SFA.DAS.EmployerAccounts/Queries/GetAccountLegalEntitiy/GetAccountLegalEntityRequest.cs +++ b/src/SFA.DAS.EmployerAccounts/Queries/GetAccountLegalEntity/GetAccountLegalEntityRequest.cs @@ -1,6 +1,6 @@ using MediatR; -namespace SFA.DAS.EmployerAccounts.Queries.GetAccountLegalEntitiy +namespace SFA.DAS.EmployerAccounts.Queries.GetAccountLegalEntity { public class GetAccountLegalEntityRequest : IAsyncRequest { diff --git a/src/SFA.DAS.EmployerAccounts/Queries/GetAccountLegalEntitiy/GetAccountLegalEntityResponse.cs b/src/SFA.DAS.EmployerAccounts/Queries/GetAccountLegalEntity/GetAccountLegalEntityResponse.cs similarity index 74% rename from src/SFA.DAS.EmployerAccounts/Queries/GetAccountLegalEntitiy/GetAccountLegalEntityResponse.cs rename to src/SFA.DAS.EmployerAccounts/Queries/GetAccountLegalEntity/GetAccountLegalEntityResponse.cs index 6c1b32cb73..8fca21ef87 100644 --- a/src/SFA.DAS.EmployerAccounts/Queries/GetAccountLegalEntitiy/GetAccountLegalEntityResponse.cs +++ b/src/SFA.DAS.EmployerAccounts/Queries/GetAccountLegalEntity/GetAccountLegalEntityResponse.cs @@ -1,6 +1,6 @@ using SFA.DAS.EmployerAccounts.Models.Organisation; -namespace SFA.DAS.EmployerAccounts.Queries.GetAccountLegalEntitiy +namespace SFA.DAS.EmployerAccounts.Queries.GetAccountLegalEntity { public class GetAccountLegalEntityResponse { diff --git a/src/SFA.DAS.EmployerAccounts/Queries/GetAccountLegalEntitiy/GetAccountLegalEntityValidator.cs b/src/SFA.DAS.EmployerAccounts/Queries/GetAccountLegalEntity/GetAccountLegalEntityValidator.cs similarity index 88% rename from src/SFA.DAS.EmployerAccounts/Queries/GetAccountLegalEntitiy/GetAccountLegalEntityValidator.cs rename to src/SFA.DAS.EmployerAccounts/Queries/GetAccountLegalEntity/GetAccountLegalEntityValidator.cs index 3c9a9e107d..c462efd707 100644 --- a/src/SFA.DAS.EmployerAccounts/Queries/GetAccountLegalEntitiy/GetAccountLegalEntityValidator.cs +++ b/src/SFA.DAS.EmployerAccounts/Queries/GetAccountLegalEntity/GetAccountLegalEntityValidator.cs @@ -2,7 +2,7 @@ using System.Threading.Tasks; using SFA.DAS.Validation; -namespace SFA.DAS.EmployerAccounts.Queries.GetAccountLegalEntitiy +namespace SFA.DAS.EmployerAccounts.Queries.GetAccountLegalEntity { public class GetAccountLegalEntityValidator : IValidator { diff --git a/src/SFA.DAS.EmployerAccounts/Queries/GetAccountOrganisationRemove/GetAccountOrganisationRemoveQueryHandler.cs b/src/SFA.DAS.EmployerAccounts/Queries/GetAccountLegalEntityRemove/GetAccountLegalEntityRemoveQueryHandler.cs similarity index 75% rename from src/SFA.DAS.EmployerAccounts/Queries/GetAccountOrganisationRemove/GetAccountOrganisationRemoveQueryHandler.cs rename to src/SFA.DAS.EmployerAccounts/Queries/GetAccountLegalEntityRemove/GetAccountLegalEntityRemoveQueryHandler.cs index 504885cfe1..13b7aa95cd 100644 --- a/src/SFA.DAS.EmployerAccounts/Queries/GetAccountOrganisationRemove/GetAccountOrganisationRemoveQueryHandler.cs +++ b/src/SFA.DAS.EmployerAccounts/Queries/GetAccountLegalEntityRemove/GetAccountLegalEntityRemoveQueryHandler.cs @@ -1,29 +1,27 @@ -using MediatR; -using SFA.DAS.Commitments.Api.Client.Interfaces; -using SFA.DAS.EmployerAccounts.Data; -using SFA.DAS.HashingService; -using SFA.DAS.Validation; -using System; +using System; using System.Linq; using System.Threading.Tasks; -using SFA.DAS.Commitments.Api.Types; +using MediatR; +using SFA.DAS.Commitments.Api.Client.Interfaces; +using SFA.DAS.EmployerAccounts.Data; using SFA.DAS.EmployerAccounts.MarkerInterfaces; using SFA.DAS.EmployerAccounts.Models.EmployerAgreement; using SFA.DAS.EmployerAccounts.Models.Organisation; -using OrganisationType = SFA.DAS.Common.Domain.Types.OrganisationType; +using SFA.DAS.HashingService; +using SFA.DAS.Validation; -namespace SFA.DAS.EmployerAccounts.Queries.GetAccountOrganisationRemove +namespace SFA.DAS.EmployerAccounts.Queries.GetAccountLegalEntityRemove { - public class GetAccountOrganisationRemoveQueryHandler : IAsyncRequestHandler + public class GetAccountLegalEntityRemoveQueryHandler : IAsyncRequestHandler { - private readonly IValidator _validator; + private readonly IValidator _validator; private readonly IEmployerAgreementRepository _employerAgreementRepository; private readonly IHashingService _hashingService; private readonly IAccountLegalEntityPublicHashingService _accountLegalEntityHashingService; private readonly IEmployerCommitmentApi _employerCommitmentApi; - public GetAccountOrganisationRemoveQueryHandler( - IValidator validator, + public GetAccountLegalEntityRemoveQueryHandler( + IValidator validator, IEmployerAgreementRepository employerAgreementRepository, IHashingService hashingService, IAccountLegalEntityPublicHashingService accountLegalEntityHashingService, @@ -36,7 +34,7 @@ public GetAccountOrganisationRemoveQueryHandler( _employerCommitmentApi = employerCommitmentApi; } - public async Task Handle(GetAccountOrganisationRemoveRequest message) + public async Task Handle(GetAccountLegalEntityRemoveRequest message) { var validationResult = await _validator.ValidateAsync(message); @@ -55,11 +53,11 @@ public async Task Handle(GetAccountOrganis var accountLegalEntity = await _employerAgreementRepository.GetAccountLegalEntity(accountLegalEntityId); var result = await _employerAgreementRepository.GetAccountLegalEntityAgreements(accountLegalEntityId); - if (result == null) return new GetAccountOrganisationRemoveResponse(); + if (result == null) return new GetAccountLegalEntityRemoveResponse(); if (result.Any(x => x.StatusId == EmployerAgreementStatus.Signed)) { - return new GetAccountOrganisationRemoveResponse + return new GetAccountLegalEntityRemoveResponse { CanBeRemoved = await SetRemovedStatusBasedOnCommitments(accountId, accountLegalEntity), HasSignedAgreement = true, @@ -67,7 +65,7 @@ public async Task Handle(GetAccountOrganis }; } - return new GetAccountOrganisationRemoveResponse + return new GetAccountLegalEntityRemoveResponse { CanBeRemoved = true, HasSignedAgreement = false, @@ -79,13 +77,6 @@ private async Task SetRemovedStatusBasedOnCommitments(long accountId, Acco { var commitments = await _employerCommitmentApi.GetEmployerAccountSummary(accountId); - commitments.Add(new ApprenticeshipStatusSummary - { - ActiveCount = 1, - LegalEntityIdentifier = "12107942", - LegalEntityOrganisationType = OrganisationType.CompaniesHouse - }); - var commitmentConnectedToEntity = commitments.FirstOrDefault(c => !string.IsNullOrEmpty(c.LegalEntityIdentifier) && c.LegalEntityIdentifier.Equals(accountLegalEntityModel.Identifier) diff --git a/src/SFA.DAS.EmployerAccounts/Queries/GetAccountOrganisationRemove/GetAccountOrganisationRemoveRequest.cs b/src/SFA.DAS.EmployerAccounts/Queries/GetAccountLegalEntityRemove/GetAccountLegalEntityRemoveRequest.cs similarity index 51% rename from src/SFA.DAS.EmployerAccounts/Queries/GetAccountOrganisationRemove/GetAccountOrganisationRemoveRequest.cs rename to src/SFA.DAS.EmployerAccounts/Queries/GetAccountLegalEntityRemove/GetAccountLegalEntityRemoveRequest.cs index f0e55f483f..7513ec2fb0 100644 --- a/src/SFA.DAS.EmployerAccounts/Queries/GetAccountOrganisationRemove/GetAccountOrganisationRemoveRequest.cs +++ b/src/SFA.DAS.EmployerAccounts/Queries/GetAccountLegalEntityRemove/GetAccountLegalEntityRemoveRequest.cs @@ -1,8 +1,8 @@ using MediatR; -namespace SFA.DAS.EmployerAccounts.Queries.GetAccountOrganisationRemove +namespace SFA.DAS.EmployerAccounts.Queries.GetAccountLegalEntityRemove { - public class GetAccountOrganisationRemoveRequest : IAsyncRequest + public class GetAccountLegalEntityRemoveRequest : IAsyncRequest { public string HashedAccountId { get; set; } public string UserId { get; set; } diff --git a/src/SFA.DAS.EmployerAccounts/Queries/GetAccountLegalEntityRemove/GetAccountLegalEntityRemoveResponse.cs b/src/SFA.DAS.EmployerAccounts/Queries/GetAccountLegalEntityRemove/GetAccountLegalEntityRemoveResponse.cs new file mode 100644 index 0000000000..6d9fd62d59 --- /dev/null +++ b/src/SFA.DAS.EmployerAccounts/Queries/GetAccountLegalEntityRemove/GetAccountLegalEntityRemoveResponse.cs @@ -0,0 +1,9 @@ +namespace SFA.DAS.EmployerAccounts.Queries.GetAccountLegalEntityRemove +{ + public class GetAccountLegalEntityRemoveResponse + { + public string Name { get; set; } + public bool CanBeRemoved { get; set; } + public bool HasSignedAgreement { get; set; } + } +} \ No newline at end of file diff --git a/src/SFA.DAS.EmployerAccounts/Queries/GetAccountOrganisationRemove/GetAccountOrganisationRemoveValidator.cs b/src/SFA.DAS.EmployerAccounts/Queries/GetAccountLegalEntityRemove/GetAccountLegalEntityRemoveValidator.cs similarity index 78% rename from src/SFA.DAS.EmployerAccounts/Queries/GetAccountOrganisationRemove/GetAccountOrganisationRemoveValidator.cs rename to src/SFA.DAS.EmployerAccounts/Queries/GetAccountLegalEntityRemove/GetAccountLegalEntityRemoveValidator.cs index e73e24f91e..a595647aaa 100644 --- a/src/SFA.DAS.EmployerAccounts/Queries/GetAccountOrganisationRemove/GetAccountOrganisationRemoveValidator.cs +++ b/src/SFA.DAS.EmployerAccounts/Queries/GetAccountLegalEntityRemove/GetAccountLegalEntityRemoveValidator.cs @@ -4,23 +4,23 @@ using SFA.DAS.EmployerAccounts.Models; using SFA.DAS.Validation; -namespace SFA.DAS.EmployerAccounts.Queries.GetAccountOrganisationRemove +namespace SFA.DAS.EmployerAccounts.Queries.GetAccountLegalEntityRemove { - public class GetAccountOrganisationRemoveValidator : IValidator + public class GetAccountLegalEntityRemoveValidator : IValidator { private readonly IMembershipRepository _membershipRepository; - public GetAccountOrganisationRemoveValidator(IMembershipRepository membershipRepository) + public GetAccountLegalEntityRemoveValidator(IMembershipRepository membershipRepository) { _membershipRepository = membershipRepository; } - public ValidationResult Validate(GetAccountOrganisationRemoveRequest item) + public ValidationResult Validate(GetAccountLegalEntityRemoveRequest item) { throw new NotImplementedException(); } - public async Task ValidateAsync(GetAccountOrganisationRemoveRequest item) + public async Task ValidateAsync(GetAccountLegalEntityRemoveRequest item) { var validationResult = new ValidationResult(); diff --git a/src/SFA.DAS.EmployerAccounts/Queries/GetAccountOrganisationRemove/GetAccountOrganisationRemoveResponse.cs b/src/SFA.DAS.EmployerAccounts/Queries/GetAccountOrganisationRemove/GetAccountOrganisationRemoveResponse.cs deleted file mode 100644 index 67274c674e..0000000000 --- a/src/SFA.DAS.EmployerAccounts/Queries/GetAccountOrganisationRemove/GetAccountOrganisationRemoveResponse.cs +++ /dev/null @@ -1,11 +0,0 @@ -using SFA.DAS.EmployerAccounts.Models.EmployerAgreement; - -namespace SFA.DAS.EmployerAccounts.Queries.GetAccountOrganisationRemove -{ - public class GetAccountOrganisationRemoveResponse - { - public string Name { get; set; } - public bool CanBeRemoved { get; set; } - public bool HasSignedAgreement { get; set; } - } -} \ No newline at end of file From 4b83b9fc1f1138daf703155f75cbb4deb30c460a Mon Sep 17 00:00:00 2001 From: Paul Howes Date: Wed, 8 Apr 2020 14:11:16 +0100 Subject: [PATCH 05/35] Changes to work as-is --- .../Controllers/EmployerAgreementController.cs | 7 ------- .../Views/EmployerAgreement/Index.cshtml | 11 ++++++++--- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/src/SFA.DAS.EmployerAccounts.Web/Controllers/EmployerAgreementController.cs b/src/SFA.DAS.EmployerAccounts.Web/Controllers/EmployerAgreementController.cs index 0ad56ebfb3..0b6fd8b93d 100644 --- a/src/SFA.DAS.EmployerAccounts.Web/Controllers/EmployerAgreementController.cs +++ b/src/SFA.DAS.EmployerAccounts.Web/Controllers/EmployerAgreementController.cs @@ -310,12 +310,5 @@ public async Task WhenDoYouWantToView(int? choice, string agreemen } } } - - [HttpGet] - [Route("agreements/{accountLegalEntityHashedId}/viewallagreements")] - public ActionResult ViewAllAgreements(string hashedAccountId, string accountLegalEntityHashedId) - { - throw new NotImplementedException(); - } } } \ No newline at end of file diff --git a/src/SFA.DAS.EmployerAccounts.Web/Views/EmployerAgreement/Index.cshtml b/src/SFA.DAS.EmployerAccounts.Web/Views/EmployerAgreement/Index.cshtml index 88131712e6..87326032a5 100644 --- a/src/SFA.DAS.EmployerAccounts.Web/Views/EmployerAgreement/Index.cshtml +++ b/src/SFA.DAS.EmployerAccounts.Web/Views/EmployerAgreement/Index.cshtml @@ -73,9 +73,14 @@ } - - View all agreements - + @if (employerAgreement.HasPendingAgreement) + { + Accept agreement + } + else if (employerAgreement.HasSignedAgreement) + { + View + } @if (Model.Data.EmployerAgreementsData.EmployerAgreements.Count > 1) From 77dcb2a368418ecabfb204deb707ebed96767b19 Mon Sep 17 00:00:00 2001 From: Shoma Gujjar Date: Tue, 14 Apr 2020 15:41:57 +0100 Subject: [PATCH 06/35] CON-1640-add timeout --- .../WhenGettingAccount.cs | 3 +- .../WhenIChangeATeamMemberRole.cs | 3 +- .../WhenIGetATeamMembersDetails.cs | 3 +- .../WhenIGetMyTeamMembers.cs | 3 +- .../WhenIInviteATeamMember.cs | 3 +- .../WhenIRemoveATeamMember.cs | 4 +- .../Orchestrators/EmployerTeamOrchestrator.cs | 79 ++++++++++--------- ...oyerApprenticeshipsServiceConfiguration.cs | 1 + .../GetApprenticeshipsHandler.cs | 3 +- .../GetApprenticeshipsRequest.cs | 2 +- .../GetReservations/GetReservationsRequest.cs | 1 + .../GetReservationsRequestHandler.cs | 16 +++- .../GetVacancies/GetVacanciesRequest.cs | 1 + .../GetVacanciesRequestHandler.cs | 14 +++- 14 files changed, 80 insertions(+), 56 deletions(-) diff --git a/src/SFA.DAS.EmployerAccounts.Web.UnitTests/Orchestrators/EmployerTeamOrchestratorTests/WhenGettingAccount.cs b/src/SFA.DAS.EmployerAccounts.Web.UnitTests/Orchestrators/EmployerTeamOrchestratorTests/WhenGettingAccount.cs index b332a02a28..3447fb4213 100644 --- a/src/SFA.DAS.EmployerAccounts.Web.UnitTests/Orchestrators/EmployerTeamOrchestratorTests/WhenGettingAccount.cs +++ b/src/SFA.DAS.EmployerAccounts.Web.UnitTests/Orchestrators/EmployerTeamOrchestratorTests/WhenGettingAccount.cs @@ -7,7 +7,6 @@ using MediatR; using Moq; using NUnit.Framework; -using SFA.DAS.Authorization.Services; using SFA.DAS.EAS.Account.Api.Client; using SFA.DAS.EAS.Account.Api.Types; using SFA.DAS.EmployerAccounts.Dtos; @@ -200,7 +199,7 @@ public void Arrange() _mapper = new Mock(); - _orchestrator = new EmployerTeamOrchestrator(_mediator.Object, _currentDateTime.Object, _accountApiClient.Object, _mapper.Object, Mock.Of()); + _orchestrator = new EmployerTeamOrchestrator(_mediator.Object, _currentDateTime.Object, _accountApiClient.Object, _mapper.Object); } [Test] diff --git a/src/SFA.DAS.EmployerAccounts.Web.UnitTests/Orchestrators/EmployerTeamOrchestratorTests/WhenIChangeATeamMemberRole.cs b/src/SFA.DAS.EmployerAccounts.Web.UnitTests/Orchestrators/EmployerTeamOrchestratorTests/WhenIChangeATeamMemberRole.cs index 2519d4bf19..5e3403f100 100644 --- a/src/SFA.DAS.EmployerAccounts.Web.UnitTests/Orchestrators/EmployerTeamOrchestratorTests/WhenIChangeATeamMemberRole.cs +++ b/src/SFA.DAS.EmployerAccounts.Web.UnitTests/Orchestrators/EmployerTeamOrchestratorTests/WhenIChangeATeamMemberRole.cs @@ -7,7 +7,6 @@ using Moq; using NUnit.Framework; using SFA.DAS.Authorization; -using SFA.DAS.Authorization.Services; using SFA.DAS.CommitmentsV2.Api.Client; using SFA.DAS.EAS.Account.Api.Client; using SFA.DAS.EmployerAccounts.Commands.ChangeTeamMemberRole; @@ -33,7 +32,7 @@ public void Arrange() _accountApiClient = new Mock(); _mapper = new Mock(); - _orchestrator = new EmployerTeamOrchestrator(_mediator.Object, Mock.Of(), _accountApiClient.Object, _mapper.Object, Mock.Of()); + _orchestrator = new EmployerTeamOrchestrator(_mediator.Object, Mock.Of(), _accountApiClient.Object, _mapper.Object); } [Test] diff --git a/src/SFA.DAS.EmployerAccounts.Web.UnitTests/Orchestrators/EmployerTeamOrchestratorTests/WhenIGetATeamMembersDetails.cs b/src/SFA.DAS.EmployerAccounts.Web.UnitTests/Orchestrators/EmployerTeamOrchestratorTests/WhenIGetATeamMembersDetails.cs index 7e607c9ae6..2864f52680 100644 --- a/src/SFA.DAS.EmployerAccounts.Web.UnitTests/Orchestrators/EmployerTeamOrchestratorTests/WhenIGetATeamMembersDetails.cs +++ b/src/SFA.DAS.EmployerAccounts.Web.UnitTests/Orchestrators/EmployerTeamOrchestratorTests/WhenIGetATeamMembersDetails.cs @@ -4,7 +4,6 @@ using MediatR; using Moq; using NUnit.Framework; -using SFA.DAS.Authorization.Services; using SFA.DAS.CommitmentsV2.Api.Client; using SFA.DAS.EAS.Account.Api.Client; using SFA.DAS.EmployerAccounts.Interfaces; @@ -45,7 +44,7 @@ public void Arrange() _accountApiClient = new Mock(); _mapper = new Mock(); - _orchestrator = new EmployerTeamOrchestrator(_mediator.Object, Mock.Of(), _accountApiClient.Object, _mapper.Object, Mock.Of()); + _orchestrator = new EmployerTeamOrchestrator(_mediator.Object, Mock.Of(), _accountApiClient.Object, _mapper.Object); _mediator.Setup(x => x.SendAsync(It.IsAny())) .ReturnsAsync(_teamMemberResponse); diff --git a/src/SFA.DAS.EmployerAccounts.Web.UnitTests/Orchestrators/EmployerTeamOrchestratorTests/WhenIGetMyTeamMembers.cs b/src/SFA.DAS.EmployerAccounts.Web.UnitTests/Orchestrators/EmployerTeamOrchestratorTests/WhenIGetMyTeamMembers.cs index fb66303035..5dec678c55 100644 --- a/src/SFA.DAS.EmployerAccounts.Web.UnitTests/Orchestrators/EmployerTeamOrchestratorTests/WhenIGetMyTeamMembers.cs +++ b/src/SFA.DAS.EmployerAccounts.Web.UnitTests/Orchestrators/EmployerTeamOrchestratorTests/WhenIGetMyTeamMembers.cs @@ -4,7 +4,6 @@ using MediatR; using Moq; using NUnit.Framework; -using SFA.DAS.Authorization.Services; using SFA.DAS.CommitmentsV2.Api.Client; using SFA.DAS.EAS.Account.Api.Client; using SFA.DAS.EmployerAccounts.Interfaces; @@ -37,7 +36,7 @@ public void Arrange() _accountApiClient = new Mock(); _mapper = new Mock(); - _orchestrator = new EmployerTeamOrchestrator(_mediator.Object, Mock.Of(), _accountApiClient.Object, _mapper.Object, Mock.Of()); + _orchestrator = new EmployerTeamOrchestrator(_mediator.Object, Mock.Of(), _accountApiClient.Object, _mapper.Object); } [Test] diff --git a/src/SFA.DAS.EmployerAccounts.Web.UnitTests/Orchestrators/EmployerTeamOrchestratorTests/WhenIInviteATeamMember.cs b/src/SFA.DAS.EmployerAccounts.Web.UnitTests/Orchestrators/EmployerTeamOrchestratorTests/WhenIInviteATeamMember.cs index 6c321417c3..e977f1047f 100644 --- a/src/SFA.DAS.EmployerAccounts.Web.UnitTests/Orchestrators/EmployerTeamOrchestratorTests/WhenIInviteATeamMember.cs +++ b/src/SFA.DAS.EmployerAccounts.Web.UnitTests/Orchestrators/EmployerTeamOrchestratorTests/WhenIInviteATeamMember.cs @@ -6,7 +6,6 @@ using MediatR; using Moq; using NUnit.Framework; -using SFA.DAS.Authorization.Services; using SFA.DAS.CommitmentsV2.Api.Client; using SFA.DAS.EAS.Account.Api.Client; using SFA.DAS.EmployerAccounts.Commands.CreateInvitation; @@ -35,7 +34,7 @@ public void Arrange() _mediator = new Mock(); _accountApiClient = new Mock(); _mapper = new Mock(); - _orchestrator = new EmployerTeamOrchestrator(_mediator.Object, Mock.Of(), _accountApiClient.Object, _mapper.Object, Mock.Of()); + _orchestrator = new EmployerTeamOrchestrator(_mediator.Object, Mock.Of(), _accountApiClient.Object, _mapper.Object); } [Test] diff --git a/src/SFA.DAS.EmployerAccounts.Web.UnitTests/Orchestrators/EmployerTeamOrchestratorTests/WhenIRemoveATeamMember.cs b/src/SFA.DAS.EmployerAccounts.Web.UnitTests/Orchestrators/EmployerTeamOrchestratorTests/WhenIRemoveATeamMember.cs index 5bc11341f2..bebfe05d60 100644 --- a/src/SFA.DAS.EmployerAccounts.Web.UnitTests/Orchestrators/EmployerTeamOrchestratorTests/WhenIRemoveATeamMember.cs +++ b/src/SFA.DAS.EmployerAccounts.Web.UnitTests/Orchestrators/EmployerTeamOrchestratorTests/WhenIRemoveATeamMember.cs @@ -6,8 +6,6 @@ using MediatR; using Moq; using NUnit.Framework; -using SFA.DAS.Authorization.Services; -using SFA.DAS.CommitmentsV2.Api.Client; using SFA.DAS.EAS.Account.Api.Client; using SFA.DAS.EmployerAccounts.Commands.RemoveTeamMember; using SFA.DAS.EmployerAccounts.Interfaces; @@ -37,7 +35,7 @@ public void Arrange() _accountApiClient = new Mock(); _mapper = new Mock(); - _orchestrator = new EmployerTeamOrchestrator(_mediator.Object, Mock.Of(), _accountApiClient.Object, _mapper.Object, Mock.Of()); + _orchestrator = new EmployerTeamOrchestrator(_mediator.Object, Mock.Of(), _accountApiClient.Object, _mapper.Object); _mediator.Setup(x => x.SendAsync(It.IsAny())) .ReturnsAsync(new GetAccountTeamMembersResponse diff --git a/src/SFA.DAS.EmployerAccounts.Web/Orchestrators/EmployerTeamOrchestrator.cs b/src/SFA.DAS.EmployerAccounts.Web/Orchestrators/EmployerTeamOrchestrator.cs index d39d17b89f..762376fcfc 100644 --- a/src/SFA.DAS.EmployerAccounts.Web/Orchestrators/EmployerTeamOrchestrator.cs +++ b/src/SFA.DAS.EmployerAccounts.Web/Orchestrators/EmployerTeamOrchestrator.cs @@ -1,6 +1,5 @@ using AutoMapper; using MediatR; -using SFA.DAS.Authorization.Services; using SFA.DAS.EAS.Account.Api.Client; using SFA.DAS.EAS.Account.Api.Types; using SFA.DAS.EmployerAccounts.Commands.ChangeTeamMemberRole; @@ -13,13 +12,13 @@ using SFA.DAS.EmployerAccounts.Models; using SFA.DAS.EmployerAccounts.Models.Account; using SFA.DAS.EmployerAccounts.Models.AccountTeam; -using SFA.DAS.EmployerAccounts.Models.CommitmentsV2; -using SFA.DAS.EmployerAccounts.Queries.GetSingleCohort; +using SFA.DAS.EmployerAccounts.Models.CommitmentsV2; +using SFA.DAS.EmployerAccounts.Queries.GetSingleCohort; using SFA.DAS.EmployerAccounts.Queries.GetAccountEmployerAgreements; using SFA.DAS.EmployerAccounts.Queries.GetAccountStats; -using SFA.DAS.EmployerAccounts.Queries.GetAccountTasks; +using SFA.DAS.EmployerAccounts.Queries.GetAccountTasks; using SFA.DAS.EmployerAccounts.Queries.GetAccountTeamMembers; -using SFA.DAS.EmployerAccounts.Queries.GetApprenticeship; +using SFA.DAS.EmployerAccounts.Queries.GetApprenticeship; using SFA.DAS.EmployerAccounts.Queries.GetEmployerAccount; using SFA.DAS.EmployerAccounts.Queries.GetInvitation; using SFA.DAS.EmployerAccounts.Queries.GetMember; @@ -33,41 +32,39 @@ using System.Linq; using System.Net; using System.Threading.Tasks; -using SFA.DAS.Authorization.Services; -using SFA.DAS.EmployerAccounts.Models; -using SFA.DAS.CommitmentsV2.Api.Client; -using SFA.DAS.EmployerAccounts.Queries.GetVacancies; -using SFA.DAS.EmployerAccounts.Models.Recruit; +using SFA.DAS.EmployerAccounts.Queries.GetVacancies; +using SFA.DAS.EmployerAccounts.Models.Recruit; using ResourceNotFoundException = SFA.DAS.EmployerAccounts.Web.Exceptions.ResourceNotFoundException; -using SFA.DAS.Common.Domain.Types; - +using SFA.DAS.Common.Domain.Types; +using SFA.DAS.EmployerAccounts.Configuration; + namespace SFA.DAS.EmployerAccounts.Web.Orchestrators { public class EmployerTeamOrchestrator : UserVerificationOrchestratorBase { private readonly IMediator _mediator; private readonly ICurrentDateTime _currentDateTime; - private readonly IAccountApiClient _accountApiClient; + private readonly IAccountApiClient _accountApiClient; private readonly IMapper _mapper; - private readonly IAuthorizationService _authorizationService; + private EmployerApprenticeshipsServiceConfiguration _employerApprenticeshipsServiceConfiguration; - public EmployerTeamOrchestrator(IMediator mediator, - ICurrentDateTime currentDateTime, - IAccountApiClient accountApiClient, - IMapper mapper, - IAuthorizationService authorizationService) + public EmployerTeamOrchestrator(IMediator mediator, + ICurrentDateTime currentDateTime, + IAccountApiClient accountApiClient, + IMapper mapper, EmployerApprenticeshipsServiceConfiguration employerApprenticeshipsServiceConfiguration) : base(mediator) { _mediator = mediator; _currentDateTime = currentDateTime; - _accountApiClient = accountApiClient; + _accountApiClient = accountApiClient; _mapper = mapper; - _authorizationService = authorizationService; + _employerApprenticeshipsServiceConfiguration = employerApprenticeshipsServiceConfiguration; } //Needed for tests - protected EmployerTeamOrchestrator() + protected EmployerTeamOrchestrator(EmployerApprenticeshipsServiceConfiguration employerApprenticeshipsServiceConfiguration) { + _employerApprenticeshipsServiceConfiguration = employerApprenticeshipsServiceConfiguration; } public async Task> Cancel(string email, string hashedAccountId, string externalUserId) @@ -161,7 +158,8 @@ await _mediator.SendAsync(new ChangeTeamMemberRoleCommand public virtual async Task> GetAccount(string hashedAccountId, string externalUserId) { try - { + { + var timeout = _employerApprenticeshipsServiceConfiguration.AddApprenticeCallToActionTimeout; var apiGetAccountTask = _accountApiClient.GetAccount(hashedAccountId); var accountResponseTask = _mediator.SendAsync(new GetEmployerAccountByHashedIdQuery @@ -193,17 +191,19 @@ public virtual async Task> GetAc var reservationsResponseTask = _mediator.SendAsync(new GetReservationsRequest { HashedAccountId = hashedAccountId, - ExternalUserId = externalUserId + ExternalUserId = externalUserId, + TimeOut = timeout }); var apprenticeshipsResponseTask = _mediator.SendAsync(new GetApprenticeshipsRequest { HashedAccountId = hashedAccountId, - ExternalUserId = externalUserId + ExternalUserId = externalUserId, + TimeOut = timeout }); - var accountCohortResponseTask = _mediator.SendAsync(new GetSingleCohortRequest - { + var accountCohortResponseTask = _mediator.SendAsync(new GetSingleCohortRequest + { HashedAccountId = hashedAccountId, ExternalUserId = externalUserId }); @@ -211,7 +211,8 @@ public virtual async Task> GetAc var vacanciesResponseTask = _mediator.SendAsync(new GetVacanciesRequest { HashedAccountId = hashedAccountId, - ExternalUserId = externalUserId + ExternalUserId = externalUserId, + TimeOut = timeout }); await Task.WhenAll(apiGetAccountTask, accountStatsResponseTask, userRoleResponseTask, userResponseTask, accountStatsResponseTask, agreementsResponseTask, reservationsResponseTask, apprenticeshipsResponseTask, accountCohortResponseTask, vacanciesResponseTask).ConfigureAwait(false); @@ -227,7 +228,7 @@ public virtual async Task> GetAc var accountCohort = accountCohortResponseTask.Result; var apprenticeshipsResponse = apprenticeshipsResponseTask.Result; - var apprenticeshipEmployerType = (Common.Domain.Types.ApprenticeshipEmployerType)Enum.Parse(typeof(Common.Domain.Types.ApprenticeshipEmployerType), accountDetailViewModel.ApprenticeshipEmployerType, true); + var apprenticeshipEmployerType = (ApprenticeshipEmployerType)Enum.Parse(typeof(ApprenticeshipEmployerType), accountDetailViewModel.ApprenticeshipEmployerType, true); var tasksResponse = await _mediator.SendAsync(new GetAccountTasksQuery { @@ -841,17 +842,17 @@ private bool EvaluateSingleApprenticeshipCallToActionRule(PanelViewModel viewModel) { if (viewModel.Data.CallToActionViewModel.ReservationsCount == 1 - && viewModel.Data.CallToActionViewModel.CohortsCount == 1 + && viewModel.Data.CallToActionViewModel.CohortsCount == 1 && viewModel.Data.CallToActionViewModel.Cohorts.Single() != null - && viewModel.Data.CallToActionViewModel.ApprenticeshipsCount == 0 + && viewModel.Data.CallToActionViewModel.ApprenticeshipsCount == 0 && viewModel.Data.CallToActionViewModel.Cohorts?.Single().CohortApprenticeshipsCount == 1 && viewModel.Data.CallToActionViewModel.Cohorts.Single().Apprenticeships.Single().HasSingleDraftApprenticeship.Equals(true) && viewModel.Data.CallToActionViewModel.Cohorts.Single().CohortStatus.Equals(CohortStatus.Draft)) - { - viewModel.ViewName = "SingleApprenticeshipContinueSetup"; - viewModel.PanelType = PanelType.Summary; - return true; - } + { + viewModel.ViewName = "SingleApprenticeshipContinueSetup"; + viewModel.PanelType = PanelType.Summary; + return true; + } return false; } @@ -887,14 +888,14 @@ private bool EvaluateContinueSetupForSingleApprenticeshipByProviderCallToActionR viewModel.PanelType = PanelType.Summary; return true; } - + return false; } private bool EvaluateSingleApprenticeshipsWithReadyToReviewStatusCallToActionRule(PanelViewModel viewModel) { if (viewModel.Data.CallToActionViewModel.ReservationsCount == 1 - && viewModel.Data.CallToActionViewModel.CohortsCount == 1 + && viewModel.Data.CallToActionViewModel.CohortsCount == 1 && viewModel.Data.CallToActionViewModel.Cohorts.Single() != null && viewModel.Data.CallToActionViewModel.ApprenticeshipsCount == 0 && viewModel.Data.CallToActionViewModel.Cohorts?.Single().CohortApprenticeshipsCount == 1 @@ -905,7 +906,7 @@ private bool EvaluateSingleApprenticeshipsWithReadyToReviewStatusCallToActionRul viewModel.PanelType = PanelType.Summary; return true; } - + return false; } } diff --git a/src/SFA.DAS.EmployerAccounts/Configuration/EmployerApprenticeshipsServiceConfiguration.cs b/src/SFA.DAS.EmployerAccounts/Configuration/EmployerApprenticeshipsServiceConfiguration.cs index 27defd0bc3..851abacf8f 100644 --- a/src/SFA.DAS.EmployerAccounts/Configuration/EmployerApprenticeshipsServiceConfiguration.cs +++ b/src/SFA.DAS.EmployerAccounts/Configuration/EmployerApprenticeshipsServiceConfiguration.cs @@ -32,5 +32,6 @@ public class EmployerApprenticeshipsServiceConfiguration : ITopicMessagePublishe public string PublicHashstring { get; set; } public string ServiceBusConnectionString { get; set; } public Dictionary ServiceBusConnectionStrings { get; set; } + public int AddApprenticeCallToActionTimeout { get; set; } } } \ No newline at end of file diff --git a/src/SFA.DAS.EmployerAccounts/Queries/GetApprenticeship/GetApprenticeshipsHandler.cs b/src/SFA.DAS.EmployerAccounts/Queries/GetApprenticeship/GetApprenticeshipsHandler.cs index a1c4b62199..f7549a381c 100644 --- a/src/SFA.DAS.EmployerAccounts/Queries/GetApprenticeship/GetApprenticeshipsHandler.cs +++ b/src/SFA.DAS.EmployerAccounts/Queries/GetApprenticeship/GetApprenticeshipsHandler.cs @@ -1,4 +1,5 @@ -using MediatR; +using System; +using MediatR; using System.Threading.Tasks; using SFA.DAS.NLog.Logger; using SFA.DAS.Validation; diff --git a/src/SFA.DAS.EmployerAccounts/Queries/GetApprenticeship/GetApprenticeshipsRequest.cs b/src/SFA.DAS.EmployerAccounts/Queries/GetApprenticeship/GetApprenticeshipsRequest.cs index 53d655bf43..b9ee3c6038 100644 --- a/src/SFA.DAS.EmployerAccounts/Queries/GetApprenticeship/GetApprenticeshipsRequest.cs +++ b/src/SFA.DAS.EmployerAccounts/Queries/GetApprenticeship/GetApprenticeshipsRequest.cs @@ -6,6 +6,6 @@ public class GetApprenticeshipsRequest : IAsyncRequest { public string HashedAccountId { get; set; } public string ExternalUserId { get; set; } + public int TimeOut { get; set; } } } diff --git a/src/SFA.DAS.EmployerAccounts/Queries/GetReservations/GetReservationsRequestHandler.cs b/src/SFA.DAS.EmployerAccounts/Queries/GetReservations/GetReservationsRequestHandler.cs index 5ea4dc1e1e..69c6ac52de 100644 --- a/src/SFA.DAS.EmployerAccounts/Queries/GetReservations/GetReservationsRequestHandler.cs +++ b/src/SFA.DAS.EmployerAccounts/Queries/GetReservations/GetReservationsRequestHandler.cs @@ -42,10 +42,24 @@ public async Task Handle(GetReservationsRequest message try { + var task = _service.Get(accountId); + if (await Task.WhenAny(task, Task.Delay(message.TimeOut)) == task) + { + await task; + } + return new GetReservationsResponse + { + Reservations = task.Result + }; + } + catch (TimeoutException ex) + { + _logger.Error(ex, $"Failued to get Reservations for {message.HashedAccountId}"); return new GetReservationsResponse { - Reservations = await _service.Get(accountId) + HasFailed = true }; + } catch (Exception ex) { diff --git a/src/SFA.DAS.EmployerAccounts/Queries/GetVacancies/GetVacanciesRequest.cs b/src/SFA.DAS.EmployerAccounts/Queries/GetVacancies/GetVacanciesRequest.cs index 4f75907a55..3b21f70274 100644 --- a/src/SFA.DAS.EmployerAccounts/Queries/GetVacancies/GetVacanciesRequest.cs +++ b/src/SFA.DAS.EmployerAccounts/Queries/GetVacancies/GetVacanciesRequest.cs @@ -6,5 +6,6 @@ public class GetVacanciesRequest : IAsyncRequest { public string HashedAccountId { get; set; } public string ExternalUserId { get; set; } + public int TimeOut { get; set; } } } diff --git a/src/SFA.DAS.EmployerAccounts/Queries/GetVacancies/GetVacanciesRequestHandler.cs b/src/SFA.DAS.EmployerAccounts/Queries/GetVacancies/GetVacanciesRequestHandler.cs index 4e803e2f2c..4ccef1fecb 100644 --- a/src/SFA.DAS.EmployerAccounts/Queries/GetVacancies/GetVacanciesRequestHandler.cs +++ b/src/SFA.DAS.EmployerAccounts/Queries/GetVacancies/GetVacanciesRequestHandler.cs @@ -36,9 +36,21 @@ public async Task Handle(GetVacanciesRequest message) try { + var task = _service.GetVacancies(message.HashedAccountId); + if (await Task.WhenAny(task, Task.Delay(message.TimeOut)) == task) + { + await task; + } + else + { + return new GetVacanciesResponse + { + HasFailed = true + }; + } return new GetVacanciesResponse { - Vacancies = await _service.GetVacancies(message.HashedAccountId) + Vacancies = task.Result }; } catch(Exception ex) From ea7d6a4b1d1bb7751436ff62aae72e774511408e Mon Sep 17 00:00:00 2001 From: Shoma Gujjar Date: Tue, 14 Apr 2020 17:11:03 +0100 Subject: [PATCH 07/35] CON-1640-make code review comment changes. --- .../WhenGettingAccount.cs | 1 - .../Orchestrators/EmployerTeamOrchestrator.cs | 27 +++++-------------- .../GetApprenticeshipsHandler.cs | 6 +++-- .../GetReservations/GetReservationsRequest.cs | 1 - .../GetReservationsRequestHandler.cs | 10 ++++--- .../GetSingleCohortRequestHandler.cs | 1 + .../GetVacancies/GetVacanciesRequest.cs | 1 - .../GetVacanciesRequestHandler.cs | 24 +++++++++++------ 8 files changed, 35 insertions(+), 36 deletions(-) diff --git a/src/SFA.DAS.EmployerAccounts.Web.UnitTests/Orchestrators/EmployerTeamOrchestratorTests/WhenGettingAccount.cs b/src/SFA.DAS.EmployerAccounts.Web.UnitTests/Orchestrators/EmployerTeamOrchestratorTests/WhenGettingAccount.cs index 3447fb4213..8c2b6ec391 100644 --- a/src/SFA.DAS.EmployerAccounts.Web.UnitTests/Orchestrators/EmployerTeamOrchestratorTests/WhenGettingAccount.cs +++ b/src/SFA.DAS.EmployerAccounts.Web.UnitTests/Orchestrators/EmployerTeamOrchestratorTests/WhenGettingAccount.cs @@ -25,7 +25,6 @@ using SFA.DAS.EmployerAccounts.Queries.GetReservations; using SFA.DAS.EmployerAccounts.Queries.GetTeamUser; using SFA.DAS.EmployerAccounts.Queries.GetUserAccountRole; -using SFA.DAS.EmployerAccounts.Web.Extensions; using SFA.DAS.EmployerAccounts.Queries.GetVacancies; using SFA.DAS.EmployerAccounts.Web.Orchestrators; using SFA.DAS.EmployerAccounts.Web.ViewModels; diff --git a/src/SFA.DAS.EmployerAccounts.Web/Orchestrators/EmployerTeamOrchestrator.cs b/src/SFA.DAS.EmployerAccounts.Web/Orchestrators/EmployerTeamOrchestrator.cs index 762376fcfc..c2ae844951 100644 --- a/src/SFA.DAS.EmployerAccounts.Web/Orchestrators/EmployerTeamOrchestrator.cs +++ b/src/SFA.DAS.EmployerAccounts.Web/Orchestrators/EmployerTeamOrchestrator.cs @@ -36,7 +36,6 @@ using SFA.DAS.EmployerAccounts.Models.Recruit; using ResourceNotFoundException = SFA.DAS.EmployerAccounts.Web.Exceptions.ResourceNotFoundException; using SFA.DAS.Common.Domain.Types; -using SFA.DAS.EmployerAccounts.Configuration; namespace SFA.DAS.EmployerAccounts.Web.Orchestrators { @@ -45,26 +44,18 @@ public class EmployerTeamOrchestrator : UserVerificationOrchestratorBase private readonly IMediator _mediator; private readonly ICurrentDateTime _currentDateTime; private readonly IAccountApiClient _accountApiClient; - private readonly IMapper _mapper; - private EmployerApprenticeshipsServiceConfiguration _employerApprenticeshipsServiceConfiguration; - + private readonly IMapper _mapper; + public EmployerTeamOrchestrator(IMediator mediator, ICurrentDateTime currentDateTime, IAccountApiClient accountApiClient, - IMapper mapper, EmployerApprenticeshipsServiceConfiguration employerApprenticeshipsServiceConfiguration) + IMapper mapper) : base(mediator) { _mediator = mediator; _currentDateTime = currentDateTime; _accountApiClient = accountApiClient; - _mapper = mapper; - _employerApprenticeshipsServiceConfiguration = employerApprenticeshipsServiceConfiguration; - } - - //Needed for tests - protected EmployerTeamOrchestrator(EmployerApprenticeshipsServiceConfiguration employerApprenticeshipsServiceConfiguration) - { - _employerApprenticeshipsServiceConfiguration = employerApprenticeshipsServiceConfiguration; + _mapper = mapper; } public async Task> Cancel(string email, string hashedAccountId, string externalUserId) @@ -159,7 +150,6 @@ public virtual async Task> GetAc { try { - var timeout = _employerApprenticeshipsServiceConfiguration.AddApprenticeCallToActionTimeout; var apiGetAccountTask = _accountApiClient.GetAccount(hashedAccountId); var accountResponseTask = _mediator.SendAsync(new GetEmployerAccountByHashedIdQuery @@ -191,15 +181,13 @@ public virtual async Task> GetAc var reservationsResponseTask = _mediator.SendAsync(new GetReservationsRequest { HashedAccountId = hashedAccountId, - ExternalUserId = externalUserId, - TimeOut = timeout + ExternalUserId = externalUserId }); var apprenticeshipsResponseTask = _mediator.SendAsync(new GetApprenticeshipsRequest { HashedAccountId = hashedAccountId, - ExternalUserId = externalUserId, - TimeOut = timeout + ExternalUserId = externalUserId }); var accountCohortResponseTask = _mediator.SendAsync(new GetSingleCohortRequest @@ -211,8 +199,7 @@ public virtual async Task> GetAc var vacanciesResponseTask = _mediator.SendAsync(new GetVacanciesRequest { HashedAccountId = hashedAccountId, - ExternalUserId = externalUserId, - TimeOut = timeout + ExternalUserId = externalUserId }); await Task.WhenAll(apiGetAccountTask, accountStatsResponseTask, userRoleResponseTask, userResponseTask, accountStatsResponseTask, agreementsResponseTask, reservationsResponseTask, apprenticeshipsResponseTask, accountCohortResponseTask, vacanciesResponseTask).ConfigureAwait(false); diff --git a/src/SFA.DAS.EmployerAccounts/Queries/GetApprenticeship/GetApprenticeshipsHandler.cs b/src/SFA.DAS.EmployerAccounts/Queries/GetApprenticeship/GetApprenticeshipsHandler.cs index f7549a381c..0e0a79cbde 100644 --- a/src/SFA.DAS.EmployerAccounts/Queries/GetApprenticeship/GetApprenticeshipsHandler.cs +++ b/src/SFA.DAS.EmployerAccounts/Queries/GetApprenticeship/GetApprenticeshipsHandler.cs @@ -1,6 +1,7 @@ using System; using MediatR; using System.Threading.Tasks; +using SFA.DAS.EmployerAccounts.Configuration; using SFA.DAS.NLog.Logger; using SFA.DAS.Validation; using SFA.DAS.EmployerAccounts.Interfaces; @@ -15,17 +16,18 @@ public class GetApprenticeshipsHandler : IAsyncRequestHandler validator, ILog logger, ICommitmentV2Service commitmentV2Service, - IHashingService hashingService) + IHashingService hashingService, EmployerApprenticeshipsServiceConfiguration employerApprenticeshipsServiceConfiguration) { _validator = validator; _logger = logger; _commitmentV2Service = commitmentV2Service; _hashingService = hashingService; + _employerApprenticeshipsServiceConfiguration = employerApprenticeshipsServiceConfiguration; } public async Task Handle(GetApprenticeshipsRequest message) diff --git a/src/SFA.DAS.EmployerAccounts/Queries/GetReservations/GetReservationsRequest.cs b/src/SFA.DAS.EmployerAccounts/Queries/GetReservations/GetReservationsRequest.cs index 8bc9014c39..34b6bc8459 100644 --- a/src/SFA.DAS.EmployerAccounts/Queries/GetReservations/GetReservationsRequest.cs +++ b/src/SFA.DAS.EmployerAccounts/Queries/GetReservations/GetReservationsRequest.cs @@ -6,6 +6,5 @@ public class GetReservationsRequest : IAsyncRequest { public string HashedAccountId { get; set; } public string ExternalUserId { get; set; } - public int TimeOut { get; set; } } } diff --git a/src/SFA.DAS.EmployerAccounts/Queries/GetReservations/GetReservationsRequestHandler.cs b/src/SFA.DAS.EmployerAccounts/Queries/GetReservations/GetReservationsRequestHandler.cs index 69c6ac52de..bebf268fc4 100644 --- a/src/SFA.DAS.EmployerAccounts/Queries/GetReservations/GetReservationsRequestHandler.cs +++ b/src/SFA.DAS.EmployerAccounts/Queries/GetReservations/GetReservationsRequestHandler.cs @@ -1,6 +1,7 @@ using System; using System.Threading.Tasks; using MediatR; +using SFA.DAS.EmployerAccounts.Configuration; using SFA.DAS.EmployerAccounts.Interfaces; using SFA.DAS.HashingService; using SFA.DAS.NLog.Logger; @@ -14,17 +15,20 @@ public class GetReservationsRequestHandler : IAsyncRequestHandler validator, ILog logger, IReservationsService service, - IHashingService hashingService) + IHashingService hashingService, + EmployerApprenticeshipsServiceConfiguration employerApprenticeshipsServiceConfiguration) { _validator = validator; _logger = logger; _service = service; _hashingService = hashingService; + _employerApprenticeshipsServiceConfiguration = employerApprenticeshipsServiceConfiguration; } public async Task Handle(GetReservationsRequest message) @@ -43,7 +47,7 @@ public async Task Handle(GetReservationsRequest message try { var task = _service.Get(accountId); - if (await Task.WhenAny(task, Task.Delay(message.TimeOut)) == task) + if (await Task.WhenAny(task, Task.Delay(_employerApprenticeshipsServiceConfiguration.AddApprenticeCallToActionTimeout)) == task) { await task; } @@ -54,7 +58,7 @@ public async Task Handle(GetReservationsRequest message } catch (TimeoutException ex) { - _logger.Error(ex, $"Failued to get Reservations for {message.HashedAccountId}"); + _logger.Error(ex, $"Failed to get Reservations for {message.HashedAccountId}"); return new GetReservationsResponse { HasFailed = true diff --git a/src/SFA.DAS.EmployerAccounts/Queries/GetSingleCohort/GetSingleCohortRequestHandler.cs b/src/SFA.DAS.EmployerAccounts/Queries/GetSingleCohort/GetSingleCohortRequestHandler.cs index 518ca96981..b3af3a02ae 100644 --- a/src/SFA.DAS.EmployerAccounts/Queries/GetSingleCohort/GetSingleCohortRequestHandler.cs +++ b/src/SFA.DAS.EmployerAccounts/Queries/GetSingleCohort/GetSingleCohortRequestHandler.cs @@ -3,6 +3,7 @@ using SFA.DAS.Validation; using SFA.DAS.EmployerAccounts.Interfaces; using System.Linq; +using SFA.DAS.EmployerAccounts.Configuration; using SFA.DAS.HashingService; using System; using SFA.DAS.NLog.Logger; diff --git a/src/SFA.DAS.EmployerAccounts/Queries/GetVacancies/GetVacanciesRequest.cs b/src/SFA.DAS.EmployerAccounts/Queries/GetVacancies/GetVacanciesRequest.cs index 3b21f70274..4f75907a55 100644 --- a/src/SFA.DAS.EmployerAccounts/Queries/GetVacancies/GetVacanciesRequest.cs +++ b/src/SFA.DAS.EmployerAccounts/Queries/GetVacancies/GetVacanciesRequest.cs @@ -6,6 +6,5 @@ public class GetVacanciesRequest : IAsyncRequest { public string HashedAccountId { get; set; } public string ExternalUserId { get; set; } - public int TimeOut { get; set; } } } diff --git a/src/SFA.DAS.EmployerAccounts/Queries/GetVacancies/GetVacanciesRequestHandler.cs b/src/SFA.DAS.EmployerAccounts/Queries/GetVacancies/GetVacanciesRequestHandler.cs index 4ccef1fecb..47685c970f 100644 --- a/src/SFA.DAS.EmployerAccounts/Queries/GetVacancies/GetVacanciesRequestHandler.cs +++ b/src/SFA.DAS.EmployerAccounts/Queries/GetVacancies/GetVacanciesRequestHandler.cs @@ -1,6 +1,7 @@ using System; using System.Threading.Tasks; using MediatR; +using SFA.DAS.EmployerAccounts.Configuration; using SFA.DAS.EmployerAccounts.Interfaces; using SFA.DAS.NLog.Logger; using SFA.DAS.Validation; @@ -12,15 +13,17 @@ public class GetVacanciesRequestHandler : IAsyncRequestHandler _validator; private readonly ILog _logger; private readonly IRecruitService _service; + private readonly EmployerApprenticeshipsServiceConfiguration _employerApprenticeshipsServiceConfiguration; public GetVacanciesRequestHandler( IValidator validator, ILog logger, - IRecruitService service) + IRecruitService service, EmployerApprenticeshipsServiceConfiguration employerApprenticeshipsServiceConfiguration) { _validator = validator; _logger = logger; _service = service; + _employerApprenticeshipsServiceConfiguration = employerApprenticeshipsServiceConfiguration; } public async Task Handle(GetVacanciesRequest message) @@ -37,23 +40,28 @@ public async Task Handle(GetVacanciesRequest message) try { var task = _service.GetVacancies(message.HashedAccountId); - if (await Task.WhenAny(task, Task.Delay(message.TimeOut)) == task) + if (await Task.WhenAny(task, Task.Delay(_employerApprenticeshipsServiceConfiguration.AddApprenticeCallToActionTimeout)) == task) { await task; - } - else - { return new GetVacanciesResponse { - HasFailed = true + Vacancies = task.Result }; } return new GetVacanciesResponse { - Vacancies = task.Result + HasFailed = true + }; + } + catch (TimeoutException ex) + { + _logger.Error(ex, $"Failed to get Reservations for {message.HashedAccountId}"); + return new GetVacanciesResponse + { + HasFailed = true }; } - catch(Exception ex) + catch (Exception ex) { _logger.Error(ex, $"Failed to get vacancies for {message.HashedAccountId}"); return new GetVacanciesResponse From 4f7e0af97dc7fd06255695101cb7007e28e40af3 Mon Sep 17 00:00:00 2001 From: Shoma Gujjar Date: Tue, 14 Apr 2020 17:14:43 +0100 Subject: [PATCH 08/35] CON-1640-code clean --- .../EmployerTeamOrchestratorTests/WhenIChangeATeamMemberRole.cs | 2 -- .../WhenIGetATeamMembersDetails.cs | 1 - .../EmployerTeamOrchestratorTests/WhenIGetMyTeamMembers.cs | 1 - .../EmployerTeamOrchestratorTests/WhenIInviteATeamMember.cs | 1 - .../Queries/GetApprenticeship/GetApprenticeshipsRequest.cs | 1 - 5 files changed, 6 deletions(-) diff --git a/src/SFA.DAS.EmployerAccounts.Web.UnitTests/Orchestrators/EmployerTeamOrchestratorTests/WhenIChangeATeamMemberRole.cs b/src/SFA.DAS.EmployerAccounts.Web.UnitTests/Orchestrators/EmployerTeamOrchestratorTests/WhenIChangeATeamMemberRole.cs index 5e3403f100..3bbb156f29 100644 --- a/src/SFA.DAS.EmployerAccounts.Web.UnitTests/Orchestrators/EmployerTeamOrchestratorTests/WhenIChangeATeamMemberRole.cs +++ b/src/SFA.DAS.EmployerAccounts.Web.UnitTests/Orchestrators/EmployerTeamOrchestratorTests/WhenIChangeATeamMemberRole.cs @@ -6,8 +6,6 @@ using MediatR; using Moq; using NUnit.Framework; -using SFA.DAS.Authorization; -using SFA.DAS.CommitmentsV2.Api.Client; using SFA.DAS.EAS.Account.Api.Client; using SFA.DAS.EmployerAccounts.Commands.ChangeTeamMemberRole; using SFA.DAS.EmployerAccounts.Interfaces; diff --git a/src/SFA.DAS.EmployerAccounts.Web.UnitTests/Orchestrators/EmployerTeamOrchestratorTests/WhenIGetATeamMembersDetails.cs b/src/SFA.DAS.EmployerAccounts.Web.UnitTests/Orchestrators/EmployerTeamOrchestratorTests/WhenIGetATeamMembersDetails.cs index 2864f52680..657aa9803f 100644 --- a/src/SFA.DAS.EmployerAccounts.Web.UnitTests/Orchestrators/EmployerTeamOrchestratorTests/WhenIGetATeamMembersDetails.cs +++ b/src/SFA.DAS.EmployerAccounts.Web.UnitTests/Orchestrators/EmployerTeamOrchestratorTests/WhenIGetATeamMembersDetails.cs @@ -4,7 +4,6 @@ using MediatR; using Moq; using NUnit.Framework; -using SFA.DAS.CommitmentsV2.Api.Client; using SFA.DAS.EAS.Account.Api.Client; using SFA.DAS.EmployerAccounts.Interfaces; using SFA.DAS.EmployerAccounts.Models; diff --git a/src/SFA.DAS.EmployerAccounts.Web.UnitTests/Orchestrators/EmployerTeamOrchestratorTests/WhenIGetMyTeamMembers.cs b/src/SFA.DAS.EmployerAccounts.Web.UnitTests/Orchestrators/EmployerTeamOrchestratorTests/WhenIGetMyTeamMembers.cs index 5dec678c55..e04769d8b1 100644 --- a/src/SFA.DAS.EmployerAccounts.Web.UnitTests/Orchestrators/EmployerTeamOrchestratorTests/WhenIGetMyTeamMembers.cs +++ b/src/SFA.DAS.EmployerAccounts.Web.UnitTests/Orchestrators/EmployerTeamOrchestratorTests/WhenIGetMyTeamMembers.cs @@ -4,7 +4,6 @@ using MediatR; using Moq; using NUnit.Framework; -using SFA.DAS.CommitmentsV2.Api.Client; using SFA.DAS.EAS.Account.Api.Client; using SFA.DAS.EmployerAccounts.Interfaces; using SFA.DAS.EmployerAccounts.Models.AccountTeam; diff --git a/src/SFA.DAS.EmployerAccounts.Web.UnitTests/Orchestrators/EmployerTeamOrchestratorTests/WhenIInviteATeamMember.cs b/src/SFA.DAS.EmployerAccounts.Web.UnitTests/Orchestrators/EmployerTeamOrchestratorTests/WhenIInviteATeamMember.cs index e977f1047f..481e5d5ef8 100644 --- a/src/SFA.DAS.EmployerAccounts.Web.UnitTests/Orchestrators/EmployerTeamOrchestratorTests/WhenIInviteATeamMember.cs +++ b/src/SFA.DAS.EmployerAccounts.Web.UnitTests/Orchestrators/EmployerTeamOrchestratorTests/WhenIInviteATeamMember.cs @@ -6,7 +6,6 @@ using MediatR; using Moq; using NUnit.Framework; -using SFA.DAS.CommitmentsV2.Api.Client; using SFA.DAS.EAS.Account.Api.Client; using SFA.DAS.EmployerAccounts.Commands.CreateInvitation; using SFA.DAS.EmployerAccounts.Interfaces; diff --git a/src/SFA.DAS.EmployerAccounts/Queries/GetApprenticeship/GetApprenticeshipsRequest.cs b/src/SFA.DAS.EmployerAccounts/Queries/GetApprenticeship/GetApprenticeshipsRequest.cs index b9ee3c6038..f45af5b397 100644 --- a/src/SFA.DAS.EmployerAccounts/Queries/GetApprenticeship/GetApprenticeshipsRequest.cs +++ b/src/SFA.DAS.EmployerAccounts/Queries/GetApprenticeship/GetApprenticeshipsRequest.cs @@ -6,6 +6,5 @@ public class GetApprenticeshipsRequest : IAsyncRequest Date: Tue, 14 Apr 2020 17:17:39 +0100 Subject: [PATCH 09/35] CON-1640-put back empty constructor --- .../Orchestrators/EmployerTeamOrchestrator.cs | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/SFA.DAS.EmployerAccounts.Web/Orchestrators/EmployerTeamOrchestrator.cs b/src/SFA.DAS.EmployerAccounts.Web/Orchestrators/EmployerTeamOrchestrator.cs index c2ae844951..2f96b8db54 100644 --- a/src/SFA.DAS.EmployerAccounts.Web/Orchestrators/EmployerTeamOrchestrator.cs +++ b/src/SFA.DAS.EmployerAccounts.Web/Orchestrators/EmployerTeamOrchestrator.cs @@ -48,14 +48,18 @@ public class EmployerTeamOrchestrator : UserVerificationOrchestratorBase public EmployerTeamOrchestrator(IMediator mediator, ICurrentDateTime currentDateTime, - IAccountApiClient accountApiClient, + IAccountApiClient accountApiClient, IMapper mapper) : base(mediator) { _mediator = mediator; _currentDateTime = currentDateTime; - _accountApiClient = accountApiClient; - _mapper = mapper; + _accountApiClient = accountApiClient; + _mapper = mapper; + } + //Needed for tests + protected EmployerTeamOrchestrator() + { } public async Task> Cancel(string email, string hashedAccountId, string externalUserId) From 96d969a0dfd57da98c22b2dc41beb8c00161ce77 Mon Sep 17 00:00:00 2001 From: Shoma Gujjar Date: Tue, 14 Apr 2020 17:21:06 +0100 Subject: [PATCH 10/35] CON-1640-add proper messages. --- .../Queries/GetVacancies/GetVacanciesRequestHandler.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/SFA.DAS.EmployerAccounts/Queries/GetVacancies/GetVacanciesRequestHandler.cs b/src/SFA.DAS.EmployerAccounts/Queries/GetVacancies/GetVacanciesRequestHandler.cs index 47685c970f..07f5bb22a7 100644 --- a/src/SFA.DAS.EmployerAccounts/Queries/GetVacancies/GetVacanciesRequestHandler.cs +++ b/src/SFA.DAS.EmployerAccounts/Queries/GetVacancies/GetVacanciesRequestHandler.cs @@ -55,7 +55,7 @@ public async Task Handle(GetVacanciesRequest message) } catch (TimeoutException ex) { - _logger.Error(ex, $"Failed to get Reservations for {message.HashedAccountId}"); + _logger.Error(ex, $"Failed to get vacancies for {message.HashedAccountId}"); return new GetVacanciesResponse { HasFailed = true From def0a7dc27ea739aab1df8db2f68a10c887ed942 Mon Sep 17 00:00:00 2001 From: Shoma Gujjar Date: Tue, 14 Apr 2020 22:36:08 +0100 Subject: [PATCH 11/35] CON-1640-fix broken build --- .../GetApprenticeship/WhenIGetApprenticeship.cs | 8 ++++++-- .../Queries/GetReservations/WhenIGetReservations.cs | 10 ++++++++-- .../Queries/GetSingleCohort/WhenIGetSingleCohort.cs | 9 +++++---- .../Queries/GetVacancies/WhenIGetVacancies.cs | 8 ++++++-- .../Configuration/EmployerAccountsConfiguration.cs | 1 + .../EmployerApprenticeshipsServiceConfiguration.cs | 1 - .../GetApprenticeship/GetApprenticeshipsHandler.cs | 6 +++--- .../GetReservations/GetReservationsRequestHandler.cs | 10 +++++----- .../Queries/GetVacancies/GetVacanciesRequestHandler.cs | 8 ++++---- 9 files changed, 38 insertions(+), 23 deletions(-) diff --git a/src/SFA.DAS.EmployerAccounts.UnitTests/Queries/GetApprenticeship/WhenIGetApprenticeship.cs b/src/SFA.DAS.EmployerAccounts.UnitTests/Queries/GetApprenticeship/WhenIGetApprenticeship.cs index 0545fb979a..2c7bdb9119 100644 --- a/src/SFA.DAS.EmployerAccounts.UnitTests/Queries/GetApprenticeship/WhenIGetApprenticeship.cs +++ b/src/SFA.DAS.EmployerAccounts.UnitTests/Queries/GetApprenticeship/WhenIGetApprenticeship.cs @@ -6,8 +6,8 @@ using NUnit.Framework; using SFA.DAS.NLog.Logger; using System.Threading.Tasks; -using SFA.DAS.CommitmentsV2.Api.Types.Responses; using System.Collections.Generic; +using SFA.DAS.EmployerAccounts.Configuration; using SFA.DAS.EmployerAccounts.Models.CommitmentsV2; using SFA.DAS.HashingService; @@ -24,6 +24,7 @@ public class WhenIGetApprenticeship : QueryBaseTest _logger; private long _accountId; private string _hashedAccountId; + public EmployerAccountsConfiguration EmployerAccountsConfiguration { get; set; } [SetUp] public void Arrange() @@ -40,8 +41,11 @@ public void Arrange() _commitmentV2Service.Setup(m => m.GetApprenticeships(_accountId)).ReturnsAsync(new List { new Apprenticeship { Id = 3 } }); _hashingService = new Mock(); _hashingService.Setup(x => x.DecodeValue(_hashedAccountId)).Returns(_accountId); + EmployerAccountsConfiguration = new EmployerAccountsConfiguration() + { - RequestHandler = new GetApprenticeshipsHandler(RequestValidator.Object, _logger.Object, _commitmentV2Service.Object, _hashingService.Object); + }; + RequestHandler = new GetApprenticeshipsHandler(RequestValidator.Object, _logger.Object, _commitmentV2Service.Object, _hashingService.Object, EmployerAccountsConfiguration); Query = new GetApprenticeshipsRequest { diff --git a/src/SFA.DAS.EmployerAccounts.UnitTests/Queries/GetReservations/WhenIGetReservations.cs b/src/SFA.DAS.EmployerAccounts.UnitTests/Queries/GetReservations/WhenIGetReservations.cs index 7b000b53ce..7e617ac429 100644 --- a/src/SFA.DAS.EmployerAccounts.UnitTests/Queries/GetReservations/WhenIGetReservations.cs +++ b/src/SFA.DAS.EmployerAccounts.UnitTests/Queries/GetReservations/WhenIGetReservations.cs @@ -3,6 +3,7 @@ using System.Threading.Tasks; using Moq; using NUnit.Framework; +using SFA.DAS.EmployerAccounts.Configuration; using SFA.DAS.EmployerAccounts.Interfaces; using SFA.DAS.EmployerAccounts.Models.Reservations; using SFA.DAS.EmployerAccounts.Queries.GetReservations; @@ -22,10 +23,11 @@ public class WhenIGetReservations : QueryBaseTest _hashingService; private Reservation _reservation; private Mock _logger; - + public EmployerAccountsConfiguration EmployerAccountsConfiguration { get; set; } private string _hashedAccountId; private long _accountId; + [SetUp] public void Arrange() { @@ -46,8 +48,12 @@ public void Arrange() _hashingService .Setup(m => m.DecodeValue(_hashedAccountId)) .Returns(_accountId); + EmployerAccountsConfiguration = EmployerAccountsConfiguration = new EmployerAccountsConfiguration() + { + + }; - RequestHandler = new GetReservationsRequestHandler(RequestValidator.Object, _logger.Object, _reservationsService.Object, _hashingService.Object); + RequestHandler = new GetReservationsRequestHandler(RequestValidator.Object, _logger.Object, _reservationsService.Object, _hashingService.Object,EmployerAccountsConfiguration); Query = new GetReservationsRequest { diff --git a/src/SFA.DAS.EmployerAccounts.UnitTests/Queries/GetSingleCohort/WhenIGetSingleCohort.cs b/src/SFA.DAS.EmployerAccounts.UnitTests/Queries/GetSingleCohort/WhenIGetSingleCohort.cs index cf4ef0866d..a96c740820 100644 --- a/src/SFA.DAS.EmployerAccounts.UnitTests/Queries/GetSingleCohort/WhenIGetSingleCohort.cs +++ b/src/SFA.DAS.EmployerAccounts.UnitTests/Queries/GetSingleCohort/WhenIGetSingleCohort.cs @@ -3,14 +3,12 @@ using SFA.DAS.EmployerAccounts.Interfaces; using SFA.DAS.EmployerAccounts.Models.CommitmentsV2; using SFA.DAS.EmployerAccounts.Queries.GetSingleCohort; -using SFA.DAS.Encoding; using SFA.DAS.HashingService; -using SFA.DAS.NLog.Logger; using SFA.DAS.Validation; -using System; using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; +using SFA.DAS.EmployerAccounts.Configuration; namespace SFA.DAS.EmployerAccounts.UnitTests.Queries.GetSingleCohort { @@ -23,7 +21,8 @@ public class WhenIGetSingleCohort : QueryBaseTest _hashingService; private long _accountId; private long _cohortId; - public string hashedAccountId; + public string hashedAccountId; + public EmployerAccountsConfiguration EmployerAccountsConfiguration { get; set; } [SetUp] public void Arrange() @@ -43,6 +42,8 @@ public void Arrange() _hashingService = new Mock(); _hashingService.Setup(x => x.DecodeValue(hashedAccountId)).Returns(_accountId); + EmployerAccountsConfiguration = EmployerAccountsConfiguration = new EmployerAccountsConfiguration() + { RequestHandler = new GetSingleCohortRequestHandler(RequestValidator.Object, _commitmentV2Service.Object, _hashingService.Object, Mock.Of()); diff --git a/src/SFA.DAS.EmployerAccounts.UnitTests/Queries/GetVacancies/WhenIGetVacancies.cs b/src/SFA.DAS.EmployerAccounts.UnitTests/Queries/GetVacancies/WhenIGetVacancies.cs index 188a0aaebb..ca87d0bead 100644 --- a/src/SFA.DAS.EmployerAccounts.UnitTests/Queries/GetVacancies/WhenIGetVacancies.cs +++ b/src/SFA.DAS.EmployerAccounts.UnitTests/Queries/GetVacancies/WhenIGetVacancies.cs @@ -3,6 +3,7 @@ using System.Threading.Tasks; using Moq; using NUnit.Framework; +using SFA.DAS.EmployerAccounts.Configuration; using SFA.DAS.EmployerAccounts.Interfaces; using SFA.DAS.EmployerAccounts.Models.Recruit; using SFA.DAS.EmployerAccounts.Queries.GetVacancies; @@ -20,7 +21,7 @@ public class GetVacancies : QueryBaseTest _recruitService; private Vacancy _vacancy; private Mock _logger; - + public EmployerAccountsConfiguration EmployerAccountsConfiguration { get; set; } private string _hashedAccountId; [SetUp] @@ -37,8 +38,11 @@ public void Arrange() _recruitService .Setup(s => s.GetVacancies(_hashedAccountId, int.MaxValue)) .ReturnsAsync(new List { _vacancy }); + EmployerAccountsConfiguration = EmployerAccountsConfiguration = new EmployerAccountsConfiguration() + { - RequestHandler = new GetVacanciesRequestHandler(RequestValidator.Object, _logger.Object, _recruitService.Object); + }; + RequestHandler = new GetVacanciesRequestHandler(RequestValidator.Object, _logger.Object, _recruitService.Object, EmployerAccountsConfiguration); Query = new GetVacanciesRequest { diff --git a/src/SFA.DAS.EmployerAccounts/Configuration/EmployerAccountsConfiguration.cs b/src/SFA.DAS.EmployerAccounts/Configuration/EmployerAccountsConfiguration.cs index aabaf9261f..d735c9610b 100644 --- a/src/SFA.DAS.EmployerAccounts/Configuration/EmployerAccountsConfiguration.cs +++ b/src/SFA.DAS.EmployerAccounts/Configuration/EmployerAccountsConfiguration.cs @@ -48,5 +48,6 @@ public class EmployerAccountsConfiguration : ITopicMessagePublisherConfiguration public string ZenDeskCobrowsingSnippetKey { get; set; } public CommitmentsApiV2ClientConfiguration CommitmentsApi { get; set; } public RecruitClientApiConfiguration RecruitApi { get; set; } + public int AddApprenticeCallToActionTimeout { get; set; } } } \ No newline at end of file diff --git a/src/SFA.DAS.EmployerAccounts/Configuration/EmployerApprenticeshipsServiceConfiguration.cs b/src/SFA.DAS.EmployerAccounts/Configuration/EmployerApprenticeshipsServiceConfiguration.cs index 851abacf8f..27defd0bc3 100644 --- a/src/SFA.DAS.EmployerAccounts/Configuration/EmployerApprenticeshipsServiceConfiguration.cs +++ b/src/SFA.DAS.EmployerAccounts/Configuration/EmployerApprenticeshipsServiceConfiguration.cs @@ -32,6 +32,5 @@ public class EmployerApprenticeshipsServiceConfiguration : ITopicMessagePublishe public string PublicHashstring { get; set; } public string ServiceBusConnectionString { get; set; } public Dictionary ServiceBusConnectionStrings { get; set; } - public int AddApprenticeCallToActionTimeout { get; set; } } } \ No newline at end of file diff --git a/src/SFA.DAS.EmployerAccounts/Queries/GetApprenticeship/GetApprenticeshipsHandler.cs b/src/SFA.DAS.EmployerAccounts/Queries/GetApprenticeship/GetApprenticeshipsHandler.cs index 0e0a79cbde..a997340ffb 100644 --- a/src/SFA.DAS.EmployerAccounts/Queries/GetApprenticeship/GetApprenticeshipsHandler.cs +++ b/src/SFA.DAS.EmployerAccounts/Queries/GetApprenticeship/GetApprenticeshipsHandler.cs @@ -16,18 +16,18 @@ public class GetApprenticeshipsHandler : IAsyncRequestHandler validator, ILog logger, ICommitmentV2Service commitmentV2Service, - IHashingService hashingService, EmployerApprenticeshipsServiceConfiguration employerApprenticeshipsServiceConfiguration) + IHashingService hashingService, EmployerAccountsConfiguration employerAccountsConfiguration) { _validator = validator; _logger = logger; _commitmentV2Service = commitmentV2Service; _hashingService = hashingService; - _employerApprenticeshipsServiceConfiguration = employerApprenticeshipsServiceConfiguration; + _employerAccountsConfiguration = employerAccountsConfiguration; } public async Task Handle(GetApprenticeshipsRequest message) diff --git a/src/SFA.DAS.EmployerAccounts/Queries/GetReservations/GetReservationsRequestHandler.cs b/src/SFA.DAS.EmployerAccounts/Queries/GetReservations/GetReservationsRequestHandler.cs index bebf268fc4..30dbd27232 100644 --- a/src/SFA.DAS.EmployerAccounts/Queries/GetReservations/GetReservationsRequestHandler.cs +++ b/src/SFA.DAS.EmployerAccounts/Queries/GetReservations/GetReservationsRequestHandler.cs @@ -15,20 +15,20 @@ public class GetReservationsRequestHandler : IAsyncRequestHandler validator, ILog logger, IReservationsService service, - IHashingService hashingService, - EmployerApprenticeshipsServiceConfiguration employerApprenticeshipsServiceConfiguration) + IHashingService hashingService, + EmployerAccountsConfiguration employerAccountsConfiguration) { _validator = validator; _logger = logger; _service = service; _hashingService = hashingService; - _employerApprenticeshipsServiceConfiguration = employerApprenticeshipsServiceConfiguration; + _employerAccountsConfiguration = employerAccountsConfiguration; } public async Task Handle(GetReservationsRequest message) @@ -47,7 +47,7 @@ public async Task Handle(GetReservationsRequest message try { var task = _service.Get(accountId); - if (await Task.WhenAny(task, Task.Delay(_employerApprenticeshipsServiceConfiguration.AddApprenticeCallToActionTimeout)) == task) + if (await Task.WhenAny(task, Task.Delay(_employerAccountsConfiguration.AddApprenticeCallToActionTimeout)) == task) { await task; } diff --git a/src/SFA.DAS.EmployerAccounts/Queries/GetVacancies/GetVacanciesRequestHandler.cs b/src/SFA.DAS.EmployerAccounts/Queries/GetVacancies/GetVacanciesRequestHandler.cs index 07f5bb22a7..c9040a17c0 100644 --- a/src/SFA.DAS.EmployerAccounts/Queries/GetVacancies/GetVacanciesRequestHandler.cs +++ b/src/SFA.DAS.EmployerAccounts/Queries/GetVacancies/GetVacanciesRequestHandler.cs @@ -13,17 +13,17 @@ public class GetVacanciesRequestHandler : IAsyncRequestHandler _validator; private readonly ILog _logger; private readonly IRecruitService _service; - private readonly EmployerApprenticeshipsServiceConfiguration _employerApprenticeshipsServiceConfiguration; + private readonly EmployerAccountsConfiguration _employerAccountsConfiguration; public GetVacanciesRequestHandler( IValidator validator, ILog logger, - IRecruitService service, EmployerApprenticeshipsServiceConfiguration employerApprenticeshipsServiceConfiguration) + IRecruitService service, EmployerAccountsConfiguration employerAccountsConfiguration) { _validator = validator; _logger = logger; _service = service; - _employerApprenticeshipsServiceConfiguration = employerApprenticeshipsServiceConfiguration; + _employerAccountsConfiguration = employerAccountsConfiguration; } public async Task Handle(GetVacanciesRequest message) @@ -40,7 +40,7 @@ public async Task Handle(GetVacanciesRequest message) try { var task = _service.GetVacancies(message.HashedAccountId); - if (await Task.WhenAny(task, Task.Delay(_employerApprenticeshipsServiceConfiguration.AddApprenticeCallToActionTimeout)) == task) + if (await Task.WhenAny(task, Task.Delay(_employerAccountsConfiguration.AddApprenticeCallToActionTimeout)) == task) { await task; return new GetVacanciesResponse From 3461da2662ecc1e5feab5a72c2bd0cd7bb23605c Mon Sep 17 00:00:00 2001 From: Shoma Gujjar Date: Wed, 15 Apr 2020 10:04:25 +0100 Subject: [PATCH 12/35] CON-1640-add timeout for commitments --- .../Queries/GetSingleCohort/WhenIGetSingleCohort.cs | 4 +++- .../Queries/GetSingleCohort/GetSingleCohortRequestHandler.cs | 3 ++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/SFA.DAS.EmployerAccounts.UnitTests/Queries/GetSingleCohort/WhenIGetSingleCohort.cs b/src/SFA.DAS.EmployerAccounts.UnitTests/Queries/GetSingleCohort/WhenIGetSingleCohort.cs index a96c740820..e9c7d68a06 100644 --- a/src/SFA.DAS.EmployerAccounts.UnitTests/Queries/GetSingleCohort/WhenIGetSingleCohort.cs +++ b/src/SFA.DAS.EmployerAccounts.UnitTests/Queries/GetSingleCohort/WhenIGetSingleCohort.cs @@ -9,6 +9,7 @@ using System.Linq; using System.Threading.Tasks; using SFA.DAS.EmployerAccounts.Configuration; +using SFA.DAS.NLog.Logger; namespace SFA.DAS.EmployerAccounts.UnitTests.Queries.GetSingleCohort { @@ -22,6 +23,7 @@ public class WhenIGetSingleCohort : QueryBaseTest _logger; public EmployerAccountsConfiguration EmployerAccountsConfiguration { get; set; } [SetUp] @@ -32,7 +34,7 @@ public void Arrange() _accountId = 123; _cohortId = 1; hashedAccountId = "Abc123"; - + _logger = new Mock(); _commitmentV2Service = new Mock(); _commitmentV2Service.Setup(m => m.GetCohorts(_accountId)) .ReturnsAsync(new List() { new Cohort { Id = _cohortId, NumberOfDraftApprentices = 1 }}); diff --git a/src/SFA.DAS.EmployerAccounts/Queries/GetSingleCohort/GetSingleCohortRequestHandler.cs b/src/SFA.DAS.EmployerAccounts/Queries/GetSingleCohort/GetSingleCohortRequestHandler.cs index b3af3a02ae..6bb688ffd6 100644 --- a/src/SFA.DAS.EmployerAccounts/Queries/GetSingleCohort/GetSingleCohortRequestHandler.cs +++ b/src/SFA.DAS.EmployerAccounts/Queries/GetSingleCohort/GetSingleCohortRequestHandler.cs @@ -1,4 +1,5 @@ -using MediatR; +using System; +using MediatR; using System.Threading.Tasks; using SFA.DAS.Validation; using SFA.DAS.EmployerAccounts.Interfaces; From 234daa0562816010afa9241bfd7a6194d500dafe Mon Sep 17 00:00:00 2001 From: Shoma Gujjar Date: Wed, 15 Apr 2020 22:49:32 +0100 Subject: [PATCH 13/35] CON-1640-Integrate Polly --- .../DependencyResolution/ServicesRegistry.cs | 5 ++- .../Extensions/PollyTimeoutExtensions.cs | 23 +++++++++++ .../GetReservationsRequestHandler.cs | 22 +--------- .../SFA.DAS.EmployerAccounts.csproj | 1 + .../ReservationsServiceWithTimeout.cs | 41 +++++++++++++++++++ 5 files changed, 71 insertions(+), 21 deletions(-) create mode 100644 src/SFA.DAS.EmployerAccounts/Extensions/PollyTimeoutExtensions.cs create mode 100644 src/SFA.DAS.EmployerAccounts/Services/ReservationsServiceWithTimeout.cs diff --git a/src/SFA.DAS.EmployerAccounts/DependencyResolution/ServicesRegistry.cs b/src/SFA.DAS.EmployerAccounts/DependencyResolution/ServicesRegistry.cs index 831e57f3b6..07caf68ba1 100644 --- a/src/SFA.DAS.EmployerAccounts/DependencyResolution/ServicesRegistry.cs +++ b/src/SFA.DAS.EmployerAccounts/DependencyResolution/ServicesRegistry.cs @@ -1,4 +1,5 @@ using System.Net; +using SFA.DAS.Authorization.Context; using SFA.DAS.EmployerAccounts.Factories; using SFA.DAS.EmployerAccounts.Interfaces; using SFA.DAS.EmployerAccounts.Services; @@ -15,7 +16,9 @@ public ServicesRegistry() For().Use(); For().Use(); For().Use(); - For().Use(); + var reservationServiceInstance = For().Use(); + For().Use() + .Ctor().Is(reservationServiceInstance); For().Use(); } } diff --git a/src/SFA.DAS.EmployerAccounts/Extensions/PollyTimeoutExtensions.cs b/src/SFA.DAS.EmployerAccounts/Extensions/PollyTimeoutExtensions.cs new file mode 100644 index 0000000000..1647a13af4 --- /dev/null +++ b/src/SFA.DAS.EmployerAccounts/Extensions/PollyTimeoutExtensions.cs @@ -0,0 +1,23 @@ +using System.Threading.Tasks; +using SFA.DAS.NLog.Logger; +using Polly; +using Polly.Timeout; + +namespace SFA.DAS.EmployerAccounts.Extensions +{ + public static class PollyTimeoutExtensions + { + public static AsyncTimeoutPolicy GetTimeoutPolicy(ILog logger) + { + return Policy + .TimeoutAsync(1, + (context, timeSpan, retryCount, exception) => + { + logger.Warn($"Error executing command for method {context.OperationKey} " + + $"Reason: {exception.Message}. " + + $"Retrying in {timeSpan.Seconds} secs...attempt: {retryCount}"); + return Task.CompletedTask; + }); + } + } +} diff --git a/src/SFA.DAS.EmployerAccounts/Queries/GetReservations/GetReservationsRequestHandler.cs b/src/SFA.DAS.EmployerAccounts/Queries/GetReservations/GetReservationsRequestHandler.cs index 30dbd27232..5ea4dc1e1e 100644 --- a/src/SFA.DAS.EmployerAccounts/Queries/GetReservations/GetReservationsRequestHandler.cs +++ b/src/SFA.DAS.EmployerAccounts/Queries/GetReservations/GetReservationsRequestHandler.cs @@ -1,7 +1,6 @@ using System; using System.Threading.Tasks; using MediatR; -using SFA.DAS.EmployerAccounts.Configuration; using SFA.DAS.EmployerAccounts.Interfaces; using SFA.DAS.HashingService; using SFA.DAS.NLog.Logger; @@ -15,20 +14,17 @@ public class GetReservationsRequestHandler : IAsyncRequestHandler validator, ILog logger, IReservationsService service, - IHashingService hashingService, - EmployerAccountsConfiguration employerAccountsConfiguration) + IHashingService hashingService) { _validator = validator; _logger = logger; _service = service; _hashingService = hashingService; - _employerAccountsConfiguration = employerAccountsConfiguration; } public async Task Handle(GetReservationsRequest message) @@ -46,25 +42,11 @@ public async Task Handle(GetReservationsRequest message try { - var task = _service.Get(accountId); - if (await Task.WhenAny(task, Task.Delay(_employerAccountsConfiguration.AddApprenticeCallToActionTimeout)) == task) - { - await task; - } return new GetReservationsResponse { - Reservations = task.Result + Reservations = await _service.Get(accountId) }; } - catch (TimeoutException ex) - { - _logger.Error(ex, $"Failed to get Reservations for {message.HashedAccountId}"); - return new GetReservationsResponse - { - HasFailed = true - }; - - } catch (Exception ex) { _logger.Error(ex, $"Failed to get Reservations for {message.HashedAccountId}"); diff --git a/src/SFA.DAS.EmployerAccounts/SFA.DAS.EmployerAccounts.csproj b/src/SFA.DAS.EmployerAccounts/SFA.DAS.EmployerAccounts.csproj index c70ed7c24a..bde5eaf991 100644 --- a/src/SFA.DAS.EmployerAccounts/SFA.DAS.EmployerAccounts.csproj +++ b/src/SFA.DAS.EmployerAccounts/SFA.DAS.EmployerAccounts.csproj @@ -19,6 +19,7 @@ + diff --git a/src/SFA.DAS.EmployerAccounts/Services/ReservationsServiceWithTimeout.cs b/src/SFA.DAS.EmployerAccounts/Services/ReservationsServiceWithTimeout.cs new file mode 100644 index 0000000000..8d8969c812 --- /dev/null +++ b/src/SFA.DAS.EmployerAccounts/Services/ReservationsServiceWithTimeout.cs @@ -0,0 +1,41 @@ +using System.Collections.Generic; +using System.Threading; +using System.Threading.Tasks; +using Newtonsoft.Json; +using Polly.Timeout; +using SFA.DAS.EmployerAccounts.Extensions; +using SFA.DAS.EmployerAccounts.Interfaces; +using SFA.DAS.EmployerAccounts.Models.Reservations; +using SFA.DAS.NLog.Logger; + +namespace SFA.DAS.EmployerAccounts.Services +{ + public class ReservationsServiceWithTimeout : IReservationsService + { + private readonly IReservationsService _service; + private readonly ILog _logger; + private AsyncTimeoutPolicy TimeoutPolicy { get; } + + public ReservationsServiceWithTimeout(IReservationsService service, ILog logger) + { + _service = service; + _logger = logger; + TimeoutPolicy= PollyTimeoutExtensions.GetTimeoutPolicy(_logger); + } + + public async Task> Get(long accountId) + { + return await TimeoutPolicy.ExecuteAsync(async token => + await _service.Get(accountId), CancellationToken.None); + //var result2 = await TimeoutPolicy.ExecuteAsync(context => + // _service.Get(accountId), CancellationToken.None, true); + + //var result1 = await TimeoutPolicy.ExecuteAndCaptureAsync(async (ct) => + //{ + // await _service.Get(accountId); + //}, CancellationToken.None); + + //return _service.Get(accountId); + } + } +} \ No newline at end of file From 5b5ffb51004c4f2dc8d46cd8feb7c72221e97346 Mon Sep 17 00:00:00 2001 From: Shoma Gujjar Date: Thu, 16 Apr 2020 11:07:50 +0100 Subject: [PATCH 14/35] CON-1640-change polly version --- src/SFA.DAS.EAS.sln | 2 +- .../Queries/GetReservations/WhenIGetReservations.cs | 9 ++------- .../SFA.DAS.EmployerAccounts.csproj | 4 ++-- 3 files changed, 5 insertions(+), 10 deletions(-) diff --git a/src/SFA.DAS.EAS.sln b/src/SFA.DAS.EAS.sln index 60f6567f2b..bf0b4d5d18 100644 --- a/src/SFA.DAS.EAS.sln +++ b/src/SFA.DAS.EAS.sln @@ -165,7 +165,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SFA.DAS.EmployerAccounts.Ap EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SFA.DAS.EmployerAccounts.Api.IntegrationTests", "SFA.DAS.EmployerAccounts.Api.IntegrationTests\SFA.DAS.EmployerAccounts.Api.IntegrationTests.csproj", "{BD68EB2C-A486-42B2-8685-776B164FD860}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SFA.DAS.EmployerFinance.MessageHandlers.TestHarness", "SFA.DAS.EmployerFinance.MessageHandlers.TestHarness\SFA.DAS.EmployerFinance.MessageHandlers.TestHarness.csproj", "{73080F2E-1875-4DBC-BE84-381E2FD603D2}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SFA.DAS.EmployerFinance.MessageHandlers.TestHarness", "SFA.DAS.EmployerFinance.MessageHandlers.TestHarness\SFA.DAS.EmployerFinance.MessageHandlers.TestHarness.csproj", "{73080F2E-1875-4DBC-BE84-381E2FD603D2}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/src/SFA.DAS.EmployerAccounts.UnitTests/Queries/GetReservations/WhenIGetReservations.cs b/src/SFA.DAS.EmployerAccounts.UnitTests/Queries/GetReservations/WhenIGetReservations.cs index 7e617ac429..d868aa70d7 100644 --- a/src/SFA.DAS.EmployerAccounts.UnitTests/Queries/GetReservations/WhenIGetReservations.cs +++ b/src/SFA.DAS.EmployerAccounts.UnitTests/Queries/GetReservations/WhenIGetReservations.cs @@ -23,7 +23,6 @@ public class WhenIGetReservations : QueryBaseTest _hashingService; private Reservation _reservation; private Mock _logger; - public EmployerAccountsConfiguration EmployerAccountsConfiguration { get; set; } private string _hashedAccountId; private long _accountId; @@ -48,12 +47,8 @@ public void Arrange() _hashingService .Setup(m => m.DecodeValue(_hashedAccountId)) .Returns(_accountId); - EmployerAccountsConfiguration = EmployerAccountsConfiguration = new EmployerAccountsConfiguration() - { - - }; - - RequestHandler = new GetReservationsRequestHandler(RequestValidator.Object, _logger.Object, _reservationsService.Object, _hashingService.Object,EmployerAccountsConfiguration); + + RequestHandler = new GetReservationsRequestHandler(RequestValidator.Object, _logger.Object, _reservationsService.Object, _hashingService.Object); Query = new GetReservationsRequest { diff --git a/src/SFA.DAS.EmployerAccounts/SFA.DAS.EmployerAccounts.csproj b/src/SFA.DAS.EmployerAccounts/SFA.DAS.EmployerAccounts.csproj index bde5eaf991..a4fdf06982 100644 --- a/src/SFA.DAS.EmployerAccounts/SFA.DAS.EmployerAccounts.csproj +++ b/src/SFA.DAS.EmployerAccounts/SFA.DAS.EmployerAccounts.csproj @@ -1,4 +1,4 @@ - + false @@ -19,7 +19,7 @@ - + From a4ae9023eb3e1fd86c04f0e403bbcc66b36360ce Mon Sep 17 00:00:00 2001 From: Shoma Gujjar Date: Tue, 14 Apr 2020 15:41:57 +0100 Subject: [PATCH 15/35] CON-1640-add timeout --- .../Orchestrators/EmployerTeamOrchestrator.cs | 7 +++++-- ...mployerApprenticeshipsServiceConfiguration.cs | 1 + .../GetReservations/GetReservationsRequest.cs | 1 + .../GetReservationsRequestHandler.cs | 16 +++++++++++++++- .../Queries/GetVacancies/GetVacanciesRequest.cs | 1 + 5 files changed, 23 insertions(+), 3 deletions(-) diff --git a/src/SFA.DAS.EmployerAccounts.Web/Orchestrators/EmployerTeamOrchestrator.cs b/src/SFA.DAS.EmployerAccounts.Web/Orchestrators/EmployerTeamOrchestrator.cs index 2f96b8db54..fd63401aed 100644 --- a/src/SFA.DAS.EmployerAccounts.Web/Orchestrators/EmployerTeamOrchestrator.cs +++ b/src/SFA.DAS.EmployerAccounts.Web/Orchestrators/EmployerTeamOrchestrator.cs @@ -60,6 +60,7 @@ public EmployerTeamOrchestrator(IMediator mediator, //Needed for tests protected EmployerTeamOrchestrator() { + _employerApprenticeshipsServiceConfiguration = employerApprenticeshipsServiceConfiguration; } public async Task> Cancel(string email, string hashedAccountId, string externalUserId) @@ -185,13 +186,15 @@ public virtual async Task> GetAc var reservationsResponseTask = _mediator.SendAsync(new GetReservationsRequest { HashedAccountId = hashedAccountId, - ExternalUserId = externalUserId + ExternalUserId = externalUserId, + TimeOut = timeout }); var apprenticeshipsResponseTask = _mediator.SendAsync(new GetApprenticeshipsRequest { HashedAccountId = hashedAccountId, - ExternalUserId = externalUserId + ExternalUserId = externalUserId, + TimeOut = timeout }); var accountCohortResponseTask = _mediator.SendAsync(new GetSingleCohortRequest diff --git a/src/SFA.DAS.EmployerAccounts/Configuration/EmployerApprenticeshipsServiceConfiguration.cs b/src/SFA.DAS.EmployerAccounts/Configuration/EmployerApprenticeshipsServiceConfiguration.cs index 27defd0bc3..851abacf8f 100644 --- a/src/SFA.DAS.EmployerAccounts/Configuration/EmployerApprenticeshipsServiceConfiguration.cs +++ b/src/SFA.DAS.EmployerAccounts/Configuration/EmployerApprenticeshipsServiceConfiguration.cs @@ -32,5 +32,6 @@ public class EmployerApprenticeshipsServiceConfiguration : ITopicMessagePublishe public string PublicHashstring { get; set; } public string ServiceBusConnectionString { get; set; } public Dictionary ServiceBusConnectionStrings { get; set; } + public int AddApprenticeCallToActionTimeout { get; set; } } } \ No newline at end of file diff --git a/src/SFA.DAS.EmployerAccounts/Queries/GetReservations/GetReservationsRequest.cs b/src/SFA.DAS.EmployerAccounts/Queries/GetReservations/GetReservationsRequest.cs index 34b6bc8459..8bc9014c39 100644 --- a/src/SFA.DAS.EmployerAccounts/Queries/GetReservations/GetReservationsRequest.cs +++ b/src/SFA.DAS.EmployerAccounts/Queries/GetReservations/GetReservationsRequest.cs @@ -6,5 +6,6 @@ public class GetReservationsRequest : IAsyncRequest { public string HashedAccountId { get; set; } public string ExternalUserId { get; set; } + public int TimeOut { get; set; } } } diff --git a/src/SFA.DAS.EmployerAccounts/Queries/GetReservations/GetReservationsRequestHandler.cs b/src/SFA.DAS.EmployerAccounts/Queries/GetReservations/GetReservationsRequestHandler.cs index 5ea4dc1e1e..69c6ac52de 100644 --- a/src/SFA.DAS.EmployerAccounts/Queries/GetReservations/GetReservationsRequestHandler.cs +++ b/src/SFA.DAS.EmployerAccounts/Queries/GetReservations/GetReservationsRequestHandler.cs @@ -42,10 +42,24 @@ public async Task Handle(GetReservationsRequest message try { + var task = _service.Get(accountId); + if (await Task.WhenAny(task, Task.Delay(message.TimeOut)) == task) + { + await task; + } + return new GetReservationsResponse + { + Reservations = task.Result + }; + } + catch (TimeoutException ex) + { + _logger.Error(ex, $"Failued to get Reservations for {message.HashedAccountId}"); return new GetReservationsResponse { - Reservations = await _service.Get(accountId) + HasFailed = true }; + } catch (Exception ex) { diff --git a/src/SFA.DAS.EmployerAccounts/Queries/GetVacancies/GetVacanciesRequest.cs b/src/SFA.DAS.EmployerAccounts/Queries/GetVacancies/GetVacanciesRequest.cs index 4f75907a55..3b21f70274 100644 --- a/src/SFA.DAS.EmployerAccounts/Queries/GetVacancies/GetVacanciesRequest.cs +++ b/src/SFA.DAS.EmployerAccounts/Queries/GetVacancies/GetVacanciesRequest.cs @@ -6,5 +6,6 @@ public class GetVacanciesRequest : IAsyncRequest { public string HashedAccountId { get; set; } public string ExternalUserId { get; set; } + public int TimeOut { get; set; } } } From df3d814c57e52f651aa6d0c4c51491d7e8037004 Mon Sep 17 00:00:00 2001 From: Shoma Gujjar Date: Tue, 14 Apr 2020 17:11:03 +0100 Subject: [PATCH 16/35] CON-1640-make code review comment changes. --- .../Orchestrators/EmployerTeamOrchestrator.cs | 6 ++---- .../Queries/GetReservations/GetReservationsRequest.cs | 1 - .../GetReservations/GetReservationsRequestHandler.cs | 10 +++++++--- .../Queries/GetVacancies/GetVacanciesRequest.cs | 1 - 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/SFA.DAS.EmployerAccounts.Web/Orchestrators/EmployerTeamOrchestrator.cs b/src/SFA.DAS.EmployerAccounts.Web/Orchestrators/EmployerTeamOrchestrator.cs index fd63401aed..8e8546ed43 100644 --- a/src/SFA.DAS.EmployerAccounts.Web/Orchestrators/EmployerTeamOrchestrator.cs +++ b/src/SFA.DAS.EmployerAccounts.Web/Orchestrators/EmployerTeamOrchestrator.cs @@ -186,15 +186,13 @@ public virtual async Task> GetAc var reservationsResponseTask = _mediator.SendAsync(new GetReservationsRequest { HashedAccountId = hashedAccountId, - ExternalUserId = externalUserId, - TimeOut = timeout + ExternalUserId = externalUserId }); var apprenticeshipsResponseTask = _mediator.SendAsync(new GetApprenticeshipsRequest { HashedAccountId = hashedAccountId, - ExternalUserId = externalUserId, - TimeOut = timeout + ExternalUserId = externalUserId }); var accountCohortResponseTask = _mediator.SendAsync(new GetSingleCohortRequest diff --git a/src/SFA.DAS.EmployerAccounts/Queries/GetReservations/GetReservationsRequest.cs b/src/SFA.DAS.EmployerAccounts/Queries/GetReservations/GetReservationsRequest.cs index 8bc9014c39..34b6bc8459 100644 --- a/src/SFA.DAS.EmployerAccounts/Queries/GetReservations/GetReservationsRequest.cs +++ b/src/SFA.DAS.EmployerAccounts/Queries/GetReservations/GetReservationsRequest.cs @@ -6,6 +6,5 @@ public class GetReservationsRequest : IAsyncRequest { public string HashedAccountId { get; set; } public string ExternalUserId { get; set; } - public int TimeOut { get; set; } } } diff --git a/src/SFA.DAS.EmployerAccounts/Queries/GetReservations/GetReservationsRequestHandler.cs b/src/SFA.DAS.EmployerAccounts/Queries/GetReservations/GetReservationsRequestHandler.cs index 69c6ac52de..bebf268fc4 100644 --- a/src/SFA.DAS.EmployerAccounts/Queries/GetReservations/GetReservationsRequestHandler.cs +++ b/src/SFA.DAS.EmployerAccounts/Queries/GetReservations/GetReservationsRequestHandler.cs @@ -1,6 +1,7 @@ using System; using System.Threading.Tasks; using MediatR; +using SFA.DAS.EmployerAccounts.Configuration; using SFA.DAS.EmployerAccounts.Interfaces; using SFA.DAS.HashingService; using SFA.DAS.NLog.Logger; @@ -14,17 +15,20 @@ public class GetReservationsRequestHandler : IAsyncRequestHandler validator, ILog logger, IReservationsService service, - IHashingService hashingService) + IHashingService hashingService, + EmployerApprenticeshipsServiceConfiguration employerApprenticeshipsServiceConfiguration) { _validator = validator; _logger = logger; _service = service; _hashingService = hashingService; + _employerApprenticeshipsServiceConfiguration = employerApprenticeshipsServiceConfiguration; } public async Task Handle(GetReservationsRequest message) @@ -43,7 +47,7 @@ public async Task Handle(GetReservationsRequest message try { var task = _service.Get(accountId); - if (await Task.WhenAny(task, Task.Delay(message.TimeOut)) == task) + if (await Task.WhenAny(task, Task.Delay(_employerApprenticeshipsServiceConfiguration.AddApprenticeCallToActionTimeout)) == task) { await task; } @@ -54,7 +58,7 @@ public async Task Handle(GetReservationsRequest message } catch (TimeoutException ex) { - _logger.Error(ex, $"Failued to get Reservations for {message.HashedAccountId}"); + _logger.Error(ex, $"Failed to get Reservations for {message.HashedAccountId}"); return new GetReservationsResponse { HasFailed = true diff --git a/src/SFA.DAS.EmployerAccounts/Queries/GetVacancies/GetVacanciesRequest.cs b/src/SFA.DAS.EmployerAccounts/Queries/GetVacancies/GetVacanciesRequest.cs index 3b21f70274..4f75907a55 100644 --- a/src/SFA.DAS.EmployerAccounts/Queries/GetVacancies/GetVacanciesRequest.cs +++ b/src/SFA.DAS.EmployerAccounts/Queries/GetVacancies/GetVacanciesRequest.cs @@ -6,6 +6,5 @@ public class GetVacanciesRequest : IAsyncRequest { public string HashedAccountId { get; set; } public string ExternalUserId { get; set; } - public int TimeOut { get; set; } } } From db6b13eb2ee0dfa187e23917aaf88b9fe92210fc Mon Sep 17 00:00:00 2001 From: Shoma Gujjar Date: Tue, 14 Apr 2020 22:36:08 +0100 Subject: [PATCH 17/35] CON-1640-fix broken build --- .../EmployerApprenticeshipsServiceConfiguration.cs | 1 - .../GetReservations/GetReservationsRequestHandler.cs | 10 +++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/SFA.DAS.EmployerAccounts/Configuration/EmployerApprenticeshipsServiceConfiguration.cs b/src/SFA.DAS.EmployerAccounts/Configuration/EmployerApprenticeshipsServiceConfiguration.cs index 851abacf8f..27defd0bc3 100644 --- a/src/SFA.DAS.EmployerAccounts/Configuration/EmployerApprenticeshipsServiceConfiguration.cs +++ b/src/SFA.DAS.EmployerAccounts/Configuration/EmployerApprenticeshipsServiceConfiguration.cs @@ -32,6 +32,5 @@ public class EmployerApprenticeshipsServiceConfiguration : ITopicMessagePublishe public string PublicHashstring { get; set; } public string ServiceBusConnectionString { get; set; } public Dictionary ServiceBusConnectionStrings { get; set; } - public int AddApprenticeCallToActionTimeout { get; set; } } } \ No newline at end of file diff --git a/src/SFA.DAS.EmployerAccounts/Queries/GetReservations/GetReservationsRequestHandler.cs b/src/SFA.DAS.EmployerAccounts/Queries/GetReservations/GetReservationsRequestHandler.cs index bebf268fc4..30dbd27232 100644 --- a/src/SFA.DAS.EmployerAccounts/Queries/GetReservations/GetReservationsRequestHandler.cs +++ b/src/SFA.DAS.EmployerAccounts/Queries/GetReservations/GetReservationsRequestHandler.cs @@ -15,20 +15,20 @@ public class GetReservationsRequestHandler : IAsyncRequestHandler validator, ILog logger, IReservationsService service, - IHashingService hashingService, - EmployerApprenticeshipsServiceConfiguration employerApprenticeshipsServiceConfiguration) + IHashingService hashingService, + EmployerAccountsConfiguration employerAccountsConfiguration) { _validator = validator; _logger = logger; _service = service; _hashingService = hashingService; - _employerApprenticeshipsServiceConfiguration = employerApprenticeshipsServiceConfiguration; + _employerAccountsConfiguration = employerAccountsConfiguration; } public async Task Handle(GetReservationsRequest message) @@ -47,7 +47,7 @@ public async Task Handle(GetReservationsRequest message try { var task = _service.Get(accountId); - if (await Task.WhenAny(task, Task.Delay(_employerApprenticeshipsServiceConfiguration.AddApprenticeCallToActionTimeout)) == task) + if (await Task.WhenAny(task, Task.Delay(_employerAccountsConfiguration.AddApprenticeCallToActionTimeout)) == task) { await task; } From 7f2071ca98086f20b026b11b8a1e36ba650d73e3 Mon Sep 17 00:00:00 2001 From: Shoma Gujjar Date: Wed, 15 Apr 2020 22:49:32 +0100 Subject: [PATCH 18/35] CON-1640-Integrate Polly --- .../GetReservationsRequestHandler.cs | 22 ++----------------- 1 file changed, 2 insertions(+), 20 deletions(-) diff --git a/src/SFA.DAS.EmployerAccounts/Queries/GetReservations/GetReservationsRequestHandler.cs b/src/SFA.DAS.EmployerAccounts/Queries/GetReservations/GetReservationsRequestHandler.cs index 30dbd27232..5ea4dc1e1e 100644 --- a/src/SFA.DAS.EmployerAccounts/Queries/GetReservations/GetReservationsRequestHandler.cs +++ b/src/SFA.DAS.EmployerAccounts/Queries/GetReservations/GetReservationsRequestHandler.cs @@ -1,7 +1,6 @@ using System; using System.Threading.Tasks; using MediatR; -using SFA.DAS.EmployerAccounts.Configuration; using SFA.DAS.EmployerAccounts.Interfaces; using SFA.DAS.HashingService; using SFA.DAS.NLog.Logger; @@ -15,20 +14,17 @@ public class GetReservationsRequestHandler : IAsyncRequestHandler validator, ILog logger, IReservationsService service, - IHashingService hashingService, - EmployerAccountsConfiguration employerAccountsConfiguration) + IHashingService hashingService) { _validator = validator; _logger = logger; _service = service; _hashingService = hashingService; - _employerAccountsConfiguration = employerAccountsConfiguration; } public async Task Handle(GetReservationsRequest message) @@ -46,25 +42,11 @@ public async Task Handle(GetReservationsRequest message try { - var task = _service.Get(accountId); - if (await Task.WhenAny(task, Task.Delay(_employerAccountsConfiguration.AddApprenticeCallToActionTimeout)) == task) - { - await task; - } return new GetReservationsResponse { - Reservations = task.Result + Reservations = await _service.Get(accountId) }; } - catch (TimeoutException ex) - { - _logger.Error(ex, $"Failed to get Reservations for {message.HashedAccountId}"); - return new GetReservationsResponse - { - HasFailed = true - }; - - } catch (Exception ex) { _logger.Error(ex, $"Failed to get Reservations for {message.HashedAccountId}"); From 3fe8505caa004d7c1a669eb80cb68ed1466116a3 Mon Sep 17 00:00:00 2001 From: Shoma Gujjar Date: Thu, 16 Apr 2020 14:46:09 +0100 Subject: [PATCH 19/35] CON-1640-temp code --- .../DependencyResolution/ServicesRegistry.cs | 5 +++-- .../Extensions/PollyTimeoutExtensions.cs | 21 ++++++++++--------- .../Services/ReservationsApiClient.cs | 15 ++++++++++--- .../Services/ReservationsService.cs | 16 +++++++++++--- .../ReservationsServiceWithTimeout.cs | 16 +++++++++----- 5 files changed, 50 insertions(+), 23 deletions(-) diff --git a/src/SFA.DAS.EmployerAccounts/DependencyResolution/ServicesRegistry.cs b/src/SFA.DAS.EmployerAccounts/DependencyResolution/ServicesRegistry.cs index 07caf68ba1..c27efdd5b8 100644 --- a/src/SFA.DAS.EmployerAccounts/DependencyResolution/ServicesRegistry.cs +++ b/src/SFA.DAS.EmployerAccounts/DependencyResolution/ServicesRegistry.cs @@ -17,8 +17,9 @@ public ServicesRegistry() For().Use(); For().Use(); var reservationServiceInstance = For().Use(); - For().Use() - .Ctor().Is(reservationServiceInstance); + //For().Use() + // .Ctor().Is(reservationServiceInstance); + For().Use(); For().Use(); } } diff --git a/src/SFA.DAS.EmployerAccounts/Extensions/PollyTimeoutExtensions.cs b/src/SFA.DAS.EmployerAccounts/Extensions/PollyTimeoutExtensions.cs index 1647a13af4..76f55a2628 100644 --- a/src/SFA.DAS.EmployerAccounts/Extensions/PollyTimeoutExtensions.cs +++ b/src/SFA.DAS.EmployerAccounts/Extensions/PollyTimeoutExtensions.cs @@ -7,17 +7,18 @@ namespace SFA.DAS.EmployerAccounts.Extensions { public static class PollyTimeoutExtensions { - public static AsyncTimeoutPolicy GetTimeoutPolicy(ILog logger) + public static TimeoutPolicy GetTimeoutPolicy(ILog logger) { - return Policy - .TimeoutAsync(1, - (context, timeSpan, retryCount, exception) => - { - logger.Warn($"Error executing command for method {context.OperationKey} " + - $"Reason: {exception.Message}. " + - $"Retrying in {timeSpan.Seconds} secs...attempt: {retryCount}"); - return Task.CompletedTask; - }); + return Policy.TimeoutAsync(1); + //.TimeoutAsync(1,TimeoutStrategy.Pessimistic,(context, timeSpan, task) => + //{ + // logger.Warn($"Error executing command for method {context.ExecutionKey} " + + // $"Reason: {task?.Exception?.Message}. " + + // $"Retrying in {timeSpan.Seconds} secs..." + // ); + // return Task.CompletedTask; + //} + //); } } } diff --git a/src/SFA.DAS.EmployerAccounts/Services/ReservationsApiClient.cs b/src/SFA.DAS.EmployerAccounts/Services/ReservationsApiClient.cs index 7a1244a03b..0e88cfb962 100644 --- a/src/SFA.DAS.EmployerAccounts/Services/ReservationsApiClient.cs +++ b/src/SFA.DAS.EmployerAccounts/Services/ReservationsApiClient.cs @@ -1,4 +1,5 @@ -using System.Net.Http; +using System; +using System.Net.Http; using System.Threading.Tasks; using SFA.DAS.Authentication.Extensions.Legacy; using SFA.DAS.EmployerAccounts.Interfaces; @@ -18,8 +19,16 @@ public ReservationsApiClient(HttpClient client, IReservationsClientApiConfigurat public Task Get(long accountId) { - var uri = $"{ApiBaseUrl}accounts/{accountId}/reservations"; - return GetAsync(uri); + try + { + var uri = $"{ApiBaseUrl}accounts/{accountId}/reservations"; + return GetAsync(uri); + } + catch (Exception e) + { + Console.WriteLine(e); + throw; + } } } } \ No newline at end of file diff --git a/src/SFA.DAS.EmployerAccounts/Services/ReservationsService.cs b/src/SFA.DAS.EmployerAccounts/Services/ReservationsService.cs index 0b8b5b93a6..547a6e0584 100644 --- a/src/SFA.DAS.EmployerAccounts/Services/ReservationsService.cs +++ b/src/SFA.DAS.EmployerAccounts/Services/ReservationsService.cs @@ -1,4 +1,5 @@ -using System.Collections.Generic; +using System; +using System.Collections.Generic; using System.Threading.Tasks; using Newtonsoft.Json; using SFA.DAS.EmployerAccounts.Interfaces; @@ -17,8 +18,17 @@ public ReservationsService(IReservationsApiClient client) public async Task> Get(long accountId) { - var reservations = await _client.Get(accountId); - return JsonConvert.DeserializeObject>(reservations); + try + { + string reservations = await _client.Get(accountId); + return JsonConvert.DeserializeObject>(reservations); + } + catch (Exception e) + { + Console.WriteLine(e); + throw; + } + } } } \ No newline at end of file diff --git a/src/SFA.DAS.EmployerAccounts/Services/ReservationsServiceWithTimeout.cs b/src/SFA.DAS.EmployerAccounts/Services/ReservationsServiceWithTimeout.cs index 8d8969c812..3c3909227f 100644 --- a/src/SFA.DAS.EmployerAccounts/Services/ReservationsServiceWithTimeout.cs +++ b/src/SFA.DAS.EmployerAccounts/Services/ReservationsServiceWithTimeout.cs @@ -1,7 +1,6 @@ using System.Collections.Generic; using System.Threading; using System.Threading.Tasks; -using Newtonsoft.Json; using Polly.Timeout; using SFA.DAS.EmployerAccounts.Extensions; using SFA.DAS.EmployerAccounts.Interfaces; @@ -14,7 +13,7 @@ public class ReservationsServiceWithTimeout : IReservationsService { private readonly IReservationsService _service; private readonly ILog _logger; - private AsyncTimeoutPolicy TimeoutPolicy { get; } + private TimeoutPolicy TimeoutPolicy { get; } public ReservationsServiceWithTimeout(IReservationsService service, ILog logger) { @@ -25,9 +24,16 @@ public ReservationsServiceWithTimeout(IReservationsService service, ILog logger) public async Task> Get(long accountId) { - return await TimeoutPolicy.ExecuteAsync(async token => - await _service.Get(accountId), CancellationToken.None); - //var result2 = await TimeoutPolicy.ExecuteAsync(context => + //var response = await _pollyPolicy.ExecuteAsync(() => _httpClient.PostAsync(url, null)); + //response.EnsureSuccessStatusCode(); + //return await response.Content.ReadAsStringAsync(); + var response = await TimeoutPolicy.ExecuteAsync(() => + _service.Get(accountId)); + //response.EnsureSuccessStatusCode(); + return response;//.Content.ReadAsStringAsync(); + //return await TimeoutPolicy.ExecuteAsync(async token => + // await _service.Get(accountId), CancellationToken.None); + //return await TimeoutPolicy.ExecuteAsync(context => // _service.Get(accountId), CancellationToken.None, true); //var result1 = await TimeoutPolicy.ExecuteAndCaptureAsync(async (ct) => From 8878043657ce8741d34b9de1df31478f020e75b9 Mon Sep 17 00:00:00 2001 From: Shoma Gujjar Date: Thu, 16 Apr 2020 16:13:42 +0100 Subject: [PATCH 20/35] CON-1640-remove timeout code --- .../Configuration/ConfigurationKeys.cs | 1 + .../GetVacanciesRequestHandler.cs | 36 +++++++++---------- 2 files changed, 19 insertions(+), 18 deletions(-) diff --git a/src/SFA.DAS.EmployerAccounts/Configuration/ConfigurationKeys.cs b/src/SFA.DAS.EmployerAccounts/Configuration/ConfigurationKeys.cs index 528bba85e0..922a1516db 100644 --- a/src/SFA.DAS.EmployerAccounts/Configuration/ConfigurationKeys.cs +++ b/src/SFA.DAS.EmployerAccounts/Configuration/ConfigurationKeys.cs @@ -13,6 +13,7 @@ public static class ConfigurationKeys public const string EmployerAccountsReadStore = "SFA.DAS.EmployerAccounts.ReadStore"; public const string AuditApi = "SFA.DAS.AuditApiClient"; public const string ReservationsClientApiConfiguration = "SFA.DAS.Reservations.Api.Client"; + //public const string ReservationsClientApiConfiguration = "SFA.DAS.ReservationClient"; public const string EncodingConfig = "SFA.DAS.Encoding"; } } diff --git a/src/SFA.DAS.EmployerAccounts/Queries/GetVacancies/GetVacanciesRequestHandler.cs b/src/SFA.DAS.EmployerAccounts/Queries/GetVacancies/GetVacanciesRequestHandler.cs index c9040a17c0..fcda29072f 100644 --- a/src/SFA.DAS.EmployerAccounts/Queries/GetVacancies/GetVacanciesRequestHandler.cs +++ b/src/SFA.DAS.EmployerAccounts/Queries/GetVacancies/GetVacanciesRequestHandler.cs @@ -39,28 +39,28 @@ public async Task Handle(GetVacanciesRequest message) try { - var task = _service.GetVacancies(message.HashedAccountId); - if (await Task.WhenAny(task, Task.Delay(_employerAccountsConfiguration.AddApprenticeCallToActionTimeout)) == task) - { - await task; - return new GetVacanciesResponse - { - Vacancies = task.Result - }; - } + var task = await _service.GetVacancies(message.HashedAccountId); + //if (await Task.WhenAny(task, Task.Delay(_employerAccountsConfiguration.AddApprenticeCallToActionTimeout)) == task) + //{ + // await task; return new GetVacanciesResponse { - HasFailed = true - }; - } - catch (TimeoutException ex) - { - _logger.Error(ex, $"Failed to get vacancies for {message.HashedAccountId}"); - return new GetVacanciesResponse - { - HasFailed = true + Vacancies = task }; + //} + //return new GetVacanciesResponse + //{ + // HasFailed = true + //}; } + //catch (TimeoutException ex) + //{ + // _logger.Error(ex, $"Failed to get vacancies for {message.HashedAccountId}"); + // return new GetVacanciesResponse + // { + // HasFailed = true + // }; + //} catch (Exception ex) { _logger.Error(ex, $"Failed to get vacancies for {message.HashedAccountId}"); From d80146648056f4bf3ff767f48ca6b4e8db58ae8c Mon Sep 17 00:00:00 2001 From: Shoma Gujjar Date: Thu, 16 Apr 2020 18:33:56 +0100 Subject: [PATCH 21/35] CON-1640-Add polly timeout registry for Reservation Service --- .../WhenIGetApprenticeship.cs | 10 +---- .../DependencyResolution/IoC.cs | 1 + .../Configuration/ConfigurationKeys.cs | 1 - src/SFA.DAS.EmployerAccounts/Constants.cs | 2 + .../PollyPolicyRegistry.cs | 38 ++++++++++++++++++ .../DependencyResolution/ServicesRegistry.cs | 10 ++--- .../Exceptions/ServiceTimeoutException.cs | 19 +++++++++ .../Extensions/PollyTimeoutExtensions.cs | 24 ----------- .../GetApprenticeshipsHandler.cs | 14 +++---- .../GetSingleCohortRequestHandler.cs | 6 +-- .../GetVacanciesRequestHandler.cs | 24 +---------- .../ReservationsServiceWithTimeout.cs | 40 +++++++------------ 12 files changed, 89 insertions(+), 100 deletions(-) create mode 100644 src/SFA.DAS.EmployerAccounts/DependencyResolution/PollyPolicyRegistry.cs create mode 100644 src/SFA.DAS.EmployerAccounts/Exceptions/ServiceTimeoutException.cs delete mode 100644 src/SFA.DAS.EmployerAccounts/Extensions/PollyTimeoutExtensions.cs diff --git a/src/SFA.DAS.EmployerAccounts.UnitTests/Queries/GetApprenticeship/WhenIGetApprenticeship.cs b/src/SFA.DAS.EmployerAccounts.UnitTests/Queries/GetApprenticeship/WhenIGetApprenticeship.cs index 2c7bdb9119..67cdc08c8f 100644 --- a/src/SFA.DAS.EmployerAccounts.UnitTests/Queries/GetApprenticeship/WhenIGetApprenticeship.cs +++ b/src/SFA.DAS.EmployerAccounts.UnitTests/Queries/GetApprenticeship/WhenIGetApprenticeship.cs @@ -7,7 +7,6 @@ using SFA.DAS.NLog.Logger; using System.Threading.Tasks; using System.Collections.Generic; -using SFA.DAS.EmployerAccounts.Configuration; using SFA.DAS.EmployerAccounts.Models.CommitmentsV2; using SFA.DAS.HashingService; @@ -24,8 +23,7 @@ public class WhenIGetApprenticeship : QueryBaseTest _logger; private long _accountId; private string _hashedAccountId; - public EmployerAccountsConfiguration EmployerAccountsConfiguration { get; set; } - + [SetUp] public void Arrange() { @@ -41,11 +39,7 @@ public void Arrange() _commitmentV2Service.Setup(m => m.GetApprenticeships(_accountId)).ReturnsAsync(new List { new Apprenticeship { Id = 3 } }); _hashingService = new Mock(); _hashingService.Setup(x => x.DecodeValue(_hashedAccountId)).Returns(_accountId); - EmployerAccountsConfiguration = new EmployerAccountsConfiguration() - { - - }; - RequestHandler = new GetApprenticeshipsHandler(RequestValidator.Object, _logger.Object, _commitmentV2Service.Object, _hashingService.Object, EmployerAccountsConfiguration); + RequestHandler = new GetApprenticeshipsHandler(RequestValidator.Object, _logger.Object, _commitmentV2Service.Object, _hashingService.Object); Query = new GetApprenticeshipsRequest { diff --git a/src/SFA.DAS.EmployerAccounts.Web/DependencyResolution/IoC.cs b/src/SFA.DAS.EmployerAccounts.Web/DependencyResolution/IoC.cs index 3f84a37b78..d8213a0dbf 100644 --- a/src/SFA.DAS.EmployerAccounts.Web/DependencyResolution/IoC.cs +++ b/src/SFA.DAS.EmployerAccounts.Web/DependencyResolution/IoC.cs @@ -56,6 +56,7 @@ public static IContainer Initialize() c.AddRegistry(); c.AddRegistry(); c.AddRegistry(); + c.AddRegistry(); }); } } diff --git a/src/SFA.DAS.EmployerAccounts/Configuration/ConfigurationKeys.cs b/src/SFA.DAS.EmployerAccounts/Configuration/ConfigurationKeys.cs index 922a1516db..528bba85e0 100644 --- a/src/SFA.DAS.EmployerAccounts/Configuration/ConfigurationKeys.cs +++ b/src/SFA.DAS.EmployerAccounts/Configuration/ConfigurationKeys.cs @@ -13,7 +13,6 @@ public static class ConfigurationKeys public const string EmployerAccountsReadStore = "SFA.DAS.EmployerAccounts.ReadStore"; public const string AuditApi = "SFA.DAS.AuditApiClient"; public const string ReservationsClientApiConfiguration = "SFA.DAS.Reservations.Api.Client"; - //public const string ReservationsClientApiConfiguration = "SFA.DAS.ReservationClient"; public const string EncodingConfig = "SFA.DAS.Encoding"; } } diff --git a/src/SFA.DAS.EmployerAccounts/Constants.cs b/src/SFA.DAS.EmployerAccounts/Constants.cs index e2d593eca8..1ee3980cf3 100644 --- a/src/SFA.DAS.EmployerAccounts/Constants.cs +++ b/src/SFA.DAS.EmployerAccounts/Constants.cs @@ -11,5 +11,7 @@ public struct TransferConnectionInvitations { public const decimal SenderMinTransferAllowance = 1; } + + public const string DefaultServiceTimeout = "DefaultServiceTimeout"; } } \ No newline at end of file diff --git a/src/SFA.DAS.EmployerAccounts/DependencyResolution/PollyPolicyRegistry.cs b/src/SFA.DAS.EmployerAccounts/DependencyResolution/PollyPolicyRegistry.cs new file mode 100644 index 0000000000..1013dc45a1 --- /dev/null +++ b/src/SFA.DAS.EmployerAccounts/DependencyResolution/PollyPolicyRegistry.cs @@ -0,0 +1,38 @@ +using System.Threading.Tasks; +using Polly; +using Polly.Registry; +using Polly.Timeout; +using SFA.DAS.EmployerAccounts.Configuration; +using SFA.DAS.NLog.Logger; +using StructureMap; + +namespace SFA.DAS.EmployerAccounts.DependencyResolution +{ + public class PollyPolicyRegistry : Registry + { + public PollyPolicyRegistry() + { + For>().Use(c => GetPolicyRegistry(c)); + } + + private PolicyRegistry GetPolicyRegistry(IContext context) + { + var logger = context.GetInstance(); + var config = context.GetInstance(); + var policyRegistry = new PolicyRegistry(); + var timeout = Policy + .TimeoutAsync(config.AddApprenticeCallToActionTimeout, TimeoutStrategy.Pessimistic + , (pollyContext, timeSpan, task) => + { + logger.Warn($"Error executing command for method {pollyContext.ExecutionKey} " + + $"Reason: {task?.Exception?.Message}. " + + $"Retrying in {timeSpan.Seconds} secs..." + ); + return Task.CompletedTask; + } + ); + policyRegistry.Add(Constants.DefaultServiceTimeout, timeout); + return policyRegistry; + } + } +} diff --git a/src/SFA.DAS.EmployerAccounts/DependencyResolution/ServicesRegistry.cs b/src/SFA.DAS.EmployerAccounts/DependencyResolution/ServicesRegistry.cs index c27efdd5b8..082c540b87 100644 --- a/src/SFA.DAS.EmployerAccounts/DependencyResolution/ServicesRegistry.cs +++ b/src/SFA.DAS.EmployerAccounts/DependencyResolution/ServicesRegistry.cs @@ -1,6 +1,4 @@ -using System.Net; -using SFA.DAS.Authorization.Context; -using SFA.DAS.EmployerAccounts.Factories; +using SFA.DAS.EmployerAccounts.Factories; using SFA.DAS.EmployerAccounts.Interfaces; using SFA.DAS.EmployerAccounts.Services; using StructureMap; @@ -13,13 +11,11 @@ public ServicesRegistry() { For().Use(); For().Use(); - For().Use(); + For().Use(); For().Use(); For().Use(); - var reservationServiceInstance = For().Use(); - //For().Use() - // .Ctor().Is(reservationServiceInstance); For().Use(); + For().DecorateAllWith(); For().Use(); } } diff --git a/src/SFA.DAS.EmployerAccounts/Exceptions/ServiceTimeoutException.cs b/src/SFA.DAS.EmployerAccounts/Exceptions/ServiceTimeoutException.cs new file mode 100644 index 0000000000..940a688bec --- /dev/null +++ b/src/SFA.DAS.EmployerAccounts/Exceptions/ServiceTimeoutException.cs @@ -0,0 +1,19 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace SFA.DAS.EmployerAccounts.Exceptions +{ + [Serializable] + public class ServiceTimeoutException : Exception + { + public ServiceTimeoutException() { } + public ServiceTimeoutException(string message) : base(message) { } + public ServiceTimeoutException(string message, Exception inner) : base(message, inner) { } + protected ServiceTimeoutException( + System.Runtime.Serialization.SerializationInfo info, + System.Runtime.Serialization.StreamingContext context) : base(info, context) { } + } +} diff --git a/src/SFA.DAS.EmployerAccounts/Extensions/PollyTimeoutExtensions.cs b/src/SFA.DAS.EmployerAccounts/Extensions/PollyTimeoutExtensions.cs deleted file mode 100644 index 76f55a2628..0000000000 --- a/src/SFA.DAS.EmployerAccounts/Extensions/PollyTimeoutExtensions.cs +++ /dev/null @@ -1,24 +0,0 @@ -using System.Threading.Tasks; -using SFA.DAS.NLog.Logger; -using Polly; -using Polly.Timeout; - -namespace SFA.DAS.EmployerAccounts.Extensions -{ - public static class PollyTimeoutExtensions - { - public static TimeoutPolicy GetTimeoutPolicy(ILog logger) - { - return Policy.TimeoutAsync(1); - //.TimeoutAsync(1,TimeoutStrategy.Pessimistic,(context, timeSpan, task) => - //{ - // logger.Warn($"Error executing command for method {context.ExecutionKey} " + - // $"Reason: {task?.Exception?.Message}. " + - // $"Retrying in {timeSpan.Seconds} secs..." - // ); - // return Task.CompletedTask; - //} - //); - } - } -} diff --git a/src/SFA.DAS.EmployerAccounts/Queries/GetApprenticeship/GetApprenticeshipsHandler.cs b/src/SFA.DAS.EmployerAccounts/Queries/GetApprenticeship/GetApprenticeshipsHandler.cs index a997340ffb..ca30cf4527 100644 --- a/src/SFA.DAS.EmployerAccounts/Queries/GetApprenticeship/GetApprenticeshipsHandler.cs +++ b/src/SFA.DAS.EmployerAccounts/Queries/GetApprenticeship/GetApprenticeshipsHandler.cs @@ -1,7 +1,6 @@ using System; using MediatR; using System.Threading.Tasks; -using SFA.DAS.EmployerAccounts.Configuration; using SFA.DAS.NLog.Logger; using SFA.DAS.Validation; using SFA.DAS.EmployerAccounts.Interfaces; @@ -13,28 +12,27 @@ namespace SFA.DAS.EmployerAccounts.Queries.GetApprenticeship public class GetApprenticeshipsHandler : IAsyncRequestHandler { private readonly IValidator _validator; - private readonly ILog _logger; + private readonly ILog _logger; private readonly ICommitmentV2Service _commitmentV2Service; private readonly IHashingService _hashingService; - private readonly EmployerAccountsConfiguration _employerAccountsConfiguration; + public GetApprenticeshipsHandler( IValidator validator, ILog logger, ICommitmentV2Service commitmentV2Service, - IHashingService hashingService, EmployerAccountsConfiguration employerAccountsConfiguration) + IHashingService hashingService) { _validator = validator; - _logger = logger; + _logger = logger; _commitmentV2Service = commitmentV2Service; _hashingService = hashingService; - _employerAccountsConfiguration = employerAccountsConfiguration; } - + public async Task Handle(GetApprenticeshipsRequest message) { var validationResult = _validator.Validate(message); - if(!validationResult.IsValid()) + if (!validationResult.IsValid()) { throw new InvalidRequestException(validationResult.ValidationDictionary); } diff --git a/src/SFA.DAS.EmployerAccounts/Queries/GetSingleCohort/GetSingleCohortRequestHandler.cs b/src/SFA.DAS.EmployerAccounts/Queries/GetSingleCohort/GetSingleCohortRequestHandler.cs index 6bb688ffd6..1dd33eaaa4 100644 --- a/src/SFA.DAS.EmployerAccounts/Queries/GetSingleCohort/GetSingleCohortRequestHandler.cs +++ b/src/SFA.DAS.EmployerAccounts/Queries/GetSingleCohort/GetSingleCohortRequestHandler.cs @@ -4,7 +4,6 @@ using SFA.DAS.Validation; using SFA.DAS.EmployerAccounts.Interfaces; using System.Linq; -using SFA.DAS.EmployerAccounts.Configuration; using SFA.DAS.HashingService; using System; using SFA.DAS.NLog.Logger; @@ -14,7 +13,7 @@ namespace SFA.DAS.EmployerAccounts.Queries.GetSingleCohort public class GetSingleCohortRequestHandler : IAsyncRequestHandler { private readonly IValidator _validator; - private readonly ICommitmentV2Service _commitmentV2Service; + private readonly ICommitmentV2Service _commitmentV2Service; private readonly IHashingService _hashingService; private readonly ILog _logger; @@ -25,7 +24,7 @@ public GetSingleCohortRequestHandler( ILog logger) { _validator = validator; - _commitmentV2Service = commitmentV2Service; + _commitmentV2Service = commitmentV2Service; _hashingService = hashingService; _logger = logger; } @@ -52,7 +51,6 @@ public async Task Handle(GetSingleCohortRequest message { singleCohort.Apprenticeships = await _commitmentV2Service.GetDraftApprenticeships(singleCohort); } - return new GetSingleCohortResponse { Cohort = singleCohort diff --git a/src/SFA.DAS.EmployerAccounts/Queries/GetVacancies/GetVacanciesRequestHandler.cs b/src/SFA.DAS.EmployerAccounts/Queries/GetVacancies/GetVacanciesRequestHandler.cs index fcda29072f..2f5a270bfa 100644 --- a/src/SFA.DAS.EmployerAccounts/Queries/GetVacancies/GetVacanciesRequestHandler.cs +++ b/src/SFA.DAS.EmployerAccounts/Queries/GetVacancies/GetVacanciesRequestHandler.cs @@ -1,7 +1,6 @@ using System; using System.Threading.Tasks; using MediatR; -using SFA.DAS.EmployerAccounts.Configuration; using SFA.DAS.EmployerAccounts.Interfaces; using SFA.DAS.NLog.Logger; using SFA.DAS.Validation; @@ -13,17 +12,15 @@ public class GetVacanciesRequestHandler : IAsyncRequestHandler _validator; private readonly ILog _logger; private readonly IRecruitService _service; - private readonly EmployerAccountsConfiguration _employerAccountsConfiguration; public GetVacanciesRequestHandler( IValidator validator, ILog logger, - IRecruitService service, EmployerAccountsConfiguration employerAccountsConfiguration) + IRecruitService service) { _validator = validator; _logger = logger; _service = service; - _employerAccountsConfiguration = employerAccountsConfiguration; } public async Task Handle(GetVacanciesRequest message) @@ -39,28 +36,11 @@ public async Task Handle(GetVacanciesRequest message) try { - var task = await _service.GetVacancies(message.HashedAccountId); - //if (await Task.WhenAny(task, Task.Delay(_employerAccountsConfiguration.AddApprenticeCallToActionTimeout)) == task) - //{ - // await task; return new GetVacanciesResponse { - Vacancies = task + Vacancies = await _service.GetVacancies(message.HashedAccountId) }; - //} - //return new GetVacanciesResponse - //{ - // HasFailed = true - //}; } - //catch (TimeoutException ex) - //{ - // _logger.Error(ex, $"Failed to get vacancies for {message.HashedAccountId}"); - // return new GetVacanciesResponse - // { - // HasFailed = true - // }; - //} catch (Exception ex) { _logger.Error(ex, $"Failed to get vacancies for {message.HashedAccountId}"); diff --git a/src/SFA.DAS.EmployerAccounts/Services/ReservationsServiceWithTimeout.cs b/src/SFA.DAS.EmployerAccounts/Services/ReservationsServiceWithTimeout.cs index 3c3909227f..9610bf19c5 100644 --- a/src/SFA.DAS.EmployerAccounts/Services/ReservationsServiceWithTimeout.cs +++ b/src/SFA.DAS.EmployerAccounts/Services/ReservationsServiceWithTimeout.cs @@ -1,47 +1,35 @@ using System.Collections.Generic; -using System.Threading; using System.Threading.Tasks; +using Polly; +using Polly.Registry; using Polly.Timeout; -using SFA.DAS.EmployerAccounts.Extensions; +using SFA.DAS.EmployerAccounts.Exceptions; using SFA.DAS.EmployerAccounts.Interfaces; using SFA.DAS.EmployerAccounts.Models.Reservations; -using SFA.DAS.NLog.Logger; namespace SFA.DAS.EmployerAccounts.Services { public class ReservationsServiceWithTimeout : IReservationsService { private readonly IReservationsService _service; - private readonly ILog _logger; - private TimeoutPolicy TimeoutPolicy { get; } + private readonly IAsyncPolicy _pollyPolicy; - public ReservationsServiceWithTimeout(IReservationsService service, ILog logger) + public ReservationsServiceWithTimeout(IReservationsService service, IReadOnlyPolicyRegistry pollyRegistry) { _service = service; - _logger = logger; - TimeoutPolicy= PollyTimeoutExtensions.GetTimeoutPolicy(_logger); + _pollyPolicy = pollyRegistry.Get(Constants.DefaultServiceTimeout); } public async Task> Get(long accountId) { - //var response = await _pollyPolicy.ExecuteAsync(() => _httpClient.PostAsync(url, null)); - //response.EnsureSuccessStatusCode(); - //return await response.Content.ReadAsStringAsync(); - var response = await TimeoutPolicy.ExecuteAsync(() => - _service.Get(accountId)); - //response.EnsureSuccessStatusCode(); - return response;//.Content.ReadAsStringAsync(); - //return await TimeoutPolicy.ExecuteAsync(async token => - // await _service.Get(accountId), CancellationToken.None); - //return await TimeoutPolicy.ExecuteAsync(context => - // _service.Get(accountId), CancellationToken.None, true); - - //var result1 = await TimeoutPolicy.ExecuteAndCaptureAsync(async (ct) => - //{ - // await _service.Get(accountId); - //}, CancellationToken.None); - - //return _service.Get(accountId); + try + { + return await _pollyPolicy.ExecuteAsync(() => _service.Get(accountId)); + } + catch (TimeoutRejectedException ex) + { + throw new ServiceTimeoutException("Call to Reservation Service timed out", ex); + } } } } \ No newline at end of file From dfc1361de18044b01d6de04769bd1a4382fdd5bc Mon Sep 17 00:00:00 2001 From: Shoma Gujjar Date: Thu, 16 Apr 2020 18:35:34 +0100 Subject: [PATCH 22/35] CON-1640-fix build --- .../Queries/GetSingleCohort/WhenIGetSingleCohort.cs | 3 +-- .../Queries/GetVacancies/WhenIGetVacancies.cs | 7 +------ 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/src/SFA.DAS.EmployerAccounts.UnitTests/Queries/GetSingleCohort/WhenIGetSingleCohort.cs b/src/SFA.DAS.EmployerAccounts.UnitTests/Queries/GetSingleCohort/WhenIGetSingleCohort.cs index e9c7d68a06..a22a4eb6fa 100644 --- a/src/SFA.DAS.EmployerAccounts.UnitTests/Queries/GetSingleCohort/WhenIGetSingleCohort.cs +++ b/src/SFA.DAS.EmployerAccounts.UnitTests/Queries/GetSingleCohort/WhenIGetSingleCohort.cs @@ -24,8 +24,7 @@ public class WhenIGetSingleCohort : QueryBaseTest _logger; - public EmployerAccountsConfiguration EmployerAccountsConfiguration { get; set; } - + [SetUp] public void Arrange() { diff --git a/src/SFA.DAS.EmployerAccounts.UnitTests/Queries/GetVacancies/WhenIGetVacancies.cs b/src/SFA.DAS.EmployerAccounts.UnitTests/Queries/GetVacancies/WhenIGetVacancies.cs index ca87d0bead..3bfd48899a 100644 --- a/src/SFA.DAS.EmployerAccounts.UnitTests/Queries/GetVacancies/WhenIGetVacancies.cs +++ b/src/SFA.DAS.EmployerAccounts.UnitTests/Queries/GetVacancies/WhenIGetVacancies.cs @@ -21,7 +21,6 @@ public class GetVacancies : QueryBaseTest _recruitService; private Vacancy _vacancy; private Mock _logger; - public EmployerAccountsConfiguration EmployerAccountsConfiguration { get; set; } private string _hashedAccountId; [SetUp] @@ -38,11 +37,7 @@ public void Arrange() _recruitService .Setup(s => s.GetVacancies(_hashedAccountId, int.MaxValue)) .ReturnsAsync(new List { _vacancy }); - EmployerAccountsConfiguration = EmployerAccountsConfiguration = new EmployerAccountsConfiguration() - { - - }; - RequestHandler = new GetVacanciesRequestHandler(RequestValidator.Object, _logger.Object, _recruitService.Object, EmployerAccountsConfiguration); + RequestHandler = new GetVacanciesRequestHandler(RequestValidator.Object, _logger.Object, _recruitService.Object); Query = new GetVacanciesRequest { From 98e08d603bb202bfc4f10fe8c318ebe869d314b5 Mon Sep 17 00:00:00 2001 From: Shoma Gujjar Date: Thu, 16 Apr 2020 22:48:05 +0100 Subject: [PATCH 23/35] CON-1640-add timeout logic to commitments and recruit service. --- .../DependencyResolution/RecruitRegistry.cs | 1 + .../DependencyResolution/ServicesRegistry.cs | 1 + .../CommitmentsV2ServiceWithTimeout.cs | 113 ++++++++++++++++++ .../Services/RecruitServiceWithTimeout.cs | 71 +++++++++++ .../Services/ReservationsApiClient.cs | 12 +- .../Services/ReservationsService.cs | 15 +-- 6 files changed, 191 insertions(+), 22 deletions(-) create mode 100644 src/SFA.DAS.EmployerAccounts/Services/CommitmentsV2ServiceWithTimeout.cs create mode 100644 src/SFA.DAS.EmployerAccounts/Services/RecruitServiceWithTimeout.cs diff --git a/src/SFA.DAS.EmployerAccounts/DependencyResolution/RecruitRegistry.cs b/src/SFA.DAS.EmployerAccounts/DependencyResolution/RecruitRegistry.cs index 30286e46f8..ba00c1a49a 100644 --- a/src/SFA.DAS.EmployerAccounts/DependencyResolution/RecruitRegistry.cs +++ b/src/SFA.DAS.EmployerAccounts/DependencyResolution/RecruitRegistry.cs @@ -9,6 +9,7 @@ public class RecruitRegistry : Registry public RecruitRegistry() { For().Use(); + For().DecorateAllWith(); } } } diff --git a/src/SFA.DAS.EmployerAccounts/DependencyResolution/ServicesRegistry.cs b/src/SFA.DAS.EmployerAccounts/DependencyResolution/ServicesRegistry.cs index 082c540b87..f6de582a38 100644 --- a/src/SFA.DAS.EmployerAccounts/DependencyResolution/ServicesRegistry.cs +++ b/src/SFA.DAS.EmployerAccounts/DependencyResolution/ServicesRegistry.cs @@ -17,6 +17,7 @@ public ServicesRegistry() For().Use(); For().DecorateAllWith(); For().Use(); + For().DecorateAllWith(); } } } \ No newline at end of file diff --git a/src/SFA.DAS.EmployerAccounts/Services/CommitmentsV2ServiceWithTimeout.cs b/src/SFA.DAS.EmployerAccounts/Services/CommitmentsV2ServiceWithTimeout.cs new file mode 100644 index 0000000000..8a455fd294 --- /dev/null +++ b/src/SFA.DAS.EmployerAccounts/Services/CommitmentsV2ServiceWithTimeout.cs @@ -0,0 +1,113 @@ +using AutoMapper; +using SFA.DAS.CommitmentsV2.Api.Client; +using SFA.DAS.CommitmentsV2.Api.Types.Responses; +using SFA.DAS.CommitmentsV2.Types; +using SFA.DAS.CommitmentsV2.Types.Dtos; +using SFA.DAS.EmployerAccounts.Interfaces; +using SFA.DAS.EmployerAccounts.Models.CommitmentsV2; +using SFA.DAS.Encoding; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; +using Polly; +using Polly.Registry; +using Polly.Timeout; +using SFA.DAS.EmployerAccounts.Exceptions; + +namespace SFA.DAS.EmployerAccounts.Services +{ + public class CommitmentsV2ServiceWithTimeout : ICommitmentV2Service + { + private readonly ICommitmentsApiClient _commitmentsApiClient; + private readonly IMapper _mapper; + private readonly IEncodingService _encodingService; + private readonly IAsyncPolicy _pollyPolicy; + + public CommitmentsV2ServiceWithTimeout(ICommitmentsApiClient commitmentsApiClient, IMapper mapper, + IEncodingService encodingService, + IReadOnlyPolicyRegistry pollyRegistry) + { + _commitmentsApiClient = commitmentsApiClient; + _mapper = mapper; + _encodingService = encodingService; + _pollyPolicy = pollyRegistry.Get(Constants.DefaultServiceTimeout); + } + + public async Task> GetDraftApprenticeships(Cohort cohort) + { + try + { + var draftApprenticeshipsResponse = await _pollyPolicy.ExecuteAsync(() => _commitmentsApiClient.GetDraftApprenticeships(cohort.Id)); + return _mapper.Map, IEnumerable>(draftApprenticeshipsResponse.DraftApprenticeships, + opt => + { + opt.AfterMap((src, dest) => + { + dest.ToList().ForEach(c => + { + c.SetHashId(_encodingService); + c.SetCohort(cohort); + c.SetTrainingProvider(cohort.TrainingProvider.First()); + }); + }); + }); + } + catch (TimeoutRejectedException ex) + { + throw new ServiceTimeoutException("Call to Commitments V2 Service timed out", ex); + } + } + + public async Task> GetCohorts(long? accountId) + { + try + { + var cohortSummary = await _pollyPolicy.ExecuteAsync(() => _commitmentsApiClient.GetCohorts(new CommitmentsV2.Api.Types.Requests.GetCohortsRequest { AccountId = accountId })); + var trainingProvider = _mapper.Map, IEnumerable>(cohortSummary.Cohorts); + + return _mapper.Map, IEnumerable>(cohortSummary.Cohorts, + opt => + { + opt.AfterMap((src, dest) => + { + dest.ToList().ForEach(c => + { + c.SetHashId(_encodingService); + c.SetTrainingProvider(trainingProvider); + }); + }); + }); + } + catch (TimeoutRejectedException ex) + { + throw new ServiceTimeoutException("Call to Commitments V2 Service timed out", ex); + } + } + + public async Task> GetApprenticeships(long accountId) + { + try + { + var apprenticeship = await _pollyPolicy.ExecuteAsync(() => _commitmentsApiClient.GetApprenticeships(new CommitmentsV2.Api.Types.Requests.GetApprenticeshipsRequest { AccountId = accountId })); + var trainingProvider = _mapper.Map, IEnumerable>(apprenticeship.Apprenticeships); + + return _mapper.Map, IEnumerable>(apprenticeship.Apprenticeships, + opt => + { + opt.AfterMap((src, dest) => + { + dest.ToList().ForEach(c => + { + c.SetHashId(_encodingService); + c.SetTrainingProvider(trainingProvider.First()); + }); + }); + }); + } + catch (TimeoutRejectedException ex) + { + throw new ServiceTimeoutException("Call to Commitments V2 Service timed out", ex); + } + } + } +} diff --git a/src/SFA.DAS.EmployerAccounts/Services/RecruitServiceWithTimeout.cs b/src/SFA.DAS.EmployerAccounts/Services/RecruitServiceWithTimeout.cs new file mode 100644 index 0000000000..08d26b301d --- /dev/null +++ b/src/SFA.DAS.EmployerAccounts/Services/RecruitServiceWithTimeout.cs @@ -0,0 +1,71 @@ +using AutoMapper; +using Newtonsoft.Json; +using SFA.DAS.EmployerAccounts.Configuration; +using SFA.DAS.EmployerAccounts.Interfaces; +using SFA.DAS.EmployerAccounts.Models.Recruit; +using SFA.DAS.EmployerAccounts.Dtos; +using System.Collections.Generic; +using System.Threading.Tasks; +using Polly; +using Polly.Registry; +using Polly.Timeout; +using SFA.DAS.EmployerAccounts.Exceptions; + +namespace SFA.DAS.EmployerAccounts.Services +{ + public class RecruitServiceWithTimeout : IRecruitService + { + private readonly EmployerAccountsConfiguration _configuration; + private readonly IHttpService _httpService; + private readonly IMapper _mapper; + private readonly IAsyncPolicy _pollyPolicy; + + public RecruitServiceWithTimeout( + IHttpServiceFactory httpServiceFactory, + EmployerAccountsConfiguration configuration, + IMapper mapper, IReadOnlyPolicyRegistry pollyRegistry) + { + _configuration = configuration; + _httpService = httpServiceFactory.Create( + configuration.RecruitApi.ClientId, + configuration.RecruitApi.ClientSecret, + configuration.RecruitApi.IdentifierUri, + configuration.RecruitApi.Tenant + ); + _mapper = mapper; + _pollyPolicy = pollyRegistry.Get(Constants.DefaultServiceTimeout); + } + + public async Task> GetVacancies(string hashedAccountId, int maxVacanciesToGet = int.MaxValue) + { + try + { + var baseUrl = GetBaseUrl(); + var url = $"{baseUrl}api/vacancies?employerAccountId={hashedAccountId}&pageSize={maxVacanciesToGet}"; + + var json = await _pollyPolicy.ExecuteAsync(() => _httpService.GetAsync(url, false)); + + if (json == null) + { + return new List(); + } + + var vacanciesSummary = JsonConvert.DeserializeObject(json); + return _mapper.Map, IEnumerable>(vacanciesSummary.Vacancies); + } + catch (TimeoutRejectedException ex) + { + throw new ServiceTimeoutException("Call to Recruit Service timed out", ex); + } + } + + private string GetBaseUrl() + { + var baseUrl = _configuration.RecruitApi.ApiBaseUrl.EndsWith("/") + ? _configuration.RecruitApi.ApiBaseUrl + : _configuration.RecruitApi.ApiBaseUrl + "/"; + + return baseUrl; + } + } +} diff --git a/src/SFA.DAS.EmployerAccounts/Services/ReservationsApiClient.cs b/src/SFA.DAS.EmployerAccounts/Services/ReservationsApiClient.cs index 0e88cfb962..01488c7aac 100644 --- a/src/SFA.DAS.EmployerAccounts/Services/ReservationsApiClient.cs +++ b/src/SFA.DAS.EmployerAccounts/Services/ReservationsApiClient.cs @@ -19,16 +19,8 @@ public ReservationsApiClient(HttpClient client, IReservationsClientApiConfigurat public Task Get(long accountId) { - try - { - var uri = $"{ApiBaseUrl}accounts/{accountId}/reservations"; - return GetAsync(uri); - } - catch (Exception e) - { - Console.WriteLine(e); - throw; - } + var uri = $"{ApiBaseUrl}accounts/{accountId}/reservations"; + return GetAsync(uri); } } } \ No newline at end of file diff --git a/src/SFA.DAS.EmployerAccounts/Services/ReservationsService.cs b/src/SFA.DAS.EmployerAccounts/Services/ReservationsService.cs index 547a6e0584..631def5c6b 100644 --- a/src/SFA.DAS.EmployerAccounts/Services/ReservationsService.cs +++ b/src/SFA.DAS.EmployerAccounts/Services/ReservationsService.cs @@ -6,7 +6,7 @@ using SFA.DAS.EmployerAccounts.Models.Reservations; namespace SFA.DAS.EmployerAccounts.Services -{ +{ public class ReservationsService : IReservationsService { private readonly IReservationsApiClient _client; @@ -18,17 +18,8 @@ public ReservationsService(IReservationsApiClient client) public async Task> Get(long accountId) { - try - { - string reservations = await _client.Get(accountId); - return JsonConvert.DeserializeObject>(reservations); - } - catch (Exception e) - { - Console.WriteLine(e); - throw; - } - + string reservations = await _client.Get(accountId); + return JsonConvert.DeserializeObject>(reservations); } } } \ No newline at end of file From e7207ec95965645966726f072a9e5f73da523015 Mon Sep 17 00:00:00 2001 From: Shoma Gujjar Date: Fri, 17 Apr 2020 11:12:58 +0100 Subject: [PATCH 24/35] CON-1640-adding tests to test polly timeout --- .../WhenIGetReservationWithTimeoutData.cs | 70 +++++++++++++++++++ .../Services/ReservationsService.cs | 2 +- 2 files changed, 71 insertions(+), 1 deletion(-) create mode 100644 src/SFA.DAS.EmployerAccounts.UnitTests/Services/Reservations/WhenIGetReservationWithTimeoutData.cs diff --git a/src/SFA.DAS.EmployerAccounts.UnitTests/Services/Reservations/WhenIGetReservationWithTimeoutData.cs b/src/SFA.DAS.EmployerAccounts.UnitTests/Services/Reservations/WhenIGetReservationWithTimeoutData.cs new file mode 100644 index 0000000000..2e33a96858 --- /dev/null +++ b/src/SFA.DAS.EmployerAccounts.UnitTests/Services/Reservations/WhenIGetReservationWithTimeoutData.cs @@ -0,0 +1,70 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; +using FluentAssertions; +using Moq; +using Newtonsoft.Json; +using NUnit.Framework; +using Polly; +using Polly.Registry; +using SFA.DAS.EmployerAccounts.Interfaces; +using SFA.DAS.EmployerAccounts.Models.Reservations; +using SFA.DAS.EmployerAccounts.Services; + +namespace SFA.DAS.EmployerAccounts.UnitTests.Services.Reservations +{ + class WhenIGetReservationWithTimeoutData + { + private Mock _mockReservationsApiClient; + private IReservationsService _sut; + private Mock _mockreservationsService; + private string _testData; + private Mock _mockPolicy; + + long _accountId; + + [SetUp] + public void Arrange() + { + _accountId = 123; + _testData = JsonConvert.SerializeObject(new List { new Reservation { AccountId = _accountId } }); + + _mockReservationsApiClient = new Mock(); + _mockReservationsApiClient + .Setup(m => m.Get(_accountId)) + .ReturnsAsync(_testData); + _mockPolicy = new Mock(); + var mockRegistryPolicy = new PolicyRegistry(); + mockRegistryPolicy.Add(Constants.DefaultServiceTimeout, _mockPolicy.Object); + _mockreservationsService = new Mock(_mockReservationsApiClient.Object); + _sut = new ReservationsServiceWithTimeout(_mockreservationsService.Object, mockRegistryPolicy); + } + + [Test] + public async Task ThenTheReservationsAreReturnedFromTheService() + { + //arrange + IEnumerable reservations = new List { + new Reservation {AccountId = _accountId} + }; + _mockreservationsService.Setup(rs => rs.Get(_accountId)) + .Returns(It.IsAny>>()); + //act + await _sut.Get(_accountId); + + // assert + _mockPolicy.Verify(p => p.ExecuteAsync(It.IsAny>>>())); + } + + [Test] + public async Task ThenTheReservationsServiceReturnsATimeout() + { + //act + await _sut.Get(_accountId); + + // assert + _mockPolicy.Verify(p => p.ExecuteAsync(It.IsAny>>>())); + } + } +} diff --git a/src/SFA.DAS.EmployerAccounts/Services/ReservationsService.cs b/src/SFA.DAS.EmployerAccounts/Services/ReservationsService.cs index 631def5c6b..7be36dabfa 100644 --- a/src/SFA.DAS.EmployerAccounts/Services/ReservationsService.cs +++ b/src/SFA.DAS.EmployerAccounts/Services/ReservationsService.cs @@ -18,7 +18,7 @@ public ReservationsService(IReservationsApiClient client) public async Task> Get(long accountId) { - string reservations = await _client.Get(accountId); + var reservations = await _client.Get(accountId); return JsonConvert.DeserializeObject>(reservations); } } From e9ec359016dce8b9836655eb83eaca4a56c6ff3d Mon Sep 17 00:00:00 2001 From: Shoma Gujjar Date: Fri, 17 Apr 2020 11:23:39 +0100 Subject: [PATCH 25/35] CON-1640-update tests CON-1 --- .../Reservations/WhenIGetReservationWithTimeoutData.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/SFA.DAS.EmployerAccounts.UnitTests/Services/Reservations/WhenIGetReservationWithTimeoutData.cs b/src/SFA.DAS.EmployerAccounts.UnitTests/Services/Reservations/WhenIGetReservationWithTimeoutData.cs index 2e33a96858..9ffdce8d9e 100644 --- a/src/SFA.DAS.EmployerAccounts.UnitTests/Services/Reservations/WhenIGetReservationWithTimeoutData.cs +++ b/src/SFA.DAS.EmployerAccounts.UnitTests/Services/Reservations/WhenIGetReservationWithTimeoutData.cs @@ -48,8 +48,8 @@ public async Task ThenTheReservationsAreReturnedFromTheService() IEnumerable reservations = new List { new Reservation {AccountId = _accountId} }; - _mockreservationsService.Setup(rs => rs.Get(_accountId)) - .Returns(It.IsAny>>()); + //_mockreservationsService.Setup(rs => rs.Get(_accountId)) + // .Returns(It.IsAny>>()); //act await _sut.Get(_accountId); From 0d14cfae563df2e55dbd9ba92432c90e26bbe35c Mon Sep 17 00:00:00 2001 From: Shoma Gujjar Date: Fri, 17 Apr 2020 12:34:29 +0100 Subject: [PATCH 26/35] CON-1640-fix build --- .../GetSingleCohort/WhenIGetSingleCohort.cs | 16 +++++----------- .../Orchestrators/EmployerTeamOrchestrator.cs | 2 +- 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/src/SFA.DAS.EmployerAccounts.UnitTests/Queries/GetSingleCohort/WhenIGetSingleCohort.cs b/src/SFA.DAS.EmployerAccounts.UnitTests/Queries/GetSingleCohort/WhenIGetSingleCohort.cs index a22a4eb6fa..a1402b676e 100644 --- a/src/SFA.DAS.EmployerAccounts.UnitTests/Queries/GetSingleCohort/WhenIGetSingleCohort.cs +++ b/src/SFA.DAS.EmployerAccounts.UnitTests/Queries/GetSingleCohort/WhenIGetSingleCohort.cs @@ -8,7 +8,6 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; -using SFA.DAS.EmployerAccounts.Configuration; using SFA.DAS.NLog.Logger; namespace SFA.DAS.EmployerAccounts.UnitTests.Queries.GetSingleCohort @@ -22,9 +21,8 @@ public class WhenIGetSingleCohort : QueryBaseTest _hashingService; private long _accountId; private long _cohortId; - public string hashedAccountId; - private Mock _logger; - + public string HashedAccountId; + [SetUp] public void Arrange() { @@ -32,8 +30,7 @@ public void Arrange() _accountId = 123; _cohortId = 1; - hashedAccountId = "Abc123"; - _logger = new Mock(); + HashedAccountId = "Abc123"; _commitmentV2Service = new Mock(); _commitmentV2Service.Setup(m => m.GetCohorts(_accountId)) .ReturnsAsync(new List() { new Cohort { Id = _cohortId, NumberOfDraftApprentices = 1 }}); @@ -42,15 +39,12 @@ public void Arrange() .ReturnsAsync(new List { new Apprenticeship { CourseName = "CourseName" } }); _hashingService = new Mock(); - _hashingService.Setup(x => x.DecodeValue(hashedAccountId)).Returns(_accountId); - EmployerAccountsConfiguration = EmployerAccountsConfiguration = new EmployerAccountsConfiguration() - { - + _hashingService.Setup(x => x.DecodeValue(HashedAccountId)).Returns(_accountId); RequestHandler = new GetSingleCohortRequestHandler(RequestValidator.Object, _commitmentV2Service.Object, _hashingService.Object, Mock.Of()); Query = new GetSingleCohortRequest { - HashedAccountId = hashedAccountId + HashedAccountId = HashedAccountId }; } diff --git a/src/SFA.DAS.EmployerAccounts.Web/Orchestrators/EmployerTeamOrchestrator.cs b/src/SFA.DAS.EmployerAccounts.Web/Orchestrators/EmployerTeamOrchestrator.cs index 8e8546ed43..6954b42dbc 100644 --- a/src/SFA.DAS.EmployerAccounts.Web/Orchestrators/EmployerTeamOrchestrator.cs +++ b/src/SFA.DAS.EmployerAccounts.Web/Orchestrators/EmployerTeamOrchestrator.cs @@ -60,7 +60,7 @@ public EmployerTeamOrchestrator(IMediator mediator, //Needed for tests protected EmployerTeamOrchestrator() { - _employerApprenticeshipsServiceConfiguration = employerApprenticeshipsServiceConfiguration; + } public async Task> Cancel(string email, string hashedAccountId, string externalUserId) From 384af6dd391489407a46041a23dfcf2aac5d9468 Mon Sep 17 00:00:00 2001 From: Shoma Gujjar Date: Fri, 17 Apr 2020 15:36:59 +0100 Subject: [PATCH 27/35] CON-1640-add tests for reservations. --- .../WhenIGetReservationWithTimeoutData.cs | 70 +++++++++++++------ 1 file changed, 47 insertions(+), 23 deletions(-) diff --git a/src/SFA.DAS.EmployerAccounts.UnitTests/Services/Reservations/WhenIGetReservationWithTimeoutData.cs b/src/SFA.DAS.EmployerAccounts.UnitTests/Services/Reservations/WhenIGetReservationWithTimeoutData.cs index 9ffdce8d9e..d6e9cb6228 100644 --- a/src/SFA.DAS.EmployerAccounts.UnitTests/Services/Reservations/WhenIGetReservationWithTimeoutData.cs +++ b/src/SFA.DAS.EmployerAccounts.UnitTests/Services/Reservations/WhenIGetReservationWithTimeoutData.cs @@ -1,13 +1,12 @@ using System; using System.Collections.Generic; -using System.Linq; using System.Threading.Tasks; -using FluentAssertions; using Moq; using Newtonsoft.Json; using NUnit.Framework; using Polly; using Polly.Registry; +using Polly.Timeout; using SFA.DAS.EmployerAccounts.Interfaces; using SFA.DAS.EmployerAccounts.Models.Reservations; using SFA.DAS.EmployerAccounts.Services; @@ -17,11 +16,11 @@ namespace SFA.DAS.EmployerAccounts.UnitTests.Services.Reservations class WhenIGetReservationWithTimeoutData { private Mock _mockReservationsApiClient; - private IReservationsService _sut; - private Mock _mockreservationsService; + private ReservationsServiceWithTimeout _reservationsServiceWithTimeout; + private Mock _reservationsService; private string _testData; - private Mock _mockPolicy; - + private IAsyncPolicy _policy; + private IEnumerable _reservations; long _accountId; [SetUp] @@ -29,42 +28,67 @@ public void Arrange() { _accountId = 123; _testData = JsonConvert.SerializeObject(new List { new Reservation { AccountId = _accountId } }); + _reservations = JsonConvert.DeserializeObject>(_testData); _mockReservationsApiClient = new Mock(); _mockReservationsApiClient .Setup(m => m.Get(_accountId)) .ReturnsAsync(_testData); - _mockPolicy = new Mock(); - var mockRegistryPolicy = new PolicyRegistry(); - mockRegistryPolicy.Add(Constants.DefaultServiceTimeout, _mockPolicy.Object); - _mockreservationsService = new Mock(_mockReservationsApiClient.Object); - _sut = new ReservationsServiceWithTimeout(_mockreservationsService.Object, mockRegistryPolicy); + + _policy = Policy.NoOpAsync(); + var registryPolicy = new PolicyRegistry(); + registryPolicy.Add(Constants.DefaultServiceTimeout, _policy); + + _reservationsService = new Mock(); + _reservationsService + .Setup(rs => rs.Get(_accountId)) + .ReturnsAsync(_reservations); + + _reservationsServiceWithTimeout = new ReservationsServiceWithTimeout(_reservationsService.Object, registryPolicy); } [Test] - public async Task ThenTheReservationsAreReturnedFromTheService() + public async Task ThenTheReservationsServiceIsCalled() { - //arrange - IEnumerable reservations = new List { - new Reservation {AccountId = _accountId} - }; - //_mockreservationsService.Setup(rs => rs.Get(_accountId)) - // .Returns(It.IsAny>>()); //act - await _sut.Get(_accountId); + await _reservationsServiceWithTimeout.Get(_accountId); // assert - _mockPolicy.Verify(p => p.ExecuteAsync(It.IsAny>>>())); + _reservationsService.Verify(rs => rs.Get(_accountId), Times.AtLeastOnce); } [Test] - public async Task ThenTheReservationsServiceReturnsATimeout() + public async Task ThenTheReservationsServiceReturnsTheSameReservation() { //act - await _sut.Get(_accountId); + var reservationsResult = await _reservationsServiceWithTimeout.Get(_accountId); // assert - _mockPolicy.Verify(p => p.ExecuteAsync(It.IsAny>>>())); + Assert.AreSame(reservationsResult, _reservations); + } + + [Test] + public async Task ThenThrowTimeoutException() + { + var innerException = "Exception of type 'Polly.Timeout.TimeoutRejectedException' was thrown."; + var message = "Call to Reservation Service timed out"; + Exception actualException = null; + var correctExceptionThrown = false; + + try + { + _reservationsService.Setup(p => p.Get(_accountId)) + .Throws(); + await _reservationsServiceWithTimeout.Get(_accountId); + } + catch (Exception e) + { + actualException = e; + correctExceptionThrown = true; + } + Assert.IsTrue(correctExceptionThrown); + Assert.AreEqual(actualException.InnerException?.Message, innerException); + Assert.AreEqual(actualException.Message, message); } } } From ed2919159b83447c01753cba8bddf81d69bc9a7c Mon Sep 17 00:00:00 2001 From: Shoma Gujjar Date: Fri, 17 Apr 2020 17:28:13 +0100 Subject: [PATCH 28/35] CON-1640-add timeout tests for Recruit Vacancies Service. --- .../Recruit/WhenIGetVacanciesWithTimeout.cs | 123 ++++++++++++++++++ .../WhenIGetReservationWithTimeoutData.cs | 2 +- 2 files changed, 124 insertions(+), 1 deletion(-) create mode 100644 src/SFA.DAS.EmployerAccounts.UnitTests/Services/Recruit/WhenIGetVacanciesWithTimeout.cs diff --git a/src/SFA.DAS.EmployerAccounts.UnitTests/Services/Recruit/WhenIGetVacanciesWithTimeout.cs b/src/SFA.DAS.EmployerAccounts.UnitTests/Services/Recruit/WhenIGetVacanciesWithTimeout.cs new file mode 100644 index 0000000000..ec5c587da0 --- /dev/null +++ b/src/SFA.DAS.EmployerAccounts.UnitTests/Services/Recruit/WhenIGetVacanciesWithTimeout.cs @@ -0,0 +1,123 @@ +using System; +using System.Collections.Generic; +using System.Threading.Tasks; +using AutoMapper; +using Moq; +using Newtonsoft.Json; +using NUnit.Framework; +using Polly; +using Polly.Registry; +using Polly.Timeout; +using SFA.DAS.EmployerAccounts.Configuration; +using SFA.DAS.EmployerAccounts.Dtos; +using SFA.DAS.EmployerAccounts.Interfaces; +using SFA.DAS.EmployerAccounts.Models.Recruit; +using SFA.DAS.EmployerAccounts.Services; + +namespace SFA.DAS.EmployerAccounts.UnitTests.Services.Recruit +{ + public class WhenIGetVacanciesWithTimeout + { + private Mock _mockHttpService; + private Mock _mockHttpServiceFactory; + private EmployerAccountsConfiguration _employerAccountsConfiguration; + private Mock _mockMapper; + private IAsyncPolicy _policy; + private string _hashedAccountId; + private string _apiBaseUrl; + private string _clientId; + private string _clientSecret; + private string _identifierUri; + private string _tenent; + private string _serviceJson; + private List _vacancies; + private RecruitServiceWithTimeout _recruitServiceWithTimeout; + + [SetUp] + public void Arrange() + { + _hashedAccountId = Guid.NewGuid().ToString(); + _apiBaseUrl = $"http://{Guid.NewGuid().ToString()}"; + _clientId = Guid.NewGuid().ToString(); + _clientSecret = Guid.NewGuid().ToString(); + _identifierUri = Guid.NewGuid().ToString(); + _tenent = Guid.NewGuid().ToString(); + _vacancies = new List { new VacancySummary()}; + _serviceJson = JsonConvert.SerializeObject(new VacanciesSummary { Vacancies = _vacancies }); + + _mockHttpService = new Mock(); + _mockHttpServiceFactory = new Mock(); + _employerAccountsConfiguration = new EmployerAccountsConfiguration + { + RecruitApi = new RecruitClientApiConfiguration + { + ApiBaseUrl = _apiBaseUrl, + ClientId = _clientId, + ClientSecret = _clientSecret, + IdentifierUri = _identifierUri, + Tenant = _tenent + } + }; + _mockMapper = new Mock(); + + _mockHttpService + .Setup(m => m.GetAsync(It.IsAny(), It.IsAny())) + .ReturnsAsync(_serviceJson); + + _mockHttpServiceFactory + .Setup(m => m.Create(_clientId, _clientSecret, _identifierUri, _tenent)) + .Returns(_mockHttpService.Object); + + _mockMapper + .Setup(m => m.Map, IEnumerable>(It.IsAny>())) + .Returns(new List()); + + _policy = Policy.NoOpAsync(); + var registryPolicy = new PolicyRegistry(); + registryPolicy.Add(Constants.DefaultServiceTimeout, _policy); + + _recruitServiceWithTimeout = new RecruitServiceWithTimeout(_mockHttpServiceFactory.Object, + _employerAccountsConfiguration, + _mockMapper.Object, registryPolicy); + } + + [Test] + public async Task ThenTheRecruitServiceIsCalled() + { + //arrange + var expectedUrl = $"{_apiBaseUrl}/api/vacancies?employerAccountId={_hashedAccountId}&pageSize={int.MaxValue}"; + + //act + await _recruitServiceWithTimeout.GetVacancies(_hashedAccountId); + + // assert + _mockHttpService.Verify(x => x.GetAsync(expectedUrl,false), Times.Once); + } + + [Test] + public async Task ThenThrowTimeoutException() + { + var expectedUrl = $"{_apiBaseUrl}/api/vacancies?employerAccountId={_hashedAccountId}&pageSize={int.MaxValue}"; + + var innerException = "Exception of type 'Polly.Timeout.TimeoutRejectedException' was thrown."; + var message = "Call to Recruit Service timed out"; + Exception actualException = null; + var correctExceptionThrown = false; + + try + { + _mockHttpService.Setup(p => p.GetAsync(expectedUrl, false)) + .Throws(); + await _recruitServiceWithTimeout.GetVacancies(_hashedAccountId); + } + catch (Exception e) + { + actualException = e; + correctExceptionThrown = true; + } + Assert.IsTrue(correctExceptionThrown); + Assert.AreEqual(actualException.InnerException?.Message, innerException); + Assert.AreEqual(actualException.Message, message); + } + } +} diff --git a/src/SFA.DAS.EmployerAccounts.UnitTests/Services/Reservations/WhenIGetReservationWithTimeoutData.cs b/src/SFA.DAS.EmployerAccounts.UnitTests/Services/Reservations/WhenIGetReservationWithTimeoutData.cs index d6e9cb6228..00170f7ef7 100644 --- a/src/SFA.DAS.EmployerAccounts.UnitTests/Services/Reservations/WhenIGetReservationWithTimeoutData.cs +++ b/src/SFA.DAS.EmployerAccounts.UnitTests/Services/Reservations/WhenIGetReservationWithTimeoutData.cs @@ -13,7 +13,7 @@ namespace SFA.DAS.EmployerAccounts.UnitTests.Services.Reservations { - class WhenIGetReservationWithTimeoutData + public class WhenIGetReservationWithTimeoutData { private Mock _mockReservationsApiClient; private ReservationsServiceWithTimeout _reservationsServiceWithTimeout; From 6288b637446a01506c8c900ceb9f6c161de9da1e Mon Sep 17 00:00:00 2001 From: Shoma Gujjar Date: Fri, 17 Apr 2020 18:27:58 +0100 Subject: [PATCH 29/35] CON-1640-add timeout tests for commitments --- .../WhenIGetAccountCohortsWithTimeout.cs | 282 ++++++++++++++++++ .../Reservations/WhenIGetReservationData.cs | 8 +- .../WhenIGetReservationWithTimeoutData.cs | 2 +- 3 files changed, 287 insertions(+), 5 deletions(-) create mode 100644 src/SFA.DAS.EmployerAccounts.UnitTests/Services/AccountCohorts/WhenIGetAccountCohortsWithTimeout.cs diff --git a/src/SFA.DAS.EmployerAccounts.UnitTests/Services/AccountCohorts/WhenIGetAccountCohortsWithTimeout.cs b/src/SFA.DAS.EmployerAccounts.UnitTests/Services/AccountCohorts/WhenIGetAccountCohortsWithTimeout.cs new file mode 100644 index 0000000000..f884d516dd --- /dev/null +++ b/src/SFA.DAS.EmployerAccounts.UnitTests/Services/AccountCohorts/WhenIGetAccountCohortsWithTimeout.cs @@ -0,0 +1,282 @@ +using SFA.DAS.CommitmentsV2.Api.Client; +using System; +using System.Collections.Generic; +using System.Threading.Tasks; +using AutoMapper; +using Moq; +using NUnit.Framework; +using SFA.DAS.EmployerAccounts.Services; +using SFA.DAS.CommitmentsV2.Api.Types.Requests; +using System.Threading; +using SFA.DAS.CommitmentsV2.Api.Types.Responses; +using SFA.DAS.CommitmentsV2.Types; +using SFA.DAS.CommitmentsV2.Types.Dtos; +using System.Linq; +using Polly; +using Polly.Registry; +using Polly.Timeout; +using SFA.DAS.EmployerAccounts.Models.CommitmentsV2; +using SFA.DAS.Encoding; + +namespace SFA.DAS.EmployerAccounts.UnitTests.Services.AccountCohorts +{ + public class WhenIGetAccountCohortsWithTimeout + { + private Mock _mockCommitmentsApiClient; + private CommitmentsV2ServiceWithTimeout _commitmentsV2ServiceWithTimeout; + private Mock _mockEncodingService; + private Mock _mockMapper; + private long _accountId = 123; + private IAsyncPolicy _policy; + + [SetUp] + public void Arrange() + { + _mockMapper = new Mock(); + _mockCommitmentsApiClient = new Mock(); + _mockEncodingService = new Mock(); + _policy = Policy.NoOpAsync(); + var registryPolicy = new PolicyRegistry(); + registryPolicy.Add(Constants.DefaultServiceTimeout, _policy); + _mockCommitmentsApiClient + .Setup(c => c.GetApprenticeships(It.Is(r => r.AccountId == _accountId), CancellationToken.None)) + .Returns(Task.FromResult(CreateApprenticeshipResponse())); + + _mockCommitmentsApiClient.Setup(c => c.GetCohorts(It.Is(r => r.AccountId == _accountId), CancellationToken.None)) + .Returns(Task.FromResult(GetCohortsResponseForWithTrainingProviderStaus())); + + _mockCommitmentsApiClient.Setup(c => c.GetDraftApprenticeships(123, It.IsAny())).Returns(Task.FromResult(GetDraftApprenticeshipsResponse())); + + _commitmentsV2ServiceWithTimeout = new CommitmentsV2ServiceWithTimeout(_mockCommitmentsApiClient.Object, _mockMapper.Object, _mockEncodingService.Object, registryPolicy); + } + + [Test] + public async Task ThenGetApprenticeshipsResponse() + { + //Arrange + var apprenticeships = new List { new Apprenticeship { ApprenticeshipStatus = EmployerAccounts.Models.CommitmentsV2.ApprenticeshipStatus.Approved, FirstName ="FirstName" , LastName = "LastName" } }; + + _mockMapper + .Setup(m => m.Map + (It.IsAny>(), + It.IsAny, IEnumerable>>>())) + .Returns(apprenticeships); + + //Act + var result =await _commitmentsV2ServiceWithTimeout.GetApprenticeships(_accountId); + + //Assert + Assert.IsNotNull(result); + Assert.IsTrue(result.Count().Equals(1)); + } + + [Test] + public async Task ThenGetCohortsResponse() + { + //Arrange + _mockEncodingService.Setup(x => x.Encode(It.IsAny(), EncodingType.CohortReference)).Returns((long y, EncodingType z) => y + "_Encoded"); + + var cohorts = new List() + { + new Cohort { Id = 1 } + }; + + _mockMapper.Setup(m => m.Map, IEnumerable>(It.IsAny(), + It.IsAny, IEnumerable>>>())) + .Returns(cohorts); + + //Act + var result = await _commitmentsV2ServiceWithTimeout.GetCohorts(_accountId); + + //Assert + Assert.IsNotNull(result); + Assert.IsTrue(result.Count().Equals(1)); + } + + [Test] + public async Task ThenGetDraftApprenticeshipsResponse() + { + //Arrange + var apprenticeships = new List { new Apprenticeship { FirstName = "FirstName", LastName = "LastName" } }; + _mockMapper.Setup(m => m.Map, IEnumerable>(It.IsAny>(), + It.IsAny, IEnumerable>>>())) + .Returns(apprenticeships); + + + //Act + var result = await _commitmentsV2ServiceWithTimeout.GetDraftApprenticeships(new Cohort {Id = 123}); + + //Assert + Assert.IsNotNull(result); + Assert.IsTrue(result.Count().Equals(1)); + } + + [Test] + public async Task ThenGetApprenticeshipsIsCalled() + { + //act + await _commitmentsV2ServiceWithTimeout.GetApprenticeships(_accountId); + + // assert + _mockCommitmentsApiClient.Verify(rs => rs.GetApprenticeships(It.Is(r => r.AccountId == _accountId), CancellationToken.None), Times.Once()); + } + + [Test] + public async Task ThenTheGetCohortsIsCalled() + { + //act + await _commitmentsV2ServiceWithTimeout.GetCohorts(_accountId); + + // assert + _mockCommitmentsApiClient.Verify(rs => rs.GetCohorts(It.Is(r => r.AccountId == _accountId), CancellationToken.None), Times.AtLeastOnce); + } + + [Test] + public async Task ThenTheGetDraftApprenticeshipsIsCalled() + { + //act + await _commitmentsV2ServiceWithTimeout.GetDraftApprenticeships(new Cohort { Id = 123 }); + + // assert + _mockCommitmentsApiClient.Verify(rs => rs.GetDraftApprenticeships(It.IsAny(),CancellationToken.None), Times.AtLeastOnce); + } + + [Test] + public async Task ThenThrowTimeoutException_GetApprenticeships() + { + var innerException = "Exception of type 'Polly.Timeout.TimeoutRejectedException' was thrown."; + var message = "Call to Commitments V2 Service timed out"; + Exception actualException = null; + var correctExceptionThrown = false; + + try + { + _mockCommitmentsApiClient.Setup(p => p.GetApprenticeships(It.Is(r => r.AccountId == _accountId), CancellationToken.None)) + .Throws(); + await _commitmentsV2ServiceWithTimeout.GetApprenticeships(_accountId); + } + catch (Exception e) + { + actualException = e; + correctExceptionThrown = true; + } + Assert.IsTrue(correctExceptionThrown); + Assert.AreEqual(actualException.InnerException?.Message, innerException); + Assert.AreEqual(actualException.Message, message); + } + + [Test] + public async Task ThenThrowTimeoutException_GetCohorts() + { + var innerException = "Exception of type 'Polly.Timeout.TimeoutRejectedException' was thrown."; + var message = "Call to Commitments V2 Service timed out"; + Exception actualException = null; + var correctExceptionThrown = false; + + try + { + _mockCommitmentsApiClient.Setup(p => p.GetCohorts(It.Is(r => r.AccountId == _accountId), CancellationToken.None)) + .Throws(); + await _commitmentsV2ServiceWithTimeout.GetCohorts(_accountId); + } + catch (Exception e) + { + actualException = e; + correctExceptionThrown = true; + } + Assert.IsTrue(correctExceptionThrown); + Assert.AreEqual(actualException.InnerException?.Message, innerException); + Assert.AreEqual(actualException.Message, message); + } + + [Test] + public async Task ThenThrowTimeoutException_GetDraftApprenticeships() + { + var innerException = "Exception of type 'Polly.Timeout.TimeoutRejectedException' was thrown."; + var message = "Call to Commitments V2 Service timed out"; + Exception actualException = null; + var correctExceptionThrown = false; + + try + { + _mockCommitmentsApiClient.Setup(p => p.GetDraftApprenticeships(It.IsAny(), CancellationToken.None)) + .Throws(); + await _commitmentsV2ServiceWithTimeout.GetDraftApprenticeships(new Cohort { Id = 123 }); + } + catch (Exception e) + { + actualException = e; + correctExceptionThrown = true; + } + Assert.IsTrue(correctExceptionThrown); + Assert.AreEqual(actualException.InnerException?.Message, innerException); + Assert.AreEqual(actualException.Message, message); + } + + + private GetApprenticeshipsResponse CreateApprenticeshipResponse() + { + IEnumerable apprenticeships = new List() + { + new GetApprenticeshipsResponse.ApprenticeshipDetailsResponse + { + Id = 1, + FirstName = "FirstName", + LastName = "LastName", + Uln = "Uln", + EmployerName = "EmployerName", + CourseName = "CourseName", + StartDate = new DateTime(2020, 5, 1), + EndDate = new DateTime(2022, 5, 1), + ApprenticeshipStatus = CommitmentsV2.Types.ApprenticeshipStatus.Live, + ProviderName = "ProviderName" + } + }; + + return new GetApprenticeshipsResponse() { Apprenticeships = apprenticeships, TotalApprenticeships = 1, TotalApprenticeshipsFound = 1, TotalApprenticeshipsWithAlertsFound = 0 }; + } + + + private GetCohortsResponse GetCohortsResponseForWithTrainingProviderStaus() + { + IEnumerable cohorts = new List() + { + new CohortSummary + { + CohortId = 4, + AccountId = 1, + ProviderId = 4, + ProviderName = "Provider4", + NumberOfDraftApprentices = 1, + IsDraft = false, + WithParty = Party.Provider, + CreatedOn = DateTime.Now + }, + }; + + return new GetCohortsResponse(cohorts); + } + + private GetDraftApprenticeshipsResponse GetDraftApprenticeshipsResponse() + { + IReadOnlyCollection draftApprenticeships = new List() + { + new DraftApprenticeshipDto + { + Id = 1, + FirstName = "FirstName", + LastName = "LastName", + DateOfBirth = new DateTime(2000, 1 ,1 ), + Cost = 100, + StartDate = new DateTime(2020, 5, 1), + EndDate = new DateTime(2022, 5, 1), + CourseCode = "CourseCode", + CourseName = "CourseName" + } + }; + + var draftApprenticeshipsResponse = new GetDraftApprenticeshipsResponse() { DraftApprenticeships = draftApprenticeships }; + return draftApprenticeshipsResponse; + } + } +} diff --git a/src/SFA.DAS.EmployerAccounts.UnitTests/Services/Reservations/WhenIGetReservationData.cs b/src/SFA.DAS.EmployerAccounts.UnitTests/Services/Reservations/WhenIGetReservationData.cs index 3cf566da2c..212dc83c1b 100644 --- a/src/SFA.DAS.EmployerAccounts.UnitTests/Services/Reservations/WhenIGetReservationData.cs +++ b/src/SFA.DAS.EmployerAccounts.UnitTests/Services/Reservations/WhenIGetReservationData.cs @@ -1,15 +1,15 @@ -using System.Linq; -using System.Collections.Generic; +using System.Collections.Generic; +using System.Linq; using System.Threading.Tasks; +using FluentAssertions; using Moq; using Newtonsoft.Json; using NUnit.Framework; using SFA.DAS.EmployerAccounts.Interfaces; using SFA.DAS.EmployerAccounts.Models.Reservations; using SFA.DAS.EmployerAccounts.Services; -using FluentAssertions; -namespace SFA.DAS.EmployerAccounts.UnitTests.Services.ReservationsApiClient +namespace SFA.DAS.EmployerAccounts.UnitTests.Services.Reservations { class WhenIGetReservationData { diff --git a/src/SFA.DAS.EmployerAccounts.UnitTests/Services/Reservations/WhenIGetReservationWithTimeoutData.cs b/src/SFA.DAS.EmployerAccounts.UnitTests/Services/Reservations/WhenIGetReservationWithTimeoutData.cs index 00170f7ef7..c66d51c508 100644 --- a/src/SFA.DAS.EmployerAccounts.UnitTests/Services/Reservations/WhenIGetReservationWithTimeoutData.cs +++ b/src/SFA.DAS.EmployerAccounts.UnitTests/Services/Reservations/WhenIGetReservationWithTimeoutData.cs @@ -54,7 +54,7 @@ public async Task ThenTheReservationsServiceIsCalled() await _reservationsServiceWithTimeout.Get(_accountId); // assert - _reservationsService.Verify(rs => rs.Get(_accountId), Times.AtLeastOnce); + _reservationsService.Verify(rs => rs.Get(_accountId), Times.Once); } [Test] From a70231c872b28c378b9fe22530f2e5d8c6f7b32c Mon Sep 17 00:00:00 2001 From: Shoma Gujjar Date: Fri, 17 Apr 2020 18:34:19 +0100 Subject: [PATCH 30/35] CON-1640-code cleanup --- .../Queries/GetReservations/WhenIGetReservations.cs | 1 - .../Queries/GetVacancies/WhenIGetVacancies.cs | 1 - 2 files changed, 2 deletions(-) diff --git a/src/SFA.DAS.EmployerAccounts.UnitTests/Queries/GetReservations/WhenIGetReservations.cs b/src/SFA.DAS.EmployerAccounts.UnitTests/Queries/GetReservations/WhenIGetReservations.cs index d868aa70d7..1ac51035a9 100644 --- a/src/SFA.DAS.EmployerAccounts.UnitTests/Queries/GetReservations/WhenIGetReservations.cs +++ b/src/SFA.DAS.EmployerAccounts.UnitTests/Queries/GetReservations/WhenIGetReservations.cs @@ -3,7 +3,6 @@ using System.Threading.Tasks; using Moq; using NUnit.Framework; -using SFA.DAS.EmployerAccounts.Configuration; using SFA.DAS.EmployerAccounts.Interfaces; using SFA.DAS.EmployerAccounts.Models.Reservations; using SFA.DAS.EmployerAccounts.Queries.GetReservations; diff --git a/src/SFA.DAS.EmployerAccounts.UnitTests/Queries/GetVacancies/WhenIGetVacancies.cs b/src/SFA.DAS.EmployerAccounts.UnitTests/Queries/GetVacancies/WhenIGetVacancies.cs index 3bfd48899a..3159114407 100644 --- a/src/SFA.DAS.EmployerAccounts.UnitTests/Queries/GetVacancies/WhenIGetVacancies.cs +++ b/src/SFA.DAS.EmployerAccounts.UnitTests/Queries/GetVacancies/WhenIGetVacancies.cs @@ -3,7 +3,6 @@ using System.Threading.Tasks; using Moq; using NUnit.Framework; -using SFA.DAS.EmployerAccounts.Configuration; using SFA.DAS.EmployerAccounts.Interfaces; using SFA.DAS.EmployerAccounts.Models.Recruit; using SFA.DAS.EmployerAccounts.Queries.GetVacancies; From 1c179ebc34eda1ec222ccb66426102b15f1413c4 Mon Sep 17 00:00:00 2001 From: Shoma Gujjar Date: Mon, 20 Apr 2020 13:40:27 +0100 Subject: [PATCH 31/35] CON-1640-fix code review comments --- .../WhenIGetAccountCohortsWithTimeout.cs | 196 +++++++----------- .../Recruit/WhenIGetVacanciesWithTimeout.cs | 92 +++----- .../CommitmentsV2ServiceWithTimeout.cs | 67 +----- .../Services/RecruitServiceWithTimeout.cs | 45 +--- 4 files changed, 114 insertions(+), 286 deletions(-) diff --git a/src/SFA.DAS.EmployerAccounts.UnitTests/Services/AccountCohorts/WhenIGetAccountCohortsWithTimeout.cs b/src/SFA.DAS.EmployerAccounts.UnitTests/Services/AccountCohorts/WhenIGetAccountCohortsWithTimeout.cs index f884d516dd..454d26ddb7 100644 --- a/src/SFA.DAS.EmployerAccounts.UnitTests/Services/AccountCohorts/WhenIGetAccountCohortsWithTimeout.cs +++ b/src/SFA.DAS.EmployerAccounts.UnitTests/Services/AccountCohorts/WhenIGetAccountCohortsWithTimeout.cs @@ -1,69 +1,67 @@ -using SFA.DAS.CommitmentsV2.Api.Client; -using System; +using System; using System.Collections.Generic; using System.Threading.Tasks; -using AutoMapper; using Moq; using NUnit.Framework; using SFA.DAS.EmployerAccounts.Services; -using SFA.DAS.CommitmentsV2.Api.Types.Requests; -using System.Threading; -using SFA.DAS.CommitmentsV2.Api.Types.Responses; -using SFA.DAS.CommitmentsV2.Types; -using SFA.DAS.CommitmentsV2.Types.Dtos; using System.Linq; using Polly; using Polly.Registry; using Polly.Timeout; +using SFA.DAS.EmployerAccounts.Interfaces; using SFA.DAS.EmployerAccounts.Models.CommitmentsV2; -using SFA.DAS.Encoding; namespace SFA.DAS.EmployerAccounts.UnitTests.Services.AccountCohorts { public class WhenIGetAccountCohortsWithTimeout { - private Mock _mockCommitmentsApiClient; + private Mock _mockCommitmentsV2Service; private CommitmentsV2ServiceWithTimeout _commitmentsV2ServiceWithTimeout; - private Mock _mockEncodingService; - private Mock _mockMapper; private long _accountId = 123; private IAsyncPolicy _policy; + private List _apprenticeships; + private List _cohorts; + private Cohort _cohort; [SetUp] public void Arrange() { - _mockMapper = new Mock(); - _mockCommitmentsApiClient = new Mock(); - _mockEncodingService = new Mock(); + _cohort=new Cohort(){Id = 123}; + _cohorts = new List + { + new Cohort() {Id = 123} + }; + + _apprenticeships = new List + { + new Apprenticeship {ApprenticeshipStatus = ApprenticeshipStatus.Approved, FirstName = "FirstName", LastName = "LastName"} + }; + + _mockCommitmentsV2Service = new Mock(); _policy = Policy.NoOpAsync(); var registryPolicy = new PolicyRegistry(); registryPolicy.Add(Constants.DefaultServiceTimeout, _policy); - _mockCommitmentsApiClient - .Setup(c => c.GetApprenticeships(It.Is(r => r.AccountId == _accountId), CancellationToken.None)) - .Returns(Task.FromResult(CreateApprenticeshipResponse())); - _mockCommitmentsApiClient.Setup(c => c.GetCohorts(It.Is(r => r.AccountId == _accountId), CancellationToken.None)) - .Returns(Task.FromResult(GetCohortsResponseForWithTrainingProviderStaus())); + _mockCommitmentsV2Service + .Setup(c => c.GetApprenticeships(_accountId)) + .ReturnsAsync(_apprenticeships); + + _mockCommitmentsV2Service + .Setup(c => c.GetCohorts(_accountId)) + .ReturnsAsync(_cohorts); - _mockCommitmentsApiClient.Setup(c => c.GetDraftApprenticeships(123, It.IsAny())).Returns(Task.FromResult(GetDraftApprenticeshipsResponse())); + _mockCommitmentsV2Service + .Setup(c => c.GetDraftApprenticeships(_cohort)) + .ReturnsAsync(_apprenticeships); - _commitmentsV2ServiceWithTimeout = new CommitmentsV2ServiceWithTimeout(_mockCommitmentsApiClient.Object, _mockMapper.Object, _mockEncodingService.Object, registryPolicy); + _commitmentsV2ServiceWithTimeout = new CommitmentsV2ServiceWithTimeout(_mockCommitmentsV2Service.Object, registryPolicy); } [Test] public async Task ThenGetApprenticeshipsResponse() { - //Arrange - var apprenticeships = new List { new Apprenticeship { ApprenticeshipStatus = EmployerAccounts.Models.CommitmentsV2.ApprenticeshipStatus.Approved, FirstName ="FirstName" , LastName = "LastName" } }; - - _mockMapper - .Setup(m => m.Map - (It.IsAny>(), - It.IsAny, IEnumerable>>>())) - .Returns(apprenticeships); - //Act - var result =await _commitmentsV2ServiceWithTimeout.GetApprenticeships(_accountId); + var result = await _commitmentsV2ServiceWithTimeout.GetApprenticeships(_accountId); //Assert Assert.IsNotNull(result); @@ -73,18 +71,6 @@ public async Task ThenGetApprenticeshipsResponse() [Test] public async Task ThenGetCohortsResponse() { - //Arrange - _mockEncodingService.Setup(x => x.Encode(It.IsAny(), EncodingType.CohortReference)).Returns((long y, EncodingType z) => y + "_Encoded"); - - var cohorts = new List() - { - new Cohort { Id = 1 } - }; - - _mockMapper.Setup(m => m.Map, IEnumerable>(It.IsAny(), - It.IsAny, IEnumerable>>>())) - .Returns(cohorts); - //Act var result = await _commitmentsV2ServiceWithTimeout.GetCohorts(_accountId); @@ -96,21 +82,44 @@ public async Task ThenGetCohortsResponse() [Test] public async Task ThenGetDraftApprenticeshipsResponse() { - //Arrange - var apprenticeships = new List { new Apprenticeship { FirstName = "FirstName", LastName = "LastName" } }; - _mockMapper.Setup(m => m.Map, IEnumerable>(It.IsAny>(), - It.IsAny, IEnumerable>>>())) - .Returns(apprenticeships); - - //Act - var result = await _commitmentsV2ServiceWithTimeout.GetDraftApprenticeships(new Cohort {Id = 123}); + var result = await _commitmentsV2ServiceWithTimeout.GetDraftApprenticeships(_cohort); //Assert Assert.IsNotNull(result); Assert.IsTrue(result.Count().Equals(1)); } + [Test] + public async Task ThenGetApprenticeshipsResponseReturnsTheSameApprenticeship() + { + //act + var apprenticeshipsResult = await _commitmentsV2ServiceWithTimeout.GetApprenticeships(_accountId); + + // assert + Assert.AreSame(apprenticeshipsResult, _apprenticeships); + } + + [Test] + public async Task ThenGetCohortsResponseReturnsTheSameCohorts() + { + //act + var cohortsResult = await _commitmentsV2ServiceWithTimeout.GetCohorts(_accountId); + + // assert + Assert.AreSame(cohortsResult, _cohorts); + } + + [Test] + public async Task ThenGetDraftApprenticeshipsResponseReturnsTheSameApprenticeship() + { + //act + var apprenticeshipsResult = await _commitmentsV2ServiceWithTimeout.GetDraftApprenticeships(_cohort); + + // assert + Assert.AreSame(apprenticeshipsResult, _apprenticeships); + } + [Test] public async Task ThenGetApprenticeshipsIsCalled() { @@ -118,7 +127,7 @@ public async Task ThenGetApprenticeshipsIsCalled() await _commitmentsV2ServiceWithTimeout.GetApprenticeships(_accountId); // assert - _mockCommitmentsApiClient.Verify(rs => rs.GetApprenticeships(It.Is(r => r.AccountId == _accountId), CancellationToken.None), Times.Once()); + _mockCommitmentsV2Service.Verify(rs => rs.GetApprenticeships(_accountId), Times.Once()); } [Test] @@ -128,17 +137,17 @@ public async Task ThenTheGetCohortsIsCalled() await _commitmentsV2ServiceWithTimeout.GetCohorts(_accountId); // assert - _mockCommitmentsApiClient.Verify(rs => rs.GetCohorts(It.Is(r => r.AccountId == _accountId), CancellationToken.None), Times.AtLeastOnce); + _mockCommitmentsV2Service.Verify(rs => rs.GetCohorts(_accountId), Times.Once); } [Test] public async Task ThenTheGetDraftApprenticeshipsIsCalled() { //act - await _commitmentsV2ServiceWithTimeout.GetDraftApprenticeships(new Cohort { Id = 123 }); + await _commitmentsV2ServiceWithTimeout.GetDraftApprenticeships(_cohort); // assert - _mockCommitmentsApiClient.Verify(rs => rs.GetDraftApprenticeships(It.IsAny(),CancellationToken.None), Times.AtLeastOnce); + _mockCommitmentsV2Service.Verify(rs => rs.GetDraftApprenticeships(_cohort), Times.Once); } [Test] @@ -151,7 +160,8 @@ public async Task ThenThrowTimeoutException_GetApprenticeships() try { - _mockCommitmentsApiClient.Setup(p => p.GetApprenticeships(It.Is(r => r.AccountId == _accountId), CancellationToken.None)) + _mockCommitmentsV2Service + .Setup(c => c.GetApprenticeships(_accountId)) .Throws(); await _commitmentsV2ServiceWithTimeout.GetApprenticeships(_accountId); } @@ -175,7 +185,8 @@ public async Task ThenThrowTimeoutException_GetCohorts() try { - _mockCommitmentsApiClient.Setup(p => p.GetCohorts(It.Is(r => r.AccountId == _accountId), CancellationToken.None)) + _mockCommitmentsV2Service + .Setup(c => c.GetCohorts(_accountId)) .Throws(); await _commitmentsV2ServiceWithTimeout.GetCohorts(_accountId); } @@ -199,7 +210,8 @@ public async Task ThenThrowTimeoutException_GetDraftApprenticeships() try { - _mockCommitmentsApiClient.Setup(p => p.GetDraftApprenticeships(It.IsAny(), CancellationToken.None)) + _mockCommitmentsV2Service + .Setup(c => c.GetDraftApprenticeships(It.IsAny())) .Throws(); await _commitmentsV2ServiceWithTimeout.GetDraftApprenticeships(new Cohort { Id = 123 }); } @@ -212,71 +224,5 @@ public async Task ThenThrowTimeoutException_GetDraftApprenticeships() Assert.AreEqual(actualException.InnerException?.Message, innerException); Assert.AreEqual(actualException.Message, message); } - - - private GetApprenticeshipsResponse CreateApprenticeshipResponse() - { - IEnumerable apprenticeships = new List() - { - new GetApprenticeshipsResponse.ApprenticeshipDetailsResponse - { - Id = 1, - FirstName = "FirstName", - LastName = "LastName", - Uln = "Uln", - EmployerName = "EmployerName", - CourseName = "CourseName", - StartDate = new DateTime(2020, 5, 1), - EndDate = new DateTime(2022, 5, 1), - ApprenticeshipStatus = CommitmentsV2.Types.ApprenticeshipStatus.Live, - ProviderName = "ProviderName" - } - }; - - return new GetApprenticeshipsResponse() { Apprenticeships = apprenticeships, TotalApprenticeships = 1, TotalApprenticeshipsFound = 1, TotalApprenticeshipsWithAlertsFound = 0 }; - } - - - private GetCohortsResponse GetCohortsResponseForWithTrainingProviderStaus() - { - IEnumerable cohorts = new List() - { - new CohortSummary - { - CohortId = 4, - AccountId = 1, - ProviderId = 4, - ProviderName = "Provider4", - NumberOfDraftApprentices = 1, - IsDraft = false, - WithParty = Party.Provider, - CreatedOn = DateTime.Now - }, - }; - - return new GetCohortsResponse(cohorts); - } - - private GetDraftApprenticeshipsResponse GetDraftApprenticeshipsResponse() - { - IReadOnlyCollection draftApprenticeships = new List() - { - new DraftApprenticeshipDto - { - Id = 1, - FirstName = "FirstName", - LastName = "LastName", - DateOfBirth = new DateTime(2000, 1 ,1 ), - Cost = 100, - StartDate = new DateTime(2020, 5, 1), - EndDate = new DateTime(2022, 5, 1), - CourseCode = "CourseCode", - CourseName = "CourseName" - } - }; - - var draftApprenticeshipsResponse = new GetDraftApprenticeshipsResponse() { DraftApprenticeships = draftApprenticeships }; - return draftApprenticeshipsResponse; - } } } diff --git a/src/SFA.DAS.EmployerAccounts.UnitTests/Services/Recruit/WhenIGetVacanciesWithTimeout.cs b/src/SFA.DAS.EmployerAccounts.UnitTests/Services/Recruit/WhenIGetVacanciesWithTimeout.cs index ec5c587da0..015c6c641f 100644 --- a/src/SFA.DAS.EmployerAccounts.UnitTests/Services/Recruit/WhenIGetVacanciesWithTimeout.cs +++ b/src/SFA.DAS.EmployerAccounts.UnitTests/Services/Recruit/WhenIGetVacanciesWithTimeout.cs @@ -1,15 +1,11 @@ using System; using System.Collections.Generic; using System.Threading.Tasks; -using AutoMapper; using Moq; -using Newtonsoft.Json; using NUnit.Framework; using Polly; using Polly.Registry; using Polly.Timeout; -using SFA.DAS.EmployerAccounts.Configuration; -using SFA.DAS.EmployerAccounts.Dtos; using SFA.DAS.EmployerAccounts.Interfaces; using SFA.DAS.EmployerAccounts.Models.Recruit; using SFA.DAS.EmployerAccounts.Services; @@ -17,88 +13,62 @@ namespace SFA.DAS.EmployerAccounts.UnitTests.Services.Recruit { public class WhenIGetVacanciesWithTimeout - { - private Mock _mockHttpService; - private Mock _mockHttpServiceFactory; - private EmployerAccountsConfiguration _employerAccountsConfiguration; - private Mock _mockMapper; + { + private Mock _mockRecruitService; private IAsyncPolicy _policy; private string _hashedAccountId; - private string _apiBaseUrl; - private string _clientId; - private string _clientSecret; - private string _identifierUri; - private string _tenent; - private string _serviceJson; - private List _vacancies; private RecruitServiceWithTimeout _recruitServiceWithTimeout; - + private IEnumerable _vacancies = new List() + { + new Vacancy() + { + Title = "Vacancy 1", + }, + new Vacancy() + { + Title = "Vacancy 2" + } + }; + [SetUp] public void Arrange() { _hashedAccountId = Guid.NewGuid().ToString(); - _apiBaseUrl = $"http://{Guid.NewGuid().ToString()}"; - _clientId = Guid.NewGuid().ToString(); - _clientSecret = Guid.NewGuid().ToString(); - _identifierUri = Guid.NewGuid().ToString(); - _tenent = Guid.NewGuid().ToString(); - _vacancies = new List { new VacancySummary()}; - _serviceJson = JsonConvert.SerializeObject(new VacanciesSummary { Vacancies = _vacancies }); - - _mockHttpService = new Mock(); - _mockHttpServiceFactory = new Mock(); - _employerAccountsConfiguration = new EmployerAccountsConfiguration - { - RecruitApi = new RecruitClientApiConfiguration - { - ApiBaseUrl = _apiBaseUrl, - ClientId = _clientId, - ClientSecret = _clientSecret, - IdentifierUri = _identifierUri, - Tenant = _tenent - } - }; - _mockMapper = new Mock(); - - _mockHttpService - .Setup(m => m.GetAsync(It.IsAny(), It.IsAny())) - .ReturnsAsync(_serviceJson); - - _mockHttpServiceFactory - .Setup(m => m.Create(_clientId, _clientSecret, _identifierUri, _tenent)) - .Returns(_mockHttpService.Object); - - _mockMapper - .Setup(m => m.Map, IEnumerable>(It.IsAny>())) - .Returns(new List()); + _mockRecruitService = new Mock(); + _mockRecruitService.Setup(rs => rs.GetVacancies(_hashedAccountId, int.MaxValue)) + .ReturnsAsync(_vacancies); + _policy = Policy.NoOpAsync(); var registryPolicy = new PolicyRegistry(); registryPolicy.Add(Constants.DefaultServiceTimeout, _policy); - _recruitServiceWithTimeout = new RecruitServiceWithTimeout(_mockHttpServiceFactory.Object, - _employerAccountsConfiguration, - _mockMapper.Object, registryPolicy); + _recruitServiceWithTimeout = new RecruitServiceWithTimeout(_mockRecruitService.Object, registryPolicy); } [Test] public async Task ThenTheRecruitServiceIsCalled() { - //arrange - var expectedUrl = $"{_apiBaseUrl}/api/vacancies?employerAccountId={_hashedAccountId}&pageSize={int.MaxValue}"; + //act + await _recruitServiceWithTimeout.GetVacancies(_hashedAccountId); + // assert + _mockRecruitService.Verify(x => x.GetVacancies(_hashedAccountId,int.MaxValue), Times.Once); + } + + [Test] + public async Task ThenTheRecruitServiceReturnsTheSameReservation() + { //act - await _recruitServiceWithTimeout.GetVacancies(_hashedAccountId); + var recruitsResult = await _recruitServiceWithTimeout.GetVacancies(_hashedAccountId); // assert - _mockHttpService.Verify(x => x.GetAsync(expectedUrl,false), Times.Once); + Assert.AreSame(recruitsResult, _vacancies); } [Test] public async Task ThenThrowTimeoutException() { - var expectedUrl = $"{_apiBaseUrl}/api/vacancies?employerAccountId={_hashedAccountId}&pageSize={int.MaxValue}"; - var innerException = "Exception of type 'Polly.Timeout.TimeoutRejectedException' was thrown."; var message = "Call to Recruit Service timed out"; Exception actualException = null; @@ -106,7 +76,7 @@ public async Task ThenThrowTimeoutException() try { - _mockHttpService.Setup(p => p.GetAsync(expectedUrl, false)) + _mockRecruitService.Setup(p => p.GetVacancies(_hashedAccountId, int.MaxValue)) .Throws(); await _recruitServiceWithTimeout.GetVacancies(_hashedAccountId); } diff --git a/src/SFA.DAS.EmployerAccounts/Services/CommitmentsV2ServiceWithTimeout.cs b/src/SFA.DAS.EmployerAccounts/Services/CommitmentsV2ServiceWithTimeout.cs index 8a455fd294..bebb9ab465 100644 --- a/src/SFA.DAS.EmployerAccounts/Services/CommitmentsV2ServiceWithTimeout.cs +++ b/src/SFA.DAS.EmployerAccounts/Services/CommitmentsV2ServiceWithTimeout.cs @@ -1,13 +1,6 @@ -using AutoMapper; -using SFA.DAS.CommitmentsV2.Api.Client; -using SFA.DAS.CommitmentsV2.Api.Types.Responses; -using SFA.DAS.CommitmentsV2.Types; -using SFA.DAS.CommitmentsV2.Types.Dtos; -using SFA.DAS.EmployerAccounts.Interfaces; +using SFA.DAS.EmployerAccounts.Interfaces; using SFA.DAS.EmployerAccounts.Models.CommitmentsV2; -using SFA.DAS.Encoding; using System.Collections.Generic; -using System.Linq; using System.Threading.Tasks; using Polly; using Polly.Registry; @@ -18,18 +11,13 @@ namespace SFA.DAS.EmployerAccounts.Services { public class CommitmentsV2ServiceWithTimeout : ICommitmentV2Service { - private readonly ICommitmentsApiClient _commitmentsApiClient; - private readonly IMapper _mapper; - private readonly IEncodingService _encodingService; + private readonly ICommitmentV2Service _commitmentsV2Service; private readonly IAsyncPolicy _pollyPolicy; - public CommitmentsV2ServiceWithTimeout(ICommitmentsApiClient commitmentsApiClient, IMapper mapper, - IEncodingService encodingService, + public CommitmentsV2ServiceWithTimeout(ICommitmentV2Service commitmentsV2Service, IReadOnlyPolicyRegistry pollyRegistry) { - _commitmentsApiClient = commitmentsApiClient; - _mapper = mapper; - _encodingService = encodingService; + _commitmentsV2Service = commitmentsV2Service; _pollyPolicy = pollyRegistry.Get(Constants.DefaultServiceTimeout); } @@ -37,20 +25,7 @@ public async Task> GetDraftApprenticeships(Cohort co { try { - var draftApprenticeshipsResponse = await _pollyPolicy.ExecuteAsync(() => _commitmentsApiClient.GetDraftApprenticeships(cohort.Id)); - return _mapper.Map, IEnumerable>(draftApprenticeshipsResponse.DraftApprenticeships, - opt => - { - opt.AfterMap((src, dest) => - { - dest.ToList().ForEach(c => - { - c.SetHashId(_encodingService); - c.SetCohort(cohort); - c.SetTrainingProvider(cohort.TrainingProvider.First()); - }); - }); - }); + return await _pollyPolicy.ExecuteAsync(() => _commitmentsV2Service.GetDraftApprenticeships(cohort)); } catch (TimeoutRejectedException ex) { @@ -62,21 +37,7 @@ public async Task> GetCohorts(long? accountId) { try { - var cohortSummary = await _pollyPolicy.ExecuteAsync(() => _commitmentsApiClient.GetCohorts(new CommitmentsV2.Api.Types.Requests.GetCohortsRequest { AccountId = accountId })); - var trainingProvider = _mapper.Map, IEnumerable>(cohortSummary.Cohorts); - - return _mapper.Map, IEnumerable>(cohortSummary.Cohorts, - opt => - { - opt.AfterMap((src, dest) => - { - dest.ToList().ForEach(c => - { - c.SetHashId(_encodingService); - c.SetTrainingProvider(trainingProvider); - }); - }); - }); + return await _pollyPolicy.ExecuteAsync(() => _commitmentsV2Service.GetCohorts(accountId)); } catch (TimeoutRejectedException ex) { @@ -88,21 +49,7 @@ public async Task> GetApprenticeships(long accountId { try { - var apprenticeship = await _pollyPolicy.ExecuteAsync(() => _commitmentsApiClient.GetApprenticeships(new CommitmentsV2.Api.Types.Requests.GetApprenticeshipsRequest { AccountId = accountId })); - var trainingProvider = _mapper.Map, IEnumerable>(apprenticeship.Apprenticeships); - - return _mapper.Map, IEnumerable>(apprenticeship.Apprenticeships, - opt => - { - opt.AfterMap((src, dest) => - { - dest.ToList().ForEach(c => - { - c.SetHashId(_encodingService); - c.SetTrainingProvider(trainingProvider.First()); - }); - }); - }); + return await _pollyPolicy.ExecuteAsync(() => _commitmentsV2Service.GetApprenticeships(accountId)); } catch (TimeoutRejectedException ex) { diff --git a/src/SFA.DAS.EmployerAccounts/Services/RecruitServiceWithTimeout.cs b/src/SFA.DAS.EmployerAccounts/Services/RecruitServiceWithTimeout.cs index 08d26b301d..91a72bd94f 100644 --- a/src/SFA.DAS.EmployerAccounts/Services/RecruitServiceWithTimeout.cs +++ b/src/SFA.DAS.EmployerAccounts/Services/RecruitServiceWithTimeout.cs @@ -1,9 +1,5 @@ -using AutoMapper; -using Newtonsoft.Json; -using SFA.DAS.EmployerAccounts.Configuration; -using SFA.DAS.EmployerAccounts.Interfaces; +using SFA.DAS.EmployerAccounts.Interfaces; using SFA.DAS.EmployerAccounts.Models.Recruit; -using SFA.DAS.EmployerAccounts.Dtos; using System.Collections.Generic; using System.Threading.Tasks; using Polly; @@ -15,24 +11,13 @@ namespace SFA.DAS.EmployerAccounts.Services { public class RecruitServiceWithTimeout : IRecruitService { - private readonly EmployerAccountsConfiguration _configuration; - private readonly IHttpService _httpService; - private readonly IMapper _mapper; + private readonly IRecruitService _recruitService; private readonly IAsyncPolicy _pollyPolicy; public RecruitServiceWithTimeout( - IHttpServiceFactory httpServiceFactory, - EmployerAccountsConfiguration configuration, - IMapper mapper, IReadOnlyPolicyRegistry pollyRegistry) + IRecruitService recruitService, IReadOnlyPolicyRegistry pollyRegistry) { - _configuration = configuration; - _httpService = httpServiceFactory.Create( - configuration.RecruitApi.ClientId, - configuration.RecruitApi.ClientSecret, - configuration.RecruitApi.IdentifierUri, - configuration.RecruitApi.Tenant - ); - _mapper = mapper; + _recruitService = recruitService; _pollyPolicy = pollyRegistry.Get(Constants.DefaultServiceTimeout); } @@ -40,32 +25,12 @@ public async Task> GetVacancies(string hashedAccountId, int { try { - var baseUrl = GetBaseUrl(); - var url = $"{baseUrl}api/vacancies?employerAccountId={hashedAccountId}&pageSize={maxVacanciesToGet}"; - - var json = await _pollyPolicy.ExecuteAsync(() => _httpService.GetAsync(url, false)); - - if (json == null) - { - return new List(); - } - - var vacanciesSummary = JsonConvert.DeserializeObject(json); - return _mapper.Map, IEnumerable>(vacanciesSummary.Vacancies); + return await _pollyPolicy.ExecuteAsync(() => _recruitService.GetVacancies(hashedAccountId)); } catch (TimeoutRejectedException ex) { throw new ServiceTimeoutException("Call to Recruit Service timed out", ex); } } - - private string GetBaseUrl() - { - var baseUrl = _configuration.RecruitApi.ApiBaseUrl.EndsWith("/") - ? _configuration.RecruitApi.ApiBaseUrl - : _configuration.RecruitApi.ApiBaseUrl + "/"; - - return baseUrl; - } } } From 72f0fe9c05a94be018fc5b9a09a5d911f1f85c15 Mon Sep 17 00:00:00 2001 From: Shoma Gujjar Date: Mon, 20 Apr 2020 15:04:00 +0100 Subject: [PATCH 32/35] CON-1640-fix code review comments --- .../Configuration/EmployerAccountsConfiguration.cs | 2 +- .../DependencyResolution/PollyPolicyRegistry.cs | 2 +- .../Services/RecruitServiceWithTimeout.cs | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/SFA.DAS.EmployerAccounts/Configuration/EmployerAccountsConfiguration.cs b/src/SFA.DAS.EmployerAccounts/Configuration/EmployerAccountsConfiguration.cs index d735c9610b..8dc1545c95 100644 --- a/src/SFA.DAS.EmployerAccounts/Configuration/EmployerAccountsConfiguration.cs +++ b/src/SFA.DAS.EmployerAccounts/Configuration/EmployerAccountsConfiguration.cs @@ -48,6 +48,6 @@ public class EmployerAccountsConfiguration : ITopicMessagePublisherConfiguration public string ZenDeskCobrowsingSnippetKey { get; set; } public CommitmentsApiV2ClientConfiguration CommitmentsApi { get; set; } public RecruitClientApiConfiguration RecruitApi { get; set; } - public int AddApprenticeCallToActionTimeout { get; set; } + public int DefaultServiceTimeout { get; set; } } } \ No newline at end of file diff --git a/src/SFA.DAS.EmployerAccounts/DependencyResolution/PollyPolicyRegistry.cs b/src/SFA.DAS.EmployerAccounts/DependencyResolution/PollyPolicyRegistry.cs index 1013dc45a1..02f5c50503 100644 --- a/src/SFA.DAS.EmployerAccounts/DependencyResolution/PollyPolicyRegistry.cs +++ b/src/SFA.DAS.EmployerAccounts/DependencyResolution/PollyPolicyRegistry.cs @@ -21,7 +21,7 @@ private PolicyRegistry GetPolicyRegistry(IContext context) var config = context.GetInstance(); var policyRegistry = new PolicyRegistry(); var timeout = Policy - .TimeoutAsync(config.AddApprenticeCallToActionTimeout, TimeoutStrategy.Pessimistic + .TimeoutAsync(config.DefaultServiceTimeout, TimeoutStrategy.Pessimistic , (pollyContext, timeSpan, task) => { logger.Warn($"Error executing command for method {pollyContext.ExecutionKey} " + diff --git a/src/SFA.DAS.EmployerAccounts/Services/RecruitServiceWithTimeout.cs b/src/SFA.DAS.EmployerAccounts/Services/RecruitServiceWithTimeout.cs index 91a72bd94f..5a5db71d03 100644 --- a/src/SFA.DAS.EmployerAccounts/Services/RecruitServiceWithTimeout.cs +++ b/src/SFA.DAS.EmployerAccounts/Services/RecruitServiceWithTimeout.cs @@ -25,7 +25,7 @@ public async Task> GetVacancies(string hashedAccountId, int { try { - return await _pollyPolicy.ExecuteAsync(() => _recruitService.GetVacancies(hashedAccountId)); + return await _pollyPolicy.ExecuteAsync(() => _recruitService.GetVacancies(hashedAccountId, maxVacanciesToGet)); } catch (TimeoutRejectedException ex) { From 960faa68be0286e2b39222f76ddfc2b5a8d8ece2 Mon Sep 17 00:00:00 2001 From: Shoma Gujjar Date: Tue, 21 Apr 2020 09:24:18 +0100 Subject: [PATCH 33/35] CON-1640-using timespan.parse instead of int --- .../Configuration/EmployerAccountsConfiguration.cs | 2 +- .../DependencyResolution/PollyPolicyRegistry.cs | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/SFA.DAS.EmployerAccounts/Configuration/EmployerAccountsConfiguration.cs b/src/SFA.DAS.EmployerAccounts/Configuration/EmployerAccountsConfiguration.cs index 8dc1545c95..cc87007980 100644 --- a/src/SFA.DAS.EmployerAccounts/Configuration/EmployerAccountsConfiguration.cs +++ b/src/SFA.DAS.EmployerAccounts/Configuration/EmployerAccountsConfiguration.cs @@ -48,6 +48,6 @@ public class EmployerAccountsConfiguration : ITopicMessagePublisherConfiguration public string ZenDeskCobrowsingSnippetKey { get; set; } public CommitmentsApiV2ClientConfiguration CommitmentsApi { get; set; } public RecruitClientApiConfiguration RecruitApi { get; set; } - public int DefaultServiceTimeout { get; set; } + public string DefaultServiceTimeout { get; set; } } } \ No newline at end of file diff --git a/src/SFA.DAS.EmployerAccounts/DependencyResolution/PollyPolicyRegistry.cs b/src/SFA.DAS.EmployerAccounts/DependencyResolution/PollyPolicyRegistry.cs index 02f5c50503..1f5cd81ecc 100644 --- a/src/SFA.DAS.EmployerAccounts/DependencyResolution/PollyPolicyRegistry.cs +++ b/src/SFA.DAS.EmployerAccounts/DependencyResolution/PollyPolicyRegistry.cs @@ -1,4 +1,5 @@ -using System.Threading.Tasks; +using System; +using System.Threading.Tasks; using Polly; using Polly.Registry; using Polly.Timeout; @@ -21,7 +22,7 @@ private PolicyRegistry GetPolicyRegistry(IContext context) var config = context.GetInstance(); var policyRegistry = new PolicyRegistry(); var timeout = Policy - .TimeoutAsync(config.DefaultServiceTimeout, TimeoutStrategy.Pessimistic + .TimeoutAsync(TimeSpan.Parse(config.DefaultServiceTimeout), TimeoutStrategy.Pessimistic , (pollyContext, timeSpan, task) => { logger.Warn($"Error executing command for method {pollyContext.ExecutionKey} " + From b388d324e8f5e1cfa30049c1c13acf788df0b4c2 Mon Sep 17 00:00:00 2001 From: Shoma Gujjar Date: Tue, 21 Apr 2020 12:09:56 +0100 Subject: [PATCH 34/35] CON-1640-read as long --- .../Configuration/EmployerAccountsConfiguration.cs | 2 +- .../DependencyResolution/PollyPolicyRegistry.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/SFA.DAS.EmployerAccounts/Configuration/EmployerAccountsConfiguration.cs b/src/SFA.DAS.EmployerAccounts/Configuration/EmployerAccountsConfiguration.cs index cc87007980..678348a243 100644 --- a/src/SFA.DAS.EmployerAccounts/Configuration/EmployerAccountsConfiguration.cs +++ b/src/SFA.DAS.EmployerAccounts/Configuration/EmployerAccountsConfiguration.cs @@ -48,6 +48,6 @@ public class EmployerAccountsConfiguration : ITopicMessagePublisherConfiguration public string ZenDeskCobrowsingSnippetKey { get; set; } public CommitmentsApiV2ClientConfiguration CommitmentsApi { get; set; } public RecruitClientApiConfiguration RecruitApi { get; set; } - public string DefaultServiceTimeout { get; set; } + public long DefaultServiceTimeoutMilliseconds { get; set; } } } \ No newline at end of file diff --git a/src/SFA.DAS.EmployerAccounts/DependencyResolution/PollyPolicyRegistry.cs b/src/SFA.DAS.EmployerAccounts/DependencyResolution/PollyPolicyRegistry.cs index 1f5cd81ecc..df64d2ba0a 100644 --- a/src/SFA.DAS.EmployerAccounts/DependencyResolution/PollyPolicyRegistry.cs +++ b/src/SFA.DAS.EmployerAccounts/DependencyResolution/PollyPolicyRegistry.cs @@ -22,7 +22,7 @@ private PolicyRegistry GetPolicyRegistry(IContext context) var config = context.GetInstance(); var policyRegistry = new PolicyRegistry(); var timeout = Policy - .TimeoutAsync(TimeSpan.Parse(config.DefaultServiceTimeout), TimeoutStrategy.Pessimistic + .TimeoutAsync(TimeSpan.FromMilliseconds(config.DefaultServiceTimeoutMilliseconds), TimeoutStrategy.Pessimistic , (pollyContext, timeSpan, task) => { logger.Warn($"Error executing command for method {pollyContext.ExecutionKey} " + From 5730917580df745b2925d51c318e25f4de8f29c0 Mon Sep 17 00:00:00 2001 From: Paul Howes Date: Wed, 22 Apr 2020 14:09:49 +0100 Subject: [PATCH 35/35] Changes for bug fix --- .../ConfirmRemoveOrganisation.cshtml | 11 ++++------- .../Views/EmployerAgreement/Index.cshtml | 2 +- .../GetAccountEmployerAgreementsQueryHandler.cs | 1 + 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/src/SFA.DAS.EmployerAccounts.Web/Views/EmployerAgreement/ConfirmRemoveOrganisation.cshtml b/src/SFA.DAS.EmployerAccounts.Web/Views/EmployerAgreement/ConfirmRemoveOrganisation.cshtml index 505ac9924e..2d14c14b8f 100644 --- a/src/SFA.DAS.EmployerAccounts.Web/Views/EmployerAgreement/ConfirmRemoveOrganisation.cshtml +++ b/src/SFA.DAS.EmployerAccounts.Web/Views/EmployerAgreement/ConfirmRemoveOrganisation.cshtml @@ -29,6 +29,10 @@ }

    Are you sure you want to remove @Model.Name?

    + @if (Model.HasSignedAgreement) + { +

    This will end @Model.Name’s agreement with ESFA.

    + }
    @Html.AntiForgeryToken() @Html.HiddenFor(m => m.Name) @@ -38,13 +42,6 @@ @Html.HiddenFor(m => m.HashedAccountLegalEntitytId)
    - @if (Model.HasSignedAgreement) - { - -

    This will end @Model.Name’s agreement with ESFA.

    -     - } - @if (!ViewData.ModelState.IsValid) { diff --git a/src/SFA.DAS.EmployerAccounts.Web/Views/EmployerAgreement/Index.cshtml b/src/SFA.DAS.EmployerAccounts.Web/Views/EmployerAgreement/Index.cshtml index 87326032a5..41d918c7e3 100644 --- a/src/SFA.DAS.EmployerAccounts.Web/Views/EmployerAgreement/Index.cshtml +++ b/src/SFA.DAS.EmployerAccounts.Web/Views/EmployerAgreement/Index.cshtml @@ -21,7 +21,7 @@

    Your organisations and agreements

    You must add each organisation that will contract with your training providers.

    -

    You can add as many connected organisations as you need to.

    +

    You can add as many connected organisations as you need to.

    Transfers status:  @{ diff --git a/src/SFA.DAS.EmployerAccounts/Queries/GetAccountEmployerAgreements/GetAccountEmployerAgreementsQueryHandler.cs b/src/SFA.DAS.EmployerAccounts/Queries/GetAccountEmployerAgreements/GetAccountEmployerAgreementsQueryHandler.cs index 8ccfde2a72..162307ace5 100644 --- a/src/SFA.DAS.EmployerAccounts/Queries/GetAccountEmployerAgreements/GetAccountEmployerAgreementsQueryHandler.cs +++ b/src/SFA.DAS.EmployerAccounts/Queries/GetAccountEmployerAgreements/GetAccountEmployerAgreementsQueryHandler.cs @@ -54,6 +54,7 @@ public async Task Handle(GetAccountEmploye var agreements = await _db.Value.AccountLegalEntities .WithSignedOrPendingAgreementsForAccount(accountId) .ProjectTo(_configurationProvider) + .OrderBy(ea => ea.LegalEntity.Name) .ToListAsync(); agreements = agreements.PostFixEmployerAgreementStatusDto(_hashingService, accountId).ToList();