[NDR-210] adding PCSE ods code to custodian (#755)

Author: NogaNHS

lambdas/services/bulk_upload_service.py

@@ -38,6 +38,7 @@
     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,
@@ -395,13 +396,17 @@ 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=current_gp_ods,
+            custodian=custodian,
             author=file_metadata.gp_practice_code,
             document_scan_creation=scan_date_formatted,
             doc_status="preliminary",

lambdas/services/post_fhir_document_reference_service.py

@@ -5,6 +5,7 @@
 
 from botocore.exceptions import ClientError
 from enums.lambda_error import LambdaError
+from enums.patient_ods_inactive_status import PatientOdsInactiveStatus
 from enums.snomed_codes import SnomedCode, SnomedCodes
 from models.document_reference import DocumentReference
 from models.fhir.R4.fhir_document_reference import SNOMED_URL, Attachment
@@ -24,6 +25,7 @@
     PdsErrorException,
 )
 from utils.lambda_exceptions import CreateDocumentRefException
+from utils.ods_utils import PCSE_ODS_CODE
 from utils.utilities import create_reference_id, get_pds_service, validate_nhs_number
 
 logger = LoggingService(__name__)
@@ -140,15 +142,19 @@ def _create_document_reference(
     ) -> DocumentReference:
         """Create a document reference model"""
         document_id = create_reference_id()
+
+        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
+            )
         document_reference = DocumentReference(
             id=document_id,
             nhs_number=nhs_number,
             current_gp_ods=current_gp_ods,
-            custodian=(
-                fhir_doc.custodian.identifier.value
-                if fhir_doc.custodian
-                else current_gp_ods
-            ),
+            custodian=custodian,
             s3_bucket_name=self.staging_bucket_name,
             author=fhir_doc.author[0].identifier.value,
             content_type=fhir_doc.content[0].attachment.contentType,

lambdas/services/process_mns_message_service.py

@@ -11,6 +11,7 @@
 from services.document_service import DocumentService
 from utils.audit_logging_setup import LoggingService
 from utils.exceptions import PdsErrorException
+from utils.ods_utils import PCSE_ODS_CODE
 from utils.utilities import get_pds_service
 
 logger = LoggingService(__name__)
@@ -24,7 +25,7 @@ def __init__(self):
         self.sqs_service = SQSService()
         self.queue = os.getenv("MNS_NOTIFICATION_QUEUE_URL")
         self.DOCUMENT_UPDATE_FIELDS = {"current_gp_ods", "custodian", "last_updated"}
-        self.PCSE_ODS = "X4S4L"
+        self.PCSE_ODS = PCSE_ODS_CODE
 
     def handle_mns_notification(self, message: MNSSQSMessage):
         try:

lambdas/services/upload_document_reference_service.py

@@ -100,6 +100,7 @@ def _process_document_reference(
                 logger.warning(f"Document {document_reference.id} failed virus scan")
             document_reference.file_size = object_size
             document_reference.uploaded = True
+            document_reference.uploading = False
             self.update_dynamo_table(document_reference, virus_scan_result)
 
         except Exception as e:
@@ -196,6 +197,7 @@ def update_dynamo_table(
                 "file_location",
                 "file_size",
                 "uploaded",
+                "uploading",
             }
 
             self.document_service.update_document(

lambdas/tests/unit/services/test_upload_document_reference_service.py

@@ -334,6 +334,7 @@ def test_update_dynamo_table_clean_scan_result(service, mock_document_reference)
             "file_location",
             "file_size",
             "uploaded",
+            "uploading",
         },
     )
 

lambdas/utils/ods_utils.py

@@ -7,6 +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"
 
 
 def is_ods_code_active(gp_ods) -> bool: