Merge pull request #2685 from TechnologyEnhancedLearning/Develop/feature/TD-3940-PromoteToAdminController-refactor

TD-3940 - PromoteToAdminController - refactor

Author: rshrirohit

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

@@ -1,7 +1,5 @@
 namespace DigitalLearningSolutions.Web.Tests.Controllers.TrackingSystem.Delegates
 {
-    using DigitalLearningSolutions.Data.DataServices;
-    using DigitalLearningSolutions.Data.DataServices.UserDataService;
     using DigitalLearningSolutions.Data.Exceptions;
     using DigitalLearningSolutions.Data.Models;
     using DigitalLearningSolutions.Data.Models.Email;
@@ -22,28 +20,24 @@ public class PromoteToAdminControllerTests
     {
         private ICentreContractAdminUsageService centreContractAdminUsageService = null!;
         private PromoteToAdminController controller = null!;
-        private ICourseCategoriesDataService courseCategoriesDataService = null!;
+        private ICourseCategoriesService courseCategoriesService = null!;
         private IRegistrationService registrationService = null!;
-        private IUserDataService userDataService = null!;
         private IUserService userService = null!;
         private IEmailGenerationService emailGenerationService = null!;
         private IEmailService emailService = null!;
 
         [SetUp]
         public void Setup()
         {
-            userDataService = A.Fake<IUserDataService>();
-            userService = A.Fake<IUserService>();
             centreContractAdminUsageService = A.Fake<ICentreContractAdminUsageService>();
-            courseCategoriesDataService = A.Fake<ICourseCategoriesDataService>();
+            courseCategoriesService = A.Fake<ICourseCategoriesService>();
             registrationService = A.Fake<IRegistrationService>();
             userService = A.Fake<IUserService>();
             emailGenerationService = A.Fake<IEmailGenerationService>();
             emailService = A.Fake<IEmailService>();
 
             controller = new PromoteToAdminController(
-                    userDataService,
-                    courseCategoriesDataService,
+                    courseCategoriesService,
                     centreContractAdminUsageService,
                     registrationService,
                     new NullLogger<PromoteToAdminController>(),
@@ -78,7 +72,7 @@ public void Summary_post_registers_delegate_with_expected_values()
             delegateEntity.UserAccount.FirstName = "TestUserName";
             delegateEntity.UserAccount.PrimaryEmail = "[email protected]";
 
-            A.CallTo(() => userDataService.GetDelegateById(delegateId)).Returns(delegateEntity);
+            A.CallTo(() => userService.GetDelegateById(delegateId)).Returns(delegateEntity);
 
             AdminUser returnedAdminUser = new AdminUser()
             {

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

@@ -1,8 +1,6 @@
 namespace DigitalLearningSolutions.Web.Controllers.TrackingSystem.Delegates
 {
     using System.Linq;
-    using DigitalLearningSolutions.Data.DataServices;
-    using DigitalLearningSolutions.Data.DataServices.UserDataService;
     using DigitalLearningSolutions.Data.Enums;
     using DigitalLearningSolutions.Data.Exceptions;
     using DigitalLearningSolutions.Data.Models.Common;
@@ -28,17 +26,15 @@
     public class PromoteToAdminController : Controller
     {
         private readonly ICentreContractAdminUsageService centreContractAdminUsageService;
-        private readonly ICourseCategoriesDataService courseCategoriesDataService;
+        private readonly ICourseCategoriesService courseCategoriesService;
         private readonly ILogger<PromoteToAdminController> logger;
         private readonly IRegistrationService registrationService;
-        private readonly IUserDataService userDataService;
         private readonly IUserService userService;
         private readonly IEmailGenerationService emailGenerationService;
         private readonly IEmailService emailService;
 
         public PromoteToAdminController(
-            IUserDataService userDataService,
-            ICourseCategoriesDataService courseCategoriesDataService,
+            ICourseCategoriesService courseCategoriesService,
             ICentreContractAdminUsageService centreContractAdminUsageService,
             IRegistrationService registrationService,
             ILogger<PromoteToAdminController> logger,
@@ -47,8 +43,7 @@ public PromoteToAdminController(
             IEmailService emailService
         )
         {
-            this.userDataService = userDataService;
-            this.courseCategoriesDataService = courseCategoriesDataService;
+            this.courseCategoriesService = courseCategoriesService;
             this.centreContractAdminUsageService = centreContractAdminUsageService;
             this.registrationService = registrationService;
             this.logger = logger;
@@ -61,10 +56,10 @@ IEmailService emailService
         public IActionResult Index(int delegateId)
         {
             var centreId = User.GetCentreIdKnownNotNull();
-            var userId = userDataService.GetUserIdFromDelegateId(delegateId);
+            var userId = userService.GetUserIdFromDelegateId(delegateId);
             var userEntity = userService.GetUserById(userId);
 
-            if(TempData["IsDelegatePromoted"] != null)
+            if (TempData["IsDelegatePromoted"] != null)
             {
                 TempData.Remove("IsDelegatePromoted");
                 return RedirectToAction("StatusCode", "LearningSolutions", new { code = 410 });
@@ -74,7 +69,7 @@ public IActionResult Index(int delegateId)
                 return NotFound();
             }
 
-            var categories = courseCategoriesDataService.GetCategoriesForCentreAndCentrallyManagedCourses(centreId);
+            var categories = courseCategoriesService.GetCategoriesForCentreAndCentrallyManagedCourses(centreId);
             categories = categories.Prepend(new Category { CategoryName = "All", CourseCategoryID = 0 });
             var numberOfAdmins = centreContractAdminUsageService.GetCentreAdministratorNumbers(centreId);
 
@@ -104,10 +99,10 @@ public IActionResult Index(AdminRolesFormData formData, int delegateId)
                 adminRoles.IsContentManager))
             {
                 var centreId = User.GetCentreIdKnownNotNull();
-                var userId = userDataService.GetUserIdFromDelegateId(delegateId);
+                var userId = userService.GetUserIdFromDelegateId(delegateId);
                 var userEntity = userService.GetUserById(userId);
 
-                var categories = courseCategoriesDataService.GetCategoriesForCentreAndCentrallyManagedCourses(centreId);
+                var categories = courseCategoriesService.GetCategoriesForCentreAndCentrallyManagedCourses(centreId);
                 categories = categories.Prepend(new Category { CategoryName = "All", CourseCategoryID = 0 });
                 var numberOfAdmins = centreContractAdminUsageService.GetCentreAdministratorNumbers(centreId);
 
@@ -142,7 +137,7 @@ public IActionResult Index(AdminRolesFormData formData, int delegateId)
                     false
                 );
 
-                var delegateUserEmailDetails = userDataService.GetDelegateById(delegateId);
+                var delegateUserEmailDetails = userService.GetDelegateById(delegateId);
 
                 if (delegateUserEmailDetails != null)
                 {