Appman 1292 cache add apprentice journey

src/SFA.DAS.EmployerCommitmentsV2.Web.UnitTests/Controllers/CohortControllerTests/WhenCallingGetAssign.cs

@@ -1,5 +1,6 @@
 using FluentAssertions;
 using SFA.DAS.CommitmentsV2.Shared.Interfaces;
+using SFA.DAS.EmployerCommitmentsV2.Interfaces;
 using SFA.DAS.EmployerCommitmentsV2.Web.Controllers;
 using SFA.DAS.EmployerCommitmentsV2.Web.Models.Cohort;
 using SFA.DAS.Testing.AutoFixture;
@@ -10,16 +11,21 @@ public class WhenCallingGetAssign
 {
     [Test, MoqAutoData]
     public async Task Then_Returns_View_With_Correct_Model(
-        AssignRequest request,
+        AddApprenticeshipCacheModel cacheModel,
         AssignViewModel viewModel,
         [Frozen] Mock<IModelMapper> mockMapper,
+        [Frozen] Mock<ICacheStorageService> cacheStorageService,
         [Greedy] CohortController controller)
     {
+        cacheStorageService
+           .Setup(x => x.RetrieveFromCache<AddApprenticeshipCacheModel>(cacheModel.ApprenticeshipSessionKey))
+           .ReturnsAsync(cacheModel);
+
         mockMapper
-            .Setup(mapper => mapper.Map<AssignViewModel>(request))
+            .Setup(mapper => mapper.Map<AssignViewModel>(cacheModel))
             .ReturnsAsync(viewModel);
 
-        var result = await controller.Assign(request) as ViewResult;
+        var result = await controller.Assign(cacheModel.ApprenticeshipSessionKey) as ViewResult;
 
         result.ViewName.Should().BeNull();
         var model = result.Model as AssignViewModel;

src/SFA.DAS.EmployerCommitmentsV2.Web.UnitTests/Controllers/CohortControllerTests/WhenCallingGetIndex.cs

@@ -1,8 +1,8 @@
 using FluentAssertions;
 using SFA.DAS.CommitmentsV2.Shared.Interfaces;
+using SFA.DAS.EmployerCommitmentsV2.Interfaces;
 using SFA.DAS.EmployerCommitmentsV2.Web.Controllers;
 using SFA.DAS.EmployerCommitmentsV2.Web.Models.Cohort;
-using SFA.DAS.EmployerUrlHelper;
 using SFA.DAS.Testing.AutoFixture;
 
 namespace SFA.DAS.EmployerCommitmentsV2.Web.UnitTests.Controllers.CohortControllerTests;
@@ -13,26 +13,22 @@ public class WhenCallingGetIndex
     public async Task Then_Returns_View_With_Correct_ViewModel(
         IndexRequest request,
         IndexViewModel viewModel,
-        string organisationsLink,
-        string schemesLink,
         [Frozen] Mock<IModelMapper> mockMapper,
-        [Frozen] Mock<ILinkGenerator> mockLinkGenerator,
+        [Frozen] Mock<ICacheStorageService> cacheStorageService,
         [Greedy] CohortController controller)
     {
+        cacheStorageService
+         .Setup(x => x.SaveToCache(It.IsAny<Guid>(), It.IsAny<AddApprenticeshipCacheModel>(), 1))
+         .Returns(Task.CompletedTask);
+
         mockMapper
-            .Setup(mapper => mapper.Map<IndexViewModel>(request))
+            .Setup(mapper => mapper.Map<IndexViewModel>(It.IsAny<IndexRequest>()))
             .ReturnsAsync(viewModel);
-        mockLinkGenerator
-            .Setup(generator => generator.AccountsLink($"accounts/{request.AccountHashedId}/agreements"))
-            .Returns(organisationsLink);
-        mockLinkGenerator
-            .Setup(generator => generator.AccountsLink($"accounts/{request.AccountHashedId}/schemes"))
-            .Returns(schemesLink);
 
         var result = await controller.Index(request) as ViewResult;
 
         result.ViewName.Should().BeNull();
         var model = result.Model as IndexViewModel;
-        model.Should().BeSameAs(viewModel);
+        model.Should().BeEquivalentTo(viewModel);
     }
 }

src/SFA.DAS.EmployerCommitmentsV2.Web.UnitTests/Controllers/CohortControllerTests/WhenCallingPostAssign.cs

@@ -4,6 +4,7 @@
 using SFA.DAS.CommitmentsV2.Api.Types.Requests;
 using SFA.DAS.CommitmentsV2.Api.Types.Responses;
 using SFA.DAS.CommitmentsV2.Shared.Interfaces;
+using SFA.DAS.EmployerCommitmentsV2.Interfaces;
 using SFA.DAS.EmployerCommitmentsV2.Web.Controllers;
 using SFA.DAS.EmployerCommitmentsV2.Web.Models.Cohort;
 using SFA.DAS.EmployerUrlHelper;
@@ -16,58 +17,63 @@ public class WhenCallingPostAssign
     [Test, MoqAutoData]
     public async Task And_Employer_Adding_Apprentices_Then_Redirect_To_Add_Apprentice(
         AssignViewModel viewModel,
+        AddApprenticeshipCacheModel cacheModel,
+        [Frozen] Mock<ICacheStorageService> cacheStorageService,
         [Greedy] CohortController controller)
     {
+        cacheModel.ApprenticeshipSessionKey = viewModel.ApprenticeshipSessionKey.Value;
+        cacheStorageService
+            .Setup(x => x.RetrieveFromCache<AddApprenticeshipCacheModel>(cacheModel.ApprenticeshipSessionKey))
+            .ReturnsAsync(cacheModel);
+
         var expectedRouteValues = new RouteValueDictionary(new
         {
-            viewModel.AccountHashedId,
-            viewModel.AccountLegalEntityHashedId,
-            viewModel.ReservationId,
-            viewModel.StartMonthYear,
-            viewModel.CourseCode,
-            viewModel.ProviderId,
-            viewModel.TransferSenderId,
-            viewModel.EncodedPledgeApplicationId,
-            Origin = viewModel.ReservationId.HasValue ? Origin.Reservations : Origin.Apprentices
+            cacheModel.AccountHashedId,
+            cacheModel.AccountLegalEntityHashedId,
+            cacheModel.ReservationId,
+            cacheModel.StartMonthYear,
+            cacheModel.CourseCode,
+            cacheModel.ProviderId,
+            cacheModel.TransferSenderId,
+            cacheModel.EncodedPledgeApplicationId,
+            cacheModel.ApprenticeshipSessionKey
         });
         viewModel.WhoIsAddingApprentices = WhoIsAddingApprentices.Employer;
 
         var result = await controller.Assign(viewModel) as RedirectToActionResult;
 
         result.Should().NotBeNull();
         result.ActionName.Should().Be("Apprentice");
-        result.ControllerName.Should().Be("Cohort");
-        result.RouteValues.Should().BeEquivalentTo(expectedRouteValues);
+        result.RouteValues["AccountHashedId"].Should().Be(cacheModel.AccountHashedId);
+        result.RouteValues["ApprenticeshipSessionKey"].Should().Be(cacheModel.ApprenticeshipSessionKey);
     }
 
     [Test, MoqAutoData]
     public async Task And_FundingType_Is_AdditionalReservations_And_Employer_Adding_Apprentices_Then_Redirect_To_Add_Apprentice(
         AssignViewModel viewModel,
+        AddApprenticeshipCacheModel cacheModel,
+        [Frozen] Mock<ICacheStorageService> cacheStorageService,
         [Greedy] CohortController controller)
     {
+        cacheModel.ApprenticeshipSessionKey = viewModel.ApprenticeshipSessionKey.Value;
+        cacheStorageService
+            .Setup(x => x.RetrieveFromCache<AddApprenticeshipCacheModel>(cacheModel.ApprenticeshipSessionKey))
+            .ReturnsAsync(cacheModel);
+
         viewModel.ReservationId = null;
         viewModel.FundingType = FundingType.AdditionalReservations;
-        viewModel.EncodedPledgeApplicationId = null;
+        viewModel.WhoIsAddingApprentices = WhoIsAddingApprentices.Employer;
 
         var expectedRouteValues = new RouteValueDictionary(new
         {
-            viewModel.AccountHashedId,
-            viewModel.AccountLegalEntityHashedId,
-            viewModel.ReservationId,
-            viewModel.StartMonthYear,
-            viewModel.CourseCode,
-            viewModel.ProviderId,
-            viewModel.TransferSenderId,
-            viewModel.EncodedPledgeApplicationId,
-            Origin = viewModel.ReservationId.HasValue ? Origin.Reservations : Origin.Apprentices
+            cacheModel.AccountHashedId,
+            cacheModel.ApprenticeshipSessionKey
         });
-        viewModel.WhoIsAddingApprentices = WhoIsAddingApprentices.Employer;
 
         var result = await controller.Assign(viewModel) as RedirectToActionResult;
 
         result.Should().NotBeNull();
         result.ActionName.Should().Be("Apprentice");
-        result.ControllerName.Should().Be("Cohort");
         result.RouteValues.Should().BeEquivalentTo(expectedRouteValues);
     }
 
@@ -76,12 +82,21 @@ public async Task And_Provider_Adding_Apprentices_Then_Redirect_To_Finish(
         AssignViewModel viewModel,
         CreateCohortWithOtherPartyRequest createCohortRequest,
         CreateCohortResponse createCohortResponse,
+        AddApprenticeshipCacheModel cacheModel,
+        [Frozen] Mock<ICacheStorageService> cacheStorageService,
         [Frozen] Mock<IModelMapper> modelMapper,
         [Frozen] Mock<ICommitmentsApiClient> apiClient,
         [Greedy] CohortController controller)
     {
+        cacheModel.ApprenticeshipSessionKey = viewModel.ApprenticeshipSessionKey.Value;
+
+        cacheStorageService
+           .Setup(x => x.RetrieveFromCache<AddApprenticeshipCacheModel>(cacheModel.ApprenticeshipSessionKey))
+           .ReturnsAsync(cacheModel);
+
         viewModel.WhoIsAddingApprentices = WhoIsAddingApprentices.Provider;
-        modelMapper.Setup(x => x.Map<CreateCohortWithOtherPartyRequest>(viewModel)).ReturnsAsync(createCohortRequest);
+        modelMapper.Setup(x => x.Map<CreateCohortWithOtherPartyRequest>(cacheModel)).ReturnsAsync(createCohortRequest);
+
         apiClient.Setup(x => x.CreateCohort(createCohortRequest, It.IsAny<CancellationToken>())).ReturnsAsync(createCohortResponse).Verifiable();
         var result = await controller.Assign(viewModel) as RedirectToActionResult;
 
@@ -94,8 +109,15 @@ public async Task And_Provider_Adding_Apprentices_Then_Redirect_To_Finish(
     [Test, MoqAutoData]
     public async Task And_Unknown_Adding_Apprentices_Then_Redirect_To_Error(
         AssignViewModel viewModel,
+        AddApprenticeshipCacheModel cacheModel,
+        [Frozen] Mock<ICacheStorageService> cacheStorageService,
         [Greedy] CohortController controller)
     {
+
+        cacheStorageService
+           .Setup(x => x.RetrieveFromCache<AddApprenticeshipCacheModel>(cacheModel.ApprenticeshipSessionKey))
+           .ReturnsAsync(cacheModel);
+
         viewModel.WhoIsAddingApprentices = (WhoIsAddingApprentices)55;
 
         var result = await controller.Assign(viewModel) as RedirectToActionResult;
@@ -109,8 +131,16 @@ public async Task And_Unknown_Adding_Apprentices_Then_Redirect_To_Error(
     public async Task And_Employer_Adding_Apprentices_And_No_Reservation_Then_Redirect_To_Reservation_Selection(
         [Frozen] Mock<ILinkGenerator> linkGenerator,
         AssignViewModel viewModel,
+        AddApprenticeshipCacheModel cacheModel,
+        [Frozen] Mock<ICacheStorageService> cacheStorageService,
         [Greedy] CohortController controller)
     {
+        cacheModel.ReservationId = null;
+
+        cacheStorageService
+           .Setup(x => x.RetrieveFromCache<AddApprenticeshipCacheModel>(cacheModel.ApprenticeshipSessionKey))
+           .ReturnsAsync(cacheModel);
+
         const string reservationsUrl = "RESERVATIONS-URL";
         linkGenerator.Setup(x => x.ReservationsLink(It.IsAny<string>())).Returns(reservationsUrl);
         viewModel.ReservationId = null;

src/SFA.DAS.EmployerCommitmentsV2.Web.UnitTests/Controllers/CohortControllerTests/WhenGetingAddDraftApprenticeship.cs

@@ -10,60 +10,34 @@ namespace SFA.DAS.EmployerCommitmentsV2.Web.UnitTests.Controllers.CohortControll
 public class WhenGetingAddDraftApprenticeship
 {
     [Test, MoqAutoData]
-    public async Task ThenReturnsViewWhenNoModelInCache(
-        ApprenticeRequest request,
+    public async Task ThenReturnsViewWhenModelIsInCache(
+        AddApprenticeshipCacheModel cacheModel,
         [Frozen] Mock<IModelMapper> mockMapper,
         [Frozen] Mock<ICacheStorageService> cacheStorageService,
         [Greedy] CohortController controller)
     {
         var viewModel = new ApprenticeViewModel();
 
         cacheStorageService
-            .Setup(x => x.RetrieveFromCache<ApprenticeViewModel>(It.IsAny<Guid>()))
-            .ReturnsAsync((ApprenticeViewModel)null);
-
-        mockMapper
-            .Setup(mapper => mapper.Map<ApprenticeViewModel>(request))
-            .ReturnsAsync(viewModel);
-
-        var result = await controller.AddDraftApprenticeship(request) as ViewResult;
-
-        result.Should().NotBeNull();
-        result.ViewName.Should().Be("Apprentice");
-        result.Model.Should().BeEquivalentTo(viewModel);
-    }
-
-    [Test, MoqAutoData]
-    public async Task ThenReturnsViewWhenModelIsInCache(
-       ApprenticeRequest request,
-       [Frozen] Mock<IModelMapper> mockMapper,
-       [Frozen] Mock<ICacheStorageService> cacheStorageService,
-       [Greedy] CohortController controller)
-    {
-        var viewModel = new ApprenticeViewModel();
-        var cacheItem = new ApprenticeViewModel
-        {
-            DeliveryModel = CommitmentsV2.Types.DeliveryModel.Regular,
-            CourseCode = "CourseCode",
-            CacheKey = request.CacheKey            
-        };
+            .Setup(x => x.RetrieveFromCache<AddApprenticeshipCacheModel>(cacheModel.ApprenticeshipSessionKey))
+            .ReturnsAsync(cacheModel);
 
         cacheStorageService
-            .Setup(x => x.RetrieveFromCache<ApprenticeViewModel>(cacheItem.CacheKey.Value))
-            .ReturnsAsync(cacheItem);
+            .Setup(x => x.SaveToCache(It.IsAny<Guid>(), It.IsAny<AddApprenticeshipCacheModel>(), 1))
+            .Returns(Task.CompletedTask);
 
         mockMapper
-            .Setup(mapper => mapper.Map<ApprenticeViewModel>(request))
+            .Setup(mapper => mapper.Map<ApprenticeViewModel>(cacheModel))
             .ReturnsAsync(viewModel);
 
-        var result = await controller.AddDraftApprenticeship(request) as ViewResult;
+        var result = await controller.AddDraftApprenticeship(cacheModel.ApprenticeshipSessionKey) as ViewResult;
+
         result.Should().NotBeNull();
         result.ViewName.Should().Be("Apprentice");
 
         var resultObject = result.Model as ApprenticeViewModel;
 
         resultObject.Should().NotBeNull();
-        resultObject.DeliveryModel.Should().Be(cacheItem.DeliveryModel);
-        resultObject.CourseCode.Should().Be(cacheItem.CourseCode);
+        resultObject.Should().BeEquivalentTo(viewModel);
     }
 }

src/SFA.DAS.EmployerCommitmentsV2.Web.UnitTests/Controllers/CohortControllerTests/WhenGettingApprentice.cs

@@ -0,0 +1,71 @@
+using FluentAssertions;
+using SFA.DAS.CommitmentsV2.Api.Client;
+using SFA.DAS.CommitmentsV2.Shared.Interfaces;
+using SFA.DAS.EmployerCommitmentsV2.Contracts;
+using SFA.DAS.EmployerCommitmentsV2.Interfaces;
+using SFA.DAS.EmployerCommitmentsV2.Web.Controllers;
+using SFA.DAS.EmployerCommitmentsV2.Web.Models.Cohort;
+using SFA.DAS.EmployerUrlHelper;
+using SFA.DAS.Encoding;
+
+namespace SFA.DAS.EmployerCommitmentsV2.Web.UnitTests.Controllers.CohortControllerTests;
+
+internal class WhenGettingApprentice
+{
+    private ApprenticeRequest _apprenticeRequest;
+    private CohortController _controller;
+    private Fixture _fixture;
+    private AddApprenticeshipCacheModel _cacheModel;
+    private Mock<ICacheStorageService> _cacheStorageService;
+
+    [SetUp]
+    public void SetUp()
+    {
+        _fixture = new Fixture();
+        _apprenticeRequest = _fixture.Build<ApprenticeRequest>()
+            .With(x => x.StartMonthYear, "012025")
+            .Create();
+
+        _cacheModel = _fixture.Create<AddApprenticeshipCacheModel>();
+        _apprenticeRequest.ApprenticeshipSessionKey = _cacheModel.ApprenticeshipSessionKey;
+
+        _cacheStorageService = new Mock<ICacheStorageService>();
+        _cacheStorageService
+           .Setup(x => x.RetrieveFromCache<AddApprenticeshipCacheModel>(_cacheModel.ApprenticeshipSessionKey))
+           .ReturnsAsync(_cacheModel);
+        _cacheStorageService
+        .Setup(x => x.SaveToCache(It.IsAny<Guid>(), It.IsAny<AddApprenticeshipCacheModel>(), 1))
+        .Returns(Task.CompletedTask);
+
+        _controller = new CohortController(Mock.Of<ICommitmentsApiClient>(),
+            Mock.Of<ILogger<CohortController>>(),
+            Mock.Of<ILinkGenerator>(),
+            Mock.Of<IModelMapper>(),
+            Mock.Of<IEncodingService>(),
+            Mock.Of<IApprovalsApiClient>(),
+            _cacheStorageService.Object);
+    }
+
+    [Test]
+    public async Task Apprentice_ShouldUpdateCacheAndRedirectToSelectCourse()
+    {
+        // Act
+        var result = await _controller.Apprentice(_apprenticeRequest);
+
+        // Assert
+        _cacheStorageService.Verify(x => x.RetrieveFromCache<AddApprenticeshipCacheModel>(_apprenticeRequest.ApprenticeshipSessionKey.Value), Times.Once);
+        _cacheStorageService.Verify(x => x.SaveToCache(_cacheModel.ApprenticeshipSessionKey, It.Is<AddApprenticeshipCacheModel>(m =>
+            m.ReservationId == _apprenticeRequest.ReservationId &&
+            m.CourseCode == _apprenticeRequest.CourseCode &&
+            m.StartMonthYear == _apprenticeRequest.StartMonthYear), 1), Times.Once);
+
+        var redirectResult = result.Should().BeOfType<RedirectToActionResult>().Subject;
+        redirectResult.ActionName.Should().Be(nameof(CohortController.SelectCourse));
+        redirectResult.RouteValues["AccountHashedId"].Should().Be(_cacheModel.AccountHashedId);
+        redirectResult.RouteValues["ApprenticeshipSessionKey"].Should().Be(_cacheModel.ApprenticeshipSessionKey);
+    }
+
+    [TearDown]
+    public void TearDown() => _controller?.Dispose();
+
+}