NRL-703 change logic to always delete if perm exists and catch exception and log

Author: eesa456

api/producer/upsertDocumentReference/upsert_document_reference.py

@@ -108,7 +108,6 @@ def handler(
 
     if result.resource.relatesTo:
         logger.log(LogReference.PROUPSERT006, relatesTo=result.resource.relatesTo)
-        has_delete_target = True
 
         for idx, relates_to in enumerate(result.resource.relatesTo):
             if not (identifier := getattr(relates_to.target.identifier, "value", None)):
@@ -129,22 +128,16 @@ def handler(
                     diagnostics="The relatesTo target identifier value does not include the expected ODS code for this organisation",
                     expression=f"relatesTo[{idx}].target.identifier.value",
                 )
-
-            if not (existing_pointer := repository.get_by_id(identifier)):
-                if (
-                    PERMISSION_SUPERSEDE_IGNORE_DELETE_FAIL
-                    not in metadata.nrl_permissions
-                ):
+            if PERMISSION_SUPERSEDE_IGNORE_DELETE_FAIL not in metadata.nrl_permissions:
+                if not (existing_pointer := repository.get_by_id(identifier)):
                     logger.log(
                         LogReference.PROCREATE007c, related_identifier=identifier
                     )
                     return SpineErrorResponse.BAD_REQUEST(
                         diagnostics="The relatesTo target document does not exist",
                         expression=f"relatesTo[{idx}].target.identifier.value",
                     )
-                has_delete_target = False
 
-            if has_delete_target:
                 if existing_pointer.nhs_number != core_model.nhs_number:
                     logger.log(
                         LogReference.PROUPSERT007d, related_identifier=identifier
@@ -163,7 +156,7 @@ def handler(
                         expression=f"relatesTo[{idx}].target.identifier.value",
                     )
 
-            if relates_to.code == "replaces" and has_delete_target:
+            if relates_to.code == "replaces":
                 logger.log(
                     LogReference.PROUPSERT008,
                     relates_to_code=relates_to.code,
@@ -177,7 +170,9 @@ def handler(
             pointer_id=result.resource.id,
             ids_to_delete=ids_to_delete,
         )
-        saved_model = repository.supersede(core_model, ids_to_delete)
+        saved_model = repository.supersede(
+            core_model, ids_to_delete, metadata.nrl_permissions
+        )
         logger.log(LogReference.PROUPSERT999)
         return NRLResponse.RESOURCE_SUPERSEDED(resource_id=saved_model.id)
 

layer/nrlf/core/dynamodb/repository.py

@@ -7,6 +7,7 @@
 
 from nrlf.core.boto import get_dynamodb_resource, get_dynamodb_table
 from nrlf.core.codes import SpineErrorConcept
+from nrlf.core.constants import PERMISSION_SUPERSEDE_IGNORE_DELETE_FAIL
 from nrlf.core.dynamodb.model import DocumentPointer, DynamoDBModel
 from nrlf.core.errors import OperationOutcomeError
 from nrlf.core.logger import LogReference, logger
@@ -374,12 +375,18 @@ def save(self, item: DocumentPointer) -> DocumentPointer:
         return self.update(item)
 
     def supersede(
-        self, item: DocumentPointer, ids_to_delete: List[str]
+        self,
+        item: DocumentPointer,
+        ids_to_delete: List[str],
+        nrl_permissions: list[str] = [],
     ) -> DocumentPointer:
         """ """
         saved_item = self.create(item)
+        can_ignore_delete_fail = (
+            PERMISSION_SUPERSEDE_IGNORE_DELETE_FAIL in nrl_permissions
+        )
         for id_ in ids_to_delete:
-            self.delete_by_id(id_)
+            self.delete_by_id(id_, can_ignore_delete_fail)
 
         return saved_item
 
@@ -411,12 +418,34 @@ def delete(self, item: DocumentPointer) -> None:
                 details=SpineErrorConcept.from_code("INTERNAL_SERVER_ERROR"),
             ) from exc
 
-    def delete_by_id(self, id_: str):
+    def delete_by_id(self, id_: str, can_ignore_delete_fail: bool):
         """ """
         producer_id, document_id = id_.split("-", 1)
         ods_code_parts = producer_id.split(".")
         partition_key = "D#" + "#".join([*ods_code_parts, document_id])
-        self.table.delete_item(Key={"pk": partition_key, "sk": partition_key})
+        try:
+            self.table.delete_item(Key={"pk": partition_key, "sk": partition_key})
+        except ClientError as exc:
+            if can_ignore_delete_fail:
+                logger.log(
+                    LogReference.REPOSITORY026a,
+                    exc_info=sys.exc_info(),
+                    stacklevel=5,
+                    error=str(exc),
+                )
+                return
+            logger.log(
+                LogReference.REPOSITORY026,
+                exc_info=sys.exc_info(),
+                stacklevel=5,
+                error=str(exc),
+            )
+            raise OperationOutcomeError(
+                status_code="500",
+                severity="error",
+                code="exception",
+                details=SpineErrorConcept.from_code("INTERNAL_SERVER_ERROR"),
+            ) from exc
 
     def _query(self, **kwargs) -> Iterator[DocumentPointer]:
         """

layer/nrlf/core/log_references.py

@@ -101,6 +101,9 @@ class LogReference(Enum):
 
     REPOSITORY025 = _Reference("DEBUG", "Deleting resource from DynamoDB")
     REPOSITORY026 = _Reference("EXCEPTION", "Failed to delete resource from DynamoDB")
+    REPOSITORY026a = _Reference(
+        "EXCEPTION", "Ignoring failure to delete resource from DynamoDB"
+    )
     REPOSITORY027 = _Reference("INFO", "Successfully deleted item from DynamoDB")
     REPOSITORY028 = _Reference("INFO", "Received page of search results")
     REPOSITORY028a = _Reference("DEBUG", "Received page of search results with result")