Merge pull request #2689 from TechnologyEnhancedLearning/Develop/feature/TD-3938-EmailDelegatesController-refactor

TD-3938-EmailDelegatesController - refactor

Author: rshrirohit

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

@@ -1,10 +1,9 @@
 namespace DigitalLearningSolutions.Web.Tests.Controllers.TrackingSystem.Delegates
 {
     using System.Collections.Generic;
-    using DigitalLearningSolutions.Data.DataServices;
     using DigitalLearningSolutions.Data.Models.SearchSortFilterPaginate;
     using DigitalLearningSolutions.Data.Models.User;
-    
+
     using DigitalLearningSolutions.Data.Utilities;
     using DigitalLearningSolutions.Web.Controllers.TrackingSystem.Delegates;
     using DigitalLearningSolutions.Web.Helpers;
@@ -24,7 +23,7 @@ public class EmailDelegatesControllerTests
         private EmailDelegatesController emailDelegatesController = null!;
         private HttpRequest httpRequest = null!;
         private HttpResponse httpResponse = null!;
-        private IJobGroupsDataService jobGroupsDataService = null!;
+        private IJobGroupsService jobGroupsService = null!;
         private IPasswordResetService passwordResetService = null!;
         private PromptsService promptsHelper = null!;
         private ISearchSortFilterPaginateService searchSortFilterPaginateService = null!;
@@ -38,7 +37,7 @@ public void Setup()
             centreRegistrationPromptsService = A.Fake<ICentreRegistrationPromptsService>();
             promptsHelper = new PromptsService(centreRegistrationPromptsService);
             userService = A.Fake<IUserService>();
-            jobGroupsDataService = A.Fake<IJobGroupsDataService>();
+            jobGroupsService = A.Fake<IJobGroupsService>();
             passwordResetService = A.Fake<IPasswordResetService>();
             searchSortFilterPaginateService = A.Fake<ISearchSortFilterPaginateService>();
             config = A.Fake<IConfiguration>();
@@ -51,7 +50,7 @@ public void Setup()
 
             emailDelegatesController = new EmailDelegatesController(
                     promptsHelper,
-                    jobGroupsDataService,
+                    jobGroupsService,
                     passwordResetService,
                     userService,
                     searchSortFilterPaginateService,

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

@@ -3,7 +3,6 @@ namespace DigitalLearningSolutions.Web.Controllers.TrackingSystem.Delegates
     using System;
     using System.Collections.Generic;
     using System.Linq;
-    using DigitalLearningSolutions.Data.DataServices;
     using DigitalLearningSolutions.Data.Enums;
     using DigitalLearningSolutions.Data.Extensions;
     using DigitalLearningSolutions.Data.Helpers;
@@ -29,7 +28,7 @@ public class EmailDelegatesController : Controller
     {
         private const string EmailDelegateFilterCookieName = "EmailDelegateFilter";
         private readonly PromptsService promptsService;
-        private readonly IJobGroupsDataService jobGroupsDataService;
+        private readonly IJobGroupsService jobGroupsService;
         private readonly IPasswordResetService passwordResetService;
         private readonly IUserService userService;
         private readonly ISearchSortFilterPaginateService searchSortFilterPaginateService;
@@ -38,7 +37,7 @@ public class EmailDelegatesController : Controller
 
         public EmailDelegatesController(
             PromptsService promptsService,
-            IJobGroupsDataService jobGroupsDataService,
+            IJobGroupsService jobGroupsService,
             IPasswordResetService passwordResetService,
             IUserService userService,
             ISearchSortFilterPaginateService searchSortFilterPaginateService,
@@ -47,7 +46,7 @@ IClockUtility clockUtility
         )
         {
             this.promptsService = promptsService;
-            this.jobGroupsDataService = jobGroupsDataService;
+            this.jobGroupsService = jobGroupsService;
             this.passwordResetService = passwordResetService;
             this.userService = userService;
             this.searchSortFilterPaginateService = searchSortFilterPaginateService;
@@ -70,7 +69,7 @@ public IActionResult Index(
                 Request,
                 EmailDelegateFilterCookieName
             );
-            var jobGroups = jobGroupsDataService.GetJobGroupsAlphabetical();
+            var jobGroups = jobGroupsService.GetJobGroupsAlphabetical();
             var customPrompts = promptsService.GetCentreRegistrationPrompts(User.GetCentreIdKnownNotNull());
             var delegateUsers = GetDelegateUserCards();
 
@@ -123,7 +122,7 @@ public IActionResult Index(
                     Request,
                     EmailDelegateFilterCookieName
                 );
-                var jobGroups = jobGroupsDataService.GetJobGroupsAlphabetical();
+                var jobGroups = jobGroupsService.GetJobGroupsAlphabetical();
                 var customPrompts = promptsService.GetCentreRegistrationPrompts(User.GetCentreIdKnownNotNull());
 
                 var promptsWithOptions = customPrompts.Where(customPrompt => customPrompt.Options.Count > 0);
@@ -167,7 +166,7 @@ public IActionResult Index(
         [Route("AllEmailDelegateItems")]
         public IActionResult AllEmailDelegateItems(IEnumerable<int> selectedIds)
         {
-            var jobGroups = jobGroupsDataService.GetJobGroupsAlphabetical();
+            var jobGroups = jobGroupsService.GetJobGroupsAlphabetical();
             var customPrompts = promptsService.GetCentreRegistrationPrompts(User.GetCentreIdKnownNotNull());
             var delegateUsers = GetDelegateUserCards();