NRL-641 Do not retrieve pointer from database if it has ignore delete fail permissions

Author: axelkrastek1-nhs

api/producer/createDocumentReference/create_document_reference.py

@@ -108,22 +108,14 @@ def _get_document_ids_to_supersede(
     ids_to_delete = []
 
     for idx, relates_to in enumerate(resource.relatesTo):
-        try:
-            identifier = _validate_identifier(relates_to, idx)
-            _validate_producer_id(identifier, metadata, idx)
-            existing_pointer = _check_existing_pointer(identifier, repository, idx)
-
-            if existing_pointer is None:
-                continue
+        identifier = _validate_identifier(relates_to, idx)
+        _validate_producer_id(identifier, metadata, idx)
 
+        if not can_ignore_delete_fail:
+            existing_pointer = _check_existing_pointer(identifier, repository, idx)
             _validate_pointer_details(existing_pointer, core_model, identifier, idx)
 
-            _append_id_if_replaces(relates_to, ids_to_delete, identifier)
-        except OperationOutcomeError:
-            if can_ignore_delete_fail:
-                logger.log(LogReference.PROCREATE007f, related_identifier=identifier)
-                continue
-            raise
+        _append_id_if_replaces(relates_to, ids_to_delete, identifier)
 
     return ids_to_delete
 

api/producer/createDocumentReference/tests/test_create_document_reference.py

@@ -988,13 +988,13 @@ def test_create_document_reference_supersede_succeeds_with_toggle(
                 "details": {
                     "coding": [
                         {
-                            "code": "RESOURCE_CREATED",
-                            "display": "Resource created",
+                            "code": "RESOURCE_SUPERSEDED",
+                            "display": "Resource created and resource(s) deleted",
                             "system": "https://fhir.nhs.uk/ValueSet/NRL-ResponseCode",
                         }
                     ]
                 },
-                "diagnostics": "The document has been created",
+                "diagnostics": "The document has been superseded by a new version",
             }
         ],
     }

api/producer/upsertDocumentReference/tests/test_upsert_document_reference.py

@@ -1075,13 +1075,13 @@ def test_create_document_reference_supersede_succeeds_with_toggle(
                 "details": {
                     "coding": [
                         {
-                            "code": "RESOURCE_CREATED",
-                            "display": "Resource created",
+                            "code": "RESOURCE_SUPERSEDED",
+                            "display": "Resource created and resource(s) deleted",
                             "system": "https://fhir.nhs.uk/ValueSet/NRL-ResponseCode",
                         }
                     ]
                 },
-                "diagnostics": "The document has been created",
+                "diagnostics": "The document has been superseded by a new version",
             }
         ],
     }

api/producer/upsertDocumentReference/upsert_document_reference.py

@@ -106,22 +106,14 @@ def _get_document_ids_to_supersede(
     ids_to_delete = []
 
     for idx, relates_to in enumerate(resource.relatesTo):
-        try:
-            identifier = _validate_identifier(relates_to, idx)
-            _validate_producer_id(identifier, metadata, idx)
-            existing_pointer = _check_existing_pointer(identifier, repository, idx)
-
-            if existing_pointer is None:
-                continue
+        identifier = _validate_identifier(relates_to, idx)
+        _validate_producer_id(identifier, metadata, idx)
 
+        if not can_ignore_delete_fail:
+            existing_pointer = _check_existing_pointer(identifier, repository, idx)
             _validate_pointer_details(existing_pointer, core_model, identifier, idx)
 
-            _append_id_if_replaces(relates_to, ids_to_delete, identifier)
-        except OperationOutcomeError:
-            if can_ignore_delete_fail:
-                logger.log(LogReference.PROUPSERT007f, relatesTo=resource.relatesTo)
-                continue
-            raise
+        _append_id_if_replaces(relates_to, ids_to_delete, identifier)
 
     return ids_to_delete
 

layer/nrlf/core/log_references.py

@@ -217,10 +217,6 @@ class LogReference(Enum):
     PROCREATE007e = _Reference(
         "WARN", "RelatesTo validation failed - relating pointer document type mismatch"
     )
-    PROCREATE007f = _Reference(
-        "INFO",
-        "Ignoring related pointer (supersede) OperationOutcome errors as permitted by NRL permissions",
-    )
     PROCREATE008 = _Reference("INFO", "Selecting document as target to be superseded")
     PROCREATE009 = _Reference("INFO", "Creating new document reference")
     PROCREATE010 = _Reference("INFO", "Superseding document reference")
@@ -262,10 +258,6 @@ class LogReference(Enum):
     PROUPSERT007e = _Reference(
         "WARN", "RelatesTo validation failed - relating pointer document type mismatch"
     )
-    PROUPSERT007f = _Reference(
-        "INFO",
-        "Ignoring related pointer (supersede) OperationOutcome errors as permitted by NRL permissions",
-    )
     PROUPSERT008 = _Reference("INFO", "Selecting document as target to be superseded")
     PROUPSERT009 = _Reference("INFO", "Upserting new document reference")
     PROUPSERT010 = _Reference("INFO", "Superseding document reference")