Merge pull request #2698 from TechnologyEnhancedLearning/Develop/feature/TD-3926-AdminFieldsController-refactor

TD-3926-AdminFieldsController - refactor

Author: rshrirohit

DigitalLearningSolutions.Web.Tests/Controllers/TrackingSystem/CourseSetup/AdminFieldsControllerTests.cs

@@ -1,9 +1,8 @@
 namespace DigitalLearningSolutions.Web.Tests.Controllers.TrackingSystem.CourseSetup
 {
-    using DigitalLearningSolutions.Data.DataServices;
     using DigitalLearningSolutions.Data.Models.CustomPrompts;
     using DigitalLearningSolutions.Data.Models.MultiPageFormData.AddAdminField;
-    using DigitalLearningSolutions.Data.Models.MultiPageFormData.EditAdminField;    
+    using DigitalLearningSolutions.Data.Models.MultiPageFormData.EditAdminField;
     using DigitalLearningSolutions.Web.Controllers.TrackingSystem.CourseSetup;
     using DigitalLearningSolutions.Web.Extensions;
     using DigitalLearningSolutions.Web.Services;
@@ -24,7 +23,6 @@
     public class AdminFieldsControllerTests
     {
         private AdminFieldsController controller = null!;
-        private ICourseAdminFieldsDataService courseAdminFieldsDataService = null!;
         private ICourseAdminFieldsService courseAdminFieldsService = null!;
         private ICourseService courseService = null!;
         private IMultiPageFormService multiPageFormService = null!;
@@ -56,13 +54,11 @@ private static IEnumerable<TestCaseData> AddAnswerModelErrorTestData
         [SetUp]
         public void Setup()
         {
-            courseAdminFieldsDataService = A.Fake<ICourseAdminFieldsDataService>();
             courseAdminFieldsService = A.Fake<ICourseAdminFieldsService>();
             multiPageFormService = A.Fake<IMultiPageFormService>();
             courseService = A.Fake<ICourseService>();
             controller = new AdminFieldsController(
                     courseAdminFieldsService,
-                    courseAdminFieldsDataService,
                     multiPageFormService
                 )
                 .WithDefaultContext()
@@ -683,7 +679,7 @@ public void AddAdminField_adds_model_error_if_field_name_is_already_in_use()
             ).Returns(initialTempData);
             const string action = "save";
 
-            A.CallTo(() => courseAdminFieldsDataService.GetCourseFieldPromptIdsForCustomisation(A<int>._))
+            A.CallTo(() => courseAdminFieldsService.GetCourseFieldPromptIdsForCustomisation(A<int>._))
                 .Returns(new[] { 1, 0, 0 });
 
             // When

DigitalLearningSolutions.Web/Controllers/TrackingSystem/CourseSetup/AdminFieldsController.cs

@@ -1,6 +1,5 @@
 namespace DigitalLearningSolutions.Web.Controllers.TrackingSystem.CourseSetup
 {
-    using DigitalLearningSolutions.Data.DataServices;
     using DigitalLearningSolutions.Data.Enums;
     using DigitalLearningSolutions.Data.Helpers;
     using DigitalLearningSolutions.Data.Models.MultiPageFormData.AddAdminField;
@@ -31,18 +30,15 @@ public class AdminFieldsController : Controller
         public const string AddPromptAction = "addPrompt";
         public const string SaveAction = "save";
         public const string BulkAction = "bulk";
-        private readonly ICourseAdminFieldsDataService courseAdminFieldsDataService;
         private readonly ICourseAdminFieldsService courseAdminFieldsService;
         private readonly IMultiPageFormService multiPageFormService;
 
         public AdminFieldsController(
             ICourseAdminFieldsService courseAdminFieldsService,
-            ICourseAdminFieldsDataService courseAdminFieldsDataService,
             IMultiPageFormService multiPageFormService
         )
         {
             this.courseAdminFieldsService = courseAdminFieldsService;
-            this.courseAdminFieldsDataService = courseAdminFieldsDataService;
             this.multiPageFormService = multiPageFormService;
         }
 
@@ -288,7 +284,7 @@ AddBulkAdminFieldAnswersViewModel model
         public IActionResult RemoveAdminField(int customisationId, int promptNumber)
         {
             var answerCount =
-                courseAdminFieldsDataService.GetAnswerCountForCourseAdminField(customisationId, promptNumber);
+                courseAdminFieldsService.GetAnswerCountForCourseAdminField(customisationId, promptNumber);
 
             if (answerCount == 0)
             {
@@ -574,7 +570,7 @@ private void ValidateUniqueAdminFieldId(int customisationId, int? adminFieldId)
                 return;
             }
 
-            var existingIds = courseAdminFieldsDataService.GetCourseFieldPromptIdsForCustomisation(customisationId);
+            var existingIds = courseAdminFieldsService.GetCourseFieldPromptIdsForCustomisation(customisationId);
 
             if (existingIds.Any(id => id == adminFieldId))
             {

DigitalLearningSolutions.Web/Services/CourseAdminFieldsService.cs

@@ -36,6 +36,10 @@ public IEnumerable<CourseAdminFieldWithResponseCounts> GetCourseAdminFieldsWithA
             int customisationId,
             int centreId
         );
+
+        int GetAnswerCountForCourseAdminField(int customisationId, int promptNumber);
+
+        int[] GetCourseFieldPromptIdsForCustomisation(int customisationId);
     }
 
     public class CourseAdminFieldsService : ICourseAdminFieldsService
@@ -413,5 +417,15 @@ private static List<CourseAdminFieldWithResponseCounts>
 
             return list;
         }
+
+        public int GetAnswerCountForCourseAdminField(int customisationId, int promptNumber)
+        {
+            return courseAdminFieldsDataService.GetAnswerCountForCourseAdminField(customisationId, promptNumber);
+        }
+
+        public int[] GetCourseFieldPromptIdsForCustomisation(int customisationId)
+        {
+            return courseAdminFieldsDataService.GetCourseFieldPromptIdsForCustomisation(customisationId);
+        }
     }
 }