Merge pull request #146 from VineetBala-AOT/main

fix amendments duplicating in consolidated conditions

Author: VineetBala-AOT

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

@@ -521,13 +521,14 @@ def create_condition(project_id, document_id, conditions_data, allow_duplicate_c
             )
             final_document_id = document[0]
             # Check if a condition exists with the given document_id and condition_number
-            existing_condition = (
+            existing_conditions = (
                 db.session.query(Condition)
                 .filter(
                     Condition.document_id == final_document_id,
                     Condition.condition_number == conditions_data.get("condition_number"),
+                    Condition.is_active is True
                 )
-                .first()
+                .all()
             )
 
             ConditionService._check_duplicate_condition_number(
@@ -540,10 +541,11 @@ def create_condition(project_id, document_id, conditions_data, allow_duplicate_c
             )
 
             # If it exists, update is_active to False
-            if existing_condition and not allow_duplicate_condition:
-                existing_condition.is_active = False
-                existing_condition.effective_to = datetime.utcnow()
-                db.session.add(existing_condition)
+            if existing_conditions and not allow_duplicate_condition:
+                for condition in existing_conditions:
+                    condition.is_active = False
+                    condition.effective_to = datetime.utcnow()
+                    db.session.add(condition)
         else:
             final_document_id = document_id
 

condition-web/src/components/Conditions/CreateConditionModal.tsx

@@ -32,6 +32,11 @@ type ConditionModalProps = {
   documentId: string;
 };
 
+type Subcondition = {
+  subcondition_text: string;
+  subconditions?: Subcondition[];
+};
+
 export const ConditionModal: FC<ConditionModalProps> = ({ open, onClose, projectId, documentId }) => {
   const navigate = useNavigate();
   const [selectedDocumentId, setSelectedDocumentId] = useState<string | "">("");
@@ -50,6 +55,16 @@ export const ConditionModal: FC<ConditionModalProps> = ({ open, onClose, project
 
   const { data: documentConditions, isPending: isConditionsLoading } = useGetConditions(loadCondition, true, projectId, selectedDocumentId);
 
+  const flattenSubconditions = (
+    subconditions: Subcondition[] = [],
+    level = 0
+  ): string[] => {
+    return subconditions.flatMap(sub => [
+      `${'  '.repeat(level)}• ${sub.subcondition_text}`,
+      ...flattenSubconditions(sub.subconditions ?? [], level + 1),
+    ]);
+  };
+
   const handleCreateNewCondition = async (conditionDetails?: ConditionModel) => {
     try {
       const response = await createCondition(conditionDetails);
@@ -175,9 +190,13 @@ export const ConditionModal: FC<ConditionModalProps> = ({ open, onClose, project
                 <Box sx={{ marginTop: 0 }}>
                   <Typography variant="body1" marginBottom={"2px"}>Condition Preview</Typography>
                   <TextField
-                    value={documentConditions.conditions
-                      .find(condition => condition.condition_id === selectedConditionId)
-                      ?.subconditions?.map(subcondition => subcondition.subcondition_text).join(' ') || ""}
+                    value={
+                      flattenSubconditions(
+                        documentConditions.conditions
+                          .find(c => c.condition_id === selectedConditionId)
+                          ?.subconditions
+                      ).join('\n')
+                    }
                     InputProps={{ readOnly: true }}
                     fullWidth
                     multiline