COMP-724 requirment grid source and conditions (#669)

Author: tom0827

compliance-api/src/compliance_api/schemas/inspection_requirement_grid.py

@@ -52,10 +52,6 @@ class InspectionRequirementGridItemSchema(Schema):
     ir_number = fields.Str(
         metadata={"description": "The inspection requirement number"}
     )
-    requirement_number = fields.List(
-        fields.Str(),
-        metadata={"description": "The list of requirement numbers"}
-    )
     requirement_source = fields.Nested(
         KeyValueSchema, metadata={"description": "The requirement source"}
     )
@@ -76,6 +72,12 @@ class InspectionRequirementGridItemSchema(Schema):
         fields.Nested(KeyValueSchema),
         metadata={"description": "The list of requirement sources"},
     )
+    condition_numbers = fields.Str(
+        metadata={"description": "The condition numbers as a comma separated string"},
+    )
+    requirement_sources_names = fields.Str(
+        metadata={"description": "The requirement source names as a comma separated string"},
+    )
 
 
 class InspectionRequirementFilterSchema(BaseSchema):

compliance-api/src/compliance_api/services/inspection_requirement.py

@@ -400,12 +400,6 @@ def _create_excel_from_dataframe(data_frame):
     # Get existing columns and headers
     existing_columns, headers = _get_excel_columns_and_headers(data_frame)
 
-    # Format requirement_number column as comma-separated values instead of array
-    if 'requirement_number' in data_frame.columns:
-        data_frame['requirement_number'] = data_frame['requirement_number'].apply(
-            lambda x: ', '.join(str(item) for item in x if item is not None) if isinstance(x, list) and x else ''
-        )
-
     # Create Excel file in memory
     output = BytesIO()
     with pd.ExcelWriter(output, engine="openpyxl") as writer:
@@ -429,8 +423,8 @@ def _get_excel_columns_and_headers(data_frame):
         ("enforcement_action.name", "Enforcement Action"),
         ("enforcement_number", "Enforcement Document #"),
         ("status.name", "Enforcement Status"),
-        ("requirement_number", "Condition #"),
-        ("requirement_source.name", "Requirement Source"),
+        ("condition_numbers", "Condition #"),
+        ("requirement_sources_names", "Requirement Source"),
         ("ir_number", "IR Number"),
         ("date_issued", "Date Issued"),
         ("primary_officer.name", "Primary Officer"),
@@ -1535,30 +1529,6 @@ def _convert_enum_to_object(enum_value):
     }
 
 
-def _convert_enum_string_to_object(enum_string, enum_class_map):
-    """Convert enum string back to proper enum object structure."""
-    if not enum_string:
-        return None
-
-    # Try to find the enum in any of the provided enum classes
-    for enum_class in enum_class_map:
-        try:
-            for enum_item in enum_class:
-                if enum_item.name == enum_string:
-                    return {
-                        "id": enum_item.name,
-                        "name": enum_item.value,
-                    }
-        except (AttributeError, TypeError, ValueError):
-            continue
-
-    # If no enum found, return as string
-    return {
-        "id": enum_string,
-        "name": enum_string,
-    }
-
-
 def _make_requirement_detail_object(requirements: list):
     """Make requirement detail object."""
 
@@ -1602,21 +1572,18 @@ def parse_requirement_sources(sources):
         item["progress"] = progress
         if requirement["requirement_source_details"]:
             first_requirement_details = requirement["requirement_source_details"][0]
-            requirement_numbers = []
             req_sources = []
+            condition_num_string = ""
+            source_string = ""
             for detail in requirement["requirement_source_details"]:
                 if detail.requirement_source not in req_sources:
                     req_sources.append(detail.requirement_source)
-                    number_field = ServiceUtils.get_requirement_source_number_field(detail)
-                    prefixes = ["Condition ", "Section "]
-                    if number_field:
-                        requirement_numbers.append(
-                            next(
-                                (number_field.split(prefix)[1] for prefix in prefixes if prefix in number_field),
-                                None
-                            )
-                        )
-            item["requirement_number"] = requirement_numbers
+                    number_field = ServiceUtils.get_requirement_grid_source_number_field(detail)
+                    name_field = ServiceUtils.get_requirement_grid_source_name_field(detail)
+                    condition_num_string += f", {number_field}" if condition_num_string else number_field or ""
+                    source_string += f", {name_field}" if source_string else name_field
+            item["condition_numbers"] = condition_num_string
+            item["requirement_sources_names"] = source_string
             item["requirement_source"] = first_requirement_details.requirement_source
         requirement_details.append(item)
     return requirement_details

compliance-api/src/compliance_api/services/service_utils.py

@@ -37,7 +37,7 @@
 from .epic_track_service.track_service import TrackService
 
 
-class ServiceUtils:
+class ServiceUtils:  # pylint: disable=too-many-public-methods
     """ServiceUtils class."""
 
     @staticmethod
@@ -494,6 +494,61 @@ def get_requirement_source_number_field(detail_obj: InspectionReqSourceDetailMod
             )
         return None
 
+    @staticmethod
+    def get_requirement_grid_source_number_field(
+        detail_obj: InspectionReqSourceDetailModel
+    ):  # pylint: disable=too-many-return-statements
+        """Identify the number field based on the requirement source id for the requirements grid."""
+        requirement_source = RequirementSourceEnum(detail_obj.requirement_source_id)
+        section_sources = {
+            RequirementSourceEnum.ACT_2018,
+            RequirementSourceEnum.ACT_2002,
+            RequirementSourceEnum.CERTIFIED_PROJECT_DESCRIPTION
+        }
+        condition_sources = {
+            RequirementSourceEnum.EAC_CERTIFICATE,
+            RequirementSourceEnum.SCHEDULE_B,
+        }
+        amendment_sources = {
+            RequirementSourceEnum.EAC_AMENDMENT,
+        }
+        order_sources = {
+            RequirementSourceEnum.ORDER,
+        }
+        regulation_sources = {
+            RequirementSourceEnum.REGULATION,
+        }
+        exemption_sources = {
+            RequirementSourceEnum.EXEMPTION_ORDER,
+        }
+        agreement_sources = {
+            RequirementSourceEnum.COMPLIANCE_AGREEMENT,
+        }
+        if requirement_source in section_sources:
+            return getattr(detail_obj, "section_number", "")
+        if requirement_source in condition_sources:
+            return getattr(detail_obj, "condition_number", "")
+        if requirement_source in amendment_sources:
+            return getattr(detail_obj, "amendment_number", "")
+        if requirement_source in order_sources:
+            return getattr(detail_obj.order, "order_number", "")
+        if requirement_source in regulation_sources:
+            return getattr(detail_obj, "regulation_number", "")
+        if requirement_source in exemption_sources:
+            return getattr(detail_obj, "clause_number", "")
+        if requirement_source in agreement_sources:
+            return getattr(detail_obj, "compliance_number", "")
+        return getattr(detail_obj, "section_number", "")
+
+    @staticmethod
+    def get_requirement_grid_source_name_field(detail_obj: InspectionReqSourceDetailModel):
+        """Get the requirement source name."""
+        if detail_obj.requirement_source_id == RequirementSourceEnum.CERTIFIED_PROJECT_DESCRIPTION.value:
+            return "Schedule A"
+        if detail_obj.requirement_source_id == RequirementSourceEnum.SCHEDULE_B.value:
+            return "Schedule B"
+        return detail_obj.requirement_source.name
+
     @staticmethod
     def check_requirement_for_enforcement_action(
         requirement_ids: list[int], enforcement_action_id: int

compliance-web/src/components/App/RequirementsGrid/RequirementsGridUtils.tsx

@@ -134,16 +134,6 @@ export const useConvertFiltersToQueryParams = (
 export const useRequirementsGridColumns = (
   dataDependencies: RequirementsGridDataDependencies
 ): MRT_ColumnDef<InspectionRequirementGrid>[] => {
-  const RequirementSourceNames = useMemo(() => ({
-    SCHEDULE_B: "Schedule B - Table of Conditions",
-    SCHEDULE_A: "Schedule A - Certified Project Description",
-  }), []);
-
-  const RequirementSourceNameMap: Record<string, string> = useMemo(() => ({
-    [RequirementSourceNames.SCHEDULE_B]: "Schedule B",
-    [RequirementSourceNames.SCHEDULE_A]: "Schedule A",
-  }), [RequirementSourceNames.SCHEDULE_B, RequirementSourceNames.SCHEDULE_A]);
-
   const { topics, complianceFindings, enforcementActions, requirementSources } =
     dataDependencies;
 
@@ -226,7 +216,7 @@ export const useRequirementsGridColumns = (
       size: 80,
     },
     {
-      accessorFn: (row) => (row.requirement_number ?? []).join(", "),
+      accessorFn: (row) => row?.condition_numbers || "",
       id: "req_src_num",
       header: "Condition #",
       filterFn: "contains",
@@ -236,25 +226,7 @@ export const useRequirementsGridColumns = (
       size: 80,
     },
     {
-      accessorFn: (row) => {
-        return (
-          row.requirement_sources
-            ?.map((source) => {
-              if (source.name === RequirementSourceNames.SCHEDULE_B) {
-                return RequirementSourceNameMap[
-                  RequirementSourceNames.SCHEDULE_B
-                ];
-              }
-              if (source.name === RequirementSourceNames.SCHEDULE_A) {
-                return RequirementSourceNameMap[
-                  RequirementSourceNames.SCHEDULE_A
-                ];
-              }
-              return source.name;
-            })
-            .join(", ") ?? ""
-        );
-      },
+      accessorFn: (row) => row?.requirement_sources_names || "",
       id: "req_src",
       header: "Source",
       filterVariant: "multi-select",
@@ -286,7 +258,7 @@ export const useRequirementsGridColumns = (
       filterFn: "greaterThanOrEqual",
       size: 120,
     },
-  ], [complianceFindings, enforcementActions, requirementSources, RequirementSourceNames, RequirementSourceNameMap, topics]);
+  ], [complianceFindings, enforcementActions, requirementSources, topics]);
 };
 
 export const enforcementStatusOptions = [

compliance-web/src/models/InspectionRequirementGrid.ts

@@ -17,13 +17,14 @@ export interface InspectionRequirementGrid {
   sort_order: number;
   date_issued: string;
   ir_number: string;
-  requirement_number: string[];
   requirement_sources: RequirementSource[];
   approved_by: StaffUser;
   approved_by_id: number;
   progress?: Option;
   status?: Option;
   enforcement_number?: string;
+  condition_numbers?: string;
+  requirement_sources_names?: string;
 }
 
 export interface InspectionRequirementGridQueryParams extends BaseTableQueryParams {