Skip to content

APPMAN-1746 always redirect to Select From Ilr regardless of UseLearnerData flag #717

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Pauljgraham wants to merge 3 commits into
base: master
Choose a base branch
from
Open

APPMAN-1746 always redirect to Select From Ilr regardless of UseLearnerData flag #717

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fde35c0
redirect to Selct From Ilr regardless of UseLearnerData flag
Pauljgraham Jul 17, 2025
f9fe074
NMake Add page readonly
Pauljgraham Jul 23, 2025
34e2aa9
Revert "NMake Add page readonly"
Pauljgraham Jul 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
58 changes: 0 additions & 58 deletions ...ents.Web.UnitTests/Controllers/CohortControllerTests/WhenIPostSelectHowToAddApprentice.cs
View file
Open in desktop

This file was deleted.

14 changes: 6 additions & 8 deletions ...tments.Web.UnitTests/Controllers/CohortControllerTests/WhenSelectingHowToAddApprentice.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}

Expand Down
28 changes: 4 additions & 24 deletions ...A.DAS.ProviderCommitments/SFA.DAS.ProviderCommitments.Web/Controllers/CohortController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,37 +124,17 @@ public async Task<IActionResult> 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<IActionResult> ChooseCohort(ChooseCohortByProviderRequest request)
Expand Down
Loading