Merge branch 'Release-2024.32' into Develop/feature/TD-3914-CentresController-refactor

Auldrin-Possa · web-flow · commit 52444ae1db0d · 2024-06-12T08:41:55.000+01:00
diff --git a/DigitalLearningSolutions.Web.Tests/Controllers/TrackingSystem/Centre/Configuration/CentreConfigurationControllerTests.cs b/DigitalLearningSolutions.Web.Tests/Controllers/TrackingSystem/Centre/Configuration/CentreConfigurationControllerTests.cs
@@ -2,9 +2,8 @@
 {
     using System;
     using System.Globalization;
-    using DigitalLearningSolutions.Data.DataServices;
     using DigitalLearningSolutions.Data.Models.Certificates;
-    using DigitalLearningSolutions.Data.Models.External.Maps;    
+    using DigitalLearningSolutions.Data.Models.External.Maps;
     using DigitalLearningSolutions.Web.Controllers.TrackingSystem.Centre.Configuration;
     using DigitalLearningSolutions.Web.Helpers.ExternalApis;
     using DigitalLearningSolutions.Web.Services;
@@ -22,7 +21,7 @@
 
     public class CentreConfigurationControllerTests
     {
-        private readonly ICentresDataService centresDataService = A.Fake<ICentresDataService>();
+        private readonly ICentresService centresService = A.Fake<ICentresService>();
 
         private readonly IImageResizeService imageResizeService = A.Fake<IImageResizeService>();
 
@@ -39,7 +38,7 @@ public void Setup()
             certificateService = A.Fake<ICertificateService>();
             controller =
                 new ConfigurationController(
-                        centresDataService,
+                        centresService,
                         mapsApiHelper,
                         logger,
                         imageResizeService,
@@ -49,7 +48,7 @@ public void Setup()
                     .WithMockUser(true);
 
             A.CallTo(
-                () => centresDataService.UpdateCentreWebsiteDetails(
+                () => centresService.UpdateCentreWebsiteDetails(
                     A<int>._,
                     A<string>._,
                     A<double>._,
@@ -68,7 +67,7 @@ public void Setup()
         [TearDown]
         public void Cleanup()
         {
-            Fake.ClearRecordedCalls(centresDataService);
+            Fake.ClearRecordedCalls(centresService);
             Fake.ClearRecordedCalls(mapsApiHelper);
             Fake.ClearRecordedCalls(logger);
             Fake.ClearRecordedCalls(imageResizeService);
@@ -126,7 +125,7 @@ public void EditCentreDetailsPostSave_without_previewing_signature_image_fails_v
 
             // Then
             A.CallTo(
-                    () => centresDataService.UpdateCentreDetails(
+                    () => centresService.UpdateCentreDetails(
                         A<int>._,
                         A<string>._,
                         A<string>._,
@@ -156,7 +155,7 @@ public void EditCentreDetailsPostSave_without_previewing_logo_image_fails_valida
 
             // Then
             A.CallTo(
-                    () => centresDataService.UpdateCentreDetails(
+                    () => centresService.UpdateCentreDetails(
                         A<int>._,
                         A<string>._,
                         A<string>._,
@@ -199,7 +198,7 @@ public void EditCentreDetailsPost_updates_centre_and_redirects_with_successful_s
 
             // Then
             result.Should().BeRedirectToActionResult().WithActionName("Index");
-            A.CallTo(() => centresDataService.UpdateCentreDetails(2, null, model.BannerText, null, null))
+            A.CallTo(() => centresService.UpdateCentreDetails(2, null, model.BannerText, null, null))
                 .MustHaveHappenedOnceExactly();
         }
 
@@ -307,7 +306,7 @@ public void EditCentreWebsiteDetails_should_show_save_coordinates_when_postcode_
             // Then
             result.Should().BeRedirectToActionResult().WithActionName("Index");
             A.CallTo(
-                () => centresDataService.UpdateCentreWebsiteDetails(
+                () => centresService.UpdateCentreWebsiteDetails(
                     A<int>._,
                     "AA123",
                     latitude,
@@ -341,7 +340,7 @@ public void PreviewCertificate_returns_view_when_service_returns_object()
         {
             // Given
             var centre = CentreTestHelper.GetDefaultCentre();
-            A.CallTo(() => centresDataService.GetCentreDetailsById(centre.CentreId)).Returns(centre);
+            A.CallTo(() => centresService.GetCentreDetailsById(centre.CentreId)).Returns(centre);
             var certificateInformation = CertificateTestHelper.GetDefaultCertificate();
             //var certificateInformation = new CertificateInformation(
             //    0,
diff --git a/DigitalLearningSolutions.Web.Tests/Controllers/TrackingSystem/Centre/Configuration/RegistrationPromptsControllerTests.cs b/DigitalLearningSolutions.Web.Tests/Controllers/TrackingSystem/Centre/Configuration/RegistrationPromptsControllerTests.cs
@@ -1,6 +1,5 @@
 ﻿namespace DigitalLearningSolutions.Web.Tests.Controllers.TrackingSystem.Centre.Configuration
 {
-    using DigitalLearningSolutions.Data.DataServices.UserDataService;
     using DigitalLearningSolutions.Data.Models.MultiPageFormData.AddRegistrationPrompt;
     using DigitalLearningSolutions.Data.Models.MultiPageFormData.EditRegistrationPrompt;
     using DigitalLearningSolutions.Web.Controllers.TrackingSystem.Centre.Configuration;
@@ -27,7 +26,7 @@ public class RegistrationPromptsControllerTests
         private IMultiPageFormService multiPageFormService = null!;
         private RegistrationPromptsController registrationPromptsController = null!;
         private RegistrationPromptsController registrationPromptsControllerWithMockHttpContext = null!;
-        private IUserDataService userDataService = null!;
+        private IUserService userService = null!;
 
         private static IEnumerable<TestCaseData> AddAnswerModelErrorTestData
         {
@@ -57,13 +56,13 @@ private static IEnumerable<TestCaseData> AddAnswerModelErrorTestData
         public void Setup()
         {
             centreRegistrationPromptsService = A.Fake<ICentreRegistrationPromptsService>();
-            userDataService = A.Fake<IUserDataService>();
+            userService = A.Fake<IUserService>();
             multiPageFormService = A.Fake<IMultiPageFormService>();
 
             registrationPromptsController =
                 new RegistrationPromptsController(
                         centreRegistrationPromptsService,
-                        userDataService,
+                        userService,
                         multiPageFormService
                     )
                     .WithDefaultContext()
@@ -77,7 +76,7 @@ public void Setup()
             registrationPromptsControllerWithMockHttpContext =
                 new RegistrationPromptsController(
                         centreRegistrationPromptsService,
-                        userDataService,
+                        userService,
                         multiPageFormService
                     )
                     .WithMockHttpContext(httpRequest, cookieName, cookieValue)
diff --git a/DigitalLearningSolutions.Web.Tests/Controllers/TrackingSystem/Centre/Dashboard/DashboardControllerTests.cs b/DigitalLearningSolutions.Web.Tests/Controllers/TrackingSystem/Centre/Dashboard/DashboardControllerTests.cs
@@ -1,7 +1,6 @@
 ﻿namespace DigitalLearningSolutions.Web.Tests.Controllers.TrackingSystem.Centre.Dashboard
 {
     using System.Collections.Generic;
-    using DigitalLearningSolutions.Data.DataServices;
     using DigitalLearningSolutions.Data.Models;    
     using DigitalLearningSolutions.Web.Controllers.TrackingSystem.Centre.Dashboard;
     using DigitalLearningSolutions.Web.Helpers;
@@ -21,16 +20,16 @@ public class DashboardControllerTests
 
         private DashboardController dashboardController = null!;
         private IDashboardInformationService dashboardInformationService = null!;
-        private ISystemNotificationsDataService systemNotificationsDataService = null!;
+        private ISystemNotificationsService systemNotificationsService = null!;
 
         [SetUp]
         public void Setup()
         {
             dashboardInformationService = A.Fake<IDashboardInformationService>();
-            systemNotificationsDataService = A.Fake<ISystemNotificationsDataService>();
+            systemNotificationsService = A.Fake<ISystemNotificationsService>();
             dashboardController = new DashboardController(
                     dashboardInformationService,
-                    systemNotificationsDataService
+                    systemNotificationsService
                 ).WithMockHttpContext(httpRequest, response: httpResponse)
                 .WithMockUser(true)
                 .WithMockServices()
@@ -41,7 +40,7 @@ public void Setup()
         public void Index_redirects_to_Notifications_page_when_unacknowledged_notifications_have_not_been_skipped()
         {
             // Given
-            A.CallTo(() => systemNotificationsDataService.GetUnacknowledgedSystemNotifications(A<int>._))
+            A.CallTo(() => systemNotificationsService.GetUnacknowledgedSystemNotifications(A<int>._))
                 .Returns(new List<SystemNotification> { SystemNotificationTestHelper.GetDefaultSystemNotification() });
 
             // When
@@ -61,7 +60,7 @@ public void Index_redirects_to_Notifications_page_when_unacknowledged_notificati
         public void Index_goes_to_Index_page_when_unacknowledged_notifications_have_been_skipped()
         {
             // Given
-            A.CallTo(() => systemNotificationsDataService.GetUnacknowledgedSystemNotifications(A<int>._))
+            A.CallTo(() => systemNotificationsService.GetUnacknowledgedSystemNotifications(A<int>._))
                 .Returns(new List<SystemNotification> { SystemNotificationTestHelper.GetDefaultSystemNotification() });
             A.CallTo(() => httpRequest.Cookies).Returns(
                 ControllerContextHelper.SetUpFakeRequestCookieCollection(SystemNotificationCookieHelper.CookieName, "7")
@@ -89,7 +88,7 @@ public void Index_goes_to_Index_page_when_unacknowledged_notifications_have_been
         public void Index_returns_not_found_when_dashboard_information_is_null()
         {
             // Given
-            A.CallTo(() => systemNotificationsDataService.GetUnacknowledgedSystemNotifications(A<int>._))
+            A.CallTo(() => systemNotificationsService.GetUnacknowledgedSystemNotifications(A<int>._))
                 .Returns(new List<SystemNotification>());
             A.CallTo(() => dashboardInformationService.GetDashboardInformationForCentre(A<int>._, A<int>._)).Returns(
                 null
@@ -106,7 +105,7 @@ public void Index_returns_not_found_when_dashboard_information_is_null()
         public void Index_goes_to_Index_page_when_no_unacknowledged_notifications_exist()
         {
             // Given
-            A.CallTo(() => systemNotificationsDataService.GetUnacknowledgedSystemNotifications(A<int>._))
+            A.CallTo(() => systemNotificationsService.GetUnacknowledgedSystemNotifications(A<int>._))
                 .Returns(new List<SystemNotification>());
             A.CallTo(() => dashboardInformationService.GetDashboardInformationForCentre(A<int>._, A<int>._)).Returns(
                 new CentreDashboardInformation(
diff --git a/DigitalLearningSolutions.Web/Controllers/TrackingSystem/Centre/Configuration/ConfigurationController.cs b/DigitalLearningSolutions.Web/Controllers/TrackingSystem/Centre/Configuration/ConfigurationController.cs
@@ -1,6 +1,5 @@
 namespace DigitalLearningSolutions.Web.Controllers.TrackingSystem.Centre.Configuration
 {
-    using DigitalLearningSolutions.Data.DataServices;
     using DigitalLearningSolutions.Data.Enums;
     using DigitalLearningSolutions.Web.Attributes;
     using DigitalLearningSolutions.Web.Extensions;
@@ -21,21 +20,21 @@ namespace DigitalLearningSolutions.Web.Controllers.TrackingSystem.Centre.Configu
     [Route("/TrackingSystem/Centre/Configuration")]
     public class ConfigurationController : Controller
     {
-        private readonly ICentresDataService centresDataService;
+        private readonly ICentresService centresService;
         private readonly ILogger<ConfigurationController> logger;
         private readonly IMapsApiHelper mapsApiHelper;
         private readonly IImageResizeService imageResizeService;
         private ICertificateService certificateService;
 
         public ConfigurationController(
-            ICentresDataService centresDataService,
+            ICentresService centresService,
             IMapsApiHelper mapsApiHelper,
             ILogger<ConfigurationController> logger,
             IImageResizeService imageResizeService,
             ICertificateService certificateService
         )
         {
-            this.centresDataService = centresDataService;
+            this.centresService = centresService;
             this.mapsApiHelper = mapsApiHelper;
             this.logger = logger;
             this.imageResizeService = imageResizeService;
@@ -46,7 +45,7 @@ public IActionResult Index()
         {
             var centreId = User.GetCentreIdKnownNotNull();
 
-            var centreDetails = centresDataService.GetCentreDetailsById(centreId)!;
+            var centreDetails = centresService.GetCentreDetailsById(centreId)!;
 
             var model = new CentreConfigurationViewModel(centreDetails);
 
@@ -59,7 +58,7 @@ public IActionResult EditCentreManagerDetails()
         {
             var centreId = User.GetCentreIdKnownNotNull();
 
-            var centreDetails = centresDataService.GetCentreDetailsById(centreId)!;
+            var centreDetails = centresService.GetCentreDetailsById(centreId)!;
 
             var model = new EditCentreManagerDetailsViewModel(centreDetails);
 
@@ -77,7 +76,7 @@ public IActionResult EditCentreManagerDetails(EditCentreManagerDetailsViewModel
 
             var centreId = User.GetCentreIdKnownNotNull();
 
-            centresDataService
+            centresService
                 .UpdateCentreManagerDetails(centreId, model.FirstName!, model.LastName!, model.Email!, model.Telephone);
 
             return RedirectToAction("Index");
@@ -89,7 +88,7 @@ public IActionResult EditCentreWebsiteDetails()
         {
             var centreId = User.GetCentreIdKnownNotNull();
 
-            var centreDetails = centresDataService.GetCentreDetailsById(centreId)!;
+            var centreDetails = centresService.GetCentreDetailsById(centreId)!;
 
             var model = new EditCentreWebsiteDetailsViewModel(centreDetails);
 
@@ -129,7 +128,7 @@ public IActionResult EditCentreWebsiteDetails(EditCentreWebsiteDetailsViewModel
 
             var centreId = User.GetCentreIdKnownNotNull();
 
-            centresDataService.UpdateCentreWebsiteDetails(
+            centresService.UpdateCentreWebsiteDetails(
                 centreId,
                 model.CentrePostcode,
                 latitude,
@@ -152,7 +151,7 @@ public IActionResult EditCentreDetails()
         {
             var centreId = User.GetCentreIdKnownNotNull();
 
-            var centreDetails = centresDataService.GetCentreDetailsById(centreId)!;
+            var centreDetails = centresService.GetCentreDetailsById(centreId)!;
 
             var model = new EditCentreDetailsViewModel(centreDetails);
 
@@ -209,7 +208,7 @@ private IActionResult EditCentreDetailsPostSave(EditCentreDetailsViewModel model
 
             var centreId = User.GetCentreIdKnownNotNull();
 
-            centresDataService.UpdateCentreDetails(
+            centresService.UpdateCentreDetails(
                 centreId,
                 model.NotifyEmail,
                 model.BannerText!,
diff --git a/DigitalLearningSolutions.Web/Controllers/TrackingSystem/Centre/Configuration/RegistrationPromptsController.cs b/DigitalLearningSolutions.Web/Controllers/TrackingSystem/Centre/Configuration/RegistrationPromptsController.cs
@@ -1,6 +1,5 @@
 ﻿namespace DigitalLearningSolutions.Web.Controllers.TrackingSystem.Centre.Configuration
 {
-    using DigitalLearningSolutions.Data.DataServices.UserDataService;
     using DigitalLearningSolutions.Data.Enums;
     using DigitalLearningSolutions.Data.Helpers;
     using DigitalLearningSolutions.Data.Models.MultiPageFormData.AddRegistrationPrompt;
@@ -35,16 +34,16 @@ public class RegistrationPromptsController : Controller
         public const string BulkAction = "bulk";
         private readonly ICentreRegistrationPromptsService centreRegistrationPromptsService;
         private readonly IMultiPageFormService multiPageFormService;
-        private readonly IUserDataService userDataService;
+        private readonly IUserService userService;
 
         public RegistrationPromptsController(
             ICentreRegistrationPromptsService centreRegistrationPromptsService,
-            IUserDataService userDataService,
+            IUserService userService,
             IMultiPageFormService multiPageFormService
         )
         {
             this.centreRegistrationPromptsService = centreRegistrationPromptsService;
-            this.userDataService = userDataService;
+            this.userService = userService;
             this.multiPageFormService = multiPageFormService;
         }
 
@@ -366,7 +365,7 @@ public IActionResult AddRegistrationPromptSummaryPost()
         public IActionResult RemoveRegistrationPrompt(int promptNumber)
         {
             var delegateWithAnswerCount =
-                userDataService.GetDelegateCountWithAnswerForPrompt(User.GetCentreIdKnownNotNull(), promptNumber);
+                userService.GetDelegateCountWithAnswerForPrompt(User.GetCentreIdKnownNotNull(), promptNumber);
 
             if (delegateWithAnswerCount == 0)
             {
diff --git a/DigitalLearningSolutions.Web/Controllers/TrackingSystem/Centre/Dashboard/DashboardController.cs b/DigitalLearningSolutions.Web/Controllers/TrackingSystem/Centre/Dashboard/DashboardController.cs
@@ -1,7 +1,6 @@
 ﻿namespace DigitalLearningSolutions.Web.Controllers.TrackingSystem.Centre.Dashboard
 {
     using System.Linq;
-    using DigitalLearningSolutions.Data.DataServices;
     using DigitalLearningSolutions.Data.Enums;
     using DigitalLearningSolutions.Web.Attributes;
     using DigitalLearningSolutions.Web.Helpers;
@@ -20,22 +19,22 @@
     public class DashboardController : Controller
     {
         private readonly IDashboardInformationService dashboardInformationService;
-        private readonly ISystemNotificationsDataService systemNotificationsDataService;
+        private readonly ISystemNotificationsService systemNotificationsService;
 
         public DashboardController(
             IDashboardInformationService dashboardInformationService,
-            ISystemNotificationsDataService systemNotificationsDataService
+            ISystemNotificationsService systemNotificationsService
         )
         {
             this.dashboardInformationService = dashboardInformationService;
-            this.systemNotificationsDataService = systemNotificationsDataService;
+            this.systemNotificationsService = systemNotificationsService;
         }
 
         public IActionResult Index()
         {
             var adminId = User.GetAdminId()!.Value;
             var unacknowledgedNotifications =
-                systemNotificationsDataService.GetUnacknowledgedSystemNotifications(adminId).ToList();
+                systemNotificationsService.GetUnacknowledgedSystemNotifications(adminId).ToList();
 
             if (!Request.Cookies.HasSkippedNotificationsCookie(adminId) && unacknowledgedNotifications.Any())
             {
diff --git a/DigitalLearningSolutions.Web/Services/CentresService.cs b/DigitalLearningSolutions.Web/Services/CentresService.cs
diff --git a/DigitalLearningSolutions.Web/Services/UserService.cs b/DigitalLearningSolutions.Web/Services/UserService.cs
diff --git a/DigitalLearningSolutions.Web/Views/Frameworks/Developer/_AllFrameworks.cshtml b/DigitalLearningSolutions.Web/Views/Frameworks/Developer/_AllFrameworks.cshtml

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,5 @@`
`1`	`1`	`namespace DigitalLearningSolutions.Web.Controllers.TrackingSystem.Centre.Configuration`
`2`	`2`	`{`
`3`		`- using DigitalLearningSolutions.Data.DataServices.UserDataService;`
`4`	`3`	`using DigitalLearningSolutions.Data.Enums;`
`5`	`4`	`using DigitalLearningSolutions.Data.Helpers;`
`6`	`5`	`using DigitalLearningSolutions.Data.Models.MultiPageFormData.AddRegistrationPrompt;`
`@@ -35,16 +34,16 @@ public class RegistrationPromptsController : Controller`
`35`	`34`	`public const string BulkAction = "bulk";`
`36`	`35`	`private readonly ICentreRegistrationPromptsService centreRegistrationPromptsService;`
`37`	`36`	`private readonly IMultiPageFormService multiPageFormService;`
`38`		`- private readonly IUserDataService userDataService;`
	`37`	`+ private readonly IUserService userService;`
`39`	`38`
`40`	`39`	`public RegistrationPromptsController(`
`41`	`40`	`ICentreRegistrationPromptsService centreRegistrationPromptsService,`
`42`		`- IUserDataService userDataService,`
	`41`	`+ IUserService userService,`
`43`	`42`	`IMultiPageFormService multiPageFormService`
`44`	`43`	`)`
`45`	`44`	`{`
`46`	`45`	`this.centreRegistrationPromptsService = centreRegistrationPromptsService;`
`47`		`- this.userDataService = userDataService;`
	`46`	`+ this.userService = userService;`
`48`	`47`	`this.multiPageFormService = multiPageFormService;`
`49`	`48`	`}`
`50`	`49`
`@@ -366,7 +365,7 @@ public IActionResult AddRegistrationPromptSummaryPost()`
`366`	`365`	`public IActionResult RemoveRegistrationPrompt(int promptNumber)`
`367`	`366`	`{`
`368`	`367`	`var delegateWithAnswerCount =`
`369`		`- userDataService.GetDelegateCountWithAnswerForPrompt(User.GetCentreIdKnownNotNull(), promptNumber);`
	`368`	`+ userService.GetDelegateCountWithAnswerForPrompt(User.GetCentreIdKnownNotNull(), promptNumber);`
`370`	`369`
`371`	`370`	`if (delegateWithAnswerCount == 0)`
`372`	`371`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,6 @@`
`1`	`1`	`namespace DigitalLearningSolutions.Web.Controllers.TrackingSystem.Centre.Dashboard`
`2`	`2`	`{`
`3`	`3`	`using System.Linq;`
`4`		`- using DigitalLearningSolutions.Data.DataServices;`
`5`	`4`	`using DigitalLearningSolutions.Data.Enums;`
`6`	`5`	`using DigitalLearningSolutions.Web.Attributes;`
`7`	`6`	`using DigitalLearningSolutions.Web.Helpers;`
`@@ -20,22 +19,22 @@`
`20`	`19`	`public class DashboardController : Controller`
`21`	`20`	`{`
`22`	`21`	`private readonly IDashboardInformationService dashboardInformationService;`
`23`		`- private readonly ISystemNotificationsDataService systemNotificationsDataService;`
	`22`	`+ private readonly ISystemNotificationsService systemNotificationsService;`
`24`	`23`
`25`	`24`	`public DashboardController(`
`26`	`25`	`IDashboardInformationService dashboardInformationService,`
`27`		`- ISystemNotificationsDataService systemNotificationsDataService`
	`26`	`+ ISystemNotificationsService systemNotificationsService`
`28`	`27`	`)`
`29`	`28`	`{`
`30`	`29`	`this.dashboardInformationService = dashboardInformationService;`
`31`		`- this.systemNotificationsDataService = systemNotificationsDataService;`
	`30`	`+ this.systemNotificationsService = systemNotificationsService;`
`32`	`31`	`}`
`33`	`32`
`34`	`33`	`public IActionResult Index()`
`35`	`34`	`{`
`36`	`35`	`var adminId = User.GetAdminId()!.Value;`
`37`	`36`	`var unacknowledgedNotifications =`
`38`		`- systemNotificationsDataService.GetUnacknowledgedSystemNotifications(adminId).ToList();`
	`37`	`+ systemNotificationsService.GetUnacknowledgedSystemNotifications(adminId).ToList();`
`39`	`38`
`40`	`39`	`if (!Request.Cookies.HasSkippedNotificationsCookie(adminId) && unacknowledgedNotifications.Any())`
`41`	`40`	`{`