CON-3503 - Remove EditApprenticeV2 flag (#219)

SkillsFundingAgency · Jun 23, 2021 · 49c81aa · 49c81aa
1 parent c17428f
commit 49c81aa
Show file tree

Hide file tree

Showing 24 changed files with 60 additions and 93 deletions.
diff --git a/...eb.UnitTests/Controllers/ApprenticeControllerTests/ApprenticeControllerTestFixtureBase.cs b/...eb.UnitTests/Controllers/ApprenticeControllerTests/ApprenticeControllerTestFixtureBase.cs
@@ -37,8 +37,7 @@ public ApprenticeControllerTestFixtureBase()
                 Mock.Of<ICookieStorageService<IndexRequest>>(),
                 _mockCommitmentsApiClient.Object,
                 _mockLinkGenerator.Object,
-                Mock.Of<ILogger<ApprenticeController>>(),
-                _mockAuthorizationService.Object);
+                Mock.Of<ILogger<ApprenticeController>>());
 
             _controller.Url = _mockUrlHelper.Object;
         }

diff --git a/...lers/ApprenticeControllerTests/WhenCallingChangeProviderRequestedConfirmationPageTests.cs b/...lers/ApprenticeControllerTests/WhenCallingChangeProviderRequestedConfirmationPageTests.cs
@@ -56,8 +56,7 @@ public WhenCallingChangeProviderRequestedConfirmationPageTestsFixture()
                 Mock.Of<ICookieStorageService<IndexRequest>>(),
                 Mock.Of<ICommitmentsApiClient>(),
                 Mock.Of<ILinkGenerator>(),
-                Mock.Of<ILogger<ApprenticeController>>(),
-                Mock.Of<IAuthorizationService>());
+                Mock.Of<ILogger<ApprenticeController>>());                
         }
 
         public async Task<IActionResult> ChangeProviderRequested()

diff --git a/...ontrollers/ApprenticeControllerTests/WhenCallingGetSendRequestNewTrainingProviderTests.cs b/...ontrollers/ApprenticeControllerTests/WhenCallingGetSendRequestNewTrainingProviderTests.cs
@@ -54,9 +54,8 @@ public WhenCallingGetSendRequestNewTrainingProviderTestsFixture()
             _controller = new ApprenticeController(_modelMapper.Object,
                Mock.Of<ICookieStorageService<IndexRequest>>(),
                Mock.Of<ICommitmentsApiClient>(),
-               Mock.Of<ILinkGenerator>(), 
-               Mock.Of<ILogger<ApprenticeController>>(),
-               Mock.Of<IAuthorizationService>());
+               Mock.Of<ILinkGenerator>(),
+               Mock.Of<ILogger<ApprenticeController>>());
         }
 
         public async Task<IActionResult> SendRequestNewTrainingProvider()

diff --git a/...Web.UnitTests/Controllers/ApprenticeControllerTests/WhenCallingTheViewChangesPageTests.cs b/...Web.UnitTests/Controllers/ApprenticeControllerTests/WhenCallingTheViewChangesPageTests.cs
@@ -55,8 +55,7 @@ public WhenCallingTheViewChangesPageTestsFixture()
                 Mock.Of<ICookieStorageService<IndexRequest>>(),
                 Mock.Of<ICommitmentsApiClient>(),
                 Mock.Of<ILinkGenerator>(),
-                Mock.Of<ILogger<ApprenticeController>>(),
-                Mock.Of<IAuthorizationService>());
+                Mock.Of<ILogger<ApprenticeController>>());
         }
 
         public async Task<IActionResult> ViewChanges()

diff --git a/...mitmentsV2.Web.UnitTests/Controllers/ApprenticeControllerTests/WhenPostingChangeStatus.cs b/...mitmentsV2.Web.UnitTests/Controllers/ApprenticeControllerTests/WhenPostingChangeStatus.cs
@@ -26,8 +26,7 @@ public void Arrange()
                 _mockCookieStorageService.Object,
                 _mockCommitmentsApiClient.Object,
                 _mockLinkGenerator.Object,
-                Mock.Of<ILogger<ApprenticeController>>(),
-                Mock.Of<IAuthorizationService>());
+                Mock.Of<ILogger<ApprenticeController>>());
         }
 
         [Test, MoqAutoData]

diff --git a/...tTests/Controllers/ApprenticeControllerTests/WhenPostingConfirmEditApprenticeshipTests.cs b/...tTests/Controllers/ApprenticeControllerTests/WhenPostingConfirmEditApprenticeshipTests.cs
@@ -41,8 +41,7 @@ public void Arrange()
                 Mock.Of<ICookieStorageService<IndexRequest>>(),
                 _mockCommitmentsApiClient.Object,
                 _mockLinkGenerator.Object,
-                Mock.Of<ILogger<ApprenticeController>>(),
-                Mock.Of<IAuthorizationService>());
+                Mock.Of<ILogger<ApprenticeController>>());
             _controller.TempData = new TempDataDictionary(new Mock<HttpContext>().Object, new Mock<ITempDataProvider>().Object);
         }
 

diff --git a/...b.UnitTests/Controllers/ApprenticeControllerTests/WhenPostingConfirmStopApprenticeship.cs b/...b.UnitTests/Controllers/ApprenticeControllerTests/WhenPostingConfirmStopApprenticeship.cs
@@ -40,9 +40,8 @@ public void Arrange()
             _controller = new ApprenticeController(_mockModelMapper.Object,
                 Mock.Of<ICookieStorageService<IndexRequest>>(),
                 _mockCommitmentsApiClient.Object,
-                _mockLinkGenerator.Object, 
-                Mock.Of<ILogger<ApprenticeController>>(),
-                Mock.Of<IAuthorizationService>());
+                _mockLinkGenerator.Object,
+                Mock.Of<ILogger<ApprenticeController>>());
             _controller.TempData = new TempDataDictionary(new Mock<HttpContext>().Object, new Mock<ITempDataProvider>().Object);
         }
 

diff --git a/...entsV2.Web.UnitTests/Controllers/ApprenticeControllerTests/WhenPostingEditEndDateTests.cs b/...entsV2.Web.UnitTests/Controllers/ApprenticeControllerTests/WhenPostingEditEndDateTests.cs
@@ -32,12 +32,11 @@ public void Arrange()
             _mockCommitmentsApiClient = new Mock<ICommitmentsApiClient>();
             _mockLinkGenerator = new Mock<ILinkGenerator>();
 
-            _controller = new ApprenticeController(_mockModelMapper.Object, 
+            _controller = new ApprenticeController(_mockModelMapper.Object,
                 _mockCookieStorageService.Object,
                 _mockCommitmentsApiClient.Object,
-                _mockLinkGenerator.Object, 
-                Mock.Of<ILogger<ApprenticeController>>(),
-                Mock.Of<IAuthorizationService>());
+                _mockLinkGenerator.Object,
+                Mock.Of<ILogger<ApprenticeController>>());
             _controller.TempData = new TempDataDictionary(new Mock<HttpContext>().Object, new Mock<ITempDataProvider>().Object);
         }
 

diff --git a/...ntsV2.Web.UnitTests/Controllers/ApprenticeControllerTests/WhenPostingEditStopDateTests.cs b/...ntsV2.Web.UnitTests/Controllers/ApprenticeControllerTests/WhenPostingEditStopDateTests.cs
@@ -41,8 +41,7 @@ public void Arrange()
                 _mockCookieStorageService.Object,
                 _mockCommitmentsApiClient.Object,
                 _mockLinkGenerator.Object,
-                Mock.Of<ILogger<ApprenticeController>>(),
-                Mock.Of<IAuthorizationService>());
+                Mock.Of<ILogger<ApprenticeController>>());
             _controller.TempData = new TempDataDictionary(new Mock<HttpContext>().Object, new Mock<ITempDataProvider>().Object);
         }
 

diff --git a/...sts/Controllers/ApprenticeControllerTests/WhenPostingHasTheApprenticeBeenMadeRedundant.cs b/...sts/Controllers/ApprenticeControllerTests/WhenPostingHasTheApprenticeBeenMadeRedundant.cs
@@ -19,10 +19,9 @@ public void Arrange()
         {
             _controller = new ApprenticeController(Mock.Of<IModelMapper>(),
                 Mock.Of<ICookieStorageService<IndexRequest>>(),
-                Mock.Of<ICommitmentsApiClient>(), 
-                Mock.Of<ILinkGenerator>(), 
-                Mock.Of<ILogger<ApprenticeController>>(),
-                Mock.Of<IAuthorizationService>());
+                Mock.Of<ICommitmentsApiClient>(),
+                Mock.Of<ILinkGenerator>(),
+                Mock.Of<ILogger<ApprenticeController>>());
         }
 
         [Test, MoqAutoData]

diff --git a/...eb.UnitTests/Controllers/ApprenticeControllerTests/WhenPostingPauseRequestConfirmation.cs b/...eb.UnitTests/Controllers/ApprenticeControllerTests/WhenPostingPauseRequestConfirmation.cs
@@ -32,12 +32,11 @@ public void Arrange()
             _mockCommitmentsApiClient = new Mock<ICommitmentsApiClient>();
             _mockLinkGenerator = new Mock<ILinkGenerator>();
 
-            _controller = new ApprenticeController(_mockModelMapper.Object, 
+            _controller = new ApprenticeController(_mockModelMapper.Object,
                 _mockCookieStorageService.Object,
                 _mockCommitmentsApiClient.Object,
-                _mockLinkGenerator.Object, 
-                Mock.Of<ILogger<ApprenticeController>>(),
-                Mock.Of<IAuthorizationService>());
+                _mockLinkGenerator.Object,
+                Mock.Of<ILogger<ApprenticeController>>());
             _controller.TempData = new TempDataDictionary(new Mock<HttpContext>().Object, new Mock<ITempDataProvider>().Object);
         }
 

diff --git a/...b.UnitTests/Controllers/ApprenticeControllerTests/WhenPostingResumeRequestConfirmation.cs b/...b.UnitTests/Controllers/ApprenticeControllerTests/WhenPostingResumeRequestConfirmation.cs
@@ -32,12 +32,11 @@ public void Arrange()
             _mockCommitmentsApiClient = new Mock<ICommitmentsApiClient>();
             _mockLinkGenerator = new Mock<ILinkGenerator>();
 
-            _controller = new ApprenticeController(_mockModelMapper.Object, 
-                _mockCookieStorageService.Object, 
-                _mockCommitmentsApiClient.Object, 
-                _mockLinkGenerator.Object, 
-                Mock.Of<ILogger<ApprenticeController>>(),
-                Mock.Of<IAuthorizationService>());
+            _controller = new ApprenticeController(_mockModelMapper.Object,
+                _mockCookieStorageService.Object,
+                _mockCommitmentsApiClient.Object,
+                _mockLinkGenerator.Object,
+                Mock.Of<ILogger<ApprenticeController>>());
             _controller.TempData = new TempDataDictionary(new Mock<HttpContext>().Object, new Mock<ITempDataProvider>().Object);
         }
 

diff --git a/...s/Controllers/ApprenticeControllerTests/WhenPostingSendRequestNewTrainingProviderTests.cs b/...s/Controllers/ApprenticeControllerTests/WhenPostingSendRequestNewTrainingProviderTests.cs
@@ -108,8 +108,7 @@ public WhenPostingSendRequestNewTrainingProviderTestsFixture()
                 Mock.Of<ICookieStorageService<IndexRequest>>(),
                 _commitmentsApiClient.Object,
                 _linkGenerator.Object,
-                Mock.Of<ILogger<ApprenticeController>>(),
-                Mock.Of<IAuthorizationService>());
+                Mock.Of<ILogger<ApprenticeController>>());
         }
 
         public async Task<IActionResult> SendRequestNewTrainingProvider()

diff --git a/...itTests/Controllers/ApprenticeControllerTests/WhenPostingWhenDidThisApprenticeshipStop.cs b/...itTests/Controllers/ApprenticeControllerTests/WhenPostingWhenDidThisApprenticeshipStop.cs
@@ -20,10 +20,9 @@ public void Arrange()
         {
             _controller = new ApprenticeController(Mock.Of<IModelMapper>(),
                 Mock.Of<ICookieStorageService<IndexRequest>>(),
-                Mock.Of<ICommitmentsApiClient>(), 
-                Mock.Of<ILinkGenerator>(), 
-                Mock.Of<ILogger<ApprenticeController>>(),
-                Mock.Of<IAuthorizationService>());
+                Mock.Of<ICommitmentsApiClient>(),
+                Mock.Of<ILinkGenerator>(),
+                Mock.Of<ILogger<ApprenticeController>>());
         }
 
         [Test]

diff --git a/...sV2.Web.UnitTests/Controllers/ApprenticeControllerTests/WhenRequestingChangeStatusPage.cs b/...sV2.Web.UnitTests/Controllers/ApprenticeControllerTests/WhenRequestingChangeStatusPage.cs
@@ -23,12 +23,11 @@ public void Arrange()
             _mockCommitmentsApiClient = new Mock<ICommitmentsApiClient>();
             _mockLinkGenerator = new Mock<ILinkGenerator>();
 
-            _controller = new ApprenticeController(_mockModelMapper.Object, 
-                _mockCookieStorageService.Object, 
-                _mockCommitmentsApiClient.Object, 
-                _mockLinkGenerator.Object, 
-                Mock.Of<ILogger<ApprenticeController>>(),
-                Mock.Of<IAuthorizationService>());
+            _controller = new ApprenticeController(_mockModelMapper.Object,
+                _mockCookieStorageService.Object,
+                _mockCommitmentsApiClient.Object,
+                _mockLinkGenerator.Object,
+                Mock.Of<ILogger<ApprenticeController>>());
         }
 
         [Test]

diff --git a/...ests/Controllers/ApprenticeControllerTests/WhenRequestingConfirmStopApprenticeshipPage.cs b/...ests/Controllers/ApprenticeControllerTests/WhenRequestingConfirmStopApprenticeshipPage.cs
@@ -23,12 +23,11 @@ public void Arrange()
             _mockCommitmentsApiClient = new Mock<ICommitmentsApiClient>();
             _mockLinkGenerator = new Mock<ILinkGenerator>();
 
-            _controller = new ApprenticeController(_mockModelMapper.Object, 
-                _mockCookieStorageService.Object, 
+            _controller = new ApprenticeController(_mockModelMapper.Object,
+                _mockCookieStorageService.Object,
                 _mockCommitmentsApiClient.Object,
-                _mockLinkGenerator.Object, 
-                Mock.Of<ILogger<ApprenticeController>>(), 
-                Mock.Of<IAuthorizationService>());
+                _mockLinkGenerator.Object,
+                Mock.Of<ILogger<ApprenticeController>>());
         }
 
         [Test, MoqAutoData]

diff --git a/...trollers/ApprenticeControllerTests/WhenRequestingHasTheApprenticeBeenMadeRedundantPage.cs b/...trollers/ApprenticeControllerTests/WhenRequestingHasTheApprenticeBeenMadeRedundantPage.cs
@@ -23,12 +23,11 @@ public void Arrange()
             _mockCommitmentsApiClient = new Mock<ICommitmentsApiClient>();
             _mockLinkGenerator = new Mock<ILinkGenerator>();
 
-            _controller = new ApprenticeController(_mockModelMapper.Object, 
-                _mockCookieStorageService.Object, 
+            _controller = new ApprenticeController(_mockModelMapper.Object,
+                _mockCookieStorageService.Object,
                 _mockCommitmentsApiClient.Object,
-                _mockLinkGenerator.Object, 
-                Mock.Of<ILogger<ApprenticeController>>(), 
-                Mock.Of<IAuthorizationService>());
+                _mockLinkGenerator.Object,
+                Mock.Of<ILogger<ApprenticeController>>());
         }
 
         [Test, MoqAutoData]

diff --git a/...ontrollers/ApprenticeControllerTests/WhenRequestingPauseApprenticeshipConfirmationPage.cs b/...ontrollers/ApprenticeControllerTests/WhenRequestingPauseApprenticeshipConfirmationPage.cs
@@ -23,12 +23,11 @@ public void Arrange()
             _mockCommitmentsApiClient = new Mock<ICommitmentsApiClient>();
             _mockLinkGenerator = new Mock<ILinkGenerator>();
 
-            _controller = new ApprenticeController(_mockModelMapper.Object, 
-                _mockCookieStorageService.Object, 
+            _controller = new ApprenticeController(_mockModelMapper.Object,
+                _mockCookieStorageService.Object,
                 _mockCommitmentsApiClient.Object,
-                _mockLinkGenerator.Object, 
-                Mock.Of<ILogger<ApprenticeController>>(), 
-                Mock.Of<IAuthorizationService>());
+                _mockLinkGenerator.Object,
+                Mock.Of<ILogger<ApprenticeController>>());
         }
 
         [Test]

diff --git a/...ntrollers/ApprenticeControllerTests/WhenRequestingResumeApprenticeshipConfirmationPage.cs b/...ntrollers/ApprenticeControllerTests/WhenRequestingResumeApprenticeshipConfirmationPage.cs
@@ -23,12 +23,11 @@ public void Arrange()
             _mockCommitmentsApiClient = new Mock<ICommitmentsApiClient>();
             _mockLinkGenerator = new Mock<ILinkGenerator>();
 
-            _controller = new ApprenticeController(_mockModelMapper.Object, 
-                _mockCookieStorageService.Object, 
-                _mockCommitmentsApiClient.Object, 
-                _mockLinkGenerator.Object, 
-                Mock.Of<ILogger<ApprenticeController>>(), 
-                Mock.Of<IAuthorizationService>());
+            _controller = new ApprenticeController(_mockModelMapper.Object,
+                _mockCookieStorageService.Object,
+                _mockCommitmentsApiClient.Object,
+                _mockLinkGenerator.Object,
+                Mock.Of<ILogger<ApprenticeController>>());
         }
 
         [Test]

diff --git a/.../Controllers/ApprenticeControllerTests/WhenRequestingWhenDidThisApprenticeshipStopPage.cs b/.../Controllers/ApprenticeControllerTests/WhenRequestingWhenDidThisApprenticeshipStopPage.cs
@@ -22,12 +22,11 @@ public void Arrange()
             _mockCommitmentsApiClient = new Mock<ICommitmentsApiClient>();
             _mockLinkGenerator = new Mock<ILinkGenerator>();
 
-            _controller = new ApprenticeController(_mockModelMapper.Object, 
-                _mockCookieStorageService.Object, 
+            _controller = new ApprenticeController(_mockModelMapper.Object,
+                _mockCookieStorageService.Object,
                 _mockCommitmentsApiClient.Object,
-                _mockLinkGenerator.Object, 
-                Mock.Of<ILogger<ApprenticeController>>(), 
-                Mock.Of<IAuthorizationService>());
+                _mockLinkGenerator.Object,
+                Mock.Of<ILogger<ApprenticeController>>());
         }
 
         [Test]

diff --git 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<IndexRequest> _cookieStorage;
         private readonly ICommitmentsApiClient _commitmentsApiClient;
         private readonly ILinkGenerator _linkGenerator;
-        private readonly ILogger<ApprenticeController> _logger;
-        private readonly IAuthorizationService _authorizationService;
+        private readonly ILogger<ApprenticeController> _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<IndexRequest> cookieStorage, ICommitmentsApiClient commitmentsApiClient, ILinkGenerator linkGenerator, ILogger<ApprenticeController> logger, IAuthorizationService authorizationService)
+        public ApprenticeController(IModelMapper modelMapper, ICookieStorageService<IndexRequest> cookieStorage, ICommitmentsApiClient commitmentsApiClient, ILinkGenerator linkGenerator, ILogger<ApprenticeController> 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<IActionResult> ResumeApprenticeship(ResumeRequestViewModel vie
         public async Task<IActionResult> ApprenticeshipDetails(ApprenticeshipDetailsRequest request)
         {
             var viewModel = await _modelMapper.Map<ApprenticeshipDetailsRequestViewModel>(request);
-
-            viewModel.IsV2Edit = _authorizationService.IsAuthorized(EmployerFeature.EditApprenticeV2);
 
             return View("details", viewModel);
         }    

diff --git a/....DAS.EmployerCommitmentsV2.Web/Models/Apprentice/ApprenticeshipDetailsRequestViewModel.cs b/....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> 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
@@ -150,14 +150,7 @@
             <div class="govuk-grid-column-one-third das-!-text-align-right--from-tablet">
                 @if (Model.EnableEdit)
                 {
-                    @if (Model.IsV2Edit)
-                    {
-                        <a id="edit-apprentice-link" href="@Url.Action("EditApprenticeship", new { AccountHashedId = Model.AccountHashedId, ApprenticeshipHashedId = Model.HashedApprenticeshipId })" class="govuk-link govuk-body">Edit</a>
-                    }
-                    else
-                    {
-                        <a id="edit-apprentice-link" href="@LinkGenerator.EditApprenticeship(Model.AccountHashedId, Model.HashedApprenticeshipId)" class="govuk-link govuk-body">Edit</a>
-                    }
+                <a id="edit-apprentice-link" href="@Url.Action("EditApprenticeship", new { AccountHashedId = Model.AccountHashedId, ApprenticeshipHashedId = Model.HashedApprenticeshipId })" class="govuk-link govuk-body">Edit</a>
                 }
             </div>
         </div>

diff --git 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";
     }
 }