ER-1464_Show legal entity name (#834) +semver: patch

SkillsFundingAgency · Sep 26, 2019 · 7bcf07b · 7bcf07b
1 parent e3a2138
commit 7bcf07b
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 9 deletions.
diff --git a/src/Employer/Employer.Web/Orchestrators/LegalEntityAgreementOrchestrator.cs b/src/Employer/Employer.Web/Orchestrators/LegalEntityAgreementOrchestrator.cs
@@ -4,6 +4,7 @@
 using Esfa.Recruit.Employer.Web.ViewModels.LegalEntityAgreement;
 using Esfa.Recruit.Shared.Web.Services;
 using Esfa.Recruit.Vacancies.Client.Infrastructure.Client;
+using Esfa.Recruit.Vacancies.Client.Infrastructure.QueryStore.Projections.EditVacancyInfo;
 
 namespace Esfa.Recruit.Employer.Web.Orchestrators
 {
@@ -31,13 +32,18 @@ public async Task<LegalEntityAgreementSoftStopViewModel> GetLegalEntityAgreement
                     _client, _vacancyClient, vrm, RouteNames.LegalEntityAgreement_SoftStop_Get);
 
             var legalEntityId = selectedLegalEntityId.HasValue ? selectedLegalEntityId.Value : vacancy.LegalEntityId;
+
+            LegalEntity legalEntity = await
+                _legalEntityAgreementService.GetLegalEntityAsync(vrm.EmployerAccountId, legalEntityId);
+
+            var hasLegalEntityAgreement = await
+                _legalEntityAgreementService.HasLegalEntityAgreementAsync(
+                    vacancy.EmployerAccountId, legalEntity);
 
             return new LegalEntityAgreementSoftStopViewModel
             {                
-                HasLegalEntityAgreement = 
-                    await _legalEntityAgreementService.HasLegalEntityAgreementAsync(
-                        vacancy.EmployerAccountId, legalEntityId),
-                LegalEntityName = vacancy.LegalEntityName,
+                HasLegalEntityAgreement = hasLegalEntityAgreement,
+                LegalEntityName = legalEntity.Name,
                 PageInfo = Utility.GetPartOnePageInfo(vacancy)
             };
         }
@@ -50,7 +56,7 @@ public async Task<LegalEntityAgreementHardStopViewModel> GetLegalEntityAgreement
             return new LegalEntityAgreementHardStopViewModel
             {
                 HasLegalEntityAgreement = await _legalEntityAgreementService.HasLegalEntityAgreementAsync(
-                    vacancy.EmployerAccountId, vacancy.LegalEntityId),
+                    vacancy.EmployerAccountId, vacancy.LegalEntityId)
             };
         }
     }

diff --git a/src/Shared/Recruit.Shared.Web/Services/ILegalEntityAgreementService.cs b/src/Shared/Recruit.Shared.Web/Services/ILegalEntityAgreementService.cs
@@ -1,10 +1,13 @@
 using System.Threading.Tasks;
+using Esfa.Recruit.Vacancies.Client.Infrastructure.QueryStore.Projections.EditVacancyInfo;
 
 
 namespace Esfa.Recruit.Shared.Web.Services
 {
     public interface ILegalEntityAgreementService
     {
         Task<bool> HasLegalEntityAgreementAsync(string employerAccountId, long legalEntityId);
+        Task<LegalEntity> GetLegalEntityAsync(string employerAccountId, long legalEntityId);
+        Task<bool> HasLegalEntityAgreementAsync(string employerAccountId, LegalEntity legalEntity);
     }
 }
diff --git a/src/Shared/Recruit.Shared.Web/Services/LegalEntityAgreementService.cs b/src/Shared/Recruit.Shared.Web/Services/LegalEntityAgreementService.cs
@@ -18,9 +18,14 @@ public async Task<bool> HasLegalEntityAgreementAsync(string employerAccountId, l
         {
             var legalEntity = await GetLegalEntityAsync(employerAccountId, legalEntityId);
 
-            if(legalEntity == null)
+             return await HasLegalEntityAgreementAsync(employerAccountId, legalEntity);
+        }
+
+        public async Task<bool> HasLegalEntityAgreementAsync(string employerAccountId, LegalEntity legalEntity)
+        {
+            if (legalEntity == null)
                 return false;
-            
+
             if (legalEntity.HasLegalEntityAgreement)
                 return true;
 
@@ -35,7 +40,7 @@ public async Task<bool> HasLegalEntityAgreementAsync(string employerAccountId, l
             return hasLegalEntityAgreement;
         }
 
-        private async Task<LegalEntity> GetLegalEntityAsync(string employerAccountId, long legalEntityId)
+        public async Task<LegalEntity> GetLegalEntityAsync(string employerAccountId, long legalEntityId)
         {
             var employerData = await _client.GetEditVacancyInfoAsync(employerAccountId);
 
@@ -44,7 +49,7 @@ private async Task<LegalEntity> GetLegalEntityAsync(string employerAccountId, lo
             return legalEntity;
         }
 
-        private async Task<bool> CheckEmployerServiceForLegalEntityAgreementAsync(string employerAccountId, long legalEntityId)
+       private async Task<bool> CheckEmployerServiceForLegalEntityAgreementAsync(string employerAccountId, long legalEntityId)
         {
             var legalEntities = await _client.GetEmployerLegalEntitiesAsync(employerAccountId);