From c91614945c93ac71da8a176f5b082f4e1170ec5f Mon Sep 17 00:00:00 2001
From: Sherif Olaboye <Sherif.Olaboye@hee.nhs.uk>
Date: Mon, 10 Feb 2025 09:54:52 +0000
Subject: [PATCH] TD-5333 Issue with optional proficiencies not retaining to
 previous state when removed and added them back

---
 .../SelfAssessmentDataService/CompetencyDataService.cs        | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/DigitalLearningSolutions.Data/DataServices/SelfAssessmentDataService/CompetencyDataService.cs b/DigitalLearningSolutions.Data/DataServices/SelfAssessmentDataService/CompetencyDataService.cs
index 76a1a199bd..3c333e78e8 100644
--- a/DigitalLearningSolutions.Data/DataServices/SelfAssessmentDataService/CompetencyDataService.cs
+++ b/DigitalLearningSolutions.Data/DataServices/SelfAssessmentDataService/CompetencyDataService.cs
@@ -635,7 +635,7 @@ 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 }
             );
         }
@@ -643,8 +643,6 @@ FROM SelfAssessmentResults s inner join
         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 });