Merge branch 'DLS-Release-v1.1.2' into UAT

Author: rshrirohit

DigitalLearningSolutions.Data/DataServices/SelfAssessmentDataService/SelfAssessmentDataService.cs

@@ -173,7 +173,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 +683,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

@@ -943,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;
@@ -968,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