Merge branch 'master' into DLS-Release-v1.2.0

Author: rshrirohit

DigitalLearningSolutions.Data/DataServices/CourseCategoriesDataService.cs

@@ -9,7 +9,7 @@
     public interface ICourseCategoriesDataService
     {
         IEnumerable<Category> GetCategoriesForCentreAndCentrallyManagedCourses(int centreId);
-        string? GetCourseCategoryName(int categoryId);
+        string? GetCourseCategoryName(int? categoryId);
     }
 
     public class CourseCategoriesDataService : ICourseCategoriesDataService
@@ -34,7 +34,7 @@ FROM CourseCategories
             );
         }
 
-        public string? GetCourseCategoryName(int categoryId)
+        public string? GetCourseCategoryName(int? categoryId)
         {
             var name = connection.QueryFirstOrDefault<string?>(
                 @"SELECT CategoryName

DigitalLearningSolutions.Data/DataServices/CourseDataService.cs

@@ -551,7 +551,7 @@ BEGIN TRANSACTION
 
                 UPDATE CandidateAssessmentSupervisors SET Removed = NULL
                  {((selfAssessmentSupervisorRoleId > 0) ? " ,SelfAssessmentSupervisorRoleID = @selfAssessmentSupervisorRoleID" : string.Empty)}
-                WHERE CandidateAssessmentID = @candidateAssessmentId AND SupervisorDelegateId = @supervisorDelegateId 
+                WHERE CandidateAssessmentID = @candidateAssessmentId AND SupervisorDelegateId = @supervisorDelegateId AND SelfAssessmentSupervisorRoleID = @selfAssessmentSupervisorRoleID
 
                 COMMIT TRANSACTION";
 

DigitalLearningSolutions.Data/DataServices/SelfAssessmentDataService/CandidateAssessmentsDataService.cs

@@ -298,6 +298,13 @@ INNER JOIN CompetencyGroups AS CG
             }
         }
 
+        public void RemoveSignoffRequestById(int candidateAssessmentSupervisorVerificationsId)
+        {
+            var numberOfAffectedRows = connection.Execute(
+              @" DELETE FROM CandidateAssessmentSupervisorVerifications WHERE ID = @candidateAssessmentSupervisorVerificationsId ",
+            new { candidateAssessmentSupervisorVerificationsId });
+        }
+
 
         public void SetCompleteByDate(int selfAssessmentId, int delegateUserId, DateTime? completeByDate)
         {

DigitalLearningSolutions.Data/DataServices/SelfAssessmentDataService/CompetencyDataService.cs

@@ -635,16 +635,14 @@ FROM SelfAssessmentResults s inner join
 				SelfAssessmentResultSupervisorVerifications sv ON s.ID = sv.SelfAssessmentResultId AND sv.Superceded = 0 
                     WHERE s.CompetencyID = @competencyId
                         AND s.SelfAssessmentID = @selfAssessmentId
-                        AND s.DelegateUserID = @delegateUserId",
+                        AND s.DelegateUserID = @delegateUserId AND sv.Verified IS NULL",
                 new { selfAssessmentId, delegateUserId, competencyId }
             );
         }
 
         public void RemoveReviewCandidateAssessmentOptionalCompetencies(int id)
         {
 
-            connection.Execute(@"UPDATE SelfAssessmentResults SET Result = NULL WHERE ID =  @id", new { id});
-
             connection.Execute(
                      @"delete from SelfAssessmentResultSupervisorVerifications WHERE SelfAssessmentResultId = @id", new { id });
 

DigitalLearningSolutions.Data/DataServices/SelfAssessmentDataService/SelfAssessmentDataService.cs

@@ -78,6 +78,7 @@ int competencyId
 
         void UpdateLastAccessed(int selfAssessmentId, int delegateUserId);
         void RemoveSignoffRequests(int selfAssessmentId, int delegateUserId, int competencyGroupsId);
+        void RemoveSignoffRequestById(int candidateAssessmentSupervisorVerificationsId);
         void SetCompleteByDate(int selfAssessmentId, int delegateUserId, DateTime? completeByDate);
 
         void SetSubmittedDateNow(int selfAssessmentId, int delegateUserId);
@@ -173,7 +174,7 @@ int GetSelfAssessmentActivityDelegatesExportCount(string searchString, string so
         bool IsCentreSelfAssessment(int selfAssessmentId, int centreId);
         bool HasMinimumOptionalCompetencies(int selfAssessmentId, int delegateUserId);
         int GetSelfAssessmentCategoryId(int selfAssessmentId);
-        void  RemoveReviewCandidateAssessmentOptionalCompetencies(int id);
+        void RemoveReviewCandidateAssessmentOptionalCompetencies(int id);
         public IEnumerable<SelfAssessmentResult> GetSelfAssessmentResultswithSupervisorVerificationsForDelegateSelfAssessmentCompetency(
         int delegateUserId,
         int selfAssessmentId,
@@ -683,9 +684,6 @@ BEGIN TRANSACTION
                         UPDATE CandidateAssessments SET RemovedDate = GETUTCDATE(), RemovalMethodID = 2
                             WHERE ID = @candidateAssessmentsId AND RemovedDate IS NULL
 
-                        UPDATE CandidateAssessmentSupervisors SET Removed = GETUTCDATE()
-                            WHERE CandidateAssessmentID = @candidateAssessmentsId AND Removed IS NULL
-
                         COMMIT TRANSACTION
                 END TRY
                 BEGIN CATCH

DigitalLearningSolutions.Data/DataServices/SupervisorDataService.cs

@@ -620,20 +620,21 @@ FROM CandidateAssessmentSupervisors AS cas INNER JOIN
         {
             return connection.Query<DelegateSelfAssessment>(
                @$"SELECT ca.ID, sa.ID AS SelfAssessmentID, sa.Name AS RoleName, sa.QuestionLabel, sa.DescriptionLabel, sa.ReviewerCommentsLabel,
-                sa.SupervisorSelfAssessmentReview, sa.SupervisorResultsReview, ca.StartedDate,
-                COALESCE(ca.LastAccessed, ca.StartedDate) AS LastAccessed,
-                ca.CompleteByDate, ca.LaunchCount, ca.CompletedDate,
-                 (SELECT COUNT(*) AS Expr1
-                 FROM    CandidateAssessmentSupervisorVerifications AS casv
-                 WHERE (CandidateAssessmentSupervisorID = cas.ID) AND (Requested IS NOT NULL) AND (Verified IS NULL)) AS SignOffRequested,
-                {signedOffFields}
-                 (SELECT COUNT(*) AS Expr1
-                    FROM   SelfAssessmentResultSupervisorVerifications AS sarsv
-                    WHERE (CandidateAssessmentSupervisorID = cas.ID) AND (Verified IS NULL) AND (sarsv.Superceded = 0)) AS ResultsVerificationRequests
-                FROM CandidateAssessmentSupervisors AS cas INNER JOIN
-                         CandidateAssessments AS ca ON cas.CandidateAssessmentID = ca.ID INNER JOIN
-                SelfAssessments AS sa ON sa.ID = ca.SelfAssessmentID
-                WHERE (ca.ID = @candidateAssessmentId) AND (ISNULL(@adminIdCategoryID, 0) = 0 OR sa.CategoryID = @adminIdCategoryId)", new { candidateAssessmentId, adminIdCategoryId }
+                            sa.SupervisorSelfAssessmentReview, sa.SupervisorResultsReview, ca.StartedDate,
+                            COALESCE(ca.LastAccessed, ca.StartedDate) AS LastAccessed,
+                            ca.CompleteByDate, ca.LaunchCount, ca.CompletedDate,
+                            (SELECT COUNT(*) AS Expr1
+                                FROM    CandidateAssessmentSupervisorVerifications AS casv
+                                WHERE (CandidateAssessmentSupervisorID = cas.ID) AND (Requested IS NOT NULL) AND (Verified IS NULL)) AS SignOffRequested,
+                            {signedOffFields}
+                            (SELECT COUNT(*) AS Expr1
+                                FROM   SelfAssessmentResultSupervisorVerifications AS sarsv
+                                WHERE (CandidateAssessmentSupervisorID = cas.ID) AND (Verified IS NULL) AND (sarsv.Superceded = 0)) AS ResultsVerificationRequests,
+                            sa.Vocabulary
+                    FROM CandidateAssessmentSupervisors AS cas INNER JOIN
+                            CandidateAssessments AS ca ON cas.CandidateAssessmentID = ca.ID INNER JOIN
+                            SelfAssessments AS sa ON sa.ID = ca.SelfAssessmentID
+                    WHERE (ca.ID = @candidateAssessmentId) AND (ISNULL(@adminIdCategoryID, 0) = 0 OR sa.CategoryID = @adminIdCategoryId)", new { candidateAssessmentId, adminIdCategoryId }
                ).FirstOrDefault();
         }
         public DelegateSelfAssessment? GetSelfAssessmentBySupervisorDelegateCandidateAssessmentId(int candidateAssessmentId, int supervisorDelegateId)
@@ -696,23 +697,24 @@ FROM SelfAssessmentResults AS sar2
         {
             return connection.Query<DelegateSelfAssessment>(
                 @$"SELECT ca.ID, sa.ID AS SelfAssessmentID, sa.Name AS RoleName, sa.SupervisorSelfAssessmentReview, sa.SupervisorResultsReview, sa.ReviewerCommentsLabel, COALESCE (sasr.RoleName, 'Supervisor') AS SupervisorRoleTitle, ca.StartedDate, ca.LastAccessed, ca.CompleteByDate, ca.LaunchCount, ca.CompletedDate, r.RoleProfile, sg.SubGroup, pg.ProfessionalGroup, sa.SupervisorResultsReview AS IsSupervisorResultsReviewed,
-                 (SELECT COUNT(*) AS Expr1
-                 FROM    CandidateAssessmentSupervisorVerifications AS casv
-                 WHERE (CandidateAssessmentSupervisorID = cas.ID) AND (Requested IS NOT NULL) AND (Verified IS NULL)) AS SignOffRequested,
-               {signedOffFields}
-                 (SELECT COUNT(*) AS Expr1
-                    FROM   SelfAssessmentResultSupervisorVerifications AS sarsv
-                    WHERE (CandidateAssessmentSupervisorID = cas.ID) AND (Verified IS NULL) AND (Superceded = 0)) AS ResultsVerificationRequests,
-                    ca.NonReportable,ca.DelegateUserID
+                            (SELECT COUNT(*) AS Expr1
+                            FROM    CandidateAssessmentSupervisorVerifications AS casv
+                            WHERE (CandidateAssessmentSupervisorID = cas.ID) AND (Requested IS NOT NULL) AND (Verified IS NULL)) AS SignOffRequested,
+                            {signedOffFields}
+                            (SELECT COUNT(*) AS Expr1
+                            FROM   SelfAssessmentResultSupervisorVerifications AS sarsv
+                            WHERE (CandidateAssessmentSupervisorID = cas.ID) AND (Verified IS NULL) AND (Superceded = 0)) AS ResultsVerificationRequests,
+                            ca.NonReportable,ca.DelegateUserID,
+                            sa.Vocabulary
                     FROM   CandidateAssessmentSupervisors AS cas INNER JOIN
-                         CandidateAssessments AS ca ON cas.CandidateAssessmentID = ca.ID INNER JOIN
-                           SelfAssessments AS sa ON sa.ID = ca.SelfAssessmentID INNER JOIN
-                             SupervisorDelegates AS sd ON cas.SupervisorDelegateId = sd.ID LEFT OUTER JOIN
-                             NRPProfessionalGroups AS pg ON sa.NRPProfessionalGroupID = pg.ID LEFT OUTER JOIN
-                             NRPSubGroups AS sg ON sa.NRPSubGroupID = sg.ID LEFT OUTER JOIN
-                             NRPRoles AS r ON sa.NRPRoleID = r.ID
-                             LEFT OUTER JOIN SelfAssessmentSupervisorRoles AS sasr ON cas.SelfAssessmentSupervisorRoleID = sasr.ID
-                WHERE (ca.ID = @candidateAssessmentId) AND (cas.Removed IS NULL) AND (sd.SupervisorAdminID = @adminId) AND (ISNULL(@adminIdCategoryID, 0) = 0 OR sa.CategoryID = @adminIdCategoryId)",
+                            CandidateAssessments AS ca ON cas.CandidateAssessmentID = ca.ID INNER JOIN
+                            SelfAssessments AS sa ON sa.ID = ca.SelfAssessmentID INNER JOIN
+                            SupervisorDelegates AS sd ON cas.SupervisorDelegateId = sd.ID LEFT OUTER JOIN
+                            NRPProfessionalGroups AS pg ON sa.NRPProfessionalGroupID = pg.ID LEFT OUTER JOIN
+                            NRPSubGroups AS sg ON sa.NRPSubGroupID = sg.ID LEFT OUTER JOIN
+                            NRPRoles AS r ON sa.NRPRoleID = r.ID
+                            LEFT OUTER JOIN SelfAssessmentSupervisorRoles AS sasr ON cas.SelfAssessmentSupervisorRoleID = sasr.ID
+                    WHERE (ca.ID = @candidateAssessmentId) AND (cas.Removed IS NULL) AND (sd.SupervisorAdminID = @adminId) AND (ISNULL(@adminIdCategoryID, 0) = 0 OR sa.CategoryID = @adminIdCategoryId)",
                 new { candidateAssessmentId, adminId, adminIdCategoryId }
                 ).FirstOrDefault();
         }
@@ -941,18 +943,45 @@ FROM CandidateAssessmentSupervisors
 
                 if (candidateAssessmentSupervisorsId == 0)
                 {
+                    //For a candidate assessment, only one supervisor role should be active (Removed = null)
                     var numberOfAffectedRows = connection.Execute(
-                        @"INSERT INTO CandidateAssessmentSupervisors (CandidateAssessmentID, SupervisorDelegateId, SelfAssessmentSupervisorRoleID)
-                            VALUES (@candidateAssessmentId, @supervisorDelegateId, @selfAssessmentSupervisorRoleId)", new { candidateAssessmentId, supervisorDelegateId, selfAssessmentSupervisorRoleId }
+                        @"BEGIN TRY
+                            BEGIN TRANSACTION
+                                UPDATE CandidateAssessmentSupervisors SET Removed = getUTCDate() WHERE CandidateAssessmentID = @candidateAssessmentId
+                                        AND SupervisorDelegateId = @supervisorDelegateId
+                                        AND Removed IS NULL
+
+                                INSERT INTO CandidateAssessmentSupervisors (CandidateAssessmentID, SupervisorDelegateId, SelfAssessmentSupervisorRoleID)
+                                        VALUES (@candidateAssessmentId, @supervisorDelegateId, @selfAssessmentSupervisorRoleId)
+
+                            COMMIT TRANSACTION
+                        END TRY
+                        BEGIN CATCH
+                            ROLLBACK TRANSACTION
+                        END CATCH",
+                        new { candidateAssessmentId, supervisorDelegateId, selfAssessmentSupervisorRoleId }
                     );
                 }
                 else
                 {
+                    //For a candidate assessment, only one supervisor role should be active (Removed = null)
                     int numberOfAffectedRows = connection.Execute(
-                                @"UPDATE CandidateAssessmentSupervisors SET Removed = NULL WHERE CandidateAssessmentID = @candidateAssessmentId
-                                AND SupervisorDelegateId = @supervisorDelegateId
-                                AND SelfAssessmentSupervisorRoleId=@selfAssessmentSupervisorRoleId",
-                                new { candidateAssessmentId, supervisorDelegateId, selfAssessmentSupervisorRoleId });
+                        @"BEGIN TRY
+                            BEGIN TRANSACTION
+                                UPDATE CandidateAssessmentSupervisors SET Removed = getUTCDate() WHERE CandidateAssessmentID = @candidateAssessmentId
+                                        AND SupervisorDelegateId = @supervisorDelegateId
+                                        AND Removed IS NULL
+
+                                UPDATE CandidateAssessmentSupervisors SET Removed = NULL WHERE CandidateAssessmentID = @candidateAssessmentId
+                                        AND SupervisorDelegateId = @supervisorDelegateId
+                                        AND SelfAssessmentSupervisorRoleId = @selfAssessmentSupervisorRoleId
+
+                            COMMIT TRANSACTION
+                        END TRY
+                        BEGIN CATCH
+                            ROLLBACK TRANSACTION
+                        END CATCH",
+                        new { candidateAssessmentId, supervisorDelegateId, selfAssessmentSupervisorRoleId });
                 }
             }
             return candidateAssessmentId;
@@ -966,9 +995,6 @@ BEGIN TRANSACTION
                         UPDATE CandidateAssessments SET RemovedDate = getUTCDate(), RemovalMethodID = 2
                             WHERE ID = @candidateAssessmentId AND RemovedDate IS NULL
 
-                        UPDATE CandidateAssessmentSupervisors SET Removed = getUTCDate()
-                            WHERE CandidateAssessmentID = @candidateAssessmentId AND Removed IS NULL
-
                         COMMIT TRANSACTION
                 END TRY
                 BEGIN CATCH

DigitalLearningSolutions.Data/DigitalLearningSolutions.Data.csproj

@@ -14,7 +14,7 @@
     <PackageReference Include="Dapper" Version="2.1.24" />
     <PackageReference Include="Dapper.FluentMap" Version="2.0.0" />
     <PackageReference Include="elfhHub.Nhs.Models" Version="3.0.8" />
-    <PackageReference Include="Freshdesk.Api" Version="0.13.6" />
+    <PackageReference Include="Freshdesk.Api" Version="0.17.2" />
     <PackageReference Include="FuzzySharp" Version="2.0.2" />
     <PackageReference Include="MailKit" Version="4.3.0" />
     <PackageReference Include="Microsoft.FeatureManagement.AspNetCore" Version="2.0.0" />

DigitalLearningSolutions.Data/Models/Supervisor/DelegateSelfAssessment.cs

@@ -28,5 +28,6 @@ public class DelegateSelfAssessment
         public bool IsSupervisorResultsReviewed { get; set; }
         public bool IsAssignedToSupervisor { get; set; }
         public bool NonReportable { get; set; }
+        public string? Vocabulary { get; set; }
     }
 }

DigitalLearningSolutions.Web.Tests/Controllers/TrackingSystem/Delegates/PromoteToAdminControllerTests.cs

@@ -94,7 +94,7 @@ public void Summary_post_registers_delegate_with_expected_values()
                             A<string>._, A<string>._, A<string>._, A<string>._,
                             A<bool>._, A<bool>._, A<bool>._, A<bool>._,
                             A<bool>._, A<bool>._, A<bool>._, A<bool>._,
-                            A<string>._, A<string>._
+                            A<string>._, A<string>._, A<string>._
                 )).Returns(adminRolesEmail);
 
             // When

DigitalLearningSolutions.Web.Tests/Services/EmailGenerationServiceTests.cs

@@ -45,6 +45,7 @@ bool isCmsManager
             const string supervisorFirstName = "TestAdminFirstName";
             const string supervisorLastName = "TestAdminFirstName";
             const string supervisorEmail = "[email protected]";
+            const string categoryName = "Digital Workplace";
 
             const string centreName = "Test Centre Name";
 
@@ -65,7 +66,8 @@ bool isCmsManager
                 isCmsAdministrator,
                 isCmsManager,
                 delegateEmail,
-                centreName
+                centreName,
+                categoryName
             );
 
             // Then
@@ -164,6 +166,11 @@ bool isCmsManager
                 returnedEmail.Body.HtmlBody.Should().NotContain("<li>CMS manager</li>");
                 returnedEmail.Body.TextBody.Should().NotContain("CMS manager");
             }
+            if (!string.IsNullOrEmpty(categoryName))
+            {
+                returnedEmail.Body.HtmlBody.Should().Contain("In the Digital Workplace category.");
+                returnedEmail.Body.TextBody.Should().Contain("In the Digital Workplace category.");
+            }
 
             returnedEmail.Body.HtmlBody.Should().Contain("the next time you log in to " + centreName + ".</body>");
             returnedEmail.Body.TextBody.Should().Contain("the next time you log in to " + centreName + ".");