[NDR-274] Add raw incoming json to an atribute in the PDM table. (#838)

Author: jameslinnell

lambdas/models/document_reference.py

@@ -78,6 +78,7 @@ class DocumentReference(BaseModel):
         default_factory=lambda: int(datetime.now(timezone.utc).timestamp()),
     )
     nhs_number: str
+    raw_request: str | None = None
     s3_bucket_name: str = Field(exclude=True, default=None)
     s3_file_key: str = Field(default=None)
     status: Literal["current", "superseded", "entered-in-error"] = Field(

lambdas/services/post_fhir_document_reference_service.py

@@ -80,6 +80,7 @@ def process_fhir_document_reference(
                 doc_type,
                 validated_fhir_doc,
                 patient_details.general_practice_ods,
+                fhir_document,
             )
 
             presigned_url = None
@@ -155,6 +156,7 @@ def _create_document_reference(
         doc_type: SnomedCode,
         fhir_doc: FhirDocumentReference,
         current_gp_ods: str,
+        raw_fhir_doc: str,
     ) -> DocumentReference:
         """Create a document reference model"""
         document_id = create_reference_id()
@@ -163,10 +165,10 @@ def _create_document_reference(
         if not custodian:
             custodian = current_gp_ods
 
-        sub_folder = (
-            "user_upload"
+        sub_folder, raw_request = (
+            ("user_upload", None)
             if doc_type != SnomedCodes.PATIENT_DATA.value
-            else f"fhir_upload/{doc_type.code}"
+            else (f"fhir_upload/{doc_type.code}", raw_fhir_doc)
         )
 
         document_reference = DocumentReference(
@@ -183,6 +185,7 @@ def _create_document_reference(
             status="current",
             sub_folder=sub_folder,
             document_scan_creation=fhir_doc.content[0].attachment.creation,
+            raw_request=raw_request,
         )
 
         return document_reference

lambdas/tests/unit/services/test_post_fhir_document_reference_service.py

@@ -500,6 +500,7 @@ def test_create_document_reference_with_author(mock_service, mocker):
         doc_type=doc_type,
         fhir_doc=fhir_doc,
         current_gp_ods="C13579",
+        raw_fhir_doc=json.dumps({"foo": "bar"}),
     )
 
     assert result.nhs_number == "9000000009"
@@ -539,6 +540,7 @@ def test_create_document_reference_without_custodian(mock_service, mocker):
         doc_type=doc_type,
         fhir_doc=fhir_doc,
         current_gp_ods=current_gp_ods,
+        raw_fhir_doc=json.dumps({"foo": "bar"}),
     )
 
     assert result.custodian == current_gp_ods
@@ -825,6 +827,7 @@ def test_s3_file_key_for_pdm(mock_service, mocker):
         doc_type=doc_type,
         fhir_doc=fhir_doc,
         current_gp_ods=current_gp_ods,
+        raw_fhir_doc=json.dumps({"foo": "bar"}),
     )
 
     assert (
@@ -864,7 +867,96 @@ def test_s3_file_key_for_lg(mock_service, mocker):
         doc_type=doc_type,
         fhir_doc=fhir_doc,
         current_gp_ods=current_gp_ods,
+        raw_fhir_doc=json.dumps({"foo": "bar"}),
     )
 
     assert "user_upload/9000000009" in result.s3_file_key
     assert result.sub_folder == "user_upload"
+
+
+def test_create_pdm_document_reference_with_raw_request(mock_service, mocker):
+    """Test _create_document_reference method with raw_request included (pdm)."""
+
+    fhir_doc = mocker.MagicMock(spec=FhirDocumentReference)
+    fhir_doc.content = [
+        DocumentReferenceContent(
+            attachment=Attachment(
+                contentType="application/pdf",
+                title="test-file.pdf",
+                creation="2023-01-01T12:00:00Z",
+            )
+        )
+    ]
+    fhir_doc.custodian = Reference(
+        identifier=Identifier(
+            system="https://fhir.nhs.uk/Id/ods-organization-code", value="A12345"
+        )
+    )
+    fhir_doc.author = [
+        Reference(
+            identifier=Identifier(
+                system="https://fhir.nhs.uk/Id/ods-organization-code", value="B67890"
+            )
+        )
+    ]
+
+    doc_type = SnomedCodes.PATIENT_DATA.value
+
+    result = mock_service._create_document_reference(
+        nhs_number="9000000009",
+        doc_type=doc_type,
+        fhir_doc=fhir_doc,
+        current_gp_ods="C13579",
+        raw_fhir_doc=json.dumps({"foo": "bar"}),
+    )
+
+    assert result.raw_request == json.dumps({"foo": "bar"})
+    assert result.nhs_number == "9000000009"
+    assert result.document_snomed_code_type == SnomedCodes.PATIENT_DATA.value.code
+    assert result.custodian == "A12345"
+    assert result.current_gp_ods == "C13579"
+    assert result.author == "B67890"  # Verify author is set
+
+
+def test_create_lg_document_reference_with_raw_request(mock_service, mocker):
+    """Test _create_document_reference method with raw_request included (LG, should be empty)."""
+
+    fhir_doc = mocker.MagicMock(spec=FhirDocumentReference)
+    fhir_doc.content = [
+        DocumentReferenceContent(
+            attachment=Attachment(
+                contentType="application/pdf",
+                title="test-file.pdf",
+                creation="2023-01-01T12:00:00Z",
+            )
+        )
+    ]
+    fhir_doc.custodian = Reference(
+        identifier=Identifier(
+            system="https://fhir.nhs.uk/Id/ods-organization-code", value="A12345"
+        )
+    )
+    fhir_doc.author = [
+        Reference(
+            identifier=Identifier(
+                system="https://fhir.nhs.uk/Id/ods-organization-code", value="B67890"
+            )
+        )
+    ]
+
+    doc_type = SnomedCodes.LLOYD_GEORGE.value
+
+    result = mock_service._create_document_reference(
+        nhs_number="9000000009",
+        doc_type=doc_type,
+        fhir_doc=fhir_doc,
+        current_gp_ods="C13579",
+        raw_fhir_doc=json.dumps({"foo": "bar"}),
+    )
+
+    assert result.raw_request is None
+    assert result.nhs_number == "9000000009"
+    assert result.document_snomed_code_type == SnomedCodes.LLOYD_GEORGE.value.code
+    assert result.custodian == "A12345"
+    assert result.current_gp_ods == "C13579"
+    assert result.author == "B67890"  # Verify author is set