Resets complete status of select frameworks task if a framework is removed

Author: kevwhitt-hee

DigitalLearningSolutions.Data/DataServices/CompetencyAssessmentDataService.cs

@@ -50,7 +50,7 @@ int categoryId
         bool UpdateBrandingTaskStatus(int assessmentId, bool taskStatus);
         bool UpdateVocabularyTaskStatus(int assessmentId, bool taskStatus);
         bool UpdateRoleProfileLinksTaskStatus(int assessmentId, bool taskStatus);
-        bool UpdateFrameworkLinksTaskStatus(int assessmentId, bool taskStatus);
+        bool UpdateFrameworkLinksTaskStatus(int assessmentId, bool taskStatus, bool? previousStatus);
         bool RemoveSelfAssessmentFramework(int assessmentId, int frameworkId, int adminId);
         bool UpdateSelectCompetenciesTaskStatus(int assessmentId, bool taskStatus, bool? previousStatus);
         bool UpdateOptionalCompetenciesTaskStatus(int assessmentId, bool taskStatus, bool? previousStatus);
@@ -529,12 +529,12 @@ FROM   SelfAssessmentFrameworks
           );
         }
 
-        public bool UpdateFrameworkLinksTaskStatus(int assessmentId, bool taskStatus)
+        public bool UpdateFrameworkLinksTaskStatus(int assessmentId, bool taskStatus, bool? previousStatus)
         {
             var numberOfAffectedRows = connection.Execute(
                @"UPDATE SelfAssessmentTaskStatus SET FrameworkLinksTaskStatus = @taskStatus
-                    WHERE SelfAssessmentId = @assessmentId",
-               new { assessmentId, taskStatus }
+                    WHERE SelfAssessmentId = @assessmentId  AND (@previousStatus IS NULL OR FrameworkLinksTaskStatus = @previousStatus)",
+               new { assessmentId, taskStatus, previousStatus }
            );
             if (numberOfAffectedRows < 1)
             {

DigitalLearningSolutions.Web/Controllers/CompetencyAssessmentsController/CompetencyAssessments.cs

@@ -445,7 +445,7 @@ public IActionResult SelectFrameworkSources(SelectFrameworkSourcesFormData model
             }
             else
             {
-                competencyAssessmentService.UpdateFrameworkLinksTaskStatus(model.CompetencyAssessmentId, model.TaskStatus ?? false);
+                competencyAssessmentService.UpdateFrameworkLinksTaskStatus(model.CompetencyAssessmentId, model.TaskStatus ?? false, null);
                 return RedirectToAction("ManageCompetencyAssessment", new { competencyAssessmentId = model.CompetencyAssessmentId });
             }
         }

DigitalLearningSolutions.Web/Services/CompetencyAssessmentService.cs

@@ -39,7 +39,7 @@ public interface ICompetencyAssessmentService
         bool UpdateCompetencyAssessmentVocabulary(int assessmentId, int adminId, string vocabulary);
         bool UpdateVocabularyTaskStatus(int assessmentId, bool taskStatus);
         bool UpdateRoleProfileLinksTaskStatus(int assessmentId, bool taskStatus);
-        bool UpdateFrameworkLinksTaskStatus(int assessmentId, bool taskStatus);
+        bool UpdateFrameworkLinksTaskStatus(int assessmentId, bool taskStatus, bool? previousStatus);
         bool UpdateSelectCompetenciesTaskStatus(int competencyAssessmentId, bool taskStatus, bool? previousStatus);
         bool UpdateOptionalCompetenciesTaskStatus(int assessmentId, bool taskStatus, bool? previousStatus);
         bool UpdateRoleRequirementsTaskStatus(int assessmentId, bool taskStatus, bool? previousStatus);
@@ -175,9 +175,9 @@ public bool InsertSelfAssessmentFramework(int adminId, int assessmentId, int fra
             return competencyAssessmentDataService.InsertSelfAssessmentFramework(adminId, assessmentId, frameworkId);
         }
 
-        public bool UpdateFrameworkLinksTaskStatus(int assessmentId, bool taskStatus)
+        public bool UpdateFrameworkLinksTaskStatus(int assessmentId, bool taskStatus, bool? previousStatus)
         {
-            return competencyAssessmentDataService.UpdateFrameworkLinksTaskStatus(assessmentId, taskStatus);
+            return competencyAssessmentDataService.UpdateFrameworkLinksTaskStatus(assessmentId, taskStatus, previousStatus);
         }
 
         public int? GetPrimaryLinkedFrameworkId(int assessmentId)
@@ -187,6 +187,7 @@ public bool UpdateFrameworkLinksTaskStatus(int assessmentId, bool taskStatus)
 
         public bool RemoveSelfAssessmentFramework(int assessmentId, int frameworkId, int adminId)
         {
+            UpdateFrameworkLinksTaskStatus(assessmentId, false, true);
             return competencyAssessmentDataService.RemoveSelfAssessmentFramework(assessmentId, frameworkId, adminId);
         }