Merge pull request #2706 from TechnologyEnhancedLearning/Develop/feature/TD-3921-RegistrationPromptsController-refactor

TD-3921-RegistrationPromptsController - refactor

Author: rshrirohit

DigitalLearningSolutions.Web.Tests/Controllers/TrackingSystem/Centre/Configuration/RegistrationPromptsControllerTests.cs

@@ -1,6 +1,5 @@
 namespace DigitalLearningSolutions.Web.Tests.Controllers.TrackingSystem.Centre.Configuration
 {
-    using DigitalLearningSolutions.Data.DataServices.UserDataService;
     using DigitalLearningSolutions.Data.Models.MultiPageFormData.AddRegistrationPrompt;
     using DigitalLearningSolutions.Data.Models.MultiPageFormData.EditRegistrationPrompt;
     using DigitalLearningSolutions.Web.Controllers.TrackingSystem.Centre.Configuration;
@@ -27,7 +26,7 @@ public class RegistrationPromptsControllerTests
         private IMultiPageFormService multiPageFormService = null!;
         private RegistrationPromptsController registrationPromptsController = null!;
         private RegistrationPromptsController registrationPromptsControllerWithMockHttpContext = null!;
-        private IUserDataService userDataService = null!;
+        private IUserService userService = null!;
 
         private static IEnumerable<TestCaseData> AddAnswerModelErrorTestData
         {
@@ -57,13 +56,13 @@ private static IEnumerable<TestCaseData> AddAnswerModelErrorTestData
         public void Setup()
         {
             centreRegistrationPromptsService = A.Fake<ICentreRegistrationPromptsService>();
-            userDataService = A.Fake<IUserDataService>();
+            userService = A.Fake<IUserService>();
             multiPageFormService = A.Fake<IMultiPageFormService>();
 
             registrationPromptsController =
                 new RegistrationPromptsController(
                         centreRegistrationPromptsService,
-                        userDataService,
+                        userService,
                         multiPageFormService
                     )
                     .WithDefaultContext()
@@ -77,7 +76,7 @@ public void Setup()
             registrationPromptsControllerWithMockHttpContext =
                 new RegistrationPromptsController(
                         centreRegistrationPromptsService,
-                        userDataService,
+                        userService,
                         multiPageFormService
                     )
                     .WithMockHttpContext(httpRequest, cookieName, cookieValue)

DigitalLearningSolutions.Web/Controllers/TrackingSystem/Centre/Configuration/RegistrationPromptsController.cs

@@ -1,6 +1,5 @@
 namespace DigitalLearningSolutions.Web.Controllers.TrackingSystem.Centre.Configuration
 {
-    using DigitalLearningSolutions.Data.DataServices.UserDataService;
     using DigitalLearningSolutions.Data.Enums;
     using DigitalLearningSolutions.Data.Helpers;
     using DigitalLearningSolutions.Data.Models.MultiPageFormData.AddRegistrationPrompt;
@@ -35,16 +34,16 @@ public class RegistrationPromptsController : Controller
         public const string BulkAction = "bulk";
         private readonly ICentreRegistrationPromptsService centreRegistrationPromptsService;
         private readonly IMultiPageFormService multiPageFormService;
-        private readonly IUserDataService userDataService;
+        private readonly IUserService userService;
 
         public RegistrationPromptsController(
             ICentreRegistrationPromptsService centreRegistrationPromptsService,
-            IUserDataService userDataService,
+            IUserService userService,
             IMultiPageFormService multiPageFormService
         )
         {
             this.centreRegistrationPromptsService = centreRegistrationPromptsService;
-            this.userDataService = userDataService;
+            this.userService = userService;
             this.multiPageFormService = multiPageFormService;
         }
 
@@ -366,7 +365,7 @@ public IActionResult AddRegistrationPromptSummaryPost()
         public IActionResult RemoveRegistrationPrompt(int promptNumber)
         {
             var delegateWithAnswerCount =
-                userDataService.GetDelegateCountWithAnswerForPrompt(User.GetCentreIdKnownNotNull(), promptNumber);
+                userService.GetDelegateCountWithAnswerForPrompt(User.GetCentreIdKnownNotNull(), promptNumber);
 
             if (delegateWithAnswerCount == 0)
             {

DigitalLearningSolutions.Web/Services/UserService.cs

@@ -143,6 +143,7 @@ string registrationConfirmationHash
         AdminUser? GetAdminUserByEmailAddress(string emailAddress);
         DelegateAccount? GetDelegateAccountById(int id);
         int? GetUserIdFromUsername(string username);
+        int GetDelegateCountWithAnswerForPrompt(int centreId, int promptNumber);
         List<AdminUser> GetAdminUsersByCentreId(int centreId);
     }
 
@@ -793,6 +794,10 @@ public bool CentreSpecificEmailIsInUseAtCentre(string email, int centreId)
             return userDataService.GetUserIdFromUsername(username);
         }
 
+        public int GetDelegateCountWithAnswerForPrompt(int centreId, int promptNumber)
+        {
+            return userDataService.GetDelegateCountWithAnswerForPrompt(centreId, promptNumber);
+        }
         public List<AdminUser> GetAdminUsersByCentreId(int centreId)
         {
             return userDataService.GetAdminUsersByCentreId(centreId);