CON-1654-Users to see version history of accepted agreements

SkillsFundingAgency · Apr 24, 2020 · 64b38f0 · 64b38f0
1 parent 682e109
commit 64b38f0
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/src/SFA.DAS.EmployerAccounts/Dtos/EmployerAgreementDto.cs b/src/SFA.DAS.EmployerAccounts/Dtos/EmployerAgreementDto.cs
@@ -17,6 +17,7 @@ public class EmployerAgreementDto
         public string HashedAgreementId { get; set; }
         public string HashedAccountId { get; set; }
         public string HashedLegalEntityId { get; set; }
-        public bool OrganisationLookupPossible { get; set; }        
+        public bool OrganisationLookupPossible { get; set; }
+        public  int TemplateId { get; set; }
     }
 }
diff --git a/...ployerAccounts/Queries/GetOrganisationAgreements/GetOrganisationAgreementsQueryHandler.cs b/...ployerAccounts/Queries/GetOrganisationAgreements/GetOrganisationAgreementsQueryHandler.cs
@@ -49,7 +49,8 @@ public async Task<GetOrganisationAgreementsResponse> Handle(GetOrganisationAgree
 
             var accountLegalEntityId = _accountLegalEntityPublicHashingService.DecodeValue(message.AccountLegalEntityHashedId);
 
-            var accountLegalEntity = await _employerAgreementRepository.GetOrganisationsAgreements(accountLegalEntityId);
+            var accountLegalEntity = await _employerAgreementRepository.GetOrganisationsAgreements(accountLegalEntityId);            
+
             if (accountLegalEntity == null) return new GetOrganisationAgreementsResponse();
 
             var organisationLookupByIdPossible = await _referenceDataService.IsIdentifiableOrganisationType(accountLegalEntity.LegalEntity.Source);
@@ -69,7 +70,7 @@ public async Task<GetOrganisationAgreementsResponse> Handle(GetOrganisationAgree
                     });
                 });
 
-            return new GetOrganisationAgreementsResponse { Agreements = agreements };
+            return new GetOrganisationAgreementsResponse { Agreements = agreements.OrderByDescending(a => a.TemplateId).ToList() };
         }
     }
 }