Merge pull request #2692 from TechnologyEnhancedLearning/Develop/feature/TD-3936-DelegateCoursesController-refactor

TD-3936-DelegateCoursesController - refactor

Author: rshrirohit

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

@@ -1,7 +1,6 @@
 namespace DigitalLearningSolutions.Web.Tests.Controllers.TrackingSystem.Delegates
 {
     using System.Collections.Generic;
-    using DigitalLearningSolutions.Data.DataServices;
     using DigitalLearningSolutions.Data.Models.Courses;
     using DigitalLearningSolutions.Data.Models.SearchSortFilterPaginate;
     using DigitalLearningSolutions.Web.Controllers.TrackingSystem.Delegates;
@@ -51,8 +50,8 @@ public class DelegateCoursesControllerTests
         private HttpResponse httpResponse = null!;
         private IPaginateService paginateService = null!;
         private IActivityService activityService = null!;
-        private ICourseCategoriesDataService courseCategoriesDataService = null!;
-        private ICourseTopicsDataService courseTopicsDataService = null!;
+        private ICourseCategoriesService courseCategoriesService = null!;
+        private ICourseTopicsService courseTopicsService = null!;
 
         [SetUp]
         public void Setup()
@@ -61,8 +60,8 @@ public void Setup()
             courseDelegatesDownloadFileService = A.Fake<ICourseDelegatesDownloadFileService>();
             activityService = A.Fake<IActivityService>();
             paginateService = A.Fake<IPaginateService>();
-            courseCategoriesDataService = A.Fake<ICourseCategoriesDataService>();
-            courseTopicsDataService = A.Fake<ICourseTopicsDataService>();
+            courseCategoriesService = A.Fake<ICourseCategoriesService>();
+            courseTopicsService = A.Fake<ICourseTopicsService>();
             A.CallTo(() => activityService.GetCourseCategoryNameForActivityFilter(A<int>._))
               .Returns("All");
             A.CallTo(() => courseService.GetCentreCourseDetailsWithAllCentreCourses(A<int>._, A<int?>._, A<string?>._, A<string?>._, A<string?>._, A<string>._))
@@ -80,8 +79,8 @@ public void Setup()
                     courseDelegatesDownloadFileService,
                     paginateService,
                     activityService,
-                    courseCategoriesDataService,
-                    courseTopicsDataService
+                    courseCategoriesService,
+                    courseTopicsService
                 )
                 .WithMockHttpContext(httpRequest, CookieName, cookieValue, httpResponse)
                 .WithMockUser(true, 101)

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

@@ -1,6 +1,5 @@
 namespace DigitalLearningSolutions.Web.Controllers.TrackingSystem.Delegates
 {
-    using DigitalLearningSolutions.Data.DataServices;
     using DigitalLearningSolutions.Data.Enums;
     using DigitalLearningSolutions.Data.Helpers;
     using DigitalLearningSolutions.Data.Models.Courses;
@@ -31,24 +30,24 @@ public class DelegateCoursesController : Controller
         private readonly ICourseService courseService;
         private readonly IPaginateService paginateService;
         private readonly IActivityService activityService;
-        private readonly ICourseCategoriesDataService courseCategoriesDataService;
-        private readonly ICourseTopicsDataService courseTopicsDataService;
+        private readonly ICourseCategoriesService courseCategoriesService;
+        private readonly ICourseTopicsService courseTopicsService;
 
         public DelegateCoursesController(
             ICourseService courseService,
             ICourseDelegatesDownloadFileService courseDelegatesDownloadFileService,
             IPaginateService paginateService,
             IActivityService activityService,
-            ICourseCategoriesDataService courseCategoriesDataService,
-            ICourseTopicsDataService courseTopicsDataService
+            ICourseCategoriesService courseCategoriesService,
+            ICourseTopicsService courseTopicsService
         )
         {
             this.courseService = courseService;
             this.courseDelegatesDownloadFileService = courseDelegatesDownloadFileService;
             this.paginateService = paginateService;
             this.activityService = activityService;
-            this.courseCategoriesDataService = courseCategoriesDataService;
-            this.courseTopicsDataService = courseTopicsDataService;
+            this.courseCategoriesService = courseCategoriesService;
+            this.courseTopicsService = courseTopicsService;
         }
 
         [NoCaching]
@@ -80,8 +79,8 @@ public IActionResult Index(
             var centreId = User.GetCentreIdKnownNotNull();
             var categoryId = User.GetAdminCategoryId();
             var courseCategoryName = this.activityService.GetCourseCategoryNameForActivityFilter(categoryId);
-            var Categories = courseCategoriesDataService.GetCategoriesForCentreAndCentrallyManagedCourses(centreId).Select(c => c.CategoryName);
-            var Topics = courseTopicsDataService.GetCourseTopicsAvailableAtCentre(centreId).Select(c => c.CourseTopic);
+            var Categories = courseCategoriesService.GetCategoriesForCentreAndCentrallyManagedCourses(centreId).Select(c => c.CategoryName);
+            var Topics = courseTopicsService.GetCourseTopicsAvailableAtCentre(centreId).Select(c => c.CourseTopic);
 
             int offSet = ((page - 1) * itemsPerPage) ?? 0;
             string isActive, categoryName, courseTopic, hasAdminFields, isCourse, isSelfAssessment;