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 520beddeb..112acc04b 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 5072eaeec..97ec954b8 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.UnitTests/Mappers/Learners/SelectMultipleLearnerRecordsViewModelMapperTests.cs b/src/SFA.DAS.ProviderCommitments/SFA.DAS.ProviderCommitments.Web.UnitTests/Mappers/Learners/SelectMultipleLearnerRecordsViewModelMapperTests.cs index 6b36682fe..ca3a1f5b3 100644 --- a/src/SFA.DAS.ProviderCommitments/SFA.DAS.ProviderCommitments.Web.UnitTests/Mappers/Learners/SelectMultipleLearnerRecordsViewModelMapperTests.cs +++ b/src/SFA.DAS.ProviderCommitments/SFA.DAS.ProviderCommitments.Web.UnitTests/Mappers/Learners/SelectMultipleLearnerRecordsViewModelMapperTests.cs @@ -108,7 +108,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 1605be831..5a3560138 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 @@ -46,8 +46,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, LearningType = source.LearningType diff --git a/src/SFA.DAS.ProviderCommitments/SFA.DAS.ProviderCommitments.Web/Mappers/Learners/SelectMultipleLearnerRecordsViewModelMapper.cs b/src/SFA.DAS.ProviderCommitments/SFA.DAS.ProviderCommitments.Web/Mappers/Learners/SelectMultipleLearnerRecordsViewModelMapper.cs index 4d97b5d54..a01934430 100644 --- a/src/SFA.DAS.ProviderCommitments/SFA.DAS.ProviderCommitments.Web/Mappers/Learners/SelectMultipleLearnerRecordsViewModelMapper.cs +++ b/src/SFA.DAS.ProviderCommitments/SFA.DAS.ProviderCommitments.Web/Mappers/Learners/SelectMultipleLearnerRecordsViewModelMapper.cs @@ -55,8 +55,8 @@ public async Task Map(SelectMultipleLearn .. response.TrainingCourses .Select(m => new SelectListItem { - Text = m.Name, - Value = m.CourseCode + Text = m.TrainingName, + Value = m.TrainingCode })], LearningType = cacheItem.LearningType }; 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 ee4e5df81..4b7820590 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,5 +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; @@ -25,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 @@ -37,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 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 e4ac10eaf..7321bf79c 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 @@ -25,7 +25,6 @@ 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 string TrainingName { get; set; } [JsonConverter(typeof(StringEnumConverter))] 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 f55fab7b8..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