HEEDLS-555 View delegate page - course section

DigitalLearningSolutions.Data.Tests/DataServices/CourseDataServiceTests.cs

@@ -272,5 +272,48 @@ public void GetCourseDetailsByIdAtCentreForCategoryId_should_return_course_detai
             // Then
             result.Should().BeEquivalentTo(expectedCourseDetails);
         }
+
+        [Test]
+        public void GetDelegateCoursesInfo_should_return_delegate_course_info_correctly()
+        {
+            // When
+            var results = courseDataService.GetDelegateCoursesInfo(20).ToList();
+
+            // Then
+            var enrollmentDate = new DateTime(2019, 04, 11, 14, 33, 37).AddMilliseconds(140);
+            var expected = new DelegateCourseInfo(
+                27915,
+                "LinkedIn",
+                "Cohort Testing",
+                "Kevin",
+                "Whittaker (Developer)",
+                enrollmentDate,
+                enrollmentDate,
+                null,
+                null,
+                null,
+                3,
+                0,
+                0,
+                null,
+                true,
+                null,
+                null,
+                null
+            );
+            results.Should().HaveCount(4);
+            results[3].Should().BeEquivalentTo(expected);
+        }
+
+        [Test]
+        public void GetDelegateCoursesAttemptStats_should_return_delegate_course_info_correctly()
+        {
+            // When
+            var (totalAttempts, attemptsPassed) = courseDataService.GetDelegateCourseAttemptStats(11, 100);
+
+            // Then
+            totalAttempts.Should().Be(23);
+            attemptsPassed.Should().Be(11);
+        }
     }
 }

DigitalLearningSolutions.Data.Tests/DataServices/CustomPromptsDataServiceTests.cs

@@ -117,11 +117,12 @@ public void GetCourseCustomPrompts_returns_populated_CourseCustomPromptsResult()
                     "Yes\nNo\nNot sure",
                     true,
                     null,
-                    "Yes\nNo\nNot sure"
+                    "Yes\nNo\nNot sure",
+                    courseCategoryId: 2
                 );
 
             // When
-            var returnedCourseCustomPromptsResult = customPromptsDataService.GetCourseCustomPrompts(1379, 101, 0);
+            var returnedCourseCustomPromptsResult = customPromptsDataService.GetCourseCustomPrompts(1379, 101);
 
             // Then
             returnedCourseCustomPromptsResult.Should().BeEquivalentTo(expectedCourseCustomPromptsResult);

DigitalLearningSolutions.Data.Tests/Services/CourseServiceTests.cs

@@ -15,15 +15,16 @@ public class CourseServiceTests
         private const int AdminCategoryId = 0;
         private ICourseDataService courseDataService = null!;
         private CourseService courseService = null!;
+        private ICustomPromptsService customPromptsService = null!;
 
         [SetUp]
         public void Setup()
         {
             courseDataService = A.Fake<ICourseDataService>();
             A.CallTo(() => courseDataService.GetCourseStatisticsAtCentreForCategoryId(CentreId, AdminCategoryId))
                 .Returns(GetSampleCourses());
-
-            courseService = new CourseService(courseDataService);
+            customPromptsService = A.Fake<ICustomPromptsService>();
+            courseService = new CourseService(courseDataService, customPromptsService);
         }
 
         [Test]
@@ -84,5 +85,69 @@ private IEnumerable<CourseStatistics> GetSampleCourses()
                 }
             };
         }
+
+        [Test]
+        public void GetAllCoursesForDelegate_should_call_correct_data_service_and_helper_methods()
+        {
+            // Given
+            const int delegateId = 20;
+            const int customisationId = 111;
+            var attemptStats = (7, 4);
+            var info = new DelegateCourseInfo
+                { CustomisationId = customisationId, IsAssessed = true };
+            A.CallTo(() => courseDataService.GetDelegateCoursesInfo(delegateId))
+                .Returns(new List<DelegateCourseInfo> { info });
+            A.CallTo(() => courseDataService.GetDelegateCourseAttemptStats(delegateId, customisationId))
+                .Returns(attemptStats);
+
+            // When
+            var results = courseService.GetAllCoursesForDelegate(delegateId, CentreId).ToList();
+
+            // Then
+            A.CallTo(() => courseDataService.GetDelegateCoursesInfo(delegateId)).MustHaveHappened(1, Times.Exactly);
+            A.CallTo(
+                () => customPromptsService.GetCustomPromptsWithAnswersForCourse(
+                    info,
+                    customisationId,
+                    CentreId,
+                    0
+                )
+            ).MustHaveHappened(1, Times.Exactly);
+            A.CallTo(() => courseDataService.GetDelegateCourseAttemptStats(delegateId, customisationId))
+                .MustHaveHappened(1, Times.Exactly);
+            results.Should().HaveCount(1);
+            results[0].DelegateCourseInfo.Should().BeEquivalentTo(info);
+            results[0].AttemptStats.Should().Be(attemptStats);
+        }
+
+        [Test]
+        public void GetAllCoursesForDelegate_should_not_fetch_attempt_stats_if_course_not_assessed()
+        {
+            // Given
+            const int delegateId = 20;
+            const int customisationId = 111;
+            var info = new DelegateCourseInfo
+                { CustomisationId = customisationId, IsAssessed = false };
+            A.CallTo(() => courseDataService.GetDelegateCoursesInfo(delegateId))
+                .Returns(new List<DelegateCourseInfo> { info });
+
+            // When
+            var results = courseService.GetAllCoursesForDelegate(delegateId, CentreId).ToList();
+
+            // Then
+            A.CallTo(() => courseDataService.GetDelegateCoursesInfo(delegateId)).MustHaveHappened(1, Times.Exactly);
+            A.CallTo(
+                () => customPromptsService.GetCustomPromptsWithAnswersForCourse(
+                    info,
+                    customisationId,
+                    CentreId,
+                    0
+                )
+            ).MustHaveHappened(1, Times.Exactly);
+            A.CallTo(() => courseDataService.GetDelegateCourseAttemptStats(A<int>._, A<int>._)).MustNotHaveHappened();
+            results.Should().HaveCount(1);
+            results[0].DelegateCourseInfo.Should().BeEquivalentTo(info);
+            results[0].AttemptStats.Should().Be((0, 0));
+        }
     }
 }

DigitalLearningSolutions.Data.Tests/Services/CustomPromptsServiceTests.cs

@@ -3,6 +3,7 @@
     using System.Collections.Generic;
     using System.Linq;
     using DigitalLearningSolutions.Data.DataServices;
+    using DigitalLearningSolutions.Data.Models.Courses;
     using DigitalLearningSolutions.Data.Models.CustomPrompts;
     using DigitalLearningSolutions.Data.Services;
     using DigitalLearningSolutions.Data.Tests.TestHelpers;
@@ -306,18 +307,48 @@ public void RemoveCustomPromptFromCentre_calls_data_service_with_correct_values(
         public void GetCustomPromptsForCourse_Returns_Populated_CourseCustomPrompts()
         {
             // Given
-            var expectedPrompt1 = CustomPromptsTestHelper.GetDefaultCustomPrompt(1, "System Access Granted", "Yes\r\nNo");
+            var expectedPrompt1 =
+                CustomPromptsTestHelper.GetDefaultCustomPrompt(1, "System Access Granted", "Yes\r\nNo");
             var expectedPrompt2 = CustomPromptsTestHelper.GetDefaultCustomPrompt(2, "Access Permissions");
             var customPrompts = new List<CustomPrompt> { expectedPrompt1, expectedPrompt2 };
             var expectedCoursePrompts = CustomPromptsTestHelper.GetDefaultCourseCustomPrompts(customPrompts);
-            A.CallTo(() => customPromptsDataService.GetCourseCustomPrompts(27920, 101, 0))
+            A.CallTo(() => customPromptsDataService.GetCourseCustomPrompts(27920, 101))
                 .Returns(CustomPromptsTestHelper.GetDefaultCourseCustomPromptsResult());
 
             // When
-            var result = customPromptsService.GetCustomPromptsForCourse(27920, 101, 0);
+            var result = customPromptsService.GetCustomPromptsForCourse(27920, 101);
 
             // Then
             result.Should().BeEquivalentTo(expectedCoursePrompts);
         }
+
+        [Test]
+        public void GetCustomPromptsWithAnswersForCourse_Returns_Populated_List_of_CustomPromptWithAnswer()
+        {
+            // Given
+            const string answer1 = "ans1";
+            const string answer2 = "ans2";
+            var expected1 = CustomPromptsTestHelper.GetDefaultCustomPromptWithAnswer(
+                1,
+                "System Access Granted",
+                "Yes\r\nNo",
+                answer: answer1
+            );
+            var expected2 = CustomPromptsTestHelper.GetDefaultCustomPromptWithAnswer(
+                2,
+                "Access Permissions",
+                answer: answer2
+            );
+            var expected = new List<CustomPromptWithAnswer> { expected1, expected2 };
+            A.CallTo(() => customPromptsDataService.GetCourseCustomPrompts(27920, 101))
+                .Returns(CustomPromptsTestHelper.GetDefaultCourseCustomPromptsResult());
+            var delegateCourseInfo = new DelegateCourseInfo { Answer1 = answer1, Answer2 = answer2 };
+
+            // When
+            var result = customPromptsService.GetCustomPromptsWithAnswersForCourse(delegateCourseInfo, 27920, 101);
+
+            // Then
+            result.Should().BeEquivalentTo(expected);
+        }
     }
 }

DigitalLearningSolutions.Data.Tests/TestHelpers/CustomPromptsTestHelper.cs

@@ -1,21 +1,20 @@
 namespace DigitalLearningSolutions.Data.Tests.TestHelpers
 {
+    using System;
     using System.Collections.Generic;
     using DigitalLearningSolutions.Data.Models.CustomPrompts;
 
     public static class CustomPromptsTestHelper
     {
-        public static CentreCustomPrompts GetDefaultCentreCustomPrompts
-        (
+        public static CentreCustomPrompts GetDefaultCentreCustomPrompts(
             List<CustomPrompt> customPrompts,
             int centreId = 29
         )
         {
             return new CentreCustomPrompts(centreId, customPrompts);
         }
 
-        public static CourseCustomPrompts GetDefaultCourseCustomPrompts
-        (
+        public static CourseCustomPrompts GetDefaultCourseCustomPrompts(
             List<CustomPrompt> customPrompts,
             int customisationId = 27920,
             int centreId = 101
@@ -24,8 +23,7 @@ public static CourseCustomPrompts GetDefaultCourseCustomPrompts
             return new CourseCustomPrompts(customisationId, centreId, customPrompts);
         }
 
-        public static CustomPrompt GetDefaultCustomPrompt
-        (
+        public static CustomPrompt GetDefaultCustomPrompt(
             int promptNumber,
             string text = "Custom Prompt",
             string? options = "",
@@ -35,17 +33,15 @@ public static CustomPrompt GetDefaultCustomPrompt
             return new CustomPrompt(promptNumber, text, options, mandatory);
         }
 
-        public static CentreCustomPromptsWithAnswers GetDefaultCentreCustomPromptsWithAnswers
-        (
+        public static CentreCustomPromptsWithAnswers GetDefaultCentreCustomPromptsWithAnswers(
             List<CustomPromptWithAnswer> customPrompts,
             int centreId = 29
         )
         {
             return new CentreCustomPromptsWithAnswers(centreId, customPrompts);
         }
 
-        public static CustomPromptWithAnswer GetDefaultCustomPromptWithAnswer
-        (
+        public static CustomPromptWithAnswer GetDefaultCustomPromptWithAnswer(
             int promptNumber,
             string text = "Custom Prompt",
             string? options = "",
@@ -56,8 +52,7 @@ public static CustomPromptWithAnswer GetDefaultCustomPromptWithAnswer
             return new CustomPromptWithAnswer(promptNumber, text, options, mandatory, answer);
         }
 
-        public static CentreCustomPromptsResult GetDefaultCentreCustomPromptsResult
-        (
+        public static CentreCustomPromptsResult GetDefaultCentreCustomPromptsResult(
             int centreId = 29,
             string? customField1Prompt = "Group",
             string? customField1Options = "Clinical\r\nNon-Clinical",
@@ -112,7 +107,8 @@ public static CourseCustomPromptsResult GetDefaultCourseCustomPromptsResult(
             bool customField2Mandatory = false,
             string? customField3Prompt = null,
             string? customField3Options = "",
-            bool customField3Mandatory = false
+            bool customField3Mandatory = false,
+            int courseCategoryId = 0
         )
         {
             return new CourseCustomPromptsResult
@@ -125,7 +121,8 @@ public static CourseCustomPromptsResult GetDefaultCourseCustomPromptsResult(
                 CustomField2Mandatory = customField2Mandatory,
                 CustomField3Prompt = customField3Prompt,
                 CustomField3Options = customField3Options,
-                CustomField3Mandatory = customField3Mandatory
+                CustomField3Mandatory = customField3Mandatory,
+                CourseCategoryId = courseCategoryId
             };
         }
     }

DigitalLearningSolutions.Data/DataServices/CourseDataService.cs

@@ -1,4 +1,4 @@
-namespace DigitalLearningSolutions.Data.DataServices
+namespace DigitalLearningSolutions.Data.DataServices
 {
     using System;
     using System.Collections.Generic;
@@ -18,6 +18,8 @@ public interface ICourseDataService
         void EnrolOnSelfAssessment(int selfAssessmentId, int candidateId);
         int GetNumberOfActiveCoursesAtCentreForCategory(int centreId, int categoryId);
         IEnumerable<CourseStatistics> GetCourseStatisticsAtCentreForCategoryId(int centreId, int categoryId);
+        IEnumerable<DelegateCourseInfo> GetDelegateCoursesInfo(int delegateId);
+        (int totalAttempts, int attemptsPassed) GetDelegateCourseAttemptStats(int delegateId, int customisationId);
         CourseDetails? GetCourseDetails(int customisationId, int centreId, int categoryId);
     }
 
@@ -198,6 +200,56 @@ FROM dbo.Customisations AS cu
             );
         }
 
+        public IEnumerable<DelegateCourseInfo> GetDelegateCoursesInfo(int delegateId)
+        {
+            return connection.Query<DelegateCourseInfo>(
+                @"SELECT
+                        cu.CustomisationID AS CustomisationId,
+                        ap.ApplicationName,
+                        cu.CustomisationName,
+                        au.Forename AS SupervisorForename,
+                        au.Surname AS SupervisorSurname,
+                        pr.FirstSubmittedTime AS Enrolled,
+                        pr.SubmittedTime AS LastUpdated,
+                        pr.CompleteByDate AS CompleteBy,
+                        pr.Completed AS Completed,
+                        pr.Evaluated AS Evaluated,
+                        pr.EnrollmentMethodID AS EnrolmentMethodId,
+                        pr.LoginCount,
+                        pr.Duration AS LearningTime,
+                        pr.DiagnosticScore,
+                        cu.IsAssessed,
+                        pr.Answer1,
+                        pr.Answer2,
+                        pr.Answer3
+                    FROM Customisations cu
+                    INNER JOIN Applications ap ON ap.ApplicationID = cu.ApplicationID
+                    INNER JOIN Progress pr ON pr.CustomisationID = cu.CustomisationID
+                    LEFT OUTER JOIN AdminUsers au ON au.AdminID = pr.SupervisorAdminId
+                    WHERE pr.CandidateID = @delegateId
+                        AND ap.ArchivedDate IS NULL
+                        AND pr.RemovedDate IS NULL",
+                new { delegateId }
+            );
+        }
+
+        public (int totalAttempts, int attemptsPassed) GetDelegateCourseAttemptStats(
+            int delegateId,
+            int customisationId
+        )
+        {
+            return connection.QueryFirstOrDefault<(int, int)>(
+                @"SELECT COUNT(aa.Status) AS TotalAttempts,
+                        COUNT(CASE WHEN aa.Status=1 THEN 1 END) AS AttemptsPassed
+                    FROM AssessAttempts aa
+                    INNER JOIN Progress AS pr ON pr.ProgressID = aa.ProgressID
+                    WHERE pr.CustomisationID = @customisationId
+                        AND pr.CandidateID = @delegateId
+                        AND pr.RemovedDate IS NULL",
+                new { delegateId, customisationId }
+            );
+        }
+
         public CourseDetails? GetCourseDetails(int customisationId, int centreId, int categoryId)
         {
             return connection.Query<CourseDetails>(