diff --git a/compliance-api/src/compliance_api/services/inspection.py b/compliance-api/src/compliance_api/services/inspection.py index 081f0b02..cde923ac 100644 --- a/compliance-api/src/compliance_api/services/inspection.py +++ b/compliance-api/src/compliance_api/services/inspection.py @@ -958,6 +958,7 @@ def _create_inspection_object(inspection_data: dict, case_file): "debrief_date": inspection_data.get("debrief_date", None), "project_status_id": inspection_data.get("project_status_id", None), "inspection_status": InspectionStatusEnum.OPEN, + "area_inspected": inspection_data.get("area_inspected", None), } diff --git a/compliance-api/src/compliance_api/services/inspection_record/inspection_record_builder.py b/compliance-api/src/compliance_api/services/inspection_record/inspection_record_builder.py index b18263c7..27d8eb5a 100644 --- a/compliance-api/src/compliance_api/services/inspection_record/inspection_record_builder.py +++ b/compliance-api/src/compliance_api/services/inspection_record/inspection_record_builder.py @@ -14,10 +14,10 @@ from compliance_api.models.inspection import InspectionRequirement as InspectionRequirementModel from compliance_api.models.inspection import InspectionRequirementTypeEnum from compliance_api.models.inspection import IRStatusOption as IRStatusOptionModel +from compliance_api.models.inspection.inspection_req_source_detail import InspectionReqSourceDetail from compliance_api.models.inspection_record import InspectionRecord as InspectionRecordModel from compliance_api.models.inspection_record import IRProgressEnum, IRStatusEnum from compliance_api.models.inspection_record_approval import InspectionRecordApproval as InspectionRecordApprovalModel -from compliance_api.models.inspection.inspection_req_source_detail import InspectionReqSourceDetail from compliance_api.models.order import Order as OrderModel from compliance_api.models.order import OrderInspectionRequirementMap as OrderInspectionRequirementMapModel from compliance_api.models.order import OrderProgressEnum, OrderReplaceStatusEnum @@ -25,7 +25,8 @@ from compliance_api.models.warning_letter import \ WarningLetterInspectionRequirementMap as WarningLetterInspectionRequirementMapModel from compliance_api.services.inspection_record.ir_template_constant import ( - ACTION_REQUIRED_BY_RP, ENFORCEMENT_SUMMARY, FINDING_STATEMENT, INSPECTION_SCOPE, PRELIMINARY_REVIEW_DETAILS) + ACTION_REQUIRED_BY_RP, AREA_INSPECTED, ENFORCEMENT_SUMMARY, FINDING_STATEMENT, INSPECTION_SCOPE, + PRELIMINARY_REVIEW_DETAILS) from compliance_api.utils.datetime import convert_to_full_month_format from compliance_api.utils.template_renderer import render_template_with_data @@ -282,7 +283,7 @@ def build_inspection_scope(self): convert_to_full_month_format(debreif_date) if debreif_date else None ), # handling of the null case "requirements": [], - "area_inspected": area_inspected if area_inspected else None, + "area_inspected": area_inspected if area_inspected else AREA_INSPECTED, } requirements = InspectionRequirementModel.get_by_inspection_id( self.inspection.id diff --git a/compliance-api/src/compliance_api/services/inspection_record/ir_template_constant.py b/compliance-api/src/compliance_api/services/inspection_record/ir_template_constant.py index 0912d245..bebfff67 100644 --- a/compliance-api/src/compliance_api/services/inspection_record/ir_template_constant.py +++ b/compliance-api/src/compliance_api/services/inspection_record/ir_template_constant.py @@ -96,3 +96,5 @@ {{ project_name }} has been brought into compliance with these requirements. Continued non-compliance with these requirements may result in additional enforcement under the {{ act }} ({{ act_year }}).

""", } + +AREA_INSPECTED = "[Brief description of Project Components / Area inspected]"