TD-3915-Controller refactor -DataService reference removed from the controller. Code modified to use service class methods.

Auldrin-Possa · Auldrin-Possa · commit ce7da95f0e67 · 2024-06-13T17:22:36.000+01:00
diff --git a/DigitalLearningSolutions.Web/Controllers/SuperAdmin/Delegates/DelegatesController.cs b/DigitalLearningSolutions.Web/Controllers/SuperAdmin/Delegates/DelegatesController.cs
@@ -1,8 +1,6 @@
 ﻿
 namespace DigitalLearningSolutions.Web.Controllers.SuperAdmin.Delegates
 {
-    using DigitalLearningSolutions.Data.DataServices;
-    using DigitalLearningSolutions.Data.DataServices.UserDataService;
     using DigitalLearningSolutions.Data.Enums;
     using DigitalLearningSolutions.Data.Helpers;
     using DigitalLearningSolutions.Data.Models.SearchSortFilterPaginate;
@@ -27,18 +25,16 @@ namespace DigitalLearningSolutions.Web.Controllers.SuperAdmin.Delegates
     [SetSelectedTab(nameof(NavMenuTab.Admins))]
     public class DelegatesController : Controller
     {
-        private readonly IUserDataService userDataService;
         private readonly ISearchSortFilterPaginateService searchSortFilterPaginateService;
-        private readonly ICentresDataService centresDataService;
+        private readonly ICentresService centresService;
         private readonly IUserService userService;
-        public DelegatesController(IUserDataService userDataService,
-            ICentresDataService centresDataService,
+        public DelegatesController(
+            ICentresService centresService,
             ISearchSortFilterPaginateService searchSortFilterPaginateService,
             IUserService userService
             )
         {
-            this.userDataService = userDataService;
-            this.centresDataService = centresDataService;
+            this.centresService = centresService;
             this.searchSortFilterPaginateService = searchSortFilterPaginateService;
             this.userService = userService;
         }
@@ -107,9 +103,9 @@ public IActionResult Index(
                     }
                 }
             }
-            (var Delegates, var ResultCount) = this.userDataService.GetAllDelegates(Search ?? string.Empty, offSet, itemsPerPage ?? 0, DelegateId, AccountStatus, LHLinkStatus, CentreId, AuthHelper.FailedLoginThreshold);
+            (var Delegates, var ResultCount) = this.userService.GetAllDelegates(Search ?? string.Empty, offSet, itemsPerPage ?? 0, DelegateId, AccountStatus, LHLinkStatus, CentreId, AuthHelper.FailedLoginThreshold);
 
-            var centres = centresDataService.GetAllCentres().ToList();
+            var centres = centresService.GetAllCentres().ToList();
             centres.Insert(0, (0, "Any"));
 
             var searchSortPaginationOptions = new SearchSortFilterAndPaginateOptions(
@@ -183,7 +179,7 @@ public List<string> GetLHLinkStatus()
         [Route("SuperAdmin/Delegates/{delegateId=0:int}/InactivateDelegateConfirmation")]
         public IActionResult InactivateDelegateConfirmation(int delegateId = 0)
         {
-            var delegateEntity = userDataService.GetDelegateById(delegateId);
+            var delegateEntity = userService.GetDelegateById(delegateId);
             if (!delegateEntity.DelegateAccount.Active)
             {
                 return StatusCode((int)HttpStatusCode.Gone);
@@ -219,7 +215,7 @@ public IActionResult InactivateDelegateConfirmation(ConfirmationViewModel confir
             TempData["DelegateId"] = delegateId;
             if (confirmationViewModel.IsChecked)
             {
-                this.userDataService.DeactivateDelegateUser(delegateId);
+                this.userService.DeactivateDelegateUser(delegateId);
                 return RedirectToAction("Index", "Delegates", new { DelegateId = delegateId });
             }
             else
@@ -234,7 +230,7 @@ public IActionResult InactivateDelegateConfirmation(ConfirmationViewModel confir
         [Route("SuperAdmin/Delegates/{delegateId=0:int}/ActivateDelegate")]
         public IActionResult ActivateDelegate(int delegateId = 0)
         {
-            userDataService.ActivateDelegateUser(delegateId);
+            userService.ActivateDelegateUser(delegateId);
             TempData["DelegateId"] = delegateId;
             return RedirectToAction("Index", "Delegates", new { DelegateId = delegateId });
         }
@@ -243,11 +239,11 @@ public IActionResult ActivateDelegate(int delegateId = 0)
         [Route("SuperAdmin/Delegates/{delegateId=0:int}/RemoveCentreEmailConfirmation")]
         public IActionResult RemoveCentreEmailConfirmation(int delegateId = 0)
         {
-            var delegateEntity = userDataService.GetDelegateById(delegateId);
+            var delegateEntity = userService.GetDelegateById(delegateId);
 
             if (delegateEntity != null)
             {
-                var userCenterEmail = userDataService.GetCentreEmail(delegateEntity.DelegateAccount.UserId, delegateEntity.DelegateAccount.CentreId);
+                var userCenterEmail = userService.GetCentreEmail(delegateEntity.DelegateAccount.UserId, delegateEntity.DelegateAccount.CentreId);
                 if (userCenterEmail == null) 
                     return StatusCode((int)HttpStatusCode.Gone);
             }
@@ -282,10 +278,10 @@ public IActionResult RemoveCentreEmailConfirmation(ConfirmationViewModel confirm
             TempData["DelegateId"] = delegateId;
             if (confirmationViewModel.IsChecked)
             {
-                var delegateEntity = userDataService.GetDelegateById(delegateId);
+                var delegateEntity = userService.GetDelegateById(delegateId);
                 if (delegateEntity != null)
                 {
-                    userDataService.DeleteUserCentreDetail(delegateEntity.DelegateAccount.UserId, delegateEntity.DelegateAccount.CentreId);
+                    userService.DeleteUserCentreDetail(delegateEntity.DelegateAccount.UserId, delegateEntity.DelegateAccount.CentreId);
                 }
                 return RedirectToAction("Index", "Delegates", new { DelegateId = delegateId });
             }
@@ -303,7 +299,7 @@ public IActionResult RemoveCentreEmailConfirmation(ConfirmationViewModel confirm
         [Route("SuperAdmin/Delegates/{delegateId=0:int}/ApproveDelegate")]
         public IActionResult ApproveDelegate(int delegateId = 0)
         {
-            userDataService.ApproveDelegateUsers(delegateId);
+            userService.ApproveDelegateUsers(delegateId);
             TempData["DelegateId"] = delegateId;
             return RedirectToAction("Index", "Delegates", new { DelegateId = delegateId });
         }
diff --git a/DigitalLearningSolutions.Web/Services/UserService.cs b/DigitalLearningSolutions.Web/Services/UserService.cs
@@ -9,6 +9,7 @@ namespace DigitalLearningSolutions.Web.Services
     using DigitalLearningSolutions.Data.DataServices.UserDataService;
     using DigitalLearningSolutions.Data.Exceptions;
     using DigitalLearningSolutions.Data.Models;
+    using DigitalLearningSolutions.Data.Models.SuperAdmin;
     using DigitalLearningSolutions.Data.Models.User;
     using DigitalLearningSolutions.Data.Utilities;
     using DocumentFormat.OpenXml.Office2010.Excel;
@@ -158,6 +159,11 @@ void SetCentreEmail(
 
         AdminUser? GetAdminUserById(int id);
         string GetUserDisplayName(int userId);
+        (IEnumerable<SuperAdminDelegateAccount>, int) GetAllDelegates(
+      string search, int offset, int rows, int? delegateId, string accountStatus, string lhlinkStatus, int? centreId, int failedLoginThreshold
+      );
+        void DeleteUserCentreDetail(int userId, int centreId);
+        void ApproveDelegateUsers(params int[] ids);
 
     }
 
@@ -826,7 +832,7 @@ public int GetDelegateCountWithAnswerForPrompt(int centreId, int promptNumber)
         {
             return userDataService.GetDelegateCountWithAnswerForPrompt(centreId, promptNumber);
         }
-        
+
         public List<AdminUser> GetAdminUsersByCentreId(int centreId)
         {
             return userDataService.GetAdminUsersByCentreId(centreId);
@@ -843,5 +849,20 @@ public string GetUserDisplayName(int userId)
         {
             return userDataService.GetUserDisplayName(userId);
         }
+
+        public (IEnumerable<SuperAdminDelegateAccount>, int) GetAllDelegates(string search, int offset, int rows, int? delegateId, string accountStatus, string lhlinkStatus, int? centreId, int failedLoginThreshold)
+        {
+            return userDataService.GetAllDelegates(search, offset, rows, delegateId, accountStatus, lhlinkStatus, centreId, failedLoginThreshold);
+        }
+
+        public void DeleteUserCentreDetail(int userId, int centreId)
+        {
+            userDataService.DeleteUserCentreDetail(userId, centreId);
+        }
+
+        public void ApproveDelegateUsers(params int[] ids)
+        {
+            userDataService.ApproveDelegateUsers(ids);
+        }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,6 @@`
`1`	`1`
`2`	`2`	`namespace DigitalLearningSolutions.Web.Controllers.SuperAdmin.Delegates`
`3`	`3`	`{`
`4`		`- using DigitalLearningSolutions.Data.DataServices;`
`5`		`- using DigitalLearningSolutions.Data.DataServices.UserDataService;`
`6`	`4`	`using DigitalLearningSolutions.Data.Enums;`
`7`	`5`	`using DigitalLearningSolutions.Data.Helpers;`
`8`	`6`	`using DigitalLearningSolutions.Data.Models.SearchSortFilterPaginate;`
`@@ -27,18 +25,16 @@ namespace DigitalLearningSolutions.Web.Controllers.SuperAdmin.Delegates`
`27`	`25`	`[SetSelectedTab(nameof(NavMenuTab.Admins))]`
`28`	`26`	`public class DelegatesController : Controller`
`29`	`27`	`{`
`30`		`- private readonly IUserDataService userDataService;`
`31`	`28`	`private readonly ISearchSortFilterPaginateService searchSortFilterPaginateService;`
`32`		`- private readonly ICentresDataService centresDataService;`
	`29`	`+ private readonly ICentresService centresService;`
`33`	`30`	`private readonly IUserService userService;`
`34`		`- public DelegatesController(IUserDataService userDataService,`
`35`		`- ICentresDataService centresDataService,`
	`31`	`+ public DelegatesController(`
	`32`	`+ ICentresService centresService,`
`36`	`33`	`ISearchSortFilterPaginateService searchSortFilterPaginateService,`
`37`	`34`	`IUserService userService`
`38`	`35`	`)`
`39`	`36`	`{`
`40`		`- this.userDataService = userDataService;`
`41`		`- this.centresDataService = centresDataService;`
	`37`	`+ this.centresService = centresService;`
`42`	`38`	`this.searchSortFilterPaginateService = searchSortFilterPaginateService;`
`43`	`39`	`this.userService = userService;`
`44`	`40`	`}`
`@@ -107,9 +103,9 @@ public IActionResult Index(`
`107`	`103`	`}`
`108`	`104`	`}`
`109`	`105`	`}`
`110`		`- (var Delegates, var ResultCount) = this.userDataService.GetAllDelegates(Search ?? string.Empty, offSet, itemsPerPage ?? 0, DelegateId, AccountStatus, LHLinkStatus, CentreId, AuthHelper.FailedLoginThreshold);`
	`106`	`+ (var Delegates, var ResultCount) = this.userService.GetAllDelegates(Search ?? string.Empty, offSet, itemsPerPage ?? 0, DelegateId, AccountStatus, LHLinkStatus, CentreId, AuthHelper.FailedLoginThreshold);`
`111`	`107`
`112`		`- var centres = centresDataService.GetAllCentres().ToList();`
	`108`	`+ var centres = centresService.GetAllCentres().ToList();`
`113`	`109`	`centres.Insert(0, (0, "Any"));`
`114`	`110`
`115`	`111`	`var searchSortPaginationOptions = new SearchSortFilterAndPaginateOptions(`
`@@ -183,7 +179,7 @@ public List<string> GetLHLinkStatus()`
`183`	`179`	`[Route("SuperAdmin/Delegates/{delegateId=0:int}/InactivateDelegateConfirmation")]`
`184`	`180`	`public IActionResult InactivateDelegateConfirmation(int delegateId = 0)`
`185`	`181`	`{`
`186`		`- var delegateEntity = userDataService.GetDelegateById(delegateId);`
	`182`	`+ var delegateEntity = userService.GetDelegateById(delegateId);`
`187`	`183`	`if (!delegateEntity.DelegateAccount.Active)`
`188`	`184`	`{`
`189`	`185`	`return StatusCode((int)HttpStatusCode.Gone);`
`@@ -219,7 +215,7 @@ public IActionResult InactivateDelegateConfirmation(ConfirmationViewModel confir`
`219`	`215`	`TempData["DelegateId"] = delegateId;`
`220`	`216`	`if (confirmationViewModel.IsChecked)`
`221`	`217`	`{`
`222`		`- this.userDataService.DeactivateDelegateUser(delegateId);`
	`218`	`+ this.userService.DeactivateDelegateUser(delegateId);`
`223`	`219`	`return RedirectToAction("Index", "Delegates", new { DelegateId = delegateId });`
`224`	`220`	`}`
`225`	`221`	`else`
`@@ -234,7 +230,7 @@ public IActionResult InactivateDelegateConfirmation(ConfirmationViewModel confir`
`234`	`230`	`[Route("SuperAdmin/Delegates/{delegateId=0:int}/ActivateDelegate")]`
`235`	`231`	`public IActionResult ActivateDelegate(int delegateId = 0)`
`236`	`232`	`{`
`237`		`- userDataService.ActivateDelegateUser(delegateId);`
	`233`	`+ userService.ActivateDelegateUser(delegateId);`
`238`	`234`	`TempData["DelegateId"] = delegateId;`
`239`	`235`	`return RedirectToAction("Index", "Delegates", new { DelegateId = delegateId });`
`240`	`236`	`}`
`@@ -243,11 +239,11 @@ public IActionResult ActivateDelegate(int delegateId = 0)`
`243`	`239`	`[Route("SuperAdmin/Delegates/{delegateId=0:int}/RemoveCentreEmailConfirmation")]`
`244`	`240`	`public IActionResult RemoveCentreEmailConfirmation(int delegateId = 0)`
`245`	`241`	`{`
`246`		`- var delegateEntity = userDataService.GetDelegateById(delegateId);`
	`242`	`+ var delegateEntity = userService.GetDelegateById(delegateId);`
`247`	`243`
`248`	`244`	`if (delegateEntity != null)`
`249`	`245`	`{`
`250`		`- var userCenterEmail = userDataService.GetCentreEmail(delegateEntity.DelegateAccount.UserId, delegateEntity.DelegateAccount.CentreId);`
	`246`	`+ var userCenterEmail = userService.GetCentreEmail(delegateEntity.DelegateAccount.UserId, delegateEntity.DelegateAccount.CentreId);`
`251`	`247`	`if (userCenterEmail == null)`
`252`	`248`	`return StatusCode((int)HttpStatusCode.Gone);`
`253`	`249`	`}`
`@@ -282,10 +278,10 @@ public IActionResult RemoveCentreEmailConfirmation(ConfirmationViewModel confirm`
`282`	`278`	`TempData["DelegateId"] = delegateId;`
`283`	`279`	`if (confirmationViewModel.IsChecked)`
`284`	`280`	`{`
`285`		`- var delegateEntity = userDataService.GetDelegateById(delegateId);`
	`281`	`+ var delegateEntity = userService.GetDelegateById(delegateId);`
`286`	`282`	`if (delegateEntity != null)`
`287`	`283`	`{`
`288`		`- userDataService.DeleteUserCentreDetail(delegateEntity.DelegateAccount.UserId, delegateEntity.DelegateAccount.CentreId);`
	`284`	`+ userService.DeleteUserCentreDetail(delegateEntity.DelegateAccount.UserId, delegateEntity.DelegateAccount.CentreId);`
`289`	`285`	`}`
`290`	`286`	`return RedirectToAction("Index", "Delegates", new { DelegateId = delegateId });`
`291`	`287`	`}`
`@@ -303,7 +299,7 @@ public IActionResult RemoveCentreEmailConfirmation(ConfirmationViewModel confirm`
`303`	`299`	`[Route("SuperAdmin/Delegates/{delegateId=0:int}/ApproveDelegate")]`
`304`	`300`	`public IActionResult ApproveDelegate(int delegateId = 0)`
`305`	`301`	`{`
`306`		`- userDataService.ApproveDelegateUsers(delegateId);`
	`302`	`+ userService.ApproveDelegateUsers(delegateId);`
`307`	`303`	`TempData["DelegateId"] = delegateId;`
`308`	`304`	`return RedirectToAction("Index", "Delegates", new { DelegateId = delegateId });`
`309`	`305`	`}`
Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,7 @@ namespace DigitalLearningSolutions.Web.Services`
`9`	`9`	`using DigitalLearningSolutions.Data.DataServices.UserDataService;`
`10`	`10`	`using DigitalLearningSolutions.Data.Exceptions;`
`11`	`11`	`using DigitalLearningSolutions.Data.Models;`
	`12`	`+ using DigitalLearningSolutions.Data.Models.SuperAdmin;`
`12`	`13`	`using DigitalLearningSolutions.Data.Models.User;`
`13`	`14`	`using DigitalLearningSolutions.Data.Utilities;`
`14`	`15`	`using DocumentFormat.OpenXml.Office2010.Excel;`
`@@ -158,6 +159,11 @@ void SetCentreEmail(`
`158`	`159`
`159`	`160`	`AdminUser? GetAdminUserById(int id);`
`160`	`161`	`string GetUserDisplayName(int userId);`
	`162`	`+ (IEnumerable<SuperAdminDelegateAccount>, int) GetAllDelegates(`
	`163`	`+ string search, int offset, int rows, int? delegateId, string accountStatus, string lhlinkStatus, int? centreId, int failedLoginThreshold`
	`164`	`+ );`
	`165`	`+ void DeleteUserCentreDetail(int userId, int centreId);`
	`166`	`+ void ApproveDelegateUsers(params int[] ids);`
`161`	`167`
`162`	`168`	`}`
`163`	`169`
`@@ -826,7 +832,7 @@ public int GetDelegateCountWithAnswerForPrompt(int centreId, int promptNumber)`
`826`	`832`	`{`
`827`	`833`	`return userDataService.GetDelegateCountWithAnswerForPrompt(centreId, promptNumber);`
`828`	`834`	`}`
`829`		`-`
	`835`	`+`
`830`	`836`	`public List<AdminUser> GetAdminUsersByCentreId(int centreId)`
`831`	`837`	`{`
`832`	`838`	`return userDataService.GetAdminUsersByCentreId(centreId);`
`@@ -843,5 +849,20 @@ public string GetUserDisplayName(int userId)`
`843`	`849`	`{`
`844`	`850`	`return userDataService.GetUserDisplayName(userId);`
`845`	`851`	`}`
	`852`	`+`
	`853`	`+ public (IEnumerable<SuperAdminDelegateAccount>, int) GetAllDelegates(string search, int offset, int rows, int? delegateId, string accountStatus, string lhlinkStatus, int? centreId, int failedLoginThreshold)`
	`854`	`+ {`
	`855`	`+ return userDataService.GetAllDelegates(search, offset, rows, delegateId, accountStatus, lhlinkStatus, centreId, failedLoginThreshold);`
	`856`	`+ }`
	`857`	`+`
	`858`	`+ public void DeleteUserCentreDetail(int userId, int centreId)`
	`859`	`+ {`
	`860`	`+ userDataService.DeleteUserCentreDetail(userId, centreId);`
	`861`	`+ }`
	`862`	`+`
	`863`	`+ public void ApproveDelegateUsers(params int[] ids)`
	`864`	`+ {`
	`865`	`+ userDataService.ApproveDelegateUsers(ids);`
	`866`	`+ }`
`846`	`867`	`}`
`847`	`868`	`}`