From 8ac7ea4ae2b1fd236bfecda930a3b637b74b171d Mon Sep 17 00:00:00 2001 From: Paul Graham Date: Tue, 10 Feb 2026 15:34:01 +0000 Subject: [PATCH 1/3] updated StandardCode to TrainingCode --- ...earnerRequestToCreateCohortWithDraftApprenticeshipRequest.cs | 2 +- ...raftApprenticeshipRequestFromLearnerSelectedRequestMapper.cs | 2 +- ...raftApprenticeshipRequestFromLearnerSelectedRequestMapper.cs | 2 +- .../OuterApi/Requests/Ilr/GetLearnerSelectedRequest.cs | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/SFA.DAS.ProviderCommitments/SFA.DAS.ProviderCommitments.Web.UnitTests/Mappers/Learners/WhenIMapSelectedLearnerRequestToCreateCohortWithDraftApprenticeshipRequest.cs b/src/SFA.DAS.ProviderCommitments/SFA.DAS.ProviderCommitments.Web.UnitTests/Mappers/Learners/WhenIMapSelectedLearnerRequestToCreateCohortWithDraftApprenticeshipRequest.cs index a9dfee9f7..46339c38f 100644 --- a/src/SFA.DAS.ProviderCommitments/SFA.DAS.ProviderCommitments.Web.UnitTests/Mappers/Learners/WhenIMapSelectedLearnerRequestToCreateCohortWithDraftApprenticeshipRequest.cs +++ b/src/SFA.DAS.ProviderCommitments/SFA.DAS.ProviderCommitments.Web.UnitTests/Mappers/Learners/WhenIMapSelectedLearnerRequestToCreateCohortWithDraftApprenticeshipRequest.cs @@ -107,7 +107,7 @@ private bool ValidateDetails(CreateCohortCacheItem i) i.LearnerDataId == _source.LearnerDataId && i.EndPointAssessmentPrice == _response.EpaoPrice && i.TrainingPrice == _response.TrainingPrice && - i.CourseCode == _response.StandardCode.ToString() && + i.CourseCode == _response.TrainingCode && i.Cost == _response.TrainingPrice + _response.EpaoPrice; } } \ No newline at end of file diff --git a/src/SFA.DAS.ProviderCommitments/SFA.DAS.ProviderCommitments.Web/Mappers/Learners/AddAnotherDraftApprenticeshipRequestFromLearnerSelectedRequestMapper.cs b/src/SFA.DAS.ProviderCommitments/SFA.DAS.ProviderCommitments.Web/Mappers/Learners/AddAnotherDraftApprenticeshipRequestFromLearnerSelectedRequestMapper.cs index d89a06947..8c98c26d5 100644 --- a/src/SFA.DAS.ProviderCommitments/SFA.DAS.ProviderCommitments.Web/Mappers/Learners/AddAnotherDraftApprenticeshipRequestFromLearnerSelectedRequestMapper.cs +++ b/src/SFA.DAS.ProviderCommitments/SFA.DAS.ProviderCommitments.Web/Mappers/Learners/AddAnotherDraftApprenticeshipRequestFromLearnerSelectedRequestMapper.cs @@ -28,7 +28,7 @@ public async Task Map(AddAnotherLearn cacheItem.Uln = learner.Uln.ToString(); cacheItem.EndPointAssessmentPrice = learner.EpaoPrice; cacheItem.TrainingPrice = learner.TrainingPrice; - cacheItem.CourseCode = learner.StandardCode.ToString(); + cacheItem.CourseCode = learner.TrainingCode; cacheItem.Cost = learner.TrainingPrice + cacheItem.EndPointAssessmentPrice; cacheItem.LearnerDataId = source.LearnerDataId; await cacheStorage.SaveToCache(cacheItem.CacheKey, cacheItem, 1); diff --git a/src/SFA.DAS.ProviderCommitments/SFA.DAS.ProviderCommitments.Web/Mappers/Learners/CreateCohortWithDraftApprenticeshipRequestFromLearnerSelectedRequestMapper.cs b/src/SFA.DAS.ProviderCommitments/SFA.DAS.ProviderCommitments.Web/Mappers/Learners/CreateCohortWithDraftApprenticeshipRequestFromLearnerSelectedRequestMapper.cs index e248949e7..23dc2ac06 100644 --- a/src/SFA.DAS.ProviderCommitments/SFA.DAS.ProviderCommitments.Web/Mappers/Learners/CreateCohortWithDraftApprenticeshipRequestFromLearnerSelectedRequestMapper.cs +++ b/src/SFA.DAS.ProviderCommitments/SFA.DAS.ProviderCommitments.Web/Mappers/Learners/CreateCohortWithDraftApprenticeshipRequestFromLearnerSelectedRequestMapper.cs @@ -27,7 +27,7 @@ public async Task Map(Models.Cohort. cacheItem.Uln = learner.Uln.ToString(); cacheItem.EndPointAssessmentPrice = learner.EpaoPrice; cacheItem.TrainingPrice = learner.TrainingPrice; - cacheItem.CourseCode = learner.StandardCode.ToString(); + cacheItem.CourseCode = learner.TrainingCode; cacheItem.Cost = learner.TrainingPrice + learner.EpaoPrice; cacheItem.LearnerDataId = source.LearnerDataId; await cacheStorage.SaveToCache(cacheItem.CacheKey, cacheItem, 1); diff --git a/src/SFA.DAS.ProviderCommitments/SFA.DAS.ProviderCommitments/Infrastructure/OuterApi/Requests/Ilr/GetLearnerSelectedRequest.cs b/src/SFA.DAS.ProviderCommitments/SFA.DAS.ProviderCommitments/Infrastructure/OuterApi/Requests/Ilr/GetLearnerSelectedRequest.cs index bff62de65..70ba1848e 100644 --- a/src/SFA.DAS.ProviderCommitments/SFA.DAS.ProviderCommitments/Infrastructure/OuterApi/Requests/Ilr/GetLearnerSelectedRequest.cs +++ b/src/SFA.DAS.ProviderCommitments/SFA.DAS.ProviderCommitments/Infrastructure/OuterApi/Requests/Ilr/GetLearnerSelectedRequest.cs @@ -19,7 +19,7 @@ public class GetLearnerSelectedResponse public DateTime PlannedEndDate { get; set; } public int EpaoPrice { get; set; } public int TrainingPrice { get; set; } - public int StandardCode { get; set; } + public string TrainingCode { get; set; } public bool IsFlexiJob { get; set; } public int PlannedOTJTrainingHours { get; set; } } From 5aa453120c1d5dc842707932b143c6c925b41561 Mon Sep 17 00:00:00 2001 From: Paul Graham Date: Tue, 28 Apr 2026 09:15:21 +0100 Subject: [PATCH 2/3] use courses type instead os trainingprogramme --- .../Cohort/SelectLearnerRecordViewModelMapperTests.cs | 2 +- .../Learners/SelectLearnerRecordViewModelMapperTests.cs | 2 +- .../Learners/SelectLearnerRecordViewModelMapper.cs | 4 ++-- .../Requests/Ilr/GetLearnerDetailsForProviderRequest.cs | 9 +++++++-- 4 files changed, 11 insertions(+), 6 deletions(-) diff --git a/src/SFA.DAS.ProviderCommitments/SFA.DAS.ProviderCommitments.Web.UnitTests/Mappers/Cohort/SelectLearnerRecordViewModelMapperTests.cs b/src/SFA.DAS.ProviderCommitments/SFA.DAS.ProviderCommitments.Web.UnitTests/Mappers/Cohort/SelectLearnerRecordViewModelMapperTests.cs index 868a62306..d09254078 100644 --- a/src/SFA.DAS.ProviderCommitments/SFA.DAS.ProviderCommitments.Web.UnitTests/Mappers/Cohort/SelectLearnerRecordViewModelMapperTests.cs +++ b/src/SFA.DAS.ProviderCommitments/SFA.DAS.ProviderCommitments.Web.UnitTests/Mappers/Cohort/SelectLearnerRecordViewModelMapperTests.cs @@ -61,7 +61,7 @@ public async Task MapToFilterModelCorrectlyForLearners() foreach (var course in _apiResponse.TrainingCourses) { - result.FilterModel.Courses.First(t => t.Value == course.CourseCode).Text.Should().Be(course.Name); + result.FilterModel.Courses.First(t => t.Value == course.TrainingCode).Text.Should().Be(course.TrainingName); } } diff --git a/src/SFA.DAS.ProviderCommitments/SFA.DAS.ProviderCommitments.Web.UnitTests/Mappers/Learners/SelectLearnerRecordViewModelMapperTests.cs b/src/SFA.DAS.ProviderCommitments/SFA.DAS.ProviderCommitments.Web.UnitTests/Mappers/Learners/SelectLearnerRecordViewModelMapperTests.cs index 30999adc6..f1f74ca9c 100644 --- a/src/SFA.DAS.ProviderCommitments/SFA.DAS.ProviderCommitments.Web.UnitTests/Mappers/Learners/SelectLearnerRecordViewModelMapperTests.cs +++ b/src/SFA.DAS.ProviderCommitments/SFA.DAS.ProviderCommitments.Web.UnitTests/Mappers/Learners/SelectLearnerRecordViewModelMapperTests.cs @@ -72,7 +72,7 @@ public async Task MapToViewModelCorrectly() result.LastIlrSubmittedOn.Should().Be(_apiResponse.LastSubmissionDate); result.FutureMonths.Should().Be(_apiResponse.FutureMonths); result.FilterModel.Courses.Where(c => c.Text != "All").Select(x => x.Text). - Should().BeEquivalentTo(_apiResponse.TrainingCourses.Select(y => y.Name)); + Should().BeEquivalentTo(_apiResponse.TrainingCourses.Select(y => y.TrainingName)); } [Test] diff --git a/src/SFA.DAS.ProviderCommitments/SFA.DAS.ProviderCommitments.Web/Mappers/Learners/SelectLearnerRecordViewModelMapper.cs b/src/SFA.DAS.ProviderCommitments/SFA.DAS.ProviderCommitments.Web/Mappers/Learners/SelectLearnerRecordViewModelMapper.cs index 3e80cda63..f06996b6f 100644 --- a/src/SFA.DAS.ProviderCommitments/SFA.DAS.ProviderCommitments.Web/Mappers/Learners/SelectLearnerRecordViewModelMapper.cs +++ b/src/SFA.DAS.ProviderCommitments/SFA.DAS.ProviderCommitments.Web/Mappers/Learners/SelectLearnerRecordViewModelMapper.cs @@ -45,8 +45,8 @@ public async Task Map(SelectLearnerRecordRequest s .. response.TrainingCourses .Select(m => new SelectListItem { - Text = m.Name, - Value = m.CourseCode + Text = m.TrainingName, + Value = m.TrainingCode })], CourseCode = source.CourseCode, }; diff --git a/src/SFA.DAS.ProviderCommitments/SFA.DAS.ProviderCommitments/Infrastructure/OuterApi/Requests/Ilr/GetLearnerDetailsForProviderRequest.cs b/src/SFA.DAS.ProviderCommitments/SFA.DAS.ProviderCommitments/Infrastructure/OuterApi/Requests/Ilr/GetLearnerDetailsForProviderRequest.cs index b815d66f9..fd2f5abff 100644 --- a/src/SFA.DAS.ProviderCommitments/SFA.DAS.ProviderCommitments/Infrastructure/OuterApi/Requests/Ilr/GetLearnerDetailsForProviderRequest.cs +++ b/src/SFA.DAS.ProviderCommitments/SFA.DAS.ProviderCommitments/Infrastructure/OuterApi/Requests/Ilr/GetLearnerDetailsForProviderRequest.cs @@ -1,7 +1,6 @@ using System; using System.Collections.Generic; using System.Net; -using SFA.DAS.ProviderCommitments.Infrastructure.OuterApi.Responses; namespace SFA.DAS.ProviderCommitments.Infrastructure.OuterApi.Requests.Ilr; @@ -27,7 +26,7 @@ public class GetLearnerDetailsForProviderResponse public string EmployerName { get; set; } public List Learners { get; set; } public int FutureMonths { get; set; } - public IEnumerable TrainingCourses { get; set; } + public IEnumerable TrainingCourses { get; set; } } public class GetLearnerSummary @@ -39,4 +38,10 @@ public class GetLearnerSummary public string Course { get; set; } public DateTime StartDate { get; set; } public string LearningType { get; set; } +} + +public class Course +{ + public string TrainingCode { get; set; } + public string TrainingName { get; set; } } \ No newline at end of file From 170a6c231d9f1809dd49532e5bdedc0c00be2168 Mon Sep 17 00:00:00 2001 From: Paul Graham Date: Wed, 22 Jul 2026 16:59:39 +0100 Subject: [PATCH 3/3] fix package issue --- .../SFA.DAS.ProviderCommitments.csproj | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/SFA.DAS.ProviderCommitments/SFA.DAS.ProviderCommitments/SFA.DAS.ProviderCommitments.csproj b/src/SFA.DAS.ProviderCommitments/SFA.DAS.ProviderCommitments/SFA.DAS.ProviderCommitments.csproj index ca948a91b..69865bb90 100644 --- a/src/SFA.DAS.ProviderCommitments/SFA.DAS.ProviderCommitments/SFA.DAS.ProviderCommitments.csproj +++ b/src/SFA.DAS.ProviderCommitments/SFA.DAS.ProviderCommitments/SFA.DAS.ProviderCommitments.csproj @@ -1,4 +1,4 @@ - + net10.0 @@ -26,8 +26,8 @@ - - + +