Merge pull request #123 from VineetBala-AOT/main

Changes to Amendment conditions - numbering rules

Author: VineetBala-AOT

.github/workflows/web.ci.yml

@@ -0,0 +1,113 @@
+name: CONDITION WEB CI
+
+on:
+  pull_request:
+    branches:
+      - main
+    paths:
+      - "condition-web/**"
+  push:
+    branches:
+      - main
+  workflow_dispatch:
+    inputs:
+      environment:
+        description: "Environment (dev/test/prod)"
+        required: true
+        default: "dev"
+
+defaults:
+  run:
+    shell: bash
+    working-directory: ./condition-web
+
+jobs:
+  setup-job:
+    runs-on: ubuntu-22.04
+
+    if: github.repository == 'bcgov/EPIC.conditions'
+
+    steps:
+      - uses: actions/checkout@v2
+      - run: "true"
+
+  linting:
+    needs: setup-job
+    runs-on: ubuntu-22.04
+
+    strategy:
+      matrix:
+        node-version: [18.x]
+
+    steps:
+      - uses: actions/checkout@v2
+      - name: Use Node.js ${{ matrix.node-version }}
+        uses: actions/setup-node@v1
+        with:
+          node-version: ${{ matrix.node-version }}
+      - name: Install dependencies
+        run: |
+          npm install --legacy-peer-deps
+      - name: Lint
+        id: lint
+        run: |
+          npm run lint
+
+  testing:
+    needs: setup-job
+    runs-on: ubuntu-22.04
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Use Node.js ${{ matrix.node-version }}
+        uses: actions/setup-node@v1
+        with:
+          node-version: ${{ matrix.node-version }}
+
+      - name: Install dependencies
+        run: |
+          npm install --legacy-peer-deps
+
+      - name: Test with Cypress
+        id: test
+        run: |
+          npx cypress run --component --headed --browser chrome
+
+      # - name: Sets Codecov branch name
+      #   run: |
+      #     echo "CODECOV_BRANCH=PR_${{ github.head_ref }}" >> $GITHUB_ENV
+      #   if: github.event_name == 'pull_request'
+
+      # - name: Upload coverage to Codecov
+      #   uses: codecov/codecov-action@v4
+      #   with:
+      #     flags: condition-web
+      #     name: codecov-condition-web
+      #     fail_ci_if_error: true
+      #     verbose: true
+      #     override_branch: ${{ env.CODECOV_BRANCH }}
+      #     token: ${{ secrets.CODECOV_TOKEN }}
+      #     directory: ./condition-web/coverage
+
+      - name: Coverage Report
+        run: |
+          npx nyc report --reporter=lcov --reporter=text-summary
+
+  build-check:
+    needs: setup-job
+    runs-on: ubuntu-22.04
+
+    steps:
+      - uses: actions/checkout@v2
+      - name: Use Node.js ${{ matrix.node-version }}
+        uses: actions/setup-node@v1
+        with:
+          node-version: ${{ matrix.node-version }}
+      - name: Install dependencies
+        run: |
+          npm install --legacy-peer-deps
+      - name: build to check strictness
+        id: build
+        run: |
+          npm run build --quiet || true

condition-api/migrations/versions/d909569f8c4e_remove_cascade_from_project.py

@@ -0,0 +1,49 @@
+"""remove_cascade_from_project
+
+Revision ID: d909569f8c4e
+Revises: af25a1d94134
+Create Date: 2025-08-11 14:39:30.881474
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = 'd909569f8c4e'
+down_revision = 'af25a1d94134'
+branch_labels = None
+depends_on = None
+
+OLD_FK_NAME = 'documents_project_id_fkey'
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    # Drop the existing FK constraint
+    op.drop_constraint(OLD_FK_NAME, 'documents', schema='condition', type_='foreignkey')
+
+    # Recreate FK with RESTRICT (or just omit ondelete to default to restrict)
+    op.create_foreign_key(
+        OLD_FK_NAME,
+        'documents', 'projects',
+        ['project_id'], ['project_id'],
+        source_schema='condition',
+        referent_schema='condition',
+        ondelete='RESTRICT'
+    )
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_constraint(OLD_FK_NAME, 'documents', schema='condition', type_='foreignkey')
+
+    op.create_foreign_key(
+        OLD_FK_NAME,
+        'documents', 'projects',
+        ['project_id'], ['project_id'],
+        source_schema='condition',
+        referent_schema='condition',
+        ondelete='CASCADE'
+    )
+    # ### end Alembic commands ###

condition-api/src/condition_api/models/document.py

@@ -31,7 +31,7 @@ class Document(BaseModel):
     is_latest_amendment_added = Column(Boolean)
 
     # Foreign key to link to the project
-    project_id = Column(String(255), ForeignKey('condition.projects.project_id', ondelete='CASCADE'))
+    project_id = Column(String(255), ForeignKey('condition.projects.project_id', ondelete='RESTRICT'))
 
     # Establish the relationship back to the Project table
     project = relationship('Project', back_populates='documents')

condition-api/src/condition_api/models/project.py

@@ -23,7 +23,7 @@ class Project(BaseModel):
     project_type = Column(Text)
 
     # Establish a one-to-many relationship with the Document table
-    documents = relationship('Document', back_populates='project', cascade='all, delete-orphan')
+    documents = relationship('Document', back_populates='project')
 
     __table_args__ = (
         UniqueConstraint('project_id', name='uq_project'),

condition-api/src/condition_api/resources/condition.py

@@ -149,10 +149,18 @@ def post(project_id, document_id):
                 conditions_data = ConditionSchema().load(API.payload)
             else:
                 conditions_data = {}
-            created_condition = ConditionService.create_condition(project_id, document_id, conditions_data)
+            query_params = request.args
+            allow_duplicate_condition  = query_params.get(
+                'allow_duplicate_condition', 'true').lower() == 'true'
+            created_condition = ConditionService.create_condition(project_id,
+                                                                  document_id,
+                                                                  conditions_data,
+                                                                  allow_duplicate_condition)
             return created_condition, HTTPStatus.OK
         except ValidationError as err:
             return {"message": str(err)}, HTTPStatus.BAD_REQUEST
+        except ConditionNumberExistsError as err:
+            return {"message": str(err)}, HTTPStatus.CONFLICT
 
 
 @cors_preflight("GET, OPTIONS, PATCH, DELETE")
@@ -194,11 +202,22 @@ def patch(condition_id):
         try:
             conditions_data = ConditionSchema().load(API.payload)
             query_params = request.args
-            check_condition_over_project = query_params.get(
-                'check_condition_over_project', 'true').lower() == 'true'
+
+            allow_duplicate_condition  = query_params.get(
+                'allow_duplicate_condition', 'true').lower() == 'true'
+            if allow_duplicate_condition:
+                check_condition_exists = True
+                check_condition_over_project = False
+            else:
+                check_condition_exists = True
+                check_condition_over_project = query_params.get(
+                    'check_condition_over_project', 'true'
+                ).lower() == 'true'
+
             updated_condition = ConditionService.update_condition(conditions_data,
-                                                                  condition_id, True,
-                                                                  check_condition_over_project)
+                                                                  condition_id, check_condition_exists,
+                                                                  check_condition_over_project,
+                                                                  allow_duplicate_condition)
             return ConditionSchema().dump(updated_condition), HTTPStatus.OK
         except ValidationError as err:
             return {"message": str(err)}, HTTPStatus.BAD_REQUEST

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

@@ -321,6 +321,7 @@ def update_condition(
         condition_id=None,
         check_condition_exists=None,
         check_condition_over_project=None,
+        allow_duplicate_condition=None,
     ):
         """
         Update the approved status, topic tags, and subconditions of a specific condition.
@@ -341,7 +342,7 @@ def update_condition(
         if check_condition_over_project:
             ConditionService._check_condition_conflict_in_project(condition, condition_number)
         # Mark existing condition inactive if needed
-        if condition.amended_document_id and not check_condition_over_project:
+        if condition.amended_document_id and not check_condition_over_project and not allow_duplicate_condition:
             ConditionService._deactivate_existing_condition(condition, condition_number)
 
         # Update condition fields
@@ -497,7 +498,7 @@ def upsert_subconditions(condition_id, subconditions, parent_id=None):
                     condition_id, subcond_data["subconditions"], parent_id=subcondition_id)
 
     @staticmethod
-    def create_condition(project_id, document_id, conditions_data):
+    def create_condition(project_id, document_id, conditions_data, allow_duplicate_condition=None):
         """Create a new condition."""
         amendment = (
             db.session.query(Amendment.document_id)
@@ -524,8 +525,18 @@ def create_condition(project_id, document_id, conditions_data):
                 .first()
             )
 
+            if allow_duplicate_condition:
+                ConditionService._check_duplicate_condition_number(
+                    condition=Condition(
+                        document_id=final_document_id,
+                        amended_document_id=amended_document_id
+                    ),
+                    condition_id=None,  # None since we are creating a new one
+                    condition_number=conditions_data.get("condition_number")
+                )
+
             # If it exists, update is_active to False
-            if existing_condition:
+            if existing_condition and not allow_duplicate_condition:
                 existing_condition.is_active = False
                 existing_condition.effective_to = datetime.utcnow()
                 db.session.add(existing_condition)

condition-lib/loadConditions.py

@@ -45,9 +45,9 @@ def insert_subconditions(condition_id, parent_subcondition_id, subconditions):
 
 def get_document_category_id(document_type):
     """Determine the document_category_id based on document_type."""
-    if document_type == "Order":
+    if document_type == "Exemption Order":
         return 2
-    elif document_type == "Other":
+    elif document_type == "Other Order":
         return 4
     elif document_type == "Amendment":
         return 3

condition-web/src/components/ConditionDetails/ConditionAttribute/Independent/ConditionAttributeRow.tsx

@@ -69,7 +69,7 @@ const ConditionAttributeRow: React.FC<ConditionAttributeRowProps> = ({
 
   useEffect(() => {
     onEditModeChange?.(isEditable);
-  }, [isEditable]);
+  }, [isEditable, onEditModeChange]);
 
   const [chips, setChips] = useState<string[]>(
     conditionKey === CONDITION_KEYS.PARTIES_REQUIRED

condition-web/src/components/ConditionDetails/ConditionAttribute/Independent/ConditionAttributeTable.tsx

@@ -126,7 +126,7 @@ const ConditionAttributeTable = memo(({
       setIsIEMRequired(!!IEMRequired);
     }
 
-    }, [conditionAttributeDetails?.independent_attributes]);
+    }, [conditionAttributeDetails?.independent_attributes, setCondition, setIsConsultationRequired, setIsIEMRequired]);
 
     const approveConditionAttributes = () => {
       if (isAnyRowEditing) {

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

@@ -165,7 +165,7 @@ const ManagementPlanAccordion: React.FC<Props> = ({
 
       afterSuccess?.();
     } catch (err) {
-      console.error("Error updating management plan:", err);
+      notify.error("Failed to update management plan.");
     }
   };  
 
@@ -213,7 +213,7 @@ const ManagementPlanAccordion: React.FC<Props> = ({
       );
       setIsIEMRequired(!!IEMRequired);
     }
-  }, [conditionAttributeDetails]);  
+  }, [conditionAttributeDetails, setCondition]);
 
   const handleApprovePlan = async (e: React.MouseEvent) => {
     e.stopPropagation();