Merge pull request #221 from dinesh-aot/COMP-317

Close status for inspection
bcgov · Feb 6, 2025 · f77077f · f77077f
2 parents e5fbe7e + 2496a2a
commit f77077f
Show file tree

Hide file tree

Showing 7 changed files with 64 additions and 13 deletions.
diff --git a/compliance-api/Makefile b/compliance-api/Makefile
@@ -68,7 +68,7 @@ install-dev: ## Install local application
 ci: lint flake8 test ## CI flow
 
 pylint: ## Linting with pylint
-	. venv/bin/activate && pylint --rcfile=setup.cfg src/$(PROJECT_NAME)
+	. venv/bin/activate && pylint --rcfile=setup.cfg --jobs=5 src/$(PROJECT_NAME)
 
 flake8: ## Linting with flake8
 	. venv/bin/activate && flake8 --ignore=Q000,W503 src/$(PROJECT_NAME) tests

diff --git a/compliance-api/migrations/versions/3aa492aa47db_remove_closed_as_note_status.py b/compliance-api/migrations/versions/3aa492aa47db_remove_closed_as_note_status.py
@@ -0,0 +1,46 @@
+"""Remove closed as note status
+
+Revision ID: 3aa492aa47db
+Revises: 91f76d883f32
+Create Date: 2025-02-06 13:22:09.682441
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = '3aa492aa47db'
+down_revision = '91f76d883f32'
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.execute("UPDATE inspections set inspection_status='CLOSED' WHERE inspection_status='CLOSED_AS_NOTE'")
+    op.execute("UPDATE inspections_version SET inspection_status='CLOSED' WHERE inspection_status='CLOSED_AS_NOTE'")
+    op.execute("""
+        CREATE TYPE inspectionstatusenum_old AS ENUM ('OPEN', 'CLOSED', 'CANCELED');
+    """)
+    op.execute("""
+        ALTER TABLE inspections 
+        ALTER COLUMN inspection_status TYPE inspectionstatusenum_old 
+        USING inspection_status::text::inspectionstatusenum_old;
+    """)
+    op.execute("""
+        ALTER TABLE inspections_version
+        ALTER COLUMN inspection_status TYPE inspectionstatusenum_old 
+        USING inspection_status::text::inspectionstatusenum_old;
+    """)
+    op.execute("DROP TYPE inspectionstatusenum;")
+    op.execute("ALTER TYPE inspectionstatusenum_old RENAME TO inspectionstatusenum;")
+
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    pass
+
+    # ### end Alembic commands ###
diff --git a/compliance-api/src/compliance_api/models/inspection/inspection_enum.py b/compliance-api/src/compliance_api/models/inspection/inspection_enum.py
@@ -21,5 +21,4 @@ class InspectionStatusEnum(enum.Enum):
 
     OPEN = "Open"
     CLOSED = "Closed"
-    CLOSED_AS_NOTE = "Closed as note"
     CANCELED = "Canceled"
diff --git a/compliance-api/src/compliance_api/schemas/inspection.py b/compliance-api/src/compliance_api/schemas/inspection.py
@@ -372,6 +372,12 @@ class Meta:  # pylint: disable=too-few-public-methods
         metadata={"description": "The status of the complaint"},
         required=True,
     )
+    alt_status_text = fields.Str(
+        metadata={
+            "description": "Alternate text for the status to be written to continuation report"
+        },
+        allow_none=True
+    )
 
     @post_load
     def extract_status_value(
@@ -390,11 +396,7 @@ def validate_status(
         """Ensure only Closed and Canceled status are passed."""
         # Retrieve the context to access other fields
         status = data.get("status")
-        if status not in [
-            InspectionStatusEnum.CANCELED,
-            InspectionStatusEnum.CLOSED,
-            InspectionStatusEnum.CLOSED_AS_NOTE
-        ]:
+        if status not in [InspectionStatusEnum.CANCELED, InspectionStatusEnum.CLOSED]:
             raise ValidationError(
                 "Invalid status value passed",
                 field_name="status",

diff --git a/compliance-api/src/compliance_api/services/inspection.py b/compliance-api/src/compliance_api/services/inspection.py
@@ -315,7 +315,7 @@ def change_status(cls, inspection_id, status):
                 inspection.id,
                 inspection.ir_number,
                 inspection.case_file_id,
-                status_enum.value.lower(),
+                status.get("alt_status_text", status_enum.value).lower()
             )
             ContinuationReportService.create(
                 cr_entry, sys_generated=True, ho_session=session

diff --git a/compliance-web/src/components/App/Inspections/Profile/InspectionFileActions.tsx b/compliance-web/src/components/App/Inspections/Profile/InspectionFileActions.tsx
@@ -73,10 +73,10 @@ const InspectionFileActions: React.FC<InspectionFileActionsProps> = ({
           ),
         });
       },
-      hidden: ["canceled", "closed", "closed as note"].includes(status?.toLowerCase()),
+      hidden: ["canceled", "closed"].includes(status?.toLowerCase()),
     },
     {
-      text: "Close as Note to File",
+      text: "Closed as note to file",
       onClick: () => {
         // Handle closing inspection
         setOpen({
@@ -88,15 +88,18 @@ const InspectionFileActions: React.FC<InspectionFileActionsProps> = ({
               onConfirm={() => {
                 updateInspectionInspection({
                   id: inspectionData?.id ?? 0,
-                  inspectionStatus: { status: "CLOSED_AS_NOTE" },
+                  inspectionStatus: {
+                    status: "CLOSED",
+                    alt_status_text: "Closed as note to file",
+                  },
                 });
               }}
             />
           ),
           width: "420px",
         });
       },
-      hidden: ["canceled", "closed as note", "closed"].includes(status?.toLowerCase()),
+      hidden: ["canceled", "closed"].includes(status?.toLowerCase()),
     },
     {
       text: "Closed",
@@ -119,7 +122,7 @@ const InspectionFileActions: React.FC<InspectionFileActionsProps> = ({
           width: "420px",
         });
       },
-      hidden: ["canceled", "closed", "closed as note"].includes(status?.toLowerCase()),
+      hidden: ["canceled", "closed"].includes(status?.toLowerCase()),
     },
     {
       text: "Delete Inspection",

diff --git a/compliance-web/src/models/Inspection.ts b/compliance-web/src/models/Inspection.ts
@@ -82,4 +82,5 @@ export interface InspectionAPIData {
 
 export interface InspectionStatusAPIData {
   status: string;
+  alt_status_text: string;
 }