Merge pull request #157 from don-aot/CONDITIONS-task#157

CR-157:Disable the selection of conditions from OG document if it has  been amended

Author: don-aot

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

@@ -136,6 +136,7 @@ def get_all_conditions(
                     ),
                     else_=False  # At least one condition is not met
                 ).label('is_approved'),  # Derived column for the calculated approval status
+                conditions.is_active,
                 conditions.is_standard_condition,
                 conditions.topic_tags,
                 conditions.subtopic_tags,
@@ -169,6 +170,7 @@ def get_all_conditions(
                     )
                 )
             )
+            .filter(conditions.is_active.is_(True))
             .group_by(
                 conditions.id,
                 conditions.condition_name,
@@ -177,6 +179,7 @@ def get_all_conditions(
                 conditions.is_approved,
                 conditions.is_condition_attributes_approved,
                 conditions.is_topic_tags_approved,
+                conditions.is_active,
                 conditions.is_standard_condition,
                 conditions.topic_tags,
                 conditions.subtopic_tags,
@@ -201,6 +204,7 @@ def get_all_conditions(
                 "condition_number": row.condition_number,
                 "condition_text": row.condition_text,
                 "is_approved": row.is_approved,
+                "is_active": row.is_active,
                 "is_standard_condition": row.is_standard_condition,
                 "topic_tags": row.topic_tags,
                 "subtopic_tags": row.subtopic_tags,

condition-web/src/models/Condition.ts

@@ -15,6 +15,7 @@ export interface ConditionModel {
   effective_document_id?: string;
   year_issued?: number;
   is_approved?: boolean;
+  is_active?: boolean;
   topic_tags?: string[];
   is_topic_tags_approved?: boolean;
   is_condition_attributes_approved?: boolean;