[PRMP-337] Refactor custodian assignment logic in document reference (#801)

* [PRMP-337] Refactor custodian assignment logic in document reference handling

* [PRMP-337] Update PCSE ODS code to new value

Author: NogaNHS

lambdas/models/fhir/R4/fhir_document_reference.py

@@ -1,5 +1,6 @@
 from typing import Any, Dict, List, Literal, Optional
 
+from enums.patient_ods_inactive_status import PatientOdsInactiveStatus
 from enums.snomed_codes import SnomedCode, SnomedCodes
 from models.document_reference import DocumentReference as NdrDocumentReference
 from models.fhir.R4.base_models import (
@@ -12,6 +13,8 @@
 )
 from pydantic import BaseModel, Field
 
+from utils.ods_utils import PCSE_ODS_CODE
+
 # Constants
 FHIR_BASE_URL = "https://fhir.nhs.uk/Id"
 SNOMED_URL = "http://snomed.info/sct"
@@ -224,6 +227,8 @@ def create_fhir_document_reference_object(
         Returns:
             DocumentReference: A FHIR DocumentReference resource
         """
+        if document.custodian in PatientOdsInactiveStatus.list():
+            document.custodian = PCSE_ODS_CODE
 
         return DocumentReference(
             resourceType="DocumentReference",

lambdas/services/bulk_upload_service.py

@@ -5,6 +5,7 @@
 
 import pydantic
 from botocore.exceptions import ClientError
+
 from enums.patient_ods_inactive_status import PatientOdsInactiveStatus
 from enums.snomed_codes import SnomedCodes
 from enums.upload_status import UploadStatus
@@ -39,7 +40,6 @@
     validate_filename_with_patient_details_strict,
     validate_lg_file_names,
 )
-from utils.ods_utils import PCSE_ODS_CODE
 from utils.request_context import request_context
 from utils.unicode_utils import (
     contains_accent_char,
@@ -401,17 +401,13 @@ def convert_to_document_reference(
             ).strftime("%Y-%m-%d")
         else:
             scan_date_formatted = None
-        if current_gp_ods in PatientOdsInactiveStatus.list():
-            custodian = PCSE_ODS_CODE
-        else:
-            custodian = current_gp_ods
         document_reference = DocumentReference(
             id=str(uuid.uuid4()),
             nhs_number=nhs_number,
             file_name=file_name,
             s3_bucket_name=s3_bucket_name,
             current_gp_ods=current_gp_ods,
-            custodian=custodian,
+            custodian=current_gp_ods,
             author=file_metadata.gp_practice_code,
             document_scan_creation=scan_date_formatted,
             doc_status="preliminary",

lambdas/services/post_fhir_document_reference_service.py

@@ -163,11 +163,7 @@ def _create_document_reference(
 
         custodian = fhir_doc.custodian.identifier.value if fhir_doc.custodian else None
         if not custodian:
-            custodian = (
-                current_gp_ods
-                if current_gp_ods not in PatientOdsInactiveStatus.list()
-                else PCSE_ODS_CODE
-            )
+            custodian = current_gp_ods
 
         sub_folder = (
             "user_upload"

lambdas/tests/unit/services/test_get_fhir_document_reference_service.py

@@ -13,6 +13,8 @@
     GetFhirDocumentReferenceException,
     InvalidDocTypeException,
 )
+from utils.lambda_exceptions import GetFhirDocumentReferenceException
+from utils.ods_utils import PCSE_ODS_CODE
 
 
 @pytest.fixture
@@ -191,3 +193,19 @@ def test_create_document_reference_fhir_response_non_final_status(
     # Verify methods were not called
     patched_service.s3_service.get_binary_file.assert_not_called()
     patched_service.get_presigned_url.assert_not_called()
+
+def test_create_document_reference_fhir_response_when_patient_is_deceased(
+    patched_service, mocker
+):
+    """Test FHIR response creation for documents with non-final status."""
+    test_doc = create_test_doc_store_refs()[0]
+    modified_doc = copy.deepcopy(test_doc)
+    modified_doc.custodian = "DECE"
+    modified_doc.doc_status = "preliminary"
+
+    patched_service.get_presigned_url = mocker.MagicMock()
+
+    result = patched_service.create_document_reference_fhir_response(modified_doc)
+    result_json = json.loads(result)
+
+    assert result_json["custodian"]["identifier"]["value"] == PCSE_ODS_CODE

lambdas/tests/unit/services/test_post_fhir_document_reference_service.py

@@ -2,6 +2,7 @@
 
 import pytest
 from botocore.exceptions import ClientError
+
 from enums.lambda_error import LambdaError
 from enums.mtls import MtlsCommonNames
 from enums.snomed_codes import SnomedCode, SnomedCodes
@@ -532,7 +533,7 @@ def test_create_document_reference_without_custodian(mock_service, mocker):
     fhir_doc.custodian = None
 
     doc_type = SnomedCode(code="test-code", display_name="Test Type")
-    current_gp_ods = "C13579"
+    current_gp_ods = "REST"
 
     result = mock_service._create_document_reference(
         nhs_number="9000000009",
@@ -543,7 +544,7 @@ def test_create_document_reference_without_custodian(mock_service, mocker):
 
     assert (
         result.custodian == current_gp_ods
-    )  # Custodian should default to current_gp_ods
+    )
 
 
 def test_create_fhir_response_with_presigned_url(mock_service, mocker):

lambdas/utils/ods_utils.py

@@ -7,7 +7,7 @@
 Sometimes, a patient will not have a generalPractitioner on PDS. Internally, we can also add codes to mark inactive
 patients for reporting purposes. The only values that should be considered 'active' are valid ODS codes.
 """
-PCSE_ODS_CODE = "X4S4L"
+PCSE_ODS_CODE = "8JD29"
 
 
 def is_ods_code_active(gp_ods) -> bool: