TechnologyEnhancedLearning · DanBloxham-sw · Jun 24, 2021 · Jun 23, 2021
diff --git a/...Data.Tests/Services/CourseServiceTests.cs → ...ts/DataServices/CourseDataServiceTests.cs b/...Data.Tests/Services/CourseServiceTests.cs → ...ts/DataServices/CourseDataServiceTests.cs
@@ -1,20 +1,20 @@
-namespace DigitalLearningSolutions.Data.Tests.Services
+namespace DigitalLearningSolutions.Data.Tests.DataServices
 {
     using System;
     using System.Linq;
     using System.Transactions;
+    using DigitalLearningSolutions.Data.DataServices;
     using DigitalLearningSolutions.Data.Mappers;
     using DigitalLearningSolutions.Data.Models.Courses;
-    using DigitalLearningSolutions.Data.Services;
     using DigitalLearningSolutions.Data.Tests.TestHelpers;
     using FakeItEasy;
     using FluentAssertions;
     using Microsoft.Extensions.Logging;
     using NUnit.Framework;
 
-    public class CourseServiceTests
+    public class CourseDataServiceTests
     {
-        private CourseService courseService;
+        private CourseDataDataService courseDataService;
 
         [OneTimeSetUp]
         public void OneTimeSetUp()
@@ -26,16 +26,16 @@ public void OneTimeSetUp()
         public void Setup()
         {
             var connection = ServiceTestHelper.GetDatabaseConnection();
-            var logger = A.Fake<ILogger<CourseService>>();
-            courseService = new CourseService(connection, logger);
+            var logger = A.Fake<ILogger<CourseDataDataService>>();
+            courseDataService = new CourseDataDataService(connection, logger);
         }
 
         [Test]
         public void Get_current_courses_should_return_courses_for_candidate()
         {
             // When
             const int candidateId = 1;
-            var result = courseService.GetCurrentCourses(candidateId).ToList();
+            var result = courseDataService.GetCurrentCourses(candidateId).ToList();
 
             // Then
             var expectedFirstCourse = new CurrentCourse
@@ -66,7 +66,7 @@ public void Get_completed_courses_should_return_courses_for_candidate()
         {
             // When
             const int candidateId = 1;
-            var result = courseService.GetCompletedCourses(candidateId).ToList();
+            var result = courseDataService.GetCompletedCourses(candidateId).ToList();
 
             // Then
             var expectedFirstCourse = new CompletedCourse
@@ -96,7 +96,7 @@ public void Get_available_courses_should_return_courses_for_candidate()
             // When
             const int candidateId = 254480;
             const int centreId = 101;
-            var result = courseService.GetAvailableCourses(candidateId, centreId).ToList();
+            var result = courseDataService.GetAvailableCourses(candidateId, centreId).ToList();
 
             // Then
             var expectedFirstCourse = new AvailableCourse
@@ -125,7 +125,7 @@ public void Get_available_courses_should_validate_category(
             // When
             const int candidateId = 254480;
             const int centreId = 101;
-            var result = courseService.GetAvailableCourses(candidateId, centreId).ToList();
+            var result = courseDataService.GetAvailableCourses(candidateId, centreId).ToList();
 
             // Then
             result[index].Category.Should().Be(expectedValidatedCategory);
@@ -141,7 +141,7 @@ public void Get_available_courses_should_validate_topic(
             // When
             const int candidateId = 254480;
             const int centreId = 101;
-            var result = courseService.GetAvailableCourses(candidateId, centreId).ToList();
+            var result = courseDataService.GetAvailableCourses(candidateId, centreId).ToList();
 
             // Then
             result[index].Topic.Should().Be(expectedValidatedTopic);
@@ -152,7 +152,7 @@ public void Get_available_courses_should_return_no_courses_if_no_centre()
         {
             // When
             const int candidateId = 1;
-            var result = courseService.GetAvailableCourses(candidateId, null).ToList();
+            var result = courseDataService.GetAvailableCourses(candidateId, null).ToList();
 
             // Then
             result.Should().BeEmpty();
@@ -169,8 +169,8 @@ public void Set_complete_by_date_should_update_db()
             using (new TransactionScope())
             {
                 // When
-                courseService.SetCompleteByDate(progressId, candidateId, newCompleteByDate);
-                var modifiedCourse = courseService.GetCurrentCourses(candidateId).ToList()
+                courseDataService.SetCompleteByDate(progressId, candidateId, newCompleteByDate);
+                var modifiedCourse = courseDataService.GetCurrentCourses(candidateId).ToList()
                     .First(c => c.ProgressID == progressId);
 
                 // Then
@@ -188,8 +188,8 @@ public void Remove_current_course_should_prevent_a_course_from_being_returned()
                 const int candidateId = 1;
 
                 // When
-                courseService.RemoveCurrentCourse(progressId, candidateId);
-                var courseReturned = courseService.GetCurrentCourses(candidateId).ToList()
+                courseDataService.RemoveCurrentCourse(progressId, candidateId);
+                var courseReturned = courseDataService.GetCurrentCourses(candidateId).ToList()
                     .Any(c => c.ProgressID == progressId);
 
                 // Then
@@ -201,7 +201,7 @@ public void Remove_current_course_should_prevent_a_course_from_being_returned()
         public void GetNumberOfActiveCoursesAtCentre_returns_expected_count()
         {
             // When
-            var count = courseService.GetNumberOfActiveCoursesAtCentreForCategory(2, 0);
+            var count = courseDataService.GetNumberOfActiveCoursesAtCentreForCategory(2, 0);
 
             // Then
             count.Should().Be(38);
@@ -211,7 +211,7 @@ public void GetNumberOfActiveCoursesAtCentre_returns_expected_count()
         public void GetNumberOfActiveCoursesAtCentre_with_filtered_category_returns_expected_count()
         {
             // When
-            var count = courseService.GetNumberOfActiveCoursesAtCentreForCategory(2, 2);
+            var count = courseDataService.GetNumberOfActiveCoursesAtCentreForCategory(2, 2);
 
             // Then
             count.Should().Be(3);

diff --git a/...gSolutions.Data/Services/CourseService.cs → ...ns.Data/DataServices/CourseDataService.cs b/...gSolutions.Data/Services/CourseService.cs → ...ns.Data/DataServices/CourseDataService.cs
@@ -1,4 +1,4 @@
-namespace DigitalLearningSolutions.Data.Services
+namespace DigitalLearningSolutions.Data.DataServices
 {
     using System;
     using System.Collections.Generic;
@@ -7,7 +7,7 @@
     using DigitalLearningSolutions.Data.Models.Courses;
     using Microsoft.Extensions.Logging;
 
-    public interface ICourseService
+    public interface ICourseDataService
     {
         IEnumerable<CurrentCourse> GetCurrentCourses(int candidateId);
         IEnumerable<CompletedCourse> GetCompletedCourses(int candidateId);
@@ -18,31 +18,40 @@ public interface ICourseService
         int GetNumberOfActiveCoursesAtCentreForCategory(int centreId, int categoryId);
     }
 
-    public class CourseService : ICourseService
+    public class CourseDataDataService : ICourseDataService
     {
         private readonly IDbConnection connection;
-        private readonly ILogger<CourseService> logger;
+        private readonly ILogger<CourseDataDataService> logger;
 
-        public CourseService(IDbConnection connection, ILogger<CourseService> logger)
+        public CourseDataDataService(IDbConnection connection, ILogger<CourseDataDataService> logger)
         {
             this.connection = connection;
             this.logger = logger;
         }
 
         public IEnumerable<CurrentCourse> GetCurrentCourses(int candidateId)
         {
-            return connection.Query<CurrentCourse>("GetCurrentCoursesForCandidate_V2", new { candidateId }, commandType: CommandType.StoredProcedure);
+            return connection.Query<CurrentCourse>(
+                "GetCurrentCoursesForCandidate_V2",
+                new { candidateId },
+                commandType: CommandType.StoredProcedure
+            );
         }
 
         public IEnumerable<CompletedCourse> GetCompletedCourses(int candidateId)
         {
-            return connection.Query<CompletedCourse>("GetCompletedCoursesForCandidate", new { candidateId }, commandType: CommandType.StoredProcedure);
+            return connection.Query<CompletedCourse>(
+                "GetCompletedCoursesForCandidate",
+                new { candidateId },
+                commandType: CommandType.StoredProcedure
+            );
         }
 
         public IEnumerable<AvailableCourse> GetAvailableCourses(int candidateId, int? centreId)
         {
             return connection.Query<AvailableCourse>(
-                @"GetActiveAvailableCustomisationsForCentreFiltered_V5", new { candidateId, centreId },
+                @"GetActiveAvailableCustomisationsForCentreFiltered_V5",
+                new { candidateId, centreId },
                 commandType: CommandType.StoredProcedure
             );
         }
@@ -55,7 +64,7 @@ public void SetCompleteByDate(int progressId, int candidateId, DateTime? complet
                         WHERE ProgressID = @progressId
                           AND CandidateID = @candidateId",
                 new { date = completeByDate, progressId, candidateId }
-                );
+            );
 
             if (numberOfAffectedRows < 1)
             {
@@ -69,13 +78,13 @@ public void SetCompleteByDate(int progressId, int candidateId, DateTime? complet
         public void RemoveCurrentCourse(int progressId, int candidateId)
         {
             var numberOfAffectedRows = connection.Execute(
-            @"UPDATE Progress
+                @"UPDATE Progress
                     SET RemovedDate = getUTCDate(),
                         RemovalMethodID = 1
                     WHERE ProgressID = @progressId
                       AND CandidateID = @candidateId
                 ",
-            new { progressId, candidateId }
+                new { progressId, candidateId }
             );
 
             if (numberOfAffectedRows < 1)

diff --git a/DigitalLearningSolutions.Web.Tests/Controllers/LearningPortal/AvailableTests.cs b/DigitalLearningSolutions.Web.Tests/Controllers/LearningPortal/AvailableTests.cs
@@ -18,7 +18,7 @@ public void Available_action_should_return_view_result()
                 AvailableCourseHelper.CreateDefaultAvailableCourse(),
                 AvailableCourseHelper.CreateDefaultAvailableCourse()
             };
-            A.CallTo(() => courseService.GetAvailableCourses(CandidateId, CentreId)).Returns(availableCourses);
+            A.CallTo(() => courseDataService.GetAvailableCourses(CandidateId, CentreId)).Returns(availableCourses);
 
             // When
             var result = controller.Available();

diff --git a/DigitalLearningSolutions.Web.Tests/Controllers/LearningPortal/CompletedTests.cs b/DigitalLearningSolutions.Web.Tests/Controllers/LearningPortal/CompletedTests.cs
@@ -19,7 +19,7 @@ public void Completed_action_should_return_view_result()
                 CompletedCourseHelper.CreateDefaultCompletedCourse()
             };
             var bannerText = "bannerText";
-            A.CallTo(() => courseService.GetCompletedCourses(CandidateId)).Returns(completedCourses);
+            A.CallTo(() => courseDataService.GetCompletedCourses(CandidateId)).Returns(completedCourses);
             A.CallTo(() => centresDataService.GetBannerText(CentreId)).Returns(bannerText);
 
             // When

diff --git a/DigitalLearningSolutions.Web.Tests/Controllers/LearningPortal/CurrentTests.cs b/DigitalLearningSolutions.Web.Tests/Controllers/LearningPortal/CurrentTests.cs
@@ -27,7 +27,7 @@ public void Current_action_should_return_view_result()
             };
 
             var bannerText = "bannerText";
-            A.CallTo(() => courseService.GetCurrentCourses(CandidateId)).Returns(currentCourses);
+            A.CallTo(() => courseDataService.GetCurrentCourses(CandidateId)).Returns(currentCourses);
             A.CallTo(() => selfAssessmentService.GetSelfAssessmentsForCandidate(CandidateId)).Returns(selfAssessments);
             A.CallTo(() => centresDataService.GetBannerText(CentreId)).Returns(bannerText);
 
@@ -57,7 +57,7 @@ public void Trying_to_edit_complete_by_date_when_not_self_enrolled_should_return
             {
                 currentCourse
             };
-            A.CallTo(() => courseService.GetCurrentCourses(CandidateId)).Returns(currentCourses);
+            A.CallTo(() => courseDataService.GetCurrentCourses(CandidateId)).Returns(currentCourses);
 
             // When
             var result = controller.SetCurrentCourseCompleteByDate(currentCourse.Id, null, null, null);
@@ -78,7 +78,7 @@ public void Trying_to_edit_complete_by_date_for_non_existent_course_should_retur
             {
                 CurrentCourseHelper.CreateDefaultCurrentCourse(2)
             };
-            A.CallTo(() => courseService.GetCurrentCourses(CandidateId)).Returns(currentCourses);
+            A.CallTo(() => courseDataService.GetCurrentCourses(CandidateId)).Returns(currentCourses);
 
             // When
             var result = controller.SetCurrentCourseCompleteByDate(3, null, null, null);
@@ -105,7 +105,7 @@ public void Setting_a_valid_complete_by_date_should_call_the_course_service()
             controller.SetCurrentCourseCompleteByDate(1, newDay, newMonth, newYear, 1);
 
             // Then
-            A.CallTo(() => courseService.SetCompleteByDate(progressId, CandidateId, newDate)).MustHaveHappened();
+            A.CallTo(() => courseDataService.SetCompleteByDate(progressId, CandidateId, newDate)).MustHaveHappened();
         }
 
         [Test]
@@ -118,7 +118,7 @@ public void Setting_an_empty_complete_by_date_should_call_the_course_service_wit
             controller.SetCurrentCourseCompleteByDate(1, 0, 0, 0, 1);
 
             // Then
-            A.CallTo(() => courseService.SetCompleteByDate(progressId, CandidateId, null)).MustHaveHappened();
+            A.CallTo(() => courseDataService.SetCompleteByDate(progressId, CandidateId, null)).MustHaveHappened();
         }
 
         [Test]
@@ -138,7 +138,7 @@ public void Setting_an_invalid_complete_by_date_should_not_call_the_course_servi
             controller.SetCurrentCourseCompleteByDate(1, 31, 2, 2020, 1);
 
             // Then
-            A.CallTo(() => courseService.SetCompleteByDate(1, CandidateId, A<DateTime>._)).MustNotHaveHappened();
+            A.CallTo(() => courseDataService.SetCompleteByDate(1, CandidateId, A<DateTime>._)).MustNotHaveHappened();
         }
 
         [Test]
@@ -168,7 +168,7 @@ public void Removing_a_current_course_should_call_the_course_service()
             controller.RemoveCurrentCourse(1);
 
             // Then
-            A.CallTo(() => courseService.RemoveCurrentCourse(1, CandidateId)).MustHaveHappened();
+            A.CallTo(() => courseDataService.RemoveCurrentCourse(1, CandidateId)).MustHaveHappened();
         }
 
         [Test]
@@ -181,7 +181,7 @@ public void Remove_confirmation_for_a_current_course_should_show_confirmation()
             {
                 currentCourse
             };
-            A.CallTo(() => courseService.GetCurrentCourses(CandidateId)).Returns(currentCourses);
+            A.CallTo(() => courseDataService.GetCurrentCourses(CandidateId)).Returns(currentCourses);
 
             // When
             var result = controller.RemoveCurrentCourseConfirmation(customisationId);
@@ -200,7 +200,7 @@ public void Removing_non_existent_course_should_return_404()
             {
                 CurrentCourseHelper.CreateDefaultCurrentCourse(2)
             };
-            A.CallTo(() => courseService.GetCurrentCourses(CandidateId)).Returns(currentCourses);
+            A.CallTo(() => courseDataService.GetCurrentCourses(CandidateId)).Returns(currentCourses);
 
             // When
             var result = controller.RemoveCurrentCourseConfirmation(3);
@@ -222,7 +222,7 @@ public void Requesting_a_course_unlock_should_call_the_unlock_service()
             {
                 CurrentCourseHelper.CreateDefaultCurrentCourse(progressId: progressId, locked: true)
             };
-            A.CallTo(() => courseService.GetCurrentCourses(CandidateId)).Returns(currentCourses);
+            A.CallTo(() => courseDataService.GetCurrentCourses(CandidateId)).Returns(currentCourses);
 
             // When
             controller.RequestUnlock(progressId);
@@ -239,7 +239,7 @@ public void Requesting_unlock_for_non_existent_course_should_return_404()
             {
                 CurrentCourseHelper.CreateDefaultCurrentCourse(progressId: 2, locked: true)
             };
-            A.CallTo(() => courseService.GetCurrentCourses(CandidateId)).Returns(currentCourses);
+            A.CallTo(() => courseDataService.GetCurrentCourses(CandidateId)).Returns(currentCourses);
 
             // When
             var result = controller.RequestUnlock(3);
@@ -261,7 +261,7 @@ public void Requesting_unlock_for_unlocked_course_should_return_404()
             {
                 CurrentCourseHelper.CreateDefaultCurrentCourse(progressId: progressId)
             };
-            A.CallTo(() => courseService.GetCurrentCourses(CandidateId)).Returns(currentCourses);
+            A.CallTo(() => courseDataService.GetCurrentCourses(CandidateId)).Returns(currentCourses);
 
             // When
             var result = controller.RequestUnlock(progressId);

diff --git a/...alLearningSolutions.Web.Tests/Controllers/LearningPortal/LearningPortalControllerTests.cs b/...alLearningSolutions.Web.Tests/Controllers/LearningPortal/LearningPortalControllerTests.cs
@@ -16,7 +16,7 @@ public partial class LearningPortalControllerTests
     {
         private LearningPortalController controller = null!;
         private ICentresDataService centresDataService = null!;
-        private ICourseService courseService = null!;
+        private ICourseDataService courseDataService = null!;
         private ISelfAssessmentService selfAssessmentService = null!;
         private INotificationService notificationService = null!;
         private IConfiguration config = null!;
@@ -30,7 +30,7 @@ public partial class LearningPortalControllerTests
         public void SetUp()
         {
             centresDataService = A.Fake<ICentresDataService>();
-            courseService = A.Fake<ICourseService>();
+            courseDataService = A.Fake<ICourseDataService>();
             selfAssessmentService = A.Fake<ISelfAssessmentService>();
             notificationService = A.Fake<INotificationService>();
             var logger = A.Fake<ILogger<LearningPortalController>>();
@@ -46,7 +46,7 @@ public void SetUp()
             }, "mock"));
             controller = new LearningPortalController(
                 centresDataService,
-                courseService,
+                courseDataService,
                 selfAssessmentService,
                 notificationService,
                 logger,

diff --git a/DigitalLearningSolutions.Web/Controllers/LearningPortalController/Available.cs b/DigitalLearningSolutions.Web/Controllers/LearningPortalController/Available.cs
@@ -17,7 +17,7 @@ public IActionResult Available(
         {
             sortBy ??= CourseSortByOptions.Name.PropertyName;
 
-            var availableCourses = courseService.GetAvailableCourses(
+            var availableCourses = courseDataService.GetAvailableCourses(
                 User.GetCandidateIdKnownNotNull(),
                 User.GetCentreId()
             );
@@ -35,7 +35,7 @@ public IActionResult Available(
 
         public IActionResult AllAvailableItems()
         {
-            var availableCourses = courseService.GetAvailableCourses(
+            var availableCourses = courseDataService.GetAvailableCourses(
                 User.GetCandidateIdKnownNotNull(),
                 User.GetCentreId()
             );
@@ -45,7 +45,7 @@ public IActionResult AllAvailableItems()
 
         public IActionResult EnrolOnSelfAssessment(int selfAssessmentId)
         {
-            courseService.EnrolOnSelfAssessment(selfAssessmentId, User.GetCandidateIdKnownNotNull());
+            courseDataService.EnrolOnSelfAssessment(selfAssessmentId, User.GetCandidateIdKnownNotNull());
             return RedirectToAction("SelfAssessment", new { selfAssessmentId });
         }
     }