Merge pull request #131 from VineetBala-AOT/main

Prevent saving amendment with duplicate condition number

Author: VineetBala-AOT

condition-api/migrations/versions/1eb403b982a4_add_condition_type.py

@@ -0,0 +1,55 @@
+"""add_condition_type
+
+Revision ID: 1eb403b982a4
+Revises: d909569f8c4e
+Create Date: 2025-08-29 13:35:05.915295
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = '1eb403b982a4'
+down_revision = 'd909569f8c4e'
+branch_labels = None
+depends_on = None
+
+
+condition_type_enum = sa.Enum("ADD", "AMEND", name="condition_type_enum")
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    condition_type_enum.create(op.get_bind(), checkfirst=True)
+
+    with op.batch_alter_table('conditions', schema='condition') as batch_op:
+        batch_op.add_column(
+            sa.Column('condition_type',
+                      sa.Enum('ADD', 'AMEND', name='condition_type_enum'),
+                      nullable=True)
+        )
+
+    # Set values based on amended_document_id
+    op.execute("""
+        UPDATE condition.conditions
+        SET condition_type = CASE
+            WHEN amended_document_id IS NULL THEN 'ADD'::condition_type_enum
+            ELSE 'AMEND'::condition_type_enum
+        END
+    """)
+
+    with op.batch_alter_table('conditions', schema='condition') as batch_op:
+        batch_op.alter_column('condition_type', nullable=False)
+
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    with op.batch_alter_table('conditions', schema='condition') as batch_op:
+        batch_op.drop_column('condition_type')
+
+    # Drop the enum type as well (if you want clean rollback)
+    op.execute("DROP TYPE condition_type_enum")
+
+    # ### end Alembic commands ###

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

@@ -2,8 +2,9 @@
 
 Manages the Condition
 """
-from sqlalchemy import ARRAY, Boolean, Column, DateTime, ForeignKey, Integer, String, Text
+from sqlalchemy import ARRAY, Boolean, Column, DateTime, Enum, ForeignKey, Integer, String, Text
 from sqlalchemy.orm import relationship
+from condition_api.utils.enums import ConditionType
 
 from .base_model import BaseModel
 
@@ -32,6 +33,11 @@ class Condition(BaseModel):
     is_active = Column(Boolean, nullable=False, default=True)
     is_standard_condition = Column(Boolean, nullable=True)
     requires_management_plan = Column(Boolean, nullable=True)
+    condition_type = Column(
+        Enum(ConditionType, name="condition_type_enum"),
+        nullable=False,
+        default=ConditionType.ADD,
+    )
 
     # Establish a one-to-many relationship with subcondition
     subconditions = relationship('Subcondition', back_populates='condition', cascade='all, delete-orphan')

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

@@ -2,11 +2,12 @@
 
 Manages the condition
 """
-
 from condition_api.schemas.condition_attribute import ConditionAttributesSchema
 from condition_api.schemas.subcondition import SubconditionSchema
+from condition_api.utils.enums import ConditionType
 
 from marshmallow import Schema, fields
+from marshmallow_enum import EnumField
 
 
 class ConditionSchema(Schema):
@@ -32,6 +33,7 @@ class ConditionSchema(Schema):
     source_document = fields.Str(data_key="source_document", allow_none=True)
     # Condition can also have its own subconditions (recursive nesting)
     subconditions = fields.List(fields.Nested(SubconditionSchema), data_key="subconditions")
+    condition_type = EnumField(ConditionType)
 
 
 class ProjectDocumentConditionSchema(Schema):

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

@@ -525,15 +525,14 @@ def create_condition(project_id, document_id, conditions_data, allow_duplicate_c
                 .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")
-                )
+            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 and not allow_duplicate_condition:
@@ -554,6 +553,7 @@ def create_condition(project_id, document_id, conditions_data, allow_duplicate_c
             is_standard_condition=conditions_data.get("is_standard_condition"),
             topic_tags=conditions_data.get("topic_tags"),
             subtopic_tags=conditions_data.get("subtopic_tags"),
+            condition_type=conditions_data.get("condition_type"),
             effective_from=datetime.utcnow()
         )
         db.session.add(new_condition)

condition-api/src/condition_api/utils/enums.py

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 """Enum definitions."""
-from enum import IntEnum
+from enum import IntEnum, Enum
 from typing import List
 
 
@@ -79,3 +79,10 @@ def required_attribute_keys() -> List[int]:
             AttributeKeys.TIME_ASSOCIATED_WITH_SUBMISSION_MILESTONE,
             AttributeKeys.REQUIRES_CONSULTATION,
         ]
+
+
+class ConditionType(Enum):
+    """Condition Type — whether a condition is newly added or an amendment."""
+
+    ADD = "add"
+    AMEND = "amend"

condition-web/src/components/ConditionDetails/CreateCondition/index.tsx

@@ -23,6 +23,8 @@ import ChipInput from "../../Shared/Chips/ChipInput";
 import { useNavigate } from "@tanstack/react-router";
 import CloseIcon from '@mui/icons-material/Close';
 import LoadingButton from "../../Shared/Buttons/LoadingButton";
+import { useQueryClient } from "@tanstack/react-query";
+import { QUERY_KEY } from "@/hooks/api/constants";
 
 export const CardInnerBox = styled(Box)({
   display: "flex",
@@ -40,7 +42,7 @@ type ConditionsParam = {
 export const CreateConditionPage = ({
   conditionData
 }: ConditionsParam) => {
-
+  const queryClient = useQueryClient();
   const navigate = useNavigate();
 
   const [condition, setCondition] = useState<ConditionModel>(
@@ -129,6 +131,11 @@ export const CreateConditionPage = ({
       };
       const response = await updateCondition(data);
       if (response) {
+        await queryClient.refetchQueries({
+          queryKey: [QUERY_KEY.CONDITIONS, conditionData?.project_id, conditionData?.document_id],
+          exact: true,
+        });
+
         navigate({
           to: `/conditions/project/${conditionData?.project_id}/document/${conditionData?.document_id}`,
         });

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

@@ -19,7 +19,7 @@ import { useCreateCondition } from "@/hooks/api/useConditions";
 import { useGetDocumentsByProject } from "@/hooks/api/useDocuments";
 import { useGetConditions } from "@/hooks/api/useConditions";
 import { DocumentModel } from "@/models/Document";
-import { ConditionModel } from "@/models/Condition";
+import { ConditionModel, ConditionType } from "@/models/Condition";
 import { notify } from "@/components/Shared/Snackbar/snackbarStore";
 import { useNavigate } from "@tanstack/react-router";
 import { HTTP_STATUS_CODES } from "../../hooks/api/constants";
@@ -68,8 +68,22 @@ export const ConditionModal: FC<ConditionModalProps> = ({ open, onClose, project
     }
   }
 
+  const handleClose = () => {
+    // reset fields
+    setSelectedMode("amend");
+    setConditionNumber("");
+    setConditionName("");
+    setConditionConflictError(false);
+    setSelectedDocumentId("");
+    setSelectedConditionId(null);
+    setLoadCondition(false);
+  
+    // call parent-provided close
+    onClose();
+  };
+
   return (
-    <Modal open={open} onClose={onClose}>
+    <Modal open={open} onClose={handleClose}>
       <Paper sx={{
         position: "absolute",
         top: "50%",
@@ -82,7 +96,7 @@ export const ConditionModal: FC<ConditionModalProps> = ({ open, onClose, project
       }}>
         <Box display="flex" justifyContent="space-between" alignItems="center" padding={"14px 5px 14px 14px"}>
           <Typography variant="h6">Manual Condition Entry</Typography>
-          <IconButton onClick={onClose}>
+          <IconButton onClick={handleClose}>
             <CloseIcon />
           </IconButton>
         </Box>
@@ -161,6 +175,19 @@ export const ConditionModal: FC<ConditionModalProps> = ({ open, onClose, project
                     rows={4}
                     variant="outlined"
                   />
+              {conditionConflictError && (
+                <Box
+                  sx={{
+                    display: "flex",
+                    flexDirection: "row",
+                    marginBottom: "15px",
+                    color: "#CE3E39",
+                    marginTop: "-20px",
+                  }}
+                >
+                  This condition number already exists within this amendment.
+                </Box>
+              ) }
                 </Box>
               )}
             </Stack>
@@ -272,7 +299,7 @@ export const ConditionModal: FC<ConditionModalProps> = ({ open, onClose, project
 
         <Divider />
         <Box sx={{ display: "flex", justifyContent: "right", padding: "14px" }}>
-          <Button variant="outlined" sx={{ minWidth: "100px" }} onClick={onClose}>Cancel</Button>
+          <Button variant="outlined" sx={{ minWidth: "100px" }} onClick={handleClose}>Cancel</Button>
           <Button
             variant="contained"
             sx={{ marginLeft: "8px", minWidth: "100px" }}
@@ -281,12 +308,18 @@ export const ConditionModal: FC<ConditionModalProps> = ({ open, onClose, project
                 handleCreateNewCondition({
                   condition_number: Number(conditionNumber) || undefined,
                   condition_name: conditionName,
+                  condition_type: ConditionType.ADD
                 });
               } else {
                 const selectedCondition = documentConditions?.conditions?.find(
                   (condition) => condition.condition_id === selectedConditionId
                 );
-                handleCreateNewCondition(selectedCondition);
+                if (selectedCondition) {
+                  handleCreateNewCondition({
+                    ...selectedCondition,
+                    condition_type: ConditionType.AMEND,
+                  });
+                }
               }
             }}
           >

condition-web/src/models/Condition.ts

@@ -1,6 +1,11 @@
 import { SubconditionModel } from "./Subcondition";
 import { ConditionAttributeModel } from "./ConditionAttribute";
 
+export enum ConditionType {
+  ADD = "ADD",
+  AMEND = "AMEND",
+}
+
 export interface ConditionModel {
   condition_id?: number;
   condition_name?: string;
@@ -19,6 +24,7 @@ export interface ConditionModel {
   subtopic_tags?: string[];
   subconditions?: SubconditionModel[];   // Nested subconditions
   condition_attributes?: ConditionAttributeModel;
+  condition_type?: ConditionType;
 }
 
 export const createDefaultCondition = (): ConditionModel => {
@@ -41,6 +47,7 @@ export const createDefaultCondition = (): ConditionModel => {
         independent_attributes: [],
         management_plans: [],
       },
+      condition_type: ConditionType.ADD,
   };
 };
 
@@ -51,7 +58,8 @@ export interface updateTopicTagsModel {
   is_approved?: boolean;
   is_topic_tags_approved?: boolean;
   is_condition_attributes_approved?: boolean;
-  subconditions?: SubconditionModel[],
+  subconditions?: SubconditionModel[];
+  condition_type?: ConditionType;
 }
 
 export type PartialUpdateTopicTagsModel = Partial<updateTopicTagsModel>;