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

Author: Auldrin-Possa

DigitalLearningSolutions.Web.Tests/Controllers/SuperAdmin/CentresControllerTests.cs

@@ -1,5 +1,5 @@
-using DigitalLearningSolutions.Data.DataServices;
-using DigitalLearningSolutions.Data.DataServices.SelfAssessmentDataService;
+//using DigitalLearningSolutions.Data.DataServices;
+//using DigitalLearningSolutions.Data.DataServices.SelfAssessmentDataService;
 using DigitalLearningSolutions.Data.Models;
 using DigitalLearningSolutions.Data.Models.Centres;
 using DigitalLearningSolutions.Data.Models.SuperAdmin;
@@ -22,13 +22,12 @@ namespace DigitalLearningSolutions.Web.Tests.Controllers.SuperAdmin
     public class CentresControllerTests
     {
         private const int CenterId = 374;
-        private readonly ICentresDataService centresDataService = A.Fake<ICentresDataService>();
         private readonly ICentreApplicationsService centreApplicationsService = A.Fake<ICentreApplicationsService>();
         private readonly ICentresService centresService = A.Fake<ICentresService>();
         private readonly ISearchSortFilterPaginateService searchSortFilterPaginateService = A.Fake<ISearchSortFilterPaginateService>();
-        private readonly IRegionDataService regionDataService = A.Fake<IRegionDataService>();
-        private readonly IContractTypesDataService contractTypesDataService = A.Fake<IContractTypesDataService>();
-        private readonly ICourseDataService courseDataService = A.Fake<ICourseDataService>();
+        private readonly IRegionService regionService = A.Fake<IRegionService>();
+        private readonly IContractTypesService contractTypesService = A.Fake<IContractTypesService>();
+        private readonly ICourseService courseService = A.Fake<ICourseService>();
         private readonly ICentresDownloadFileService centresDownloadFileService = A.Fake<ICentresDownloadFileService>();
         private readonly ICentreSelfAssessmentsService centreSelfAssessmentsService = A.Fake<ICentreSelfAssessmentsService>();
         private CentresController controller = null!;
@@ -40,17 +39,16 @@ public void Setup()
             centresService,
             centreApplicationsService,
             searchSortFilterPaginateService,
-            regionDataService,
-            centresDataService,
-            contractTypesDataService,
-            courseDataService,
+            regionService,
+            contractTypesService,
+            courseService,
             centresDownloadFileService,
             centreSelfAssessmentsService
             )
             .WithDefaultContext()
             .WithMockUser(true);
 
-            A.CallTo(() => centresDataService.UpdateCentreDetailsForSuperAdmin(
+            A.CallTo(() => centresService.UpdateCentreDetailsForSuperAdmin(
                     A<int>._,
                     A<string>._,
                     A<int>._,
@@ -64,15 +62,15 @@ public void Setup()
         [TearDown]
         public void Cleanup()
         {
-            Fake.ClearRecordedCalls(centresDataService);
+            Fake.ClearRecordedCalls(centresService);
         }
 
         [Test]
         public void EditCentreDetails_updates_centre_and_redirects_with_successful_save()
         {
             // Given
             IEnumerable<(int, string)> centresList = new List<(int, string)> { (374, "##HEE Demo Centre1##") };
-            A.CallTo(() => centresDataService.GetAllCentres(false)).Returns(centresList);
+            A.CallTo(() => centresService.GetAllCentres(false)).Returns(centresList);
             var model = new EditCentreDetailsSuperAdminViewModel
             {
                 CentreId = 374,
@@ -91,7 +89,7 @@ public void EditCentreDetails_updates_centre_and_redirects_with_successful_save(
 
             // Then
             result.Should().BeRedirectToActionResult().WithActionName("ManageCentre");
-            A.CallTo(() => centresDataService.UpdateCentreDetailsForSuperAdmin(
+            A.CallTo(() => centresService.UpdateCentreDetailsForSuperAdmin(
                                                 model.CentreId,
                                                 model.CentreName,
                                                 model.CentreTypeId,
@@ -107,7 +105,7 @@ public void EditCentreDetails_results_DuplicateCentre_error()
         {
             // Given
             IEnumerable<(int, string)> centresList = new List<(int, string)> { (374, "##HEE Demo Centre##"), (610, "Alternative Futures Group") };
-            A.CallTo(() => centresDataService.GetAllCentres(false)).Returns(centresList);
+            A.CallTo(() => centresService.GetAllCentres(false)).Returns(centresList);
             var model = new EditCentreDetailsSuperAdminViewModel
             {
                 CentreId = 374,
@@ -131,7 +129,7 @@ public void EditCentreDetails_results_DuplicateCentre_error()
             centreNameErrors.Should().Contain(error => error.ErrorMessage ==
             "The centre name you have entered already exists, please enter a different centre name");
 
-            A.CallTo(() => centresDataService.UpdateCentreDetailsForSuperAdmin(
+            A.CallTo(() => centresService.UpdateCentreDetailsForSuperAdmin(
                                                 model.CentreId,
                                                 model.CentreName,
                                                 model.CentreTypeId,
@@ -166,7 +164,7 @@ public void AddCentre_adds_centre_and_redirects_with_successful_save()
 
             // Then
             result.Should().BeRedirectToActionResult().WithActionName("ManageCentre");
-            A.CallTo(() => centresDataService.AddCentreForSuperAdmin(
+            A.CallTo(() => centresService.AddCentreForSuperAdmin(
                                                 model.CentreName,
                                                 model.ContactFirstName,
                                                 model.ContactLastName,
@@ -186,7 +184,7 @@ public void AddCentre_results_DuplicateCentre_error()
         {
             // Given
             IEnumerable<(int, string)> centresList = new List<(int, string)> { (374, "##HEE Demo Centre##") };
-            A.CallTo(() => centresDataService.GetAllCentres(false)).Returns(centresList);
+            A.CallTo(() => centresService.GetAllCentres(false)).Returns(centresList);
             var model = new AddCentreSuperAdminViewModel
             {
                 CentreName = "##HEE Demo Centre##",
@@ -214,7 +212,7 @@ public void AddCentre_results_DuplicateCentre_error()
             centreNameErrors.Should().Contain(error => error.ErrorMessage ==
             "The centre name you have entered already exists, please enter a different centre name");
 
-            A.CallTo(() => centresDataService.AddCentreForSuperAdmin(
+            A.CallTo(() => centresService.AddCentreForSuperAdmin(
                                                 model.CentreName,
                                                 model.ContactFirstName,
                                                 model.ContactLastName,
@@ -242,7 +240,7 @@ public void CentreRoleLimits_route_loads_existing_role_limits_with_derived_flags
                 RoleLimitTrainers = 30,             // set
             };
 
-            A.CallTo(() => centresDataService.GetRoleLimitsForCentre(
+            A.CallTo(() => centresService.GetRoleLimitsForCentre(
                 A<int>._
             )).Returns(roleLimits);
 
@@ -266,7 +264,7 @@ public void CentreRoleLimits_route_loads_existing_role_limits_with_derived_flags
 
             // Then
 
-            A.CallTo(() => centresDataService.GetRoleLimitsForCentre(374)).MustHaveHappenedOnceExactly();
+            A.CallTo(() => centresService.GetRoleLimitsForCentre(374)).MustHaveHappenedOnceExactly();
             result.Should().BeViewResult("CentreRoleLimits").ModelAs<CentreRoleLimitsViewModel>().Should().BeEquivalentTo(expectedVm);
         }
 
@@ -294,7 +292,7 @@ public void EditCentreRoleLimits_updates_centre_role_limits_and_redirects_with_s
 
             // Then
             A.CallTo(
-                    () => centresDataService.UpdateCentreRoleLimits(
+                    () => centresService.UpdateCentreRoleLimits(
                         model.CentreId,
                         model.RoleLimitCmsAdministrators,
                         model.RoleLimitCmsManagers,
@@ -331,7 +329,7 @@ public void EditCentreRoleLimits_default_role_limit_value_to_negative_if_not_set
 
             // Then
             A.CallTo(
-                    () => centresDataService.UpdateCentreRoleLimits(
+                    () => centresService.UpdateCentreRoleLimits(
                         model.CentreId,
                         model.RoleLimitCmsAdministrators,
                         -1,
@@ -357,7 +355,7 @@ public void Get_with_centreId_shows_EditContractInfo_page()
             const int contractReviewDay = 28;
             const int contractReviewMonth = 8;
             const int contractReviewYear = 2023;
-            A.CallTo(() => centresDataService.GetContractInfo(CenterId)).Returns(CentreContractAdminUsageTestHelper.GetDefaultEditContractInfo(CenterId));
+            A.CallTo(() => centresService.GetContractInfo(CenterId)).Returns(CentreContractAdminUsageTestHelper.GetDefaultEditContractInfo(CenterId));
 
             // When
             var result = controller.EditContractInfo(centreId, 28, 8, 2023, 10024, 10024, 100024);
@@ -399,7 +397,7 @@ public void Edit_ContractInfo_redirects_with_successful_save()
 
             // When
             var result = controller.EditContractInfo(model, DateTime.UtcNow.Day, DateTime.UtcNow.Month, DateTime.UtcNow.Year);
-            A.CallTo(() => centresDataService.UpdateContractTypeandCenter(model.CentreId,
+            A.CallTo(() => centresService.UpdateContractTypeandCenter(model.CentreId,
                model.ContractTypeID,
                model.DelegateUploadSpace,
                model.ServerSpaceBytesInc,