diff --git a/src/SFA.DAS.EmployerCommitmentsV2.Web.UnitTests/Controllers/ApprenticeControllerTests/ApprenticeControllerTestFixtureBase.cs b/src/SFA.DAS.EmployerCommitmentsV2.Web.UnitTests/Controllers/ApprenticeControllerTests/ApprenticeControllerTestFixtureBase.cs index 1efca9a70..66896f4b5 100644 --- a/src/SFA.DAS.EmployerCommitmentsV2.Web.UnitTests/Controllers/ApprenticeControllerTests/ApprenticeControllerTestFixtureBase.cs +++ b/src/SFA.DAS.EmployerCommitmentsV2.Web.UnitTests/Controllers/ApprenticeControllerTests/ApprenticeControllerTestFixtureBase.cs @@ -37,8 +37,7 @@ public ApprenticeControllerTestFixtureBase() Mock.Of>(), _mockCommitmentsApiClient.Object, _mockLinkGenerator.Object, - Mock.Of>(), - _mockAuthorizationService.Object); + Mock.Of>()); _controller.Url = _mockUrlHelper.Object; } diff --git a/src/SFA.DAS.EmployerCommitmentsV2.Web.UnitTests/Controllers/ApprenticeControllerTests/WhenCallingChangeProviderRequestedConfirmationPageTests.cs b/src/SFA.DAS.EmployerCommitmentsV2.Web.UnitTests/Controllers/ApprenticeControllerTests/WhenCallingChangeProviderRequestedConfirmationPageTests.cs index 8e63163f5..05e57a0a3 100644 --- a/src/SFA.DAS.EmployerCommitmentsV2.Web.UnitTests/Controllers/ApprenticeControllerTests/WhenCallingChangeProviderRequestedConfirmationPageTests.cs +++ b/src/SFA.DAS.EmployerCommitmentsV2.Web.UnitTests/Controllers/ApprenticeControllerTests/WhenCallingChangeProviderRequestedConfirmationPageTests.cs @@ -56,8 +56,7 @@ public WhenCallingChangeProviderRequestedConfirmationPageTestsFixture() Mock.Of>(), Mock.Of(), Mock.Of(), - Mock.Of>(), - Mock.Of()); + Mock.Of>()); } public async Task ChangeProviderRequested() diff --git a/src/SFA.DAS.EmployerCommitmentsV2.Web.UnitTests/Controllers/ApprenticeControllerTests/WhenCallingGetSendRequestNewTrainingProviderTests.cs b/src/SFA.DAS.EmployerCommitmentsV2.Web.UnitTests/Controllers/ApprenticeControllerTests/WhenCallingGetSendRequestNewTrainingProviderTests.cs index 74284e8b8..d33cdc426 100644 --- a/src/SFA.DAS.EmployerCommitmentsV2.Web.UnitTests/Controllers/ApprenticeControllerTests/WhenCallingGetSendRequestNewTrainingProviderTests.cs +++ b/src/SFA.DAS.EmployerCommitmentsV2.Web.UnitTests/Controllers/ApprenticeControllerTests/WhenCallingGetSendRequestNewTrainingProviderTests.cs @@ -54,9 +54,8 @@ public WhenCallingGetSendRequestNewTrainingProviderTestsFixture() _controller = new ApprenticeController(_modelMapper.Object, Mock.Of>(), Mock.Of(), - Mock.Of(), - Mock.Of>(), - Mock.Of()); + Mock.Of(), + Mock.Of>()); } public async Task SendRequestNewTrainingProvider() diff --git a/src/SFA.DAS.EmployerCommitmentsV2.Web.UnitTests/Controllers/ApprenticeControllerTests/WhenCallingTheViewChangesPageTests.cs b/src/SFA.DAS.EmployerCommitmentsV2.Web.UnitTests/Controllers/ApprenticeControllerTests/WhenCallingTheViewChangesPageTests.cs index eeee2a016..ffadfce25 100644 --- a/src/SFA.DAS.EmployerCommitmentsV2.Web.UnitTests/Controllers/ApprenticeControllerTests/WhenCallingTheViewChangesPageTests.cs +++ b/src/SFA.DAS.EmployerCommitmentsV2.Web.UnitTests/Controllers/ApprenticeControllerTests/WhenCallingTheViewChangesPageTests.cs @@ -55,8 +55,7 @@ public WhenCallingTheViewChangesPageTestsFixture() Mock.Of>(), Mock.Of(), Mock.Of(), - Mock.Of>(), - Mock.Of()); + Mock.Of>()); } public async Task ViewChanges() diff --git a/src/SFA.DAS.EmployerCommitmentsV2.Web.UnitTests/Controllers/ApprenticeControllerTests/WhenPostingChangeStatus.cs b/src/SFA.DAS.EmployerCommitmentsV2.Web.UnitTests/Controllers/ApprenticeControllerTests/WhenPostingChangeStatus.cs index 1c1b3e46d..91adc61c5 100644 --- a/src/SFA.DAS.EmployerCommitmentsV2.Web.UnitTests/Controllers/ApprenticeControllerTests/WhenPostingChangeStatus.cs +++ b/src/SFA.DAS.EmployerCommitmentsV2.Web.UnitTests/Controllers/ApprenticeControllerTests/WhenPostingChangeStatus.cs @@ -26,8 +26,7 @@ public void Arrange() _mockCookieStorageService.Object, _mockCommitmentsApiClient.Object, _mockLinkGenerator.Object, - Mock.Of>(), - Mock.Of()); + Mock.Of>()); } [Test, MoqAutoData] diff --git a/src/SFA.DAS.EmployerCommitmentsV2.Web.UnitTests/Controllers/ApprenticeControllerTests/WhenPostingConfirmEditApprenticeshipTests.cs b/src/SFA.DAS.EmployerCommitmentsV2.Web.UnitTests/Controllers/ApprenticeControllerTests/WhenPostingConfirmEditApprenticeshipTests.cs index 51116a38a..41ea705f3 100644 --- a/src/SFA.DAS.EmployerCommitmentsV2.Web.UnitTests/Controllers/ApprenticeControllerTests/WhenPostingConfirmEditApprenticeshipTests.cs +++ b/src/SFA.DAS.EmployerCommitmentsV2.Web.UnitTests/Controllers/ApprenticeControllerTests/WhenPostingConfirmEditApprenticeshipTests.cs @@ -41,8 +41,7 @@ public void Arrange() Mock.Of>(), _mockCommitmentsApiClient.Object, _mockLinkGenerator.Object, - Mock.Of>(), - Mock.Of()); + Mock.Of>()); _controller.TempData = new TempDataDictionary(new Mock().Object, new Mock().Object); } diff --git a/src/SFA.DAS.EmployerCommitmentsV2.Web.UnitTests/Controllers/ApprenticeControllerTests/WhenPostingConfirmStopApprenticeship.cs b/src/SFA.DAS.EmployerCommitmentsV2.Web.UnitTests/Controllers/ApprenticeControllerTests/WhenPostingConfirmStopApprenticeship.cs index 61c375a53..91eabd809 100644 --- a/src/SFA.DAS.EmployerCommitmentsV2.Web.UnitTests/Controllers/ApprenticeControllerTests/WhenPostingConfirmStopApprenticeship.cs +++ b/src/SFA.DAS.EmployerCommitmentsV2.Web.UnitTests/Controllers/ApprenticeControllerTests/WhenPostingConfirmStopApprenticeship.cs @@ -40,9 +40,8 @@ public void Arrange() _controller = new ApprenticeController(_mockModelMapper.Object, Mock.Of>(), _mockCommitmentsApiClient.Object, - _mockLinkGenerator.Object, - Mock.Of>(), - Mock.Of()); + _mockLinkGenerator.Object, + Mock.Of>()); _controller.TempData = new TempDataDictionary(new Mock().Object, new Mock().Object); } diff --git a/src/SFA.DAS.EmployerCommitmentsV2.Web.UnitTests/Controllers/ApprenticeControllerTests/WhenPostingEditEndDateTests.cs b/src/SFA.DAS.EmployerCommitmentsV2.Web.UnitTests/Controllers/ApprenticeControllerTests/WhenPostingEditEndDateTests.cs index 990363d2c..652140625 100644 --- a/src/SFA.DAS.EmployerCommitmentsV2.Web.UnitTests/Controllers/ApprenticeControllerTests/WhenPostingEditEndDateTests.cs +++ b/src/SFA.DAS.EmployerCommitmentsV2.Web.UnitTests/Controllers/ApprenticeControllerTests/WhenPostingEditEndDateTests.cs @@ -32,12 +32,11 @@ public void Arrange() _mockCommitmentsApiClient = new Mock(); _mockLinkGenerator = new Mock(); - _controller = new ApprenticeController(_mockModelMapper.Object, + _controller = new ApprenticeController(_mockModelMapper.Object, _mockCookieStorageService.Object, _mockCommitmentsApiClient.Object, - _mockLinkGenerator.Object, - Mock.Of>(), - Mock.Of()); + _mockLinkGenerator.Object, + Mock.Of>()); _controller.TempData = new TempDataDictionary(new Mock().Object, new Mock().Object); } diff --git a/src/SFA.DAS.EmployerCommitmentsV2.Web.UnitTests/Controllers/ApprenticeControllerTests/WhenPostingEditStopDateTests.cs b/src/SFA.DAS.EmployerCommitmentsV2.Web.UnitTests/Controllers/ApprenticeControllerTests/WhenPostingEditStopDateTests.cs index e6c902385..e863bb8c9 100644 --- a/src/SFA.DAS.EmployerCommitmentsV2.Web.UnitTests/Controllers/ApprenticeControllerTests/WhenPostingEditStopDateTests.cs +++ b/src/SFA.DAS.EmployerCommitmentsV2.Web.UnitTests/Controllers/ApprenticeControllerTests/WhenPostingEditStopDateTests.cs @@ -41,8 +41,7 @@ public void Arrange() _mockCookieStorageService.Object, _mockCommitmentsApiClient.Object, _mockLinkGenerator.Object, - Mock.Of>(), - Mock.Of()); + Mock.Of>()); _controller.TempData = new TempDataDictionary(new Mock().Object, new Mock().Object); } diff --git a/src/SFA.DAS.EmployerCommitmentsV2.Web.UnitTests/Controllers/ApprenticeControllerTests/WhenPostingHasTheApprenticeBeenMadeRedundant.cs b/src/SFA.DAS.EmployerCommitmentsV2.Web.UnitTests/Controllers/ApprenticeControllerTests/WhenPostingHasTheApprenticeBeenMadeRedundant.cs index 9fb5b273d..916bf49d5 100644 --- a/src/SFA.DAS.EmployerCommitmentsV2.Web.UnitTests/Controllers/ApprenticeControllerTests/WhenPostingHasTheApprenticeBeenMadeRedundant.cs +++ b/src/SFA.DAS.EmployerCommitmentsV2.Web.UnitTests/Controllers/ApprenticeControllerTests/WhenPostingHasTheApprenticeBeenMadeRedundant.cs @@ -19,10 +19,9 @@ public void Arrange() { _controller = new ApprenticeController(Mock.Of(), Mock.Of>(), - Mock.Of(), - Mock.Of(), - Mock.Of>(), - Mock.Of()); + Mock.Of(), + Mock.Of(), + Mock.Of>()); } [Test, MoqAutoData] diff --git a/src/SFA.DAS.EmployerCommitmentsV2.Web.UnitTests/Controllers/ApprenticeControllerTests/WhenPostingPauseRequestConfirmation.cs b/src/SFA.DAS.EmployerCommitmentsV2.Web.UnitTests/Controllers/ApprenticeControllerTests/WhenPostingPauseRequestConfirmation.cs index a9610577b..2d018132d 100644 --- a/src/SFA.DAS.EmployerCommitmentsV2.Web.UnitTests/Controllers/ApprenticeControllerTests/WhenPostingPauseRequestConfirmation.cs +++ b/src/SFA.DAS.EmployerCommitmentsV2.Web.UnitTests/Controllers/ApprenticeControllerTests/WhenPostingPauseRequestConfirmation.cs @@ -32,12 +32,11 @@ public void Arrange() _mockCommitmentsApiClient = new Mock(); _mockLinkGenerator = new Mock(); - _controller = new ApprenticeController(_mockModelMapper.Object, + _controller = new ApprenticeController(_mockModelMapper.Object, _mockCookieStorageService.Object, _mockCommitmentsApiClient.Object, - _mockLinkGenerator.Object, - Mock.Of>(), - Mock.Of()); + _mockLinkGenerator.Object, + Mock.Of>()); _controller.TempData = new TempDataDictionary(new Mock().Object, new Mock().Object); } diff --git a/src/SFA.DAS.EmployerCommitmentsV2.Web.UnitTests/Controllers/ApprenticeControllerTests/WhenPostingResumeRequestConfirmation.cs b/src/SFA.DAS.EmployerCommitmentsV2.Web.UnitTests/Controllers/ApprenticeControllerTests/WhenPostingResumeRequestConfirmation.cs index ff4a52983..fc2fa0a5b 100644 --- a/src/SFA.DAS.EmployerCommitmentsV2.Web.UnitTests/Controllers/ApprenticeControllerTests/WhenPostingResumeRequestConfirmation.cs +++ b/src/SFA.DAS.EmployerCommitmentsV2.Web.UnitTests/Controllers/ApprenticeControllerTests/WhenPostingResumeRequestConfirmation.cs @@ -32,12 +32,11 @@ public void Arrange() _mockCommitmentsApiClient = new Mock(); _mockLinkGenerator = new Mock(); - _controller = new ApprenticeController(_mockModelMapper.Object, - _mockCookieStorageService.Object, - _mockCommitmentsApiClient.Object, - _mockLinkGenerator.Object, - Mock.Of>(), - Mock.Of()); + _controller = new ApprenticeController(_mockModelMapper.Object, + _mockCookieStorageService.Object, + _mockCommitmentsApiClient.Object, + _mockLinkGenerator.Object, + Mock.Of>()); _controller.TempData = new TempDataDictionary(new Mock().Object, new Mock().Object); } diff --git a/src/SFA.DAS.EmployerCommitmentsV2.Web.UnitTests/Controllers/ApprenticeControllerTests/WhenPostingSendRequestNewTrainingProviderTests.cs b/src/SFA.DAS.EmployerCommitmentsV2.Web.UnitTests/Controllers/ApprenticeControllerTests/WhenPostingSendRequestNewTrainingProviderTests.cs index c89426f61..13f123a4d 100644 --- a/src/SFA.DAS.EmployerCommitmentsV2.Web.UnitTests/Controllers/ApprenticeControllerTests/WhenPostingSendRequestNewTrainingProviderTests.cs +++ b/src/SFA.DAS.EmployerCommitmentsV2.Web.UnitTests/Controllers/ApprenticeControllerTests/WhenPostingSendRequestNewTrainingProviderTests.cs @@ -108,8 +108,7 @@ public WhenPostingSendRequestNewTrainingProviderTestsFixture() Mock.Of>(), _commitmentsApiClient.Object, _linkGenerator.Object, - Mock.Of>(), - Mock.Of()); + Mock.Of>()); } public async Task SendRequestNewTrainingProvider() diff --git a/src/SFA.DAS.EmployerCommitmentsV2.Web.UnitTests/Controllers/ApprenticeControllerTests/WhenPostingWhenDidThisApprenticeshipStop.cs b/src/SFA.DAS.EmployerCommitmentsV2.Web.UnitTests/Controllers/ApprenticeControllerTests/WhenPostingWhenDidThisApprenticeshipStop.cs index f527b1de7..c5832c2d0 100644 --- a/src/SFA.DAS.EmployerCommitmentsV2.Web.UnitTests/Controllers/ApprenticeControllerTests/WhenPostingWhenDidThisApprenticeshipStop.cs +++ b/src/SFA.DAS.EmployerCommitmentsV2.Web.UnitTests/Controllers/ApprenticeControllerTests/WhenPostingWhenDidThisApprenticeshipStop.cs @@ -20,10 +20,9 @@ public void Arrange() { _controller = new ApprenticeController(Mock.Of(), Mock.Of>(), - Mock.Of(), - Mock.Of(), - Mock.Of>(), - Mock.Of()); + Mock.Of(), + Mock.Of(), + Mock.Of>()); } [Test] diff --git a/src/SFA.DAS.EmployerCommitmentsV2.Web.UnitTests/Controllers/ApprenticeControllerTests/WhenRequestingChangeStatusPage.cs b/src/SFA.DAS.EmployerCommitmentsV2.Web.UnitTests/Controllers/ApprenticeControllerTests/WhenRequestingChangeStatusPage.cs index 57ac96529..55f1ca8fa 100644 --- a/src/SFA.DAS.EmployerCommitmentsV2.Web.UnitTests/Controllers/ApprenticeControllerTests/WhenRequestingChangeStatusPage.cs +++ b/src/SFA.DAS.EmployerCommitmentsV2.Web.UnitTests/Controllers/ApprenticeControllerTests/WhenRequestingChangeStatusPage.cs @@ -23,12 +23,11 @@ public void Arrange() _mockCommitmentsApiClient = new Mock(); _mockLinkGenerator = new Mock(); - _controller = new ApprenticeController(_mockModelMapper.Object, - _mockCookieStorageService.Object, - _mockCommitmentsApiClient.Object, - _mockLinkGenerator.Object, - Mock.Of>(), - Mock.Of()); + _controller = new ApprenticeController(_mockModelMapper.Object, + _mockCookieStorageService.Object, + _mockCommitmentsApiClient.Object, + _mockLinkGenerator.Object, + Mock.Of>()); } [Test] diff --git a/src/SFA.DAS.EmployerCommitmentsV2.Web.UnitTests/Controllers/ApprenticeControllerTests/WhenRequestingConfirmStopApprenticeshipPage.cs b/src/SFA.DAS.EmployerCommitmentsV2.Web.UnitTests/Controllers/ApprenticeControllerTests/WhenRequestingConfirmStopApprenticeshipPage.cs index 3742acc0b..7b85bf60d 100644 --- a/src/SFA.DAS.EmployerCommitmentsV2.Web.UnitTests/Controllers/ApprenticeControllerTests/WhenRequestingConfirmStopApprenticeshipPage.cs +++ b/src/SFA.DAS.EmployerCommitmentsV2.Web.UnitTests/Controllers/ApprenticeControllerTests/WhenRequestingConfirmStopApprenticeshipPage.cs @@ -23,12 +23,11 @@ public void Arrange() _mockCommitmentsApiClient = new Mock(); _mockLinkGenerator = new Mock(); - _controller = new ApprenticeController(_mockModelMapper.Object, - _mockCookieStorageService.Object, + _controller = new ApprenticeController(_mockModelMapper.Object, + _mockCookieStorageService.Object, _mockCommitmentsApiClient.Object, - _mockLinkGenerator.Object, - Mock.Of>(), - Mock.Of()); + _mockLinkGenerator.Object, + Mock.Of>()); } [Test, MoqAutoData] diff --git a/src/SFA.DAS.EmployerCommitmentsV2.Web.UnitTests/Controllers/ApprenticeControllerTests/WhenRequestingHasTheApprenticeBeenMadeRedundantPage.cs b/src/SFA.DAS.EmployerCommitmentsV2.Web.UnitTests/Controllers/ApprenticeControllerTests/WhenRequestingHasTheApprenticeBeenMadeRedundantPage.cs index 3c34e8fc7..22216009d 100644 --- a/src/SFA.DAS.EmployerCommitmentsV2.Web.UnitTests/Controllers/ApprenticeControllerTests/WhenRequestingHasTheApprenticeBeenMadeRedundantPage.cs +++ b/src/SFA.DAS.EmployerCommitmentsV2.Web.UnitTests/Controllers/ApprenticeControllerTests/WhenRequestingHasTheApprenticeBeenMadeRedundantPage.cs @@ -23,12 +23,11 @@ public void Arrange() _mockCommitmentsApiClient = new Mock(); _mockLinkGenerator = new Mock(); - _controller = new ApprenticeController(_mockModelMapper.Object, - _mockCookieStorageService.Object, + _controller = new ApprenticeController(_mockModelMapper.Object, + _mockCookieStorageService.Object, _mockCommitmentsApiClient.Object, - _mockLinkGenerator.Object, - Mock.Of>(), - Mock.Of()); + _mockLinkGenerator.Object, + Mock.Of>()); } [Test, MoqAutoData] diff --git a/src/SFA.DAS.EmployerCommitmentsV2.Web.UnitTests/Controllers/ApprenticeControllerTests/WhenRequestingPauseApprenticeshipConfirmationPage.cs b/src/SFA.DAS.EmployerCommitmentsV2.Web.UnitTests/Controllers/ApprenticeControllerTests/WhenRequestingPauseApprenticeshipConfirmationPage.cs index 9ba27cde5..d42c42dc3 100644 --- a/src/SFA.DAS.EmployerCommitmentsV2.Web.UnitTests/Controllers/ApprenticeControllerTests/WhenRequestingPauseApprenticeshipConfirmationPage.cs +++ b/src/SFA.DAS.EmployerCommitmentsV2.Web.UnitTests/Controllers/ApprenticeControllerTests/WhenRequestingPauseApprenticeshipConfirmationPage.cs @@ -23,12 +23,11 @@ public void Arrange() _mockCommitmentsApiClient = new Mock(); _mockLinkGenerator = new Mock(); - _controller = new ApprenticeController(_mockModelMapper.Object, - _mockCookieStorageService.Object, + _controller = new ApprenticeController(_mockModelMapper.Object, + _mockCookieStorageService.Object, _mockCommitmentsApiClient.Object, - _mockLinkGenerator.Object, - Mock.Of>(), - Mock.Of()); + _mockLinkGenerator.Object, + Mock.Of>()); } [Test] diff --git a/src/SFA.DAS.EmployerCommitmentsV2.Web.UnitTests/Controllers/ApprenticeControllerTests/WhenRequestingResumeApprenticeshipConfirmationPage.cs b/src/SFA.DAS.EmployerCommitmentsV2.Web.UnitTests/Controllers/ApprenticeControllerTests/WhenRequestingResumeApprenticeshipConfirmationPage.cs index bf3ebcbe6..5b73148d4 100644 --- a/src/SFA.DAS.EmployerCommitmentsV2.Web.UnitTests/Controllers/ApprenticeControllerTests/WhenRequestingResumeApprenticeshipConfirmationPage.cs +++ b/src/SFA.DAS.EmployerCommitmentsV2.Web.UnitTests/Controllers/ApprenticeControllerTests/WhenRequestingResumeApprenticeshipConfirmationPage.cs @@ -23,12 +23,11 @@ public void Arrange() _mockCommitmentsApiClient = new Mock(); _mockLinkGenerator = new Mock(); - _controller = new ApprenticeController(_mockModelMapper.Object, - _mockCookieStorageService.Object, - _mockCommitmentsApiClient.Object, - _mockLinkGenerator.Object, - Mock.Of>(), - Mock.Of()); + _controller = new ApprenticeController(_mockModelMapper.Object, + _mockCookieStorageService.Object, + _mockCommitmentsApiClient.Object, + _mockLinkGenerator.Object, + Mock.Of>()); } [Test] diff --git a/src/SFA.DAS.EmployerCommitmentsV2.Web.UnitTests/Controllers/ApprenticeControllerTests/WhenRequestingWhenDidThisApprenticeshipStopPage.cs b/src/SFA.DAS.EmployerCommitmentsV2.Web.UnitTests/Controllers/ApprenticeControllerTests/WhenRequestingWhenDidThisApprenticeshipStopPage.cs index 48bb79cb4..fd652fcc2 100644 --- a/src/SFA.DAS.EmployerCommitmentsV2.Web.UnitTests/Controllers/ApprenticeControllerTests/WhenRequestingWhenDidThisApprenticeshipStopPage.cs +++ b/src/SFA.DAS.EmployerCommitmentsV2.Web.UnitTests/Controllers/ApprenticeControllerTests/WhenRequestingWhenDidThisApprenticeshipStopPage.cs @@ -22,12 +22,11 @@ public void Arrange() _mockCommitmentsApiClient = new Mock(); _mockLinkGenerator = new Mock(); - _controller = new ApprenticeController(_mockModelMapper.Object, - _mockCookieStorageService.Object, + _controller = new ApprenticeController(_mockModelMapper.Object, + _mockCookieStorageService.Object, _mockCommitmentsApiClient.Object, - _mockLinkGenerator.Object, - Mock.Of>(), - Mock.Of()); + _mockLinkGenerator.Object, + Mock.Of>()); } [Test] diff --git a/src/SFA.DAS.EmployerCommitmentsV2.Web/Controllers/ApprenticeController.cs b/src/SFA.DAS.EmployerCommitmentsV2.Web/Controllers/ApprenticeController.cs index f94e84431..c783bb4df 100644 --- a/src/SFA.DAS.EmployerCommitmentsV2.Web/Controllers/ApprenticeController.cs +++ b/src/SFA.DAS.EmployerCommitmentsV2.Web/Controllers/ApprenticeController.cs @@ -32,8 +32,7 @@ public class ApprenticeController : Controller private readonly ICookieStorageService _cookieStorage; private readonly ICommitmentsApiClient _commitmentsApiClient; private readonly ILinkGenerator _linkGenerator; - private readonly ILogger _logger; - private readonly IAuthorizationService _authorizationService; + private readonly ILogger _logger; private const string ApprenticePausedMessage = "Apprenticeship paused"; private const string ApprenticeResumeMessage = "Apprenticeship resumed"; private const string ApprenticeStoppedMessage = "Apprenticeship stopped"; @@ -46,14 +45,13 @@ public class ApprenticeController : Controller private const string ChangesRejectedMessage = "Changes rejected"; private const string ChangesUndoneMessage = "Changes undone"; - public ApprenticeController(IModelMapper modelMapper, ICookieStorageService cookieStorage, ICommitmentsApiClient commitmentsApiClient, ILinkGenerator linkGenerator, ILogger logger, IAuthorizationService authorizationService) + public ApprenticeController(IModelMapper modelMapper, ICookieStorageService cookieStorage, ICommitmentsApiClient commitmentsApiClient, ILinkGenerator linkGenerator, ILogger logger) { _modelMapper = modelMapper; _cookieStorage = cookieStorage; _commitmentsApiClient = commitmentsApiClient; _linkGenerator = linkGenerator; - _logger = logger; - _authorizationService = authorizationService; + _logger = logger; } [Route("", Name = RouteNames.ApprenticesIndex)] @@ -552,8 +550,6 @@ public async Task ResumeApprenticeship(ResumeRequestViewModel vie public async Task ApprenticeshipDetails(ApprenticeshipDetailsRequest request) { var viewModel = await _modelMapper.Map(request); - - viewModel.IsV2Edit = _authorizationService.IsAuthorized(EmployerFeature.EditApprenticeV2); return View("details", viewModel); } diff --git a/src/SFA.DAS.EmployerCommitmentsV2.Web/Models/Apprentice/ApprenticeshipDetailsRequestViewModel.cs b/src/SFA.DAS.EmployerCommitmentsV2.Web/Models/Apprentice/ApprenticeshipDetailsRequestViewModel.cs index ad966e28d..56bef9586 100644 --- a/src/SFA.DAS.EmployerCommitmentsV2.Web/Models/Apprentice/ApprenticeshipDetailsRequestViewModel.cs +++ b/src/SFA.DAS.EmployerCommitmentsV2.Web/Models/Apprentice/ApprenticeshipDetailsRequestViewModel.cs @@ -47,8 +47,7 @@ public class ApprenticeshipDetailsRequestViewModel : IAuthorizationContextModel public bool HasPendingChangeOfEmployerRequest { get; set; } public Party? PendingChangeOfEmployerRequestWithParty { get; set; } public List TrainingProviderHistory { get; set; } - public bool IsV2Edit { get; set; } - + public ActionRequiredBanner GetActionRequiredBanners() { var actionRequiredBanner = ActionRequiredBanner.None; diff --git a/src/SFA.DAS.EmployerCommitmentsV2.Web/Views/Apprentice/Details.cshtml b/src/SFA.DAS.EmployerCommitmentsV2.Web/Views/Apprentice/Details.cshtml index 088b6b5a9..cebbe2a71 100644 --- a/src/SFA.DAS.EmployerCommitmentsV2.Web/Views/Apprentice/Details.cshtml +++ b/src/SFA.DAS.EmployerCommitmentsV2.Web/Views/Apprentice/Details.cshtml @@ -150,14 +150,7 @@
@if (Model.EnableEdit) { - @if (Model.IsV2Edit) - { - Edit - } - else - { - Edit - } + Edit }
diff --git a/src/SFA.DAS.EmployerCommitmentsV2/Features/EmployerFeature.cs b/src/SFA.DAS.EmployerCommitmentsV2/Features/EmployerFeature.cs index cb59f4011..dc72cad09 100644 --- a/src/SFA.DAS.EmployerCommitmentsV2/Features/EmployerFeature.cs +++ b/src/SFA.DAS.EmployerCommitmentsV2/Features/EmployerFeature.cs @@ -5,8 +5,7 @@ public static class EmployerFeature private const string Prefix = "EmployerFeature."; public const string EnhancedApproval = Prefix + "EnhancedApproval"; - public const string ManageApprenticesV2 = Prefix + "ManageApprenticesV2"; - public const string EditApprenticeV2 = Prefix + "EditApprenticeV2"; + public const string ManageApprenticesV2 = Prefix + "ManageApprenticesV2"; public const string ApprenticeEmail = Prefix + "ApprenticeEmail"; } } \ No newline at end of file