CON-1654 - Resolved Comments

SkillsFundingAgency · Apr 9, 2020 · d7bf19c · d7bf19c
1 parent 69d1e90
commit d7bf19c
Show file tree

Hide file tree

Showing 14 changed files with 53 additions and 57 deletions.
diff --git a/...yerAccounts.UnitTests/Queries/GetOrganisationAgreements/WhenIGetOrganisationAgreements.cs b/...yerAccounts.UnitTests/Queries/GetOrganisationAgreements/WhenIGetOrganisationAgreements.cs
@@ -39,17 +39,9 @@ public void Arrange()
             _mockAccountLegalEntityPublicHashingService.Setup(m => m.DecodeValue(It.IsAny<string>())).Returns(_accountLegelEntityId);
 
             _mockEmployerAgreementRepository = new Mock<IEmployerAgreementRepository>();
-            _mockEmployerAgreementRepository.Setup(m => m.GetOrganisationAgreement(It.IsAny<long>())).ReturnsAsync
-                (new AccountLegalEntity {
-
+            _mockEmployerAgreementRepository.Setup(m => m.GetOrganisationAgreement(It.IsAny<long>())).ReturnsAsync(new AccountLegalEntity {       
                  LegalEntity = new LegalEntity { Id=1, Source= OrganisationType.CompaniesHouse } , 
-                 Agreements = new List<EmployerAgreement>()                 
-                    { new EmployerAgreement 
-                        { 
-                            SignedDate = DateTime.UtcNow,
-                        } 
-
-                    } });
+                 Agreements = new List<EmployerAgreement>()  { new EmployerAgreement { SignedDate = DateTime.UtcNow, } }});
 
             _mockhashingService = new Mock<IHashingService>();
             _mockhashingService.Setup(m => m.HashValue(It.IsAny<long>())).Returns(hashedId);

diff --git a/...S.EmployerAccounts.UnitTests/Queries/GetOrganisationAgreements/WhenIValidateTheRequest.cs b/...S.EmployerAccounts.UnitTests/Queries/GetOrganisationAgreements/WhenIValidateTheRequest.cs
@@ -25,13 +25,24 @@ public async Task ThenShouldReturnValidIfRequestIsValid()
         }
 
         [Test]
-        public async Task ThenShouldReturnInValidIfRequestIsNotValid()
+        public async Task ThenShouldReturnInvaldidIfAccountLegalEntityHashedIdIsEmpty()
         {
             //Act
             var result = await _validator.ValidateAsync(new GetOrganisationAgreementsRequest { AccountLegalEntityHashedId = string.Empty });
 
             //Assert
             Assert.IsFalse(result.IsValid());
         }
+
+
+        [Test]
+        public async Task ThenShouldReturnInvaldidIfAccountLegalEntityHashedIdIsNull()
+        {
+            //Act
+            var result = await _validator.ValidateAsync(new GetOrganisationAgreementsRequest { AccountLegalEntityHashedId = null });
+
+            //Assert
+            Assert.IsFalse(result.IsValid());
+        }
     }
 }
diff --git a/...tTests/Orchestrators/EmployerAgreementOrchestratorTests/WhenIGetOrganisationAgreements.cs b/...tTests/Orchestrators/EmployerAgreementOrchestratorTests/WhenIGetOrganisationAgreements.cs
@@ -39,18 +39,18 @@ public void Arrange()
                     }
                 });             
 
-            var EmployerAgreementViewModelV1 = new List<EmployerAgreementViewModelV1>()
+            var organisationAgreementViewModel = new List<OrganisationAgreementViewModel>()
             {
-                new EmployerAgreementViewModelV1 { SignedDate = DateTime.UtcNow }
+                new OrganisationAgreementViewModel { SignedDate = DateTime.UtcNow }
             };
 
             _referenceDataService = new Mock<IReferenceDataService>();
-            _mapper.Setup(m => m.Map<ICollection<EmployerAgreementDto>, ICollection<EmployerAgreementViewModelV1>>(It.IsAny<ICollection<EmployerAgreementDto>>())).Returns(EmployerAgreementViewModelV1);
+            _mapper.Setup(m => m.Map<ICollection<EmployerAgreementDto>, ICollection<OrganisationAgreementViewModel>>(It.IsAny<ICollection<EmployerAgreementDto>>())).Returns(organisationAgreementViewModel);
             _orchestrator = new EmployerAgreementOrchestrator(_mediator.Object, _mapper.Object, _referenceDataService.Object);
         }
 
         [Test]
-        public async Task ThenTheMediatorIsCalledWithAccountLegalEntityId()
+        public async Task ThenTheRequestForAllOrganisationAgreementsIsMadeForAccountLegalEntity()
         {
 
             //Act
@@ -88,7 +88,7 @@ public async Task ThenIfAUnauthroizedAccessExceptionIsThrownThenTheOrchestratorR
         }
 
         [Test]
-        public async Task ThenTheValuesAreReturnedInTheResponseFromTheMediatorCall()
+        public async Task ThenTheValuesAreReturnedInTheResponseFromTheRequestForAllOrganisationAgreementsIsMadeForAccountLegalEntity()
         {
             //Act
             var actual = await _orchestrator.GetOrganisationAgreements(AccountLegalEntityHashedId);

diff --git a/src/SFA.DAS.EmployerAccounts.Web/Helpers/HtmlHelperExtensions.cs b/src/SFA.DAS.EmployerAccounts.Web/Helpers/HtmlHelperExtensions.cs
@@ -129,23 +129,13 @@ public static string GetClaimsHashedAccountId(this HtmlHelper htmlHelper)
 
         public static string GetAgreementHistoryTabTitle(this HtmlHelper htmlHelper , int versionNumber)
         {
-            if (versionNumber == 1) return "Published 9 January 2020";
+            if (versionNumber == 3) return "Published 9 January 2020";
             if (versionNumber == 2) return "Published 1 May 2018";
-            if (versionNumber == 3) return "Published 1 May 2017";
+            if (versionNumber == 1) return "Published 1 May 2017";
 
             return string.Empty;
         }
 
-        public static string GetAgreementTabListId(this HtmlHelper htmlHelper, int versionNumber)
-        {
-            return $"#v{versionNumber}-agreement";
-        }
-
-        public static string GetAgreementTabPanelId(this HtmlHelper htmlHelper, int versionNumber)
-        {
-            return $"v{versionNumber}-agreement";
-        }
-
         public static bool ViewExists(this HtmlHelper html, string viewName)
         {
             var controllerContext = html.ViewContext.Controller.ControllerContext;

diff --git a/src/SFA.DAS.EmployerAccounts.Web/Mappings/AgreementMappings.cs b/src/SFA.DAS.EmployerAccounts.Web/Mappings/AgreementMappings.cs
@@ -36,9 +36,11 @@ public AgreementMappings()
             CreateMap<AccountDetailViewModel, AgreementInfoViewModel>()
                 .ConvertUsing(new AgreementInfoConverter());
 
-            CreateMap<EmployerAgreementDto, EmployerAgreementViewModelV1>()
+            CreateMap<EmployerAgreementDto, OrganisationAgreementViewModel>()
                 .ForMember(dest => dest.SignedDateText, opt => opt.MapFrom(src => src.SignedDate.HasValue ? src.SignedDate.Value.ToString("dd MMMM yyyy") : ""))
-                .ForMember(dest => dest.AccountLegalEntityPublicHashedId, opts => opts.Ignore());
+                .ForMember(dest => dest.AccountLegalEntityPublicHashedId, opts => opts.Ignore())
+                .ForMember(dest => dest.GetAgreementTabListId, opts => opts.Ignore())
+                .ForMember(dest => dest.GetAgreementTabPanelId, opts => opts.Ignore());
         }
     }
 }
diff --git a/src/SFA.DAS.EmployerAccounts.Web/Orchestrators/EmployerAgreementOrchestrator.cs b/src/SFA.DAS.EmployerAccounts.Web/Orchestrators/EmployerAgreementOrchestrator.cs
@@ -369,9 +369,9 @@ public virtual async Task<OrchestratorResponse<ConfirmLegalAgreementToRemoveView
             return response;
         }
 
-        public virtual async Task<OrchestratorResponse<ICollection<EmployerAgreementViewModelV1>>> GetOrganisationAgreements(string accountLegalEntityHashedId)
+        public virtual async Task<OrchestratorResponse<ICollection<OrganisationAgreementViewModel>>> GetOrganisationAgreements(string accountLegalEntityHashedId)
         {
-            var response = new OrchestratorResponse<ICollection<EmployerAgreementViewModelV1>>();
+            var response = new OrchestratorResponse<ICollection<OrganisationAgreementViewModel>>();
 
             try
             {
@@ -380,20 +380,20 @@ public virtual async Task<OrchestratorResponse<ICollection<EmployerAgreementView
                     AccountLegalEntityHashedId = accountLegalEntityHashedId
                 });
 
-                response.Data = _mapper.Map<ICollection<EmployerAgreementDto>, ICollection<EmployerAgreementViewModelV1>>(result.Agreements);
+                response.Data = _mapper.Map<ICollection<EmployerAgreementDto>, ICollection<OrganisationAgreementViewModel>>(result.Agreements);
             }
             catch (InvalidRequestException ex)
             {
-                return new OrchestratorResponse<ICollection<EmployerAgreementViewModelV1>>
+                return new OrchestratorResponse<ICollection<OrganisationAgreementViewModel>>
                 {
                     Status = HttpStatusCode.BadRequest,
-                    Data = new List<EmployerAgreementViewModelV1>(),
+                    Data = new List<OrganisationAgreementViewModel>(),
                     Exception = ex
                 };
             }
             catch (UnauthorizedAccessException)
             {
-                return new OrchestratorResponse<ICollection<EmployerAgreementViewModelV1>>
+                return new OrchestratorResponse<ICollection<OrganisationAgreementViewModel>>
                 {
                     Status = HttpStatusCode.Unauthorized
                 };

diff --git a/src/SFA.DAS.EmployerAccounts.Web/SFA.DAS.EmployerAccounts.Web.csproj b/src/SFA.DAS.EmployerAccounts.Web/SFA.DAS.EmployerAccounts.Web.csproj
@@ -281,7 +281,7 @@
     <Compile Include="ViewModels\CallToActionViewModel.cs" />
     <Compile Include="ViewModels\CohortViewModel.cs" />
     <Compile Include="ViewModels\CreateUserAccountViewModel.cs" />
-    <Compile Include="ViewModels\EmployerAgreementViewModelV1.cs" />
+    <Compile Include="ViewModels\OrganisationAgreementViewModel.cs" />
     <Compile Include="ViewModels\SignEmployerAgreementViewModel.cs" />
     <Compile Include="ViewModels\PensionRegulatorDetailsViewModel.cs" />
     <Compile Include="ViewModels\PanelViewModel.cs" />

diff --git a/...iewModels/EmployerAgreementViewModelV1.cs → ...wModels/OrganisationAgreementViewModel.cs b/...iewModels/EmployerAgreementViewModelV1.cs → ...wModels/OrganisationAgreementViewModel.cs
@@ -3,7 +3,7 @@
 using SFA.DAS.EmployerAccounts.Models.EmployerAgreement;
 namespace SFA.DAS.EmployerAccounts.Web.ViewModels
 {
-    public class EmployerAgreementViewModelV1
+    public class OrganisationAgreementViewModel
     {
         public long Id { get; set; }
         public DateTime? ExpiredDate { get; set; }
@@ -21,7 +21,10 @@ public class EmployerAgreementViewModelV1
         public string HashedAgreementId { get; set; }
 
         public string AccountLegalEntityPublicHashedId => AccountLegalEntity.PublicHashedId;
-
         public string SignedDateText { get; set; }
+        public string GetAgreementTabListId => $"#v{Template.VersionNumber}-agreement";
+        public string GetAgreementTabPanelId => $"#v{Template.VersionNumber}-agreement";
+
+
     }
 }
diff --git a/src/SFA.DAS.EmployerAccounts.Web/Views/EmployerAgreement/ViewAllAgreements.cshtml b/src/SFA.DAS.EmployerAccounts.Web/Views/EmployerAgreement/ViewAllAgreements.cshtml
@@ -1,6 +1,6 @@
 @{Layout = "~/Views/Shared/_Layout_CDN.cshtml"; }
 @using SFA.DAS.EmployerAccounts.Web.Helpers
-@model OrchestratorResponse<ICollection<EmployerAgreementViewModelV1>>
+@model OrchestratorResponse<ICollection<OrganisationAgreementViewModel>>
 @{
     ViewBag.PageID = "organisations-agreements-details";
     ViewBag.Title = "ViewAllAgreements";
@@ -19,15 +19,15 @@
 
     @foreach (var item in Model.Data)
     {
-        <ul class="govuk-tabs__list">
+        <ul class="govuk-tabs__list"> 
             <li class="govuk-tabs__list-item govuk-tabs__list-item--selected">
-                <a class="govuk-tabs__tab" href=@Html.GetAgreementTabListId(@item.Template.VersionNumber)>
+                <a class="govuk-tabs__tab" href=@item.GetAgreementTabListId>
                     @Html.GetAgreementHistoryTabTitle(@item.Template.VersionNumber)
                 </a>
             </li>
         </ul>
 
-        <div class="govuk-tabs__panel" id=@Html.GetAgreementTabPanelId(@item.Template.VersionNumber)>
+        <div class="govuk-tabs__panel" id=@item.GetAgreementTabPanelId>
 
             @if (item.SignedDate != null)
             {

diff --git a/src/SFA.DAS.EmployerAccounts.Web/Views/Shared/_AcceptedAgreement.cshtml b/src/SFA.DAS.EmployerAccounts.Web/Views/Shared/_AcceptedAgreement.cshtml
@@ -1,4 +1,4 @@
-@model SFA.DAS.EmployerAccounts.Web.ViewModels.EmployerAgreementViewModelV1
+@model SFA.DAS.EmployerAccounts.Web.ViewModels.OrganisationAgreementViewModel
 
 
 <p>This agreement allows you to spend funds for <strong> @Model.AccountLegalEntity.Name</strong>.</p>

diff --git a/src/SFA.DAS.EmployerAccounts.Web/Views/Shared/_NotAcceptedAgreement.cshtml b/src/SFA.DAS.EmployerAccounts.Web/Views/Shared/_NotAcceptedAgreement.cshtml
@@ -1,5 +1,5 @@
 
-@model SFA.DAS.EmployerAccounts.Web.ViewModels.EmployerAgreementViewModelV1
+@model SFA.DAS.EmployerAccounts.Web.ViewModels.OrganisationAgreementViewModel
 
 
 <insettext>This is a new agreement.</insettext>

diff --git a/src/SFA.DAS.EmployerAccounts/Data/EmployerAgreementRepository.cs b/src/SFA.DAS.EmployerAccounts/Data/EmployerAgreementRepository.cs
@@ -173,12 +173,15 @@ public async Task SetAccountLegalEntityAgreementDetails(long accountLegalEntityI
         public async Task<AccountLegalEntity> GetOrganisationAgreement(long accountLegalEntityId)
         {
             var accountLegalEntity = await _db.Value.AccountLegalEntities
-                .Include(x => x.LegalEntity)
-                .Include(x => x.Agreements.Select(y => y.Template))
-                .SingleOrDefaultAsync(x => x.Id == accountLegalEntityId);
+             .Where(ale => ale.Id == accountLegalEntityId
+                           && ale.Deleted == null
+                           && ale.Agreements.Any(ea =>
+                               ea.StatusId == EmployerAgreementStatus.Pending ||
+                               ea.StatusId == EmployerAgreementStatus.Signed))
+             .SingleOrDefaultAsync()
+             .ConfigureAwait(false);
 
             return accountLegalEntity;
-
         }
     }
 }
diff --git a/src/SFA.DAS.EmployerAccounts/Models/Account/LegalEntity.cs b/src/SFA.DAS.EmployerAccounts/Models/Account/LegalEntity.cs
@@ -8,10 +8,8 @@ public class LegalEntity
     {
         public virtual long Id { get; set; }
         public virtual string Code { get; set; }
-        public virtual DateTime? DateOfIncorporation { get; set; }
-        //public virtual string Name { get; set; }
-        public virtual byte? PublicSectorDataSource { get; set; }
-        //public virtual string RegisteredAddress { get; set; }
+        public virtual DateTime? DateOfIncorporation { get; set; }        
+        public virtual byte? PublicSectorDataSource { get; set; }        
         public virtual string Sector { get; set; }
         public virtual OrganisationType Source { get; set; }
         public virtual string Status { get; set; }

diff --git a/...S.EmployerAccounts/Queries/GetOrganisationAgreements/GetOrganisationAgreementsResponse.cs b/...S.EmployerAccounts/Queries/GetOrganisationAgreements/GetOrganisationAgreementsResponse.cs
@@ -1,13 +1,10 @@
-using SFA.DAS.EmployerAccounts.Models.EmployerAgreement;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using SFA.DAS.EmployerAccounts.Dtos;
 
 namespace SFA.DAS.EmployerAccounts.Queries.GetOrganisationAgreements
 {
     public class GetOrganisationAgreementsResponse
     {
-        //public OrganisationAgreement OrganisationAgreements { get; set; }
-
         public virtual ICollection<EmployerAgreementDto> Agreements { get; set; } = new List<EmployerAgreementDto>();
     }
 }