diff --git a/src/SFA.DAS.ProviderCommitments/SFA.DAS.ProviderCommitments.Web.UnitTests/Controllers/CohortControllerTests/WhenIPostSelectHowToAddApprentice.cs b/src/SFA.DAS.ProviderCommitments/SFA.DAS.ProviderCommitments.Web.UnitTests/Controllers/CohortControllerTests/WhenIPostSelectHowToAddApprentice.cs deleted file mode 100644 index 5aba304b0..000000000 --- a/src/SFA.DAS.ProviderCommitments/SFA.DAS.ProviderCommitments.Web.UnitTests/Controllers/CohortControllerTests/WhenIPostSelectHowToAddApprentice.cs +++ /dev/null @@ -1,58 +0,0 @@ -using System; -using SFA.DAS.CommitmentsV2.Api.Client; -using SFA.DAS.CommitmentsV2.Shared.Interfaces; -using SFA.DAS.Encoding; -using SFA.DAS.ProviderCommitments.Interfaces; -using SFA.DAS.ProviderCommitments.Web.Controllers; -using SFA.DAS.ProviderCommitments.Web.Models.Cohort; -using SFA.DAS.ProviderUrlHelper; - -namespace SFA.DAS.ProviderCommitments.Web.UnitTests.Controllers.CohortControllerTests -{ - [TestFixture] - public class WhenIPostSelectHowToAddApprentice - { - [Test] - public void PostHowTo_WithValidModel_WithIlrOption_ShouldRedirectToSelectLearnerRecord() - { - var fixture = new WhenIPostSelectHowToAddApprenticeFixture(); - fixture.ViewModel.Selection = AddFirstDraftApprenticeshipJourneyOptions.Ilr; - - var result = fixture.Sut.SelectHowToAddApprentice(fixture.ViewModel); - result.VerifyReturnsRedirectToActionResult().WithActionName("SelectLearnerRecord"); - var action = result as RedirectToActionResult; - action.RouteValues["providerId"].Should().Be(fixture.ViewModel.ProviderId); - action.RouteValues["EmployerAccountLegalEntityPublicHashedId"].Should().Be(fixture.ViewModel.EmployerAccountLegalEntityPublicHashedId); - action.RouteValues["CacheKey"].Should().Be(fixture.ViewModel.CacheKey); - } - - [Test] - public void PostHowTo_WithValidModel_WithManualOption_ShouldRedirectToSelectCourse() - { - var fixture = new WhenIPostSelectHowToAddApprenticeFixture(); - fixture.ViewModel.Selection = AddFirstDraftApprenticeshipJourneyOptions.Manual; - - var result = fixture.Sut.SelectHowToAddApprentice(fixture.ViewModel); - result.VerifyReturnsRedirectToActionResult().WithActionName("SelectCourse"); - var action = result as RedirectToActionResult; - action.RouteValues["providerId"].Should().Be(fixture.ViewModel.ProviderId); - action.RouteValues["EmployerAccountLegalEntityPublicHashedId"].Should().Be(fixture.ViewModel.EmployerAccountLegalEntityPublicHashedId); - action.RouteValues["CacheKey"].Should().Be(fixture.ViewModel.CacheKey); - } - } - - public class WhenIPostSelectHowToAddApprenticeFixture - { - public readonly SelectHowToAddFirstApprenticeshipJourneyViewModel ViewModel; - - public readonly CohortController Sut; - - public WhenIPostSelectHowToAddApprenticeFixture() - { - ViewModel = new SelectHowToAddFirstApprenticeshipJourneyViewModel { ProviderId = 123, EmployerAccountLegalEntityPublicHashedId = "XYZ", CacheKey = Guid.NewGuid()}; - - Sut = new CohortController(Mock.Of(), Mock.Of(), Mock.Of(), Mock.Of(), - Mock.Of(), Mock.Of(),Mock.Of(), Mock.Of>()); - } - } -} diff --git a/src/SFA.DAS.ProviderCommitments/SFA.DAS.ProviderCommitments.Web.UnitTests/Controllers/CohortControllerTests/WhenSelectingHowToAddApprentice.cs b/src/SFA.DAS.ProviderCommitments/SFA.DAS.ProviderCommitments.Web.UnitTests/Controllers/CohortControllerTests/WhenSelectingHowToAddApprentice.cs index ba32779ce..dd0826a49 100644 --- a/src/SFA.DAS.ProviderCommitments/SFA.DAS.ProviderCommitments.Web.UnitTests/Controllers/CohortControllerTests/WhenSelectingHowToAddApprentice.cs +++ b/src/SFA.DAS.ProviderCommitments/SFA.DAS.ProviderCommitments.Web.UnitTests/Controllers/CohortControllerTests/WhenSelectingHowToAddApprentice.cs @@ -13,19 +13,17 @@ namespace SFA.DAS.ProviderCommitments.Web.UnitTests.Controllers.CohortController public class WhenSelectingHowToAddApprentice { [Test] - public void ThenReturnsView() + public void ThenReturnsRedirectToSelectFromIlr() { var fixture = new WhenSelectingHowToAddApprenticeFixture(); - var result = fixture.Act() as ViewResult; + var result = fixture.Act() as RedirectToActionResult; result.Should().NotBeNull(); - result.Model.GetType().Should().Be(typeof(SelectHowToAddFirstApprenticeshipJourneyViewModel)); - var model = result.Model as SelectHowToAddFirstApprenticeshipJourneyViewModel; - model.Should().NotBeNull(); - model.ProviderId.Should().Be(fixture.Request.ProviderId); - model.EmployerAccountLegalEntityPublicHashedId.Should().Be(fixture.Request.EmployerAccountLegalEntityPublicHashedId); - model.CacheKey.Should().Be(fixture.Request.CacheKey); + + result.RouteValues["providerId"].Should().Be(fixture.Request.ProviderId); + result.RouteValues["EmployerAccountLegalEntityPublicHashedId"].Should().Be(fixture.Request.EmployerAccountLegalEntityPublicHashedId); + result.RouteValues["CacheKey"].Should().Be(fixture.Request.CacheKey); } } diff --git a/src/SFA.DAS.ProviderCommitments/SFA.DAS.ProviderCommitments.Web/Controllers/CohortController.cs b/src/SFA.DAS.ProviderCommitments/SFA.DAS.ProviderCommitments.Web/Controllers/CohortController.cs index a0fab6691..84f93852e 100644 --- a/src/SFA.DAS.ProviderCommitments/SFA.DAS.ProviderCommitments.Web/Controllers/CohortController.cs +++ b/src/SFA.DAS.ProviderCommitments/SFA.DAS.ProviderCommitments.Web/Controllers/CohortController.cs @@ -124,37 +124,17 @@ public async Task AddNewDraftApprenticeship(CreateCohortWithDraft [Route("add/select-how")] public IActionResult SelectHowToAddApprentice(CreateCohortWithDraftApprenticeshipRequest request) { - var model = new SelectHowToAddFirstApprenticeshipJourneyViewModel + var redirectModel = new CreateCohortWithDraftApprenticeshipRequest { ProviderId = request.ProviderId, EmployerAccountLegalEntityPublicHashedId = request.EmployerAccountLegalEntityPublicHashedId, - CacheKey = request.CacheKey + CacheKey = request.CacheKey, + UseLearnerData = true }; - return View(model); + return RedirectToAction("SelectLearnerRecord", "Learner", redirectModel); } - [HttpPost] - [Route("add/select-how")] - [Authorize(Policy = nameof(PolicyNames.HasContributorOrAbovePermission))] - public ActionResult SelectHowToAddApprentice(SelectHowToAddFirstApprenticeshipJourneyViewModel model) - { - var redirectModel = new CreateCohortWithDraftApprenticeshipRequest - { - ProviderId = model.ProviderId, - EmployerAccountLegalEntityPublicHashedId = model.EmployerAccountLegalEntityPublicHashedId, - CacheKey = model.CacheKey, - UseLearnerData = (model.Selection == AddFirstDraftApprenticeshipJourneyOptions.Ilr) - }; - - if (model.Selection == AddFirstDraftApprenticeshipJourneyOptions.Ilr) - { - return RedirectToAction("SelectLearnerRecord", "Learner", redirectModel); - } - return RedirectToAction("SelectCourse", redirectModel); - } - - [HttpGet] [Route("choose-cohort", Name = RouteNames.ChooseCohort)] public async Task ChooseCohort(ChooseCohortByProviderRequest request)