APPMAN-2336 drop standard code

src/SFA.DAS.LearnerData.Api.UnitTests/Controllers/LearnersController/WhenIGetById.cs

@@ -32,7 +32,6 @@ [Greedy] Api.Controllers.ProviderLearnersController sut
         okResult.Should().NotBeNull();
 
         var response = okResult.Value as GetLearnerByIdResponse;
-
         response.Should().NotBeNull();
         response.Id.Should().Be(learner.Id);
         response.Uln.Should().Be(learner.Uln);
@@ -47,7 +46,6 @@ [Greedy] Api.Controllers.ProviderLearnersController sut
         response.EpaoPrice.Should().Be(learner.EpaoPrice);
         response.TrainingPrice.Should().Be(learner.TrainingPrice);
         response.AgreementId.Should().Be(learner.AgreementId);
-        response.StandardCode.Should().Be(learner.StandardCode);
         response.TrainingCode.Should().Be(learner.TrainingCode);
         response.TrainingName.Should().Be(learner.TrainingName);
         response.LearningType.Should().Be(learner.LearningType);

src/SFA.DAS.LearnerData.Api.UnitTests/Controllers/LearnersController/WhenISave.cs

@@ -110,7 +110,6 @@ [Greedy] Api.Controllers.ProviderLearnersController sut
                 && ctx.ConsumerReference == request.ConsumerReference
                 && ctx.CorrelationId == request.CorrelationId
                 && ctx.ReceivedDate == request.ReceivedDate
-                && ctx.StandardCode == request.StandardCode
                 && ctx.TrainingCode == request.LarsCode
                 && ctx.TrainingName == request.TrainingName
                 && ctx.LearningType == request.LearningType
@@ -164,7 +163,6 @@ [Greedy] Api.Controllers.ProviderLearnersController sut
                 && ctx.ConsumerReference == request.ConsumerReference
                 && ctx.CorrelationId == request.CorrelationId
                 && ctx.ReceivedDate == request.ReceivedDate
-                && ctx.StandardCode == request.StandardCode
                 && ctx.TrainingCode == request.LarsCode
                 && ctx.TrainingName == request.TrainingName
                 && ctx.LearningType == request.LearningType

src/SFA.DAS.LearnerData.Api.UnitTests/Models/Responses/GetAllLearnersResponseTests.cs

@@ -53,7 +53,7 @@ List<GetAllLearnersResultItem> resultItems
         firstResponseItem.ConsumerReference.Should().Be(firstResultItem.ConsumerReference);
         firstResponseItem.CorrelationId.Should().Be(firstResultItem.CorrelationId);
         firstResponseItem.ReceivedDate.Should().Be(firstResultItem.ReceivedDate);
-        firstResponseItem.StandardCode.Should().Be(firstResultItem.StandardCode);
+        firstResponseItem.TrainingCode.Should().Be(firstResultItem.TrainingCode);
         firstResponseItem.IsFlexiJob.Should().Be(firstResultItem.IsFlexiJob);
         firstResponseItem.PlannedOTJTrainingHours.Should().Be(firstResultItem.PlannedOTJTrainingHours);
     }

src/SFA.DAS.LearnerData.Api/Controllers/ProviderLearnersController.cs

@@ -7,7 +7,6 @@
 using SFA.DAS.LearnerData.Api.Models.Responses;
 using SFA.DAS.LearnerData.Application.Commands.AssignApprenticeshipId;
 using SFA.DAS.LearnerData.Application.Commands.SaveLearner;
-using SFA.DAS.LearnerData.Application.Queries.GetCourseCodesByUkprn;
 using SFA.DAS.LearnerData.Application.Queries.GetLearnerById;
 using SFA.DAS.LearnerData.Application.Queries.GetSearch;
 using SFA.DAS.LearnerData.Services;
@@ -67,7 +66,6 @@ public async Task<IActionResult> Save(long ukprn, long uln, [FromBody] SaveLearn
             ConsumerReference = request.ConsumerReference,
             CorrelationId = request.CorrelationId,
             ReceivedDate = request.ReceivedDate,
-            StandardCode = request.StandardCode,
             TrainingCode = request.LarsCode,
             TrainingName = request.TrainingName,
             LearningType = request.LearningType.Value,
@@ -135,16 +133,4 @@ public async Task<IActionResult> PatchApprenticeshipId(long ukprn, long id, [Fro
 
         return Ok();
     }
-
-    [HttpGet]
-    [ProducesResponseType((int)HttpStatusCode.OK)]
-    [Route("coursecodes")]
-    public async Task<IActionResult> GetCourseCodesByUkprn(long ukprn)
-    {
-        var query = new GetCourseCodesByUkprnQuery(ukprn);
-
-        var result = await sender.Send(query);
-
-        return Ok(result);
-    }
 }

src/SFA.DAS.LearnerData.Api/Models/Requests/SaveLearnerRequest.cs

@@ -17,7 +17,6 @@ public record SaveLearnerRequest
     public int EpaoPrice { get; set; }
     public int TrainingPrice { get; set; }
     public string? AgreementId { get; set; }
-    public int StandardCode { get; set; }
     public string? LarsCode { get; set; }
     public string? TrainingName { get; set; }
     public LearningType? LearningType { get; set; }

src/SFA.DAS.LearnerData.Api/Models/Responses/GetAllLearnersResponse.cs

@@ -34,7 +34,6 @@ public static GetAllLearnersResponse MapFrom(GetAllLearnersResult result)
                 ConsumerReference = item.ConsumerReference,
                 CorrelationId = item.CorrelationId,
                 ReceivedDate = item.ReceivedDate,
-                StandardCode = item.StandardCode,
                 TrainingCode = item.TrainingCode,
                 TrainingName = item.TrainingName,
                 LearningType = item.LearningType?.GetEnumDescription(),
@@ -70,7 +69,6 @@ public class GetAllLearnersResponseItem
     public string ConsumerReference { get; set; } = string.Empty;
     public Guid CorrelationId { get; set; }
     public DateTime ReceivedDate { get; set; }
-    public int StandardCode { get; set; }
     public string? TrainingCode { get; set; }
     public string? TrainingName { get; set; }
     public string? LearningType { get; set; }

src/SFA.DAS.LearnerData.Api/Models/Responses/GetLearnerByIdResponse.cs

@@ -21,7 +21,6 @@ public record GetLearnerByIdResponse : LearnerResponse
     public int EpaoPrice { get; set; }
     public int TrainingPrice { get; set; }
     public string? AgreementId { get; set; }
-    public int StandardCode { get; set; }
     public string? TrainingCode { get; set; }
     public string? TrainingName { get; set; }
 
@@ -57,7 +56,6 @@ public static GetLearnerByIdResponse MapFrom(GetLearnerByIdResult result)
             ConsumerReference = result.ConsumerReference,
             CorrelationId = result.CorrelationId,
             ReceivedDate = result.ReceivedDate,
-            StandardCode = result.StandardCode,
             TrainingCode = result.TrainingCode,
             TrainingName = result.TrainingName,
             LearningType = result.LearningType,

src/SFA.DAS.LearnerData.Api/Models/Responses/GetSearchResponse.cs

@@ -1,6 +1,7 @@
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
 using SFA.DAS.LearnerData.Application.Queries.GetSearch;
+using SFA.DAS.LearnerData.Data.Entities;
 using SFA.DAS.LearnerData.Extensions;
 using SFA.DAS.LearnerData.Messages;
 
@@ -9,12 +10,14 @@ namespace SFA.DAS.LearnerData.Api.Models.Responses;
 public record GetSearchResponse : PagedResponse<GetSearchResponseItem>
 {
     public DateTime? LastSubmissionDate { get; set; }
-
+    public List<Course> Courses { get; set; } = [];
+
     public static GetSearchResponse MapFrom(GetSearchResult result)
     {
         return new GetSearchResponse
         {
             LastSubmissionDate = result.LastSubmissionDate,
+            Courses = result.Courses,
             Data = result.Items.Select(item => new GetSearchResponseItem
             {
                 Id = item.Id,
@@ -36,7 +39,6 @@ public static GetSearchResponse MapFrom(GetSearchResult result)
                 ConsumerReference = item.ConsumerReference,
                 CorrelationId = item.CorrelationId,
                 ReceivedDate = item.ReceivedDate,
-                StandardCode = item.StandardCode,
                 TrainingCode = item.TrainingCode,
                 TrainingName = item.TrainingName,
                 LearningType = item.LearningType,
@@ -66,7 +68,6 @@ public record GetSearchResponseItem : LearnerResponse
     public int EpaoPrice { get; set; }
     public int TrainingPrice { get; set; }
     public string? AgreementId { get; set; }
-    public int StandardCode { get; set; }
     public string? TrainingCode { get; set; }
     public string? TrainingName { get; set; }
 

src/SFA.DAS.LearnerData.Database/PostDeployment/Script.PostDeployment.sql

@@ -14,19 +14,4 @@ Post-Deployment Script Template
 IF OBJECT_ID('dbo.Learner', 'U') IS NOT NULL
 BEGIN
     DROP TABLE dbo.Learner;
-END
-
--- Migrate existing TrainingCode data from StandardCode
-UPDATE dbo.LearnerData SET 
-    TrainingCode = CAST(StandardCode AS NVARCHAR(20)) 
-WHERE TrainingCode IS NULL;
-
--- update LearningType for existing records - FoundationApprenticeship
-UPDATE dbo.LearnerData SET 
-    LearningType = 1 
-WHERE LearningType IS NULL AND TrainingCode in ('805','806','807','808','809','810','811');
-
--- update LearningType for existing records - Apprenticeship
-UPDATE dbo.LearnerData SET 
-    LearningType = 0
-WHERE LearningType IS NULL;
+END

src/SFA.DAS.LearnerData.Database/Tables/LearnerData.sql

@@ -13,7 +13,6 @@ CREATE TABLE [dbo].[LearnerData](
     [EpaoPrice] [int] NOT NULL,
     [TrainingPrice] [int] NOT NULL,
     [AgreementId] [nvarchar](20) NULL,
-    [StandardCode] [int] NOT NULL,
     [TrainingCode] [nvarchar](20) NULL,
     [TrainingName] [nvarchar](126) NULL,
     [LearningType] [tinyint] NULL,

src/SFA.DAS.LearnerData.Messages/ChangeSummary.cs

@@ -20,7 +20,6 @@ public enum ChangeType
     PlannedEndDateChange,
     EpaoPriceChange,
     TrainingPriceChange,
-    StandardCodeChange,
     TrainingCodeChange,
     LearningTypeChange,
     IsFlexiJob
@@ -88,13 +87,6 @@ public class TrainingPriceChange : IChange
     public int? NewValue { get; init; }
 }
 
-public class StandardCodeChange : IChange
-{
-    public ChangeType ChangeType => ChangeType.StandardCodeChange;
-    public int? OldValue { get; init; }
-    public int? NewValue { get; init; }
-}
-
 public class TrainingCodeChange : IChange
 {
     public ChangeType ChangeType => ChangeType.TrainingCodeChange;
@@ -141,7 +133,6 @@ public class ChangeJsonConverter : JsonConverter<IChange>
             ChangeType.PlannedEndDateChange => JsonSerializer.Deserialize<PlannedEndDateChange>(root.GetRawText(), options),
             ChangeType.EpaoPriceChange => JsonSerializer.Deserialize<EpaoPriceChange>(root.GetRawText(), options),
             ChangeType.TrainingPriceChange => JsonSerializer.Deserialize<TrainingPriceChange>(root.GetRawText(), options),
-            ChangeType.StandardCodeChange => JsonSerializer.Deserialize<StandardCodeChange>(root.GetRawText(), options),
             ChangeType.IsFlexiJob => JsonSerializer.Deserialize<IsFlexiJobChange>(root.GetRawText(), options),
             _ => throw new JsonException($"Unknown change type: {changeType}")
         };

src/SFA.DAS.LearnerData.UnitTests/Application/Queries/GetAllLearners/GetAllLearnersQueryHandlerTests.cs

@@ -6,6 +6,7 @@
 using SFA.DAS.LearnerData.Data;
 using SFA.DAS.LearnerData.Data.Entities;
 using SFA.DAS.LearnerData.Data.Repositories;
+using SFA.DAS.LearnerData.Extensions;
 using SFA.DAS.Testing.AutoFixture;
 
 namespace SFA.DAS.LearnerData.UnitTests.Application.Queries.GetAllLearners;
@@ -70,7 +71,6 @@ GetAllLearnersQueryHandler sut
         firstResultItem.ConsumerReference.Should().Be(firstLearner.ConsumerReference);
         firstResultItem.CorrelationId.Should().Be(firstLearner.CorrelationId);
         firstResultItem.ReceivedDate.Should().Be(firstLearner.ReceivedDate);
-        firstResultItem.StandardCode.Should().Be(firstLearner.StandardCode);
         firstResultItem.TrainingCode.Should().Be(firstLearner.TrainingCode);
         firstResultItem.TrainingName.Should().Be(firstLearner.TrainingName);
         firstResultItem.LearningType.Should().Be(firstLearner.LearningType);

src/SFA.DAS.LearnerData.UnitTests/Application/Queries/GetLearnerById/GetLearnerByIdQueryHandlerTests.cs

@@ -40,7 +40,6 @@ GetLearnerByIdQueryHandler sut
         result.EpaoPrice.Should().Be(learner.EpaoPrice);
         result.TrainingPrice.Should().Be(learner.TrainingPrice);
         result.AgreementId.Should().Be(learner.AgreementId);
-        result.StandardCode.Should().Be(learner.StandardCode);
         result.TrainingCode.Should().Be(learner.TrainingCode);
         result.TrainingName.Should().Be(learner.TrainingName);
         result.LearningType.Should().Be(learner.LearningType);

src/SFA.DAS.LearnerData.UnitTests/Application/Queries/GetSearch/GetSearchQueryHandlerTests.cs

@@ -17,6 +17,7 @@ public async Task Handle_GetForProvider_When_Learners_Exist(
         GetSearchQuery query,
         PagedResult<Learner> learners,
         DateTime? lastSubmissionDate,
+        List<Course> courses,
         [Frozen] Mock<ILearnerRepository> repository,
         GetSearchQueryHandler sut
     )
@@ -35,6 +36,10 @@ GetSearchQueryHandler sut
             .Setup(x => x.GetLastSubmissionDate(query.UkPrn, It.IsAny<CancellationToken>())).ReturnsAsync(lastSubmissionDate)
             .Verifiable();
 
+        repository
+            .Setup(x => x.GetCourseList(query.UkPrn, query.ExcludeApproved, query.MaxStartDate, query.ExcludeUlns, It.IsAny<CancellationToken>())).ReturnsAsync(courses)
+            .Verifiable();
+
         var result = await sut.Handle(query, CancellationToken.None);
         result.Should().NotBeNull();
         result.Items.Should().BeEquivalentTo(learners.Data, options => options.ExcludingMissingMembers());
@@ -43,6 +48,7 @@ GetSearchQueryHandler sut
         result.PageSize.Should().Be(query.PageSize);
         result.TotalItems.Should().Be(learners.TotalItems);
         result.LastSubmissionDate.Should().Be(lastSubmissionDate);
+        result.Courses.Should().BeEquivalentTo(courses);
 
         repository.Verify();
     }

src/SFA.DAS.LearnerData.UnitTests/Extensions/StringExtensionsTests.cs

@@ -0,0 +1,18 @@
+using FluentAssertions;
+using NUnit.Framework;
+using SFA.DAS.LearnerData.Extensions;
+
+namespace SFA.DAS.LearnerData.UnitTests.Extensions;
+
+public class StringExtensionsTests
+{
+    [TestCase(null, 0)]
+    [TestCase("123", 123)]
+    [TestCase("X123", 0)]
+    public void Convert_String_ToLongOrDefault(string? input, long expectedOutput)
+    {
+        var result = input.ToLongOrDefault();
+
+        result.Should().Be(expectedOutput);
+    }
+}