CON-1654-Resolved PR comments

SkillsFundingAgency · Apr 17, 2020 · 0bc23e7 · 0bc23e7
1 parent 5804ad7
commit 0bc23e7
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 17 deletions.
diff --git a/...yerAccounts.UnitTests/Queries/GetOrganisationAgreements/WhenIGetOrganisationAgreements.cs b/...yerAccounts.UnitTests/Queries/GetOrganisationAgreements/WhenIGetOrganisationAgreements.cs
@@ -39,7 +39,7 @@ 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.GetAccountLegalEntityAgreements(It.IsAny<long>())).ReturnsAsync(new AccountLegalEntity {       
                  LegalEntity = new LegalEntity { Id=1, Source= OrganisationType.CompaniesHouse } , 
                  Agreements = new List<EmployerAgreement>()  { new EmployerAgreement { SignedDate = DateTime.UtcNow, } }});
 
@@ -75,7 +75,7 @@ public override async Task ThenIfTheMessageIsValidTheRepositoryIsCalled()
             await RequestHandler.Handle(Query);
 
             //Assert
-            _mockEmployerAgreementRepository.Verify(x => x.GetOrganisationAgreement(It.IsAny<long>()), Times.Once);
+            _mockEmployerAgreementRepository.Verify(x => x.GetAccountLegalEntityAgreements(It.IsAny<long>()), Times.Once);
         }
 
         [Test]

diff --git a/src/SFA.DAS.EmployerAccounts.Web/Mappings/AgreementMappings.cs b/src/SFA.DAS.EmployerAccounts.Web/Mappings/AgreementMappings.cs
@@ -37,7 +37,7 @@ public AgreementMappings()
                 .ConvertUsing(new AgreementInfoConverter());
 
             CreateMap<EmployerAgreementDto, OrganisationAgreementViewModel>()
-                .ForMember(dest => dest.SignedDateText, opt => opt.MapFrom(src => src.SignedDate.HasValue ? src.SignedDate.Value.ToString("dd MMMM yyyy") : ""))
+                .ForMember(dest => dest.SignedDateText, opt => opt.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
@@ -386,8 +386,7 @@ public virtual async Task<OrchestratorResponse<ICollection<OrganisationAgreement
             {
                 return new OrchestratorResponse<ICollection<OrganisationAgreementViewModel>>
                 {
-                    Status = HttpStatusCode.BadRequest,
-                    Data = new List<OrganisationAgreementViewModel>(),
+                    Status = HttpStatusCode.BadRequest,                    
                     Exception = ex
                 };
             }

diff --git a/src/SFA.DAS.EmployerAccounts.Web/ViewModels/OrganisationAgreementViewModel.cs b/src/SFA.DAS.EmployerAccounts.Web/ViewModels/OrganisationAgreementViewModel.cs
@@ -21,7 +21,7 @@ public class OrganisationAgreementViewModel
         public string HashedAgreementId { get; set; }
 
         public string AccountLegalEntityPublicHashedId => AccountLegalEntity.PublicHashedId;
-        public string SignedDateText { get; set; }
+        public string SignedDateText => SignedDate.HasValue ? SignedDate.Value.ToString("dd MMMM yyyy") : "";
         public string GetAgreementTabListId => $"#v{Template.VersionNumber}-agreement";
         public string GetAgreementTabPanelId => $"#v{Template.VersionNumber}-agreement";        
         public string GetAgreementTabCssClass => Template.VersionNumber == 0 ? "govuk-tabs__list-item" : "govuk-tabs__list-item govuk-tabs__list-item--selected";

diff --git a/src/SFA.DAS.EmployerAccounts.Web/Views/EmployerAgreement/ViewAllAgreements.cshtml b/src/SFA.DAS.EmployerAccounts.Web/Views/EmployerAgreement/ViewAllAgreements.cshtml
@@ -1,19 +1,15 @@
-@{Layout = "~/Views/Shared/_Layout_CDN.cshtml"; }
-@using SFA.DAS.EmployerAccounts.Web.Helpers
+@using SFA.DAS.EmployerAccounts.Web.Helpers
 @model OrchestratorResponse<ICollection<OrganisationAgreementViewModel>>
-@{
+
+@{  
+    Layout = "~/Views/Shared/_Layout_CDN.cshtml";
     ViewBag.PageID = "organisations-agreements-details";
     ViewBag.Title = "ViewAllAgreements";
     ViewBag.Section = "organisations";
     ViewBag.ZenDeskLabel = "eas-your-esfa-agreement";
-}
-
-@{
     ViewBag.GaData.Vpv = "/accounts/agreements/view-your-agreement/agreement-details";
 }
 
-@{Layout = "~/Views/Shared/_Layout_CDN.cshtml"; }
-
 <div class="govuk-grid-row">
         <div class="govuk-grid-column-two-thirds">
 

diff --git a/src/SFA.DAS.EmployerAccounts/Data/EmployerAgreementRepository.cs b/src/SFA.DAS.EmployerAccounts/Data/EmployerAgreementRepository.cs
@@ -170,7 +170,7 @@ public async Task SetAccountLegalEntityAgreementDetails(long accountLegalEntityI
             await _db.Value.SaveChangesAsync();
         }
 
-        public async Task<AccountLegalEntity> GetOrganisationAgreement(long accountLegalEntityId)
+        public async Task<AccountLegalEntity> GetAccountLegalEntityAgreements(long accountLegalEntityId)
         {
             var accountLegalEntity = await _db.Value.AccountLegalEntities
              .Where(ale => ale.Id == accountLegalEntityId

diff --git a/src/SFA.DAS.EmployerAccounts/Data/IEmployerAgreementRepository.cs b/src/SFA.DAS.EmployerAccounts/Data/IEmployerAgreementRepository.cs
@@ -19,6 +19,6 @@ public interface IEmployerAgreementRepository
         Task<IEnumerable<EmployerAgreement>> GetAccountAgreements(long accountId);
         Task<EmployerAgreementStatus?> GetEmployerAgreementStatus(long agreementId);
         Task SetAccountLegalEntityAgreementDetails(long accountLegalEntityId, long? pendingAgreementId, int? pendingAgreementVersion, long? signedAgreementId, int? signedAgreementVersion);
-        Task<AccountLegalEntity> GetOrganisationAgreement(long accountLegalEntityId);
+        Task<AccountLegalEntity> GetAccountLegalEntityAgreements(long accountLegalEntityId);
     }
 }
diff --git a/...ployerAccounts/Queries/GetOrganisationAgreements/GetOrganisationAgreementsQueryHandler.cs b/...ployerAccounts/Queries/GetOrganisationAgreements/GetOrganisationAgreementsQueryHandler.cs
@@ -49,7 +49,7 @@ public async Task<GetOrganisationAgreementsResponse> Handle(GetOrganisationAgree
 
             var accountLegalEntityId = _accountLegalEntityPublicHashingService.DecodeValue(message.AccountLegalEntityHashedId);
 
-            var accountLegalEntity = await _employerAgreementRepository.GetOrganisationAgreement(accountLegalEntityId);
+            var accountLegalEntity = await _employerAgreementRepository.GetAccountLegalEntityAgreements(accountLegalEntityId);
             if (accountLegalEntity == null) return new GetOrganisationAgreementsResponse();
 
             var organisationLookupByIdPossible = await _referenceDataService.IsIdentifiableOrganisationType(accountLegalEntity.LegalEntity.Source);