CON-997 Renamed property per PR comments

SkillsFundingAgency · Nov 4, 2019 · 119e065 · 119e065
1 parent b1f869b
commit 119e065
Show file tree

Hide file tree

Showing 21 changed files with 24 additions and 26 deletions.
diff --git a/src/Employer/Employer.Web/Mappings/VacancyDisplayViewModelMapper.cs b/src/Employer/Employer.Web/Mappings/VacancyDisplayViewModelMapper.cs
@@ -86,7 +86,7 @@ public async Task MapFromVacancyAsync(DisplayVacancyViewModel vm, Vacancy vacanc
             {
                 vm.TrainingTitle = programme?.Title;
                 vm.TrainingType = programme?.ApprenticeshipType.GetDisplayName();
-                vm.TrainingLevel = programme?.Level.GetDisplayName();
+                vm.TrainingLevel = programme?.ApprenticeshipLevel.GetDisplayName();
             }
 
             if (vacancy.Wage != null)

diff --git a/src/Employer/Employer.Web/Orchestrators/Part1/TrainingOrchestrator.cs b/src/Employer/Employer.Web/Orchestrators/Part1/TrainingOrchestrator.cs
@@ -90,7 +90,7 @@ public async Task<ConfirmTrainingViewModel> GetConfirmTrainingViewModelAsync(Vac
             return new ConfirmTrainingViewModel
             {
                 ProgrammeId = programme.Id,
-                Level = programme.Level,
+                ApprenticeshipLevel = programme.ApprenticeshipLevel,
                 TrainingTitle = programme.Title,
                 DurationMonths = programme.Duration,
                 ProgrammeType = programme.ApprenticeshipType.GetDisplayName(),

diff --git a/src/Employer/Employer.Web/Orchestrators/VacancyPreviewOrchestrator.cs b/src/Employer/Employer.Web/Orchestrators/VacancyPreviewOrchestrator.cs
@@ -65,7 +65,7 @@ public async Task<VacancyPreviewViewModel> GetVacancyPreviewViewModelAsync(Vacan
             vm.SoftValidationErrors = GetSoftValidationErrors(vacancy);
             vm.EducationLevelName = EducationLevelNumberHelper.GetEducationLevelName(programme.EducationLevelNumber);
 
-            if (programme != null) vm.Level = programme.Level;
+            if (programme != null) vm.Level = programme.ApprenticeshipLevel;
 
             if (vacancy.Status == VacancyStatus.Referred)
             {

diff --git a/src/Employer/Employer.Web/ViewModels/Part1/Training/ConfirmTrainingViewModel.cs b/src/Employer/Employer.Web/ViewModels/Part1/Training/ConfirmTrainingViewModel.cs
@@ -6,7 +6,7 @@ namespace Esfa.Recruit.Employer.Web.ViewModels.Part1.Training
     public class ConfirmTrainingViewModel
     {
         public string TrainingTitle { get; set; }
-        public ApprenticeshipLevel Level { get; set; }
+        public ApprenticeshipLevel ApprenticeshipLevel { get; set; }
         public int DurationMonths { get; set; }
         public string ProgrammeType {get; set; }
         public string ProgrammeId { get; set; }

diff --git a/src/Provider/Provider.Web/Mappings/VacancyDisplayViewModelMapper.cs b/src/Provider/Provider.Web/Mappings/VacancyDisplayViewModelMapper.cs
@@ -84,7 +84,7 @@ public async Task MapFromVacancyAsync(DisplayVacancyViewModel vm, Vacancy vacanc
             {
                 vm.TrainingTitle = programme?.Title;
                 vm.TrainingType = programme?.ApprenticeshipType.GetDisplayName();
-                vm.TrainingLevel = programme?.Level.GetDisplayName();
+                vm.TrainingLevel = programme?.ApprenticeshipLevel.GetDisplayName();
             }
 
             if (vacancy.Wage != null)

diff --git a/src/Provider/Provider.Web/Orchestrators/Part1/TrainingOrchestrator.cs b/src/Provider/Provider.Web/Orchestrators/Part1/TrainingOrchestrator.cs
@@ -82,7 +82,7 @@ public async Task<ConfirmTrainingViewModel> GetConfirmTrainingViewModelAsync(Vac
             return new ConfirmTrainingViewModel
             {
                 ProgrammeId = programme.Id,
-                Level = programme.Level,
+                ApprenticeshipLevel = programme.ApprenticeshipLevel,
                 TrainingTitle = programme.Title,
                 DurationMonths = programme.Duration,
                 ProgrammeType = programme.ApprenticeshipType.GetDisplayName(),

diff --git a/src/Provider/Provider.Web/Orchestrators/VacancyPreviewOrchestrator.cs b/src/Provider/Provider.Web/Orchestrators/VacancyPreviewOrchestrator.cs
@@ -64,7 +64,7 @@ public async Task<VacancyPreviewViewModel> GetVacancyPreviewViewModelAsync(Vacan
             vm.CanShowDraftHeader = vacancy.Status == VacancyStatus.Draft;
             vm.SoftValidationErrors = GetSoftValidationErrors(vacancy);
 
-            if (programme != null) vm.Level = programme.Level;
+            if (programme != null) vm.Level = programme.ApprenticeshipLevel;
 
             if (vacancy.Status == VacancyStatus.Referred)
             {

diff --git a/src/Provider/Provider.Web/ViewModels/Part1/Training/ConfirmTrainingViewModel.cs b/src/Provider/Provider.Web/ViewModels/Part1/Training/ConfirmTrainingViewModel.cs
@@ -6,7 +6,7 @@ namespace Esfa.Recruit.Provider.Web.ViewModels.Part1.Training
     public class ConfirmTrainingViewModel
     {
         public string TrainingTitle { get; set; }
-        public ApprenticeshipLevel Level { get; set; }
+        public ApprenticeshipLevel ApprenticeshipLevel { get; set; }
         public string EducationLevelName { get; set; }
         public int DurationMonths { get; set; }
         public string ProgrammeType {get; set; }

diff --git a/src/QA/QA.Web/Mappings/ReviewMapper.cs b/src/QA/QA.Web/Mappings/ReviewMapper.cs
@@ -197,8 +197,8 @@ await Task.WhenAll(
                 vm.VacancyReferenceNumber = $"VAC{vacancy.VacancyReference}";
                 vm.TrainingTitle = programme.Title;
                 vm.TrainingType = programme.ApprenticeshipType.GetDisplayName();
-                vm.TrainingLevel = programme.Level.GetDisplayName();
-                vm.Level = programme.Level;
+                vm.TrainingLevel = programme.ApprenticeshipLevel.GetDisplayName();
+                vm.Level = programme.ApprenticeshipLevel;
                 vm.ExpectedDuration = (vacancy.Wage.DurationUnit.HasValue && vacancy.Wage.Duration.HasValue)
                     ? vacancy.Wage.DurationUnit.Value.GetDisplayName().ToQuantity(vacancy.Wage.Duration.Value)
                     : null;

diff --git a/src/Shared/Recruit.Shared.Web/Extensions/ApprenticeshipProgrammeMapperExtensions.cs b/src/Shared/Recruit.Shared.Web/Extensions/ApprenticeshipProgrammeMapperExtensions.cs
@@ -23,7 +23,7 @@ public static ApprenticeshipProgrammeViewModel ToViewModel(this IApprenticeshipP
             return new ApprenticeshipProgrammeViewModel
             {
                 Id = programme.Id,
-                Name = $"{programme.Title}, Level: {programme.Level}, level {(int)programme.Level} ({programme.ApprenticeshipType.ToString()})"
+                Name = $"{programme.Title}, Level: {programme.ApprenticeshipLevel}, level {(int)programme.ApprenticeshipLevel} ({programme.ApprenticeshipType.ToString()})"
             };
         }
     }

diff --git a/src/Shared/Recruit.Vacancies.Client/Domain/Entities/ApprenticeshipLevelHelper.cs b/src/Shared/Recruit.Vacancies.Client/Domain/Entities/ApprenticeshipLevelHelper.cs
@@ -4,7 +4,6 @@ namespace Esfa.Recruit.Vacancies.Client.Domain.Entities
 {
     public static class ApprenticeshipLevelHelper
     {
-        //TODO: PeteM - TryRemapFromEducationLevel
         public static bool TryRemapFromInt(int value, out ApprenticeshipLevel result)
         {
             switch (value)
@@ -26,7 +25,6 @@ public static bool TryRemapFromInt(int value, out ApprenticeshipLevel result)
             return false;
         }
 
-        //TODO: PeteM - RemapFromEducationLevel
         public static ApprenticeshipLevel RemapFromInt(int value)
         {
             if (TryRemapFromInt(value, out ApprenticeshipLevel result))

diff --git a/src/Shared/Recruit.Vacancies.Client/Domain/Entities/IApprenticeshipProgramme.cs b/src/Shared/Recruit.Vacancies.Client/Domain/Entities/IApprenticeshipProgramme.cs
@@ -9,7 +9,7 @@ public interface IApprenticeshipProgramme
         string Title { get; }
         DateTime? EffectiveFrom { get; }
         DateTime? EffectiveTo { get; }
-        ApprenticeshipLevel Level { get; }
+        ApprenticeshipLevel ApprenticeshipLevel { get; }
         int Duration { get; }
         bool IsActive { get; set; }
         int? EducationLevelNumber { get; set; }

diff --git a/src/Shared/Recruit.Vacancies.Client/Infrastructure/Extensions/VacancyExtensions.cs b/src/Shared/Recruit.Vacancies.Client/Infrastructure/Extensions/VacancyExtensions.cs
@@ -47,7 +47,7 @@ public static T ToVacancyProjectionBase<T>(this Vacancy vacancy, ApprenticeshipP
             projectedVacancy.NumberOfPositions = vacancy.NumberOfPositions.GetValueOrDefault();
             projectedVacancy.OutcomeDescription = vacancy.OutcomeDescription;
             projectedVacancy.ProgrammeId = vacancy.ProgrammeId;
-            projectedVacancy.ProgrammeLevel = programme.Level.ToString();
+            projectedVacancy.ProgrammeLevel = programme.ApprenticeshipLevel.ToString();
             projectedVacancy.ProgrammeType = programme.ApprenticeshipType.ToString();
             projectedVacancy.Qualifications = vacancy.Qualifications.ToProjection();
             projectedVacancy.ShortDescription = vacancy.ShortDescription;

diff --git a/...structure/ReferenceData/ApprenticeshipProgrammes/ApprenticeshipApiCollectionExtensions.cs b/...structure/ReferenceData/ApprenticeshipProgrammes/ApprenticeshipApiCollectionExtensions.cs
@@ -21,7 +21,7 @@ public static IEnumerable<ApprenticeshipProgramme> FilterAndMapToApprenticeshipP
                 IsActive = IsStandardActive(x),
                 EffectiveFrom = x.EffectiveFrom,
                 EffectiveTo = x.EffectiveTo,
-                Level = ApprenticeshipLevelHelper.RemapFromInt(x.Level),
+                ApprenticeshipLevel = ApprenticeshipLevelHelper.RemapFromInt(x.Level),
                 EducationLevelNumber = x.Level,
                 Duration = x.Duration
             });
@@ -40,7 +40,7 @@ public static IEnumerable<ApprenticeshipProgramme> FilterAndMapToApprenticeshipP
                 IsActive = IsFrameworkActive(x),
                 EffectiveFrom = x.EffectiveFrom,
                 EffectiveTo = x.EffectiveTo,
-                Level = ApprenticeshipLevelHelper.RemapFromInt(x.Level),
+                ApprenticeshipLevel = ApprenticeshipLevelHelper.RemapFromInt(x.Level),
                 EducationLevelNumber = x.Level,
                 Duration = x.Duration
             });

diff --git a/...s.Client/Infrastructure/ReferenceData/ApprenticeshipProgrammes/ApprenticeshipProgramme.cs b/...s.Client/Infrastructure/ReferenceData/ApprenticeshipProgrammes/ApprenticeshipProgramme.cs
@@ -15,7 +15,7 @@ public class ApprenticeshipProgramme : IApprenticeshipProgramme
 
         public DateTime? EffectiveTo { get; set; }
 
-        public ApprenticeshipLevel Level { get; set; }
+        public ApprenticeshipLevel ApprenticeshipLevel { get; set; }
 
         public int Duration { get; set; }
 

diff --git a/...ructure/ReferenceData/ApprenticeshipProgrammes/ApprenticeshipProgrammeEqualityComparer.cs b/...ructure/ReferenceData/ApprenticeshipProgrammes/ApprenticeshipProgrammeEqualityComparer.cs
@@ -7,7 +7,7 @@ public class ApprenticeshipProgrammeEqualityComparer : IEqualityComparer<Apprent
         public bool Equals(ApprenticeshipProgramme x, ApprenticeshipProgramme y)
         {
             return x.Id.Equals(y.Id)
-                    && x.Level == y.Level
+                    && x.ApprenticeshipLevel == y.ApprenticeshipLevel
                     && x.ApprenticeshipType == y.ApprenticeshipType;
         }
 

diff --git a/...acancies.Client/Infrastructure/Services/Projections/EmployerDashboardProjectionService.cs b/...acancies.Client/Infrastructure/Services/Projections/EmployerDashboardProjectionService.cs
@@ -87,7 +87,7 @@ private async Task UpdateWithTrainingProgrammeInfo(VacancySummary summary)
                 {
                     summary.TrainingTitle = programme.Title;
                     summary.TrainingType = programme.ApprenticeshipType;
-                    summary.TrainingLevel = programme.Level;
+                    summary.TrainingLevel = programme.ApprenticeshipLevel;
                 }
             }
         }

diff --git a/...acancies.Client/Infrastructure/Services/Projections/ProviderDashboardProjectionService.cs b/...acancies.Client/Infrastructure/Services/Projections/ProviderDashboardProjectionService.cs
@@ -100,7 +100,7 @@ private async Task UpdateWithTrainingProgrammeInfo(VacancySummary summary)
                 {
                     summary.TrainingTitle = programme.Title;
                     summary.TrainingType = programme.ApprenticeshipType;
-                    summary.TrainingLevel = programme.Level;
+                    summary.TrainingLevel = programme.ApprenticeshipLevel;
                 }
             }
         }

diff --git a/.../Vacancies.Client/Application/VacancyValidation/CrossField/TestApprenticeshipProgramme.cs b/.../Vacancies.Client/Application/VacancyValidation/CrossField/TestApprenticeshipProgramme.cs
@@ -15,7 +15,7 @@ public class TestApprenticeshipProgramme : IApprenticeshipProgramme
 
         public DateTime? EffectiveTo { get; set; }
 
-        public ApprenticeshipLevel Level  { get; set; }
+        public ApprenticeshipLevel ApprenticeshipLevel  { get; set; }
 
         public int Duration { get; set; }
 

diff --git a/src/Shared/UnitTests/Vacancies.Client/Infrastructure/Extensions/VacancyExtensionsTests.cs b/src/Shared/UnitTests/Vacancies.Client/Infrastructure/Extensions/VacancyExtensionsTests.cs
@@ -19,7 +19,7 @@ public class VacancyExtensionsTests
         private DateTime _now = DateTime.UtcNow;
         private ApprenticeshipProgramme _programme = new ApprenticeshipProgramme 
         {
-            Level = ApprenticeshipLevel.Advanced,
+            ApprenticeshipLevel = ApprenticeshipLevel.Advanced,
             ApprenticeshipType = TrainingType.Standard,
             EducationLevelNumber = 7
         };
@@ -119,7 +119,7 @@ private  void AssertCommonProperties(Vacancy v, VacancyProjectionBase p)
             p.NumberOfPositions.Should().Be(v.NumberOfPositions.Value);
             p.OutcomeDescription.Should().Be(v.OutcomeDescription);
             p.ProgrammeId.Should().Be(v.ProgrammeId);
-            p.ProgrammeLevel.Should().Be(_programme.Level.ToString());
+            p.ProgrammeLevel.Should().Be(_programme.ApprenticeshipLevel.ToString());
             p.ProgrammeType.Should().Be(_programme.ApprenticeshipType.ToString());
             p.EducationLevelNumber.Should().Be(_programme.EducationLevelNumber);
             p.ShortDescription.Should().Be(v.ShortDescription);

diff --git a/...ure/ReferenceData/ApprenticeshipProgrammes/ApprenticeshipProgrammesUpdaterServiceTests.cs b/...ure/ReferenceData/ApprenticeshipProgrammes/ApprenticeshipProgrammesUpdaterServiceTests.cs
@@ -200,7 +200,7 @@ public async Task WhenApprenticeshipsApiReturnsDuplicateStandards_ThenOnlyDistin
             apprenticeshipProgrammesReferenceData.Data.Count.Should().Be(3);
             apprenticeshipProgrammesReferenceData.Data.Where(ap => ap.ApprenticeshipType == TrainingType.Standard).Count().Should().Be(2);
             firstItem.Id.Equals(secondItem.Id).Should().BeFalse();
-            firstItem.Level.Equals(secondItem.Level).Should().BeFalse();
+            firstItem.ApprenticeshipLevel.Equals(secondItem.ApprenticeshipLevel).Should().BeFalse();
             firstItem.Title.Equals(secondItem.Title).Should().BeFalse();
         }
 
@@ -237,7 +237,7 @@ public async Task WhenApprenticeshipsApiReturnsDuplicateFrameworks_ThenOnlyDisti
             apprenticeshipProgrammesReferenceData.Data.Count().Should().Be(3);
             apprenticeshipProgrammesReferenceData.Data.Where(ap => ap.ApprenticeshipType == TrainingType.Framework).Count().Should().Be(2);
             firstItem.Id.Equals(secondItem.Id).Should().BeFalse();
-            firstItem.Level.Equals(secondItem.Level).Should().BeFalse();
+            firstItem.ApprenticeshipLevel.Equals(secondItem.ApprenticeshipLevel).Should().BeFalse();
             firstItem.Title.Equals(secondItem.Title).Should().BeFalse();
         }