Merge pull request #117 from VineetBala-AOT/main

Fix issue of condition not getting approved even if all MP are approved

Author: VineetBala-AOT

condition-api/src/condition_api/services/condition_service.py

@@ -680,22 +680,24 @@ def _build_nested_subconditions(condition_id):
         nested_subconditions = []
 
         for row in sub_condition_data:
-            subcond = {
+            subcondition_map[row.subcondition_id] = {
                 "subcondition_id": row.subcondition_id,
                 "subcondition_identifier": row.subcondition_identifier,
                 "subcondition_text": row.subcondition_text,
                 "sort_order": row.sort_order,
                 "subconditions": []
             }
 
-            subcondition_map[row.subcondition_id] = subcond
-
+        for row in sub_condition_data:
+            current = subcondition_map[row.subcondition_id]
             if row.parent_subcondition_id:
                 parent = subcondition_map.get(row.parent_subcondition_id)
                 if parent:
-                    parent["subconditions"].append(subcond)
+                    parent["subconditions"].append(current)
+                else:
+                    nested_subconditions.append(current)
             else:
-                nested_subconditions.append(subcond)
+                nested_subconditions.append(current)
 
         return nested_subconditions
 

condition-web/src/components/ConditionDetails/ConditionAttribute/ManagementPlan/ManagementPlanAccordion.tsx

@@ -205,7 +205,7 @@ const ManagementPlanAccordion: React.FC<Props> = ({
     }
   }, [conditionAttributeDetails]);  
 
-  const handleApprovePlan = (e: React.MouseEvent) => {
+  const handleApprovePlan = async (e: React.MouseEvent) => {
     e.stopPropagation();
     e.preventDefault();
 
@@ -233,21 +233,25 @@ const ManagementPlanAccordion: React.FC<Props> = ({
     setConditionAttributeError(false);
 
     const currentApproval = attributes.is_approved;
-    handleUpdatePlan({ is_approved: !currentApproval });
-
-    const allPlans = condition.condition_attributes?.management_plans || [];
-  
-    // Return early if there are no plans
-    if (allPlans.length === 0) return;
-  
-    const allApproved = allPlans.every((plan) => plan.is_approved);
-  
-    // Only update if condition doesn't match the derived value
-    if (condition.is_condition_attributes_approved !== allApproved) {
-      updateConditionDetails({
-        is_condition_attributes_approved: allApproved,
-      });
-    }
+    await handleUpdatePlan(
+      { is_approved: !currentApproval },
+      () => {
+        const updatedPlans = condition.condition_attributes?.management_plans || [];
+
+        if (updatedPlans.length === 0) return;
+
+        const allApproved = updatedPlans.every((plan) => plan.id === attributes.id
+          ? !currentApproval // this one just got toggled
+          : plan.is_approved
+        );
+
+        if (condition.is_condition_attributes_approved !== allApproved) {
+          updateConditionDetails({
+            is_condition_attributes_approved: allApproved,
+          });
+        }
+      }
+    );
 
   };