[NRL-1631] Add masterid to multi-pointer warning log

Author: mattdean3-nhs

api/producer/createDocumentReference/create_document_reference.py

@@ -259,20 +259,19 @@ def handler(
     pointer_type = core_model.type
     if pointer_type not in TYPES_WITH_MULTIPLES:
         nhs_number = core_model.nhs_number
-        pointer_custodian = core_model.custodian
-        pointer_master_identifier = core_model.master_identifier
         existing_pointers_count = repository.count_by_nhs_number(
             nhs_number, [pointer_type]
         )
 
         if existing_pointers_count > 0:
             logger.log(
                 LogReference.PROCREATE012,
-                new_pointer_master_id=pointer_master_identifier,
+                new_pointer_id=core_model.id,
+                new_pointer_master_id=core_model.master_identifier,
                 pointer_type=pointer_type,
                 nhs_number=nhs_number,
+                custodian=core_model.custodian,
                 existing_pointers_count=existing_pointers_count,
-                custodian=pointer_custodian,
             )
 
     logger.log(LogReference.PROCREATE009, pointer_id=result.resource.id)

api/producer/createDocumentReference/tests/test_create_document_reference.py

@@ -1808,6 +1808,7 @@ def test_create_logs_for_unexpected_multi_pointer(
             if doc_ref.custodian and doc_ref.custodian.identifier
             else None
         ),
+        "new_pointer_id": "Y05868-00000000-0000-0000-0000-000000000001",
         "new_pointer_master_id": (
             doc_ref.masterIdentifier.value if doc_ref.masterIdentifier else None
         ),

api/producer/upsertDocumentReference/tests/test_upsert_document_reference.py

@@ -1775,6 +1775,9 @@ def test_upsert_logs_for_unexpected_multi_pointer(
             else None
         ),
         "new_pointer_id": doc_ref.id,
+        "new_pointer_master_id": (
+            doc_ref.masterIdentifier.value if doc_ref.masterIdentifier else None
+        ),
     } == [
         call[1:][0]
         for call in mock_logger.log.call_args_list

api/producer/upsertDocumentReference/upsert_document_reference.py

@@ -266,7 +266,6 @@ def handler(
     pointer_type = core_model.type
     if pointer_type not in TYPES_WITH_MULTIPLES:
         nhs_number = core_model.nhs_number
-        pointer_custodian = core_model.custodian
         existing_pointers_count = repository.count_by_nhs_number(
             nhs_number, [pointer_type]
         )
@@ -275,10 +274,11 @@ def handler(
             logger.log(
                 LogReference.PROUPSERT012,
                 new_pointer_id=core_model.id,
+                new_pointer_master_id=core_model.master_identifier,
                 pointer_type=pointer_type,
                 nhs_number=nhs_number,
+                custodian=core_model.custodian,
                 existing_pointers_count=existing_pointers_count,
-                custodian=pointer_custodian,
             )
 
     logger.log(LogReference.PROUPSERT009, pointer_id=result.resource.id)