Merge pull request #2702 from TechnologyEnhancedLearning/Develop/feature/TD-3922-ContractDetailsController-refactor

TD-3922-ContractDetailsController - refactor

Author: rshrirohit

DigitalLearningSolutions.Web/Controllers/TrackingSystem/Centre/Dashboard/ContractDetailsController.cs

@@ -1,11 +1,10 @@
 namespace DigitalLearningSolutions.Web.Controllers.TrackingSystem.Centre.Dashboard
 {
-    using DigitalLearningSolutions.Data.DataServices;
-    using DigitalLearningSolutions.Data.DataServices.UserDataService;
     using DigitalLearningSolutions.Data.Enums;
     using DigitalLearningSolutions.Web.Attributes;
     using DigitalLearningSolutions.Web.Helpers;
     using DigitalLearningSolutions.Web.Models.Enums;
+    using DigitalLearningSolutions.Web.Services;
     using DigitalLearningSolutions.Web.ViewModels.TrackingSystem.Centre.ContractDetails;
     using Microsoft.AspNetCore.Authorization;
     using Microsoft.AspNetCore.Mvc;
@@ -18,27 +17,27 @@
     [Route("/TrackingSystem/Centre/ContractDetails")]
     public class ContractDetailsController : Controller
     {
-        private readonly ICentresDataService centresDataService;
-        private readonly ICourseDataService courseDataService;
-        private readonly IUserDataService userDataService;
+        private readonly ICentresService centresService;
+        private readonly ICourseService courseService;
+        private readonly IUserService userService;
 
         public ContractDetailsController(
-            ICentresDataService centresDataService,
-            IUserDataService userDataService,
-            ICourseDataService courseDataService
+            ICentresService centresService,
+            IUserService userService,
+            ICourseService courseService
         )
         {
-            this.centresDataService = centresDataService;
-            this.userDataService = userDataService;
-            this.courseDataService = courseDataService;
+            this.centresService = centresService;
+            this.userService = userService;
+            this.courseService = courseService;
         }
 
         public IActionResult Index()
         {
             var centreId = User.GetCentreIdKnownNotNull();
-            var centreDetails = centresDataService.GetCentreDetailsById(centreId)!;
-            var adminUsersAtCentre = userDataService.GetAdminUsersByCentreId(centreId);
-            var numberOfCourses = courseDataService.GetNumberOfActiveCoursesAtCentreFilteredByCategory(centreId, null);
+            var centreDetails = centresService.GetCentreDetailsById(centreId)!;
+            var adminUsersAtCentre = userService.GetAdminUsersByCentreId(centreId);
+            var numberOfCourses = courseService.GetNumberOfActiveCoursesAtCentreFilteredByCategory(centreId, null);
 
             var model = new ContractDetailsViewModel(adminUsersAtCentre, centreDetails, numberOfCourses);
 

DigitalLearningSolutions.Web/Services/CentresService.cs

@@ -43,6 +43,7 @@ void UpdateCentreManagerDetails(
         string? GetCentreName(int centreId);
         IEnumerable<(int, string)> GetCentresForDelegateSelfRegistrationAlphabetical();
         (bool autoRegistered, string? autoRegisterManagerEmail) GetCentreAutoRegisterValues(int centreId);
+        Centre? GetCentreDetailsById(int centreId);
     }
 
     public class CentresService : ICentresService
@@ -148,5 +149,10 @@ public void UpdateCentreManagerDetails(int centreId, string firstName, string la
         {
             return centresDataService.GetCentreAutoRegisterValues(centreId);
         }
+
+        public Centre? GetCentreDetailsById(int centreId)
+        {
+            return centresDataService.GetCentreDetailsById(centreId);
+        }
     }
 }

DigitalLearningSolutions.Web/Services/CourseService.cs

@@ -130,6 +130,7 @@ int diagCompletionThreshold
         IEnumerable<CompletedCourse> GetCompletedCourses(int candidateId);
         IEnumerable<AvailableCourse> GetAvailableCourses(int candidateId, int? centreId);
         void EnrolOnSelfAssessment(int selfAssessmentId, int delegateUserId, int centreId);
+        int GetNumberOfActiveCoursesAtCentreFilteredByCategory(int centreId, int? categoryId);
     }
 
     public class CourseService : ICourseService
@@ -607,5 +608,10 @@ public void EnrolOnSelfAssessment(int selfAssessmentId, int delegateUserId, int
         {
             courseDataService.EnrolSelfAssessment(selfAssessmentId, delegateUserId, centreId);
         }
+
+        public int GetNumberOfActiveCoursesAtCentreFilteredByCategory(int centreId, int? categoryId)
+        {
+            return courseDataService.GetNumberOfActiveCoursesAtCentreFilteredByCategory(centreId, categoryId);
+        }
     }
 }

DigitalLearningSolutions.Web/Services/UserService.cs

@@ -143,6 +143,7 @@ string registrationConfirmationHash
         AdminUser? GetAdminUserByEmailAddress(string emailAddress);
         DelegateAccount? GetDelegateAccountById(int id);
         int? GetUserIdFromUsername(string username);
+        List<AdminUser> GetAdminUsersByCentreId(int centreId);
     }
 
     public class UserService : IUserService
@@ -791,5 +792,10 @@ public bool CentreSpecificEmailIsInUseAtCentre(string email, int centreId)
         {
             return userDataService.GetUserIdFromUsername(username);
         }
+
+        public List<AdminUser> GetAdminUsersByCentreId(int centreId)
+        {
+            return userDataService.GetAdminUsersByCentreId(centreId);
+        }
     }
 }