related document image changes

Author: dinesh-aot

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

@@ -146,7 +146,11 @@ class InspectionReqDetailDocCreateSchema(BaseSchema):
     section_title = fields.Str(
         metadata={"description": "Additional description of the document"}
     )
-    images = fields.List(fields.Nested(InspectionReqDetailDocImageCreateSchema))
+    images = fields.List(
+        fields.Nested(InspectionReqDetailDocImageCreateSchema),
+        allow_none=True,
+        required=False,
+    )
 
 
 class InspectionReqDetailDocUpdateSchema(InspectionReqDetailDocCreateSchema):
@@ -157,7 +161,6 @@ class InspectionReqDetailDocUpdateSchema(InspectionReqDetailDocCreateSchema):
             "description": "The unique identifier of the requirement detail document"
         }
     )
-    images = fields.List(fields.Nested(InspectionReqDetailDocImageUpdateSchema))
 
 
 class InspectionReqSourceDetailCreateSchema(BaseSchema):

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

@@ -353,8 +353,11 @@ def link(cls, administrative_penalty_id, link):
             raise UnprocessableEntityError(
                 "Administrative Penalty already exists for these requirements."
             )
-        existing_requirements = AdministrativePenaltyInspectionRequirementMap.get_by_inspection_and_administrative_penalty_id(
-            inspection_id, administrative_penalty_id
+        existing_requirements = (
+            AdministrativePenaltyInspectionRequirementMap.
+            get_by_inspection_and_administrative_penalty_id(
+                inspection_id, administrative_penalty_id
+            )
         )
         if existing_requirements:
             raise UnprocessableEntityError(
@@ -386,8 +389,11 @@ def insert_or_update_inspection_requirements(
             existing_inspection_requirement_ids = {
                 req.id for req in existing_inspection_requirements
             }
-            existing_requirements = AdministrativePenaltyInspectionRequirementMap.get_by_inspection_and_administrative_penalty_id(
-                inspection_id, administrative_penalty_id
+            existing_requirements = (
+                AdministrativePenaltyInspectionRequirementMap.
+                get_by_inspection_and_administrative_penalty_id(
+                    inspection_id, administrative_penalty_id
+                )
             )
             existing_requirement_ids = {
                 req.inspection_requirement_id for req in existing_requirements

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

@@ -379,7 +379,6 @@ def delete_inspection(cls, inspection_id):
         inspection = InspectionModel.find_by_id(inspection_id)
         if not inspection:
             raise ResourceNotFoundError(f"Inspection with ID {inspection_id} not found")
-        ServiceUtils.inspection_status_check(inspection)
         with session_scope() as session:
             InspectionModel.delete_inspection(inspection_id, session)
             InspectionTypeModel.delete_inspection_type(inspection_id, session)

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

@@ -228,12 +228,19 @@ def _process_documents(source_detail_dict, documents):
             title = doc.document_title
             if title not in grouped_docs:
                 grouped_docs[title] = {"documents": [], "document_title": title}
+
+            # Process document images
+            doc_images = []
+            if doc.images:
+                ServiceUtils._process_document_images(doc_images, doc.images)
+
             grouped_docs[title]["documents"].append(
                 {
                     "appendix_no": (doc.appendix.appendix_no if doc.appendix else None),
                     "section_number": doc.section_number,
                     "section_title": doc.section_title,
                     "description": doc.description,
+                    "document_images": doc_images,
                 }
             )
 
@@ -258,6 +265,23 @@ def _process_requirement_source_images(source_detail_dict, images):
                 }
             )
 
+    @staticmethod
+    def _process_document_images(doc_images_list, images):
+        """Process document images and get presigned URLs."""
+        for image in images:
+            image_response = DocService.get_presigned_url(
+                {
+                    "relative_url": image.relative_url,
+                    "action": ActionOnFileEnum.GET.value,
+                }
+            )
+            doc_images_list.append(
+                {
+                    "original_file_name": image.original_file_name,
+                    "image_url": image_response.get("presigned_url"),
+                }
+            )
+
     @staticmethod
     def _add_photos_and_figures(req, requirement_id):
         """Add photos and figures to requirement dict."""

compliance-api/src/compliance_api/templates/ir_template.html

@@ -615,6 +615,17 @@
                         {% if doc.description %}
                         <div class="com-ir-document-description">{{ doc.description | safe | replace('style="white-space: pre-wrap;"', '') }}</div>
                         {% endif %}
+                        {% if doc.document_images and doc.document_images|length > 0 %}
+                        {% for image in doc.document_images %}
+                        <div class="com-ir-photo-section">
+                            <img src="{{ image.image_url }}" alt="{{ image.original_file_name }}"
+                                style="max-width: 600px; display: block; margin: 10px 0;">
+                            <div class="com-ir-photo-caption">
+                                {{ image.original_file_name }}
+                            </div>
+                        </div>
+                        {% endfor %}
+                        {% endif %}
                         {% endfor %}
                         {% endfor %}
                         {% endif %}