Merge pull request #2690 from TechnologyEnhancedLearning/Develop/feature/TD-3941-Controller-refactor-SetDelegatePasswordController

TD-3941-SetDelegatePasswordController - refactor

Author: rshrirohit

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

@@ -1,7 +1,6 @@
 namespace DigitalLearningSolutions.Web.Tests.Controllers.TrackingSystem.Delegates
 {
     using System.Threading.Tasks;
-    using DigitalLearningSolutions.Data.DataServices.UserDataService;
     using DigitalLearningSolutions.Web.Controllers.TrackingSystem.Delegates;
     using DigitalLearningSolutions.Web.Services;
     using DigitalLearningSolutions.Web.Tests.ControllerHelpers;
@@ -20,14 +19,14 @@ public class SetDelegatePasswordControllerTests
 
         private IPasswordService passwordService = null!;
         private SetDelegatePasswordController setDelegatePasswordController = null!;
-        private IUserDataService userDataService = null!;
+        private IUserService userService = null!;
 
         [SetUp]
         public void Setup()
         {
-            userDataService = A.Fake<IUserDataService>();
+            userService = A.Fake<IUserService>();
             passwordService = A.Fake<IPasswordService>();
-            setDelegatePasswordController = new SetDelegatePasswordController(passwordService, userDataService)
+            setDelegatePasswordController = new SetDelegatePasswordController(passwordService, userService)
                 .WithDefaultContext()
                 .WithMockUser(true);
         }
@@ -36,7 +35,7 @@ public void Setup()
         public void Index_should_return_view_result_with_IsFromViewDelegatePage_false_when_not_from_view_page()
         {
             // Given
-            A.CallTo(() => userDataService.GetDelegateUserById(DelegateId))
+            A.CallTo(() => userService.GetDelegateUserById(DelegateId))
                 .Returns(UserTestHelper.GetDefaultDelegateUser());
 
             // When
@@ -51,7 +50,7 @@ public void Index_should_return_view_result_with_IsFromViewDelegatePage_false_wh
         public void Index_should_return_view_result_with_IsFromViewDelegatePage_true_when_from_view_page()
         {
             // Given
-            A.CallTo(() => userDataService.GetDelegateUserById(DelegateId))
+            A.CallTo(() => userService.GetDelegateUserById(DelegateId))
                 .Returns(UserTestHelper.GetDefaultDelegateUser());
 
             // When
@@ -85,7 +84,7 @@ public async Task IndexAsync_with_valid_model_calls_password_service_and_returns
             // Given
             var delegateAccount = UserTestHelper.GetDefaultDelegateAccount();
             var model = new SetDelegatePasswordViewModel { Password = Password };
-            A.CallTo(() => userDataService.GetDelegateAccountById(DelegateId))
+            A.CallTo(() => userService.GetDelegateAccountById(DelegateId))
                 .Returns(delegateAccount);
             A.CallTo(() => passwordService.ChangePasswordAsync(A<int>._, A<string>._)).Returns(Task.CompletedTask);
 

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

@@ -1,7 +1,6 @@
 namespace DigitalLearningSolutions.Web.Controllers.TrackingSystem.Delegates
 {
     using System.Threading.Tasks;
-    using DigitalLearningSolutions.Data.DataServices.UserDataService;
     using DigitalLearningSolutions.Data.Enums;
     using DigitalLearningSolutions.Data.Models.SearchSortFilterPaginate;
     using DigitalLearningSolutions.Web.Attributes;
@@ -23,12 +22,12 @@
     public class SetDelegatePasswordController : Controller
     {
         private readonly IPasswordService passwordService;
-        private readonly IUserDataService userDataService;
+        private readonly IUserService userService;
 
-        public SetDelegatePasswordController(IPasswordService passwordService, IUserDataService userDataService)
+        public SetDelegatePasswordController(IPasswordService passwordService, IUserService userDataService)
         {
             this.passwordService = passwordService;
-            this.userDataService = userDataService;
+            this.userService = userDataService;
         }
 
         [HttpGet]
@@ -38,7 +37,7 @@ public IActionResult Index(
             ReturnPageQuery? returnPageQuery = null
         )
         {
-            var delegateUser = userDataService.GetDelegateUserById(delegateId)!;
+            var delegateUser = userService.GetDelegateUserById(delegateId)!;
 
             var model = new SetDelegatePasswordViewModel(
                 DisplayStringHelper.GetNonSortableFullNameForDisplayOnly(delegateUser.FirstName, delegateUser.LastName),
@@ -64,7 +63,7 @@ bool isFromViewDelegatePage
                 return View(model);
             }
 
-            var delegateAccount = userDataService.GetDelegateAccountById(delegateId)!;
+            var delegateAccount = userService.GetDelegateAccountById(delegateId)!;
 
             await passwordService.ChangePasswordAsync(delegateAccount.UserId, model.Password!);
 

DigitalLearningSolutions.Web/Services/UserService.cs

@@ -141,6 +141,7 @@ string registrationConfirmationHash
         bool CentreSpecificEmailIsInUseAtCentre(string email, int centreId);
         int? GetUserIdByAdminId(int adminId);
         AdminUser? GetAdminUserByEmailAddress(string emailAddress);
+        DelegateAccount? GetDelegateAccountById(int id);
     }
 
     public class UserService : IUserService
@@ -762,7 +763,7 @@ public void DeleteUserAndAccounts(int userId)
         }
         public bool PrimaryEmailInUseAtCentres(string email)
         {
-           return  userDataService.PrimaryEmailInUseAtCentres(email);
+            return userDataService.PrimaryEmailInUseAtCentres(email);
         }
 
         public bool CentreSpecificEmailIsInUseAtCentre(string email, int centreId)
@@ -779,5 +780,10 @@ public bool CentreSpecificEmailIsInUseAtCentre(string email, int centreId)
         {
             return userDataService.GetAdminUserByEmailAddress(emailAddress);
         }
+
+        public DelegateAccount? GetDelegateAccountById(int id)
+        {
+            return userDataService.GetDelegateAccountById(id);
+        }
     }
 }