Merge pull request #2695 from TechnologyEnhancedLearning/Develop/feature/TD-3931-DelegateApprovalsController-refactor

TD-3931-DelegateApprovalsController - refactor

Author: rshrirohit

DigitalLearningSolutions.Web.Tests/Controllers/TrackingSystem/Delegates/DelegateApprovalsControllerTests.cs

@@ -1,6 +1,5 @@
 namespace DigitalLearningSolutions.Web.Tests.Controllers.TrackingSystem.Delegates
 {
-    using DigitalLearningSolutions.Data.DataServices.UserDataService;
     using DigitalLearningSolutions.Web.Controllers.TrackingSystem.Delegates;
     using DigitalLearningSolutions.Web.Services;
     using DigitalLearningSolutions.Web.Tests.ControllerHelpers;
@@ -12,14 +11,14 @@ public class DelegateApprovalsControllerTests
     {
         private DelegateApprovalsController delegateApprovalsController = null!;
         private IDelegateApprovalsService delegateApprovalsService = null!;
-        private IUserDataService userDataService = null!;
+        private IUserService userService = null!;
 
         [SetUp]
         public void Setup()
         {
-            userDataService = A.Fake<IUserDataService>();
+            userService = A.Fake<IUserService>();
             delegateApprovalsService = A.Fake<IDelegateApprovalsService>();
-            delegateApprovalsController = new DelegateApprovalsController(delegateApprovalsService, userDataService)
+            delegateApprovalsController = new DelegateApprovalsController(delegateApprovalsService, userService)
                 .WithDefaultContext()
                 .WithMockUser(true);
         }

DigitalLearningSolutions.Web/Controllers/TrackingSystem/Delegates/DelegateApprovalsController.cs

@@ -1,7 +1,6 @@
 namespace DigitalLearningSolutions.Web.Controllers.TrackingSystem.Delegates
 {
     using System.Linq;
-    using DigitalLearningSolutions.Data.DataServices.UserDataService;
     using DigitalLearningSolutions.Data.Enums;
     using DigitalLearningSolutions.Web.Attributes;
     using DigitalLearningSolutions.Web.Helpers;
@@ -20,15 +19,15 @@
     public class DelegateApprovalsController : Controller
     {
         private readonly IDelegateApprovalsService delegateApprovalsService;
-        private readonly IUserDataService userDataService;
+        private readonly IUserService userService;
 
         public DelegateApprovalsController(
             IDelegateApprovalsService delegateApprovalsService,
-            IUserDataService userDataService
+            IUserService userService
         )
         {
             this.delegateApprovalsService = delegateApprovalsService;
-            this.userDataService = userDataService;
+            this.userService = userService;
         }
 
         public IActionResult Index()
@@ -65,7 +64,7 @@ public IActionResult ApproveDelegatesForCentre()
         [Route("/TrackingSystem/Delegates/Reject")]
         public IActionResult DelegateRejectionPage(int delegateId)
         {
-            var delegateEntity = userDataService.GetDelegateById(delegateId);
+            var delegateEntity = userService.GetDelegateById(delegateId);
             var model = new RejectDelegateViewModel(delegateEntity);
             return View(model);
         }