TD-2932-A self-assessment ID check is added when the learner removes the supervisor.

Author: Auldrin-Possa

DigitalLearningSolutions.Data/DataServices/SupervisorService.cs

@@ -53,7 +53,7 @@ public interface ISupervisorService
         int IsSupervisorDelegateExistAndReturnId(int? supervisorAdminId, string delegateEmail, int centreId);
         SupervisorDelegate GetSupervisorDelegateById(int supervisorDelegateId);
         void RemoveCandidateAssessmentSupervisorVerification(int id);
-       bool RemoveDelegateSelfAssessmentsupervisor(int candidateAssessmentId, int supervisorDelegateId);
+        bool RemoveDelegateSelfAssessmentsupervisor(int candidateAssessmentId, int supervisorDelegateId);
     }
     public class SupervisorService : ISupervisorService
     {
@@ -410,14 +410,7 @@ public bool RemoveSupervisorDelegateById(int supervisorDelegateId, int delegateU
             connection.Execute(
                 @"DELETE FROM sarsv FROM SelfAssessmentResultSupervisorVerifications as sarsv
                     LEFT JOIN CandidateAssessmentSupervisors AS cas ON cas.ID = sarsv.CandidateAssessmentSupervisorID
-                    WHERE cas.SupervisorDelegateId IN (SELECT sd.ID
-					FROM SupervisorDelegates sd
-					JOIN (
-					  SELECT DelegateEmail
-					  FROM SupervisorDelegates
-					  WHERE ID = @supervisorDelegateId
-					) sds
-					ON sd.SupervisorEmail = sds.DelegateEmail) AND cas.Removed IS NULL AND sarsv.Verified IS NULL", new { supervisorDelegateId }
+                    WHERE cas.SupervisorDelegateId = @supervisorDelegateId AND cas.Removed IS NULL AND sarsv.Verified IS NULL", new { supervisorDelegateId }
             );
 
             var numberOfAffectedRows = connection.Execute(
@@ -866,7 +859,7 @@ ROLLBACK TRANSACTION
             if (numberOfAffectedRows < 1)
             {
                 logger.LogWarning(
-                    $"Not removing Candidate Assessment Supervisors as db update failed. candidateAssessmentId: {candidateAssessmentId} " +$"supervisorDelegateId: {supervisorDelegateId}"
+                    $"Not removing Candidate Assessment Supervisors as db update failed. candidateAssessmentId: {candidateAssessmentId} " + $"supervisorDelegateId: {supervisorDelegateId}"
                 );
                 return false;
             }
@@ -877,7 +870,11 @@ public bool RemoveCandidateAssessmentSupervisor(int selfAssessmentId, int superv
             connection.Execute(
                 @"DELETE FROM sarsv FROM SelfAssessmentResultSupervisorVerifications as sarsv
                     LEFT JOIN CandidateAssessmentSupervisors AS cas ON cas.ID = sarsv.CandidateAssessmentSupervisorID
-                    WHERE cas.SupervisorDelegateId = @supervisorDelegateId AND cas.Removed IS NULL AND sarsv.Verified IS NULL", new { supervisorDelegateId }
+                    INNER JOIN SelfAssessmentResults AS srs ON sarsv.SelfAssessmentResultId = srs.ID
+                    INNER JOIN SelfAssessments AS sa ON srs.SelfAssessmentID = sa.ID
+                    WHERE cas.SupervisorDelegateId = @supervisorDelegateId
+                          AND cas.Removed IS NULL AND sarsv.Verified IS NULL
+                          AND sa.ID = @selfAssessmentId", new { supervisorDelegateId, selfAssessmentId }
                 );
 
             var deletedCandidateAssessmentSupervisors = connection.Execute(