chore: extract evaluate_record_deletion into utils

Author: carlinmack

invenio_app_rdm/records_ui/utils.py

@@ -11,9 +11,11 @@
 
 from itertools import chain
 
-from flask import current_app
+from flask import current_app, g
 from invenio_access.permissions import system_identity
 from invenio_rdm_records.requests.record_deletion import RecordDeletion
+from invenio_rdm_records.services.config import RDMRecordDeletionPolicy
+from invenio_rdm_records.records.api import RDMRecord
 from invenio_records.dictutils import dict_set
 from invenio_records.errors import MissingModelError
 from invenio_records_files.api import FileObject
@@ -109,3 +111,45 @@ def get_existing_deletion_request(record_id):
     )
     if existing_requests.total > 0:
         return list(existing_requests)[0]
+
+
+def evaluate_record_deletion(record: RDMRecord):
+    """Evaluate whether a given record can be deleted by an identity."""
+    rec_del = RDMRecordDeletionPolicy().evaluate(g.identity, record._record)
+
+    immediate, request = rec_del["immediate_deletion"], rec_del["request_deletion"]
+    rd_enabled = immediate.enabled or request.enabled
+    rd_valid_user = (
+        rec_del["immediate_deletion"].valid_user
+        or rec_del["request_deletion"].valid_user
+    )
+    rd_allowed = immediate.allowed or request.allowed
+    existing_request = get_existing_deletion_request(record.id)
+
+    if rd_allowed:
+        record_deletion = {
+            "enabled": rd_enabled,
+            "valid_user": rd_valid_user,
+            "allowed": rd_allowed,
+            "recordDeletion": rec_del,
+            "checklist": (
+                current_app.config["RDM_IMMEDIATE_RECORD_DELETION_CHECKLIST"]
+                if immediate.allowed
+                else current_app.config["RDM_REQUEST_RECORD_DELETION_CHECKLIST"]
+            ),
+            "context": {
+                "files": record.files.count,
+                "internalDoi": record.pids["doi"]["provider"] != "external",
+            },
+        }
+    else:
+        record_deletion = {
+            "enabled": rd_enabled,
+            "valid_user": rd_valid_user,
+            "allowed": rd_allowed,
+        }
+    record_deletion["existing_request"] = (
+        existing_request["links"]["self_html"] if existing_request else None
+    )
+
+    return record_deletion

invenio_app_rdm/records_ui/views/deposits.py

@@ -26,7 +26,6 @@
 from invenio_rdm_records.proxies import current_rdm_records
 from invenio_rdm_records.records.api import get_files_quota
 from invenio_rdm_records.resources.serializers import UIJSONSerializer
-from invenio_rdm_records.services.config import RDMRecordDeletionPolicy
 from invenio_rdm_records.services.schemas import RDMRecordSchema
 from invenio_rdm_records.services.schemas.utils import dump_empty
 from invenio_rdm_records.views import file_transfer_type
@@ -38,7 +37,7 @@
 from marshmallow_utils.fields.babel import gettext_from_dict
 from sqlalchemy.orm import load_only
 
-from ..utils import get_existing_deletion_request, set_default_value
+from ..utils import evaluate_record_deletion, set_default_value
 from .decorators import (
     no_cache_response,
     pass_draft,
@@ -542,43 +541,7 @@ def deposit_edit(pid_value, draft=None, draft_files=None, files_locked=True):
         )
         published_record = ui_serializer.dump_obj(published_record_result.to_dict())
 
-        rec_del = RDMRecordDeletionPolicy().evaluate(
-            g.identity, published_record_result._record
-        )
-        immediate, request = rec_del["immediate_deletion"], rec_del["request_deletion"]
-        rd_enabled = immediate.enabled or request.enabled
-        rd_valid_user = (
-            rec_del["immediate_deletion"].valid_user
-            or rec_del["request_deletion"].valid_user
-        )
-        rd_allowed = immediate.allowed or request.allowed
-        existing_request = get_existing_deletion_request(record.get("id"))
-
-        if rd_allowed:
-            record_deletion = {
-                "enabled": rd_enabled,
-                "valid_user": rd_valid_user,
-                "allowed": rd_allowed,
-                "recordDeletion": rec_del,
-                "checklist": (
-                    current_app.config["RDM_IMMEDIATE_RECORD_DELETION_CHECKLIST"]
-                    if immediate.allowed
-                    else current_app.config["RDM_REQUEST_RECORD_DELETION_CHECKLIST"]
-                ),
-                "context": {
-                    "files": draft._record.files.count,
-                    "internalDoi": draft._record.pids["doi"]["provider"] != "external",
-                },
-            }
-        else:
-            record_deletion = {
-                "enabled": rd_enabled,
-                "valid_user": rd_valid_user,
-                "allowed": rd_allowed,
-            }
-        record_deletion["existing_request"] = (
-            existing_request["links"]["self_html"] if existing_request else None
-        )
+        record_deletion = evaluate_record_deletion(published_record_result, draft)
     else:
         record_deletion = {}
 

invenio_app_rdm/records_ui/views/records.py

@@ -29,7 +29,6 @@
     AccessSettings,
 )
 from invenio_rdm_records.resources.serializers import UIJSONSerializer
-from invenio_rdm_records.services.config import RDMRecordDeletionPolicy
 from invenio_stats.proxies import current_stats
 from invenio_users_resources.proxies import current_user_resources
 from marshmallow import ValidationError
@@ -38,7 +37,7 @@
     previewable_extensions as image_extensions,
 )
 
-from ..utils import get_existing_deletion_request, get_external_resources
+from ..utils import evaluate_record_deletion, get_external_resources
 from .decorators import (
     add_signposting_content_resources,
     add_signposting_landing_page,
@@ -158,42 +157,7 @@ def record_detail(
 
     record_ui = UIJSONSerializer().dump_obj(record.to_dict())
 
-    rec_del = RDMRecordDeletionPolicy().evaluate(g.identity, record._record)
-
-    immediate, request = rec_del["immediate_deletion"], rec_del["request_deletion"]
-    rd_enabled = immediate.enabled or request.enabled
-    rd_valid_user = (
-        rec_del["immediate_deletion"].valid_user
-        or rec_del["request_deletion"].valid_user
-    )
-    rd_allowed = immediate.allowed or request.allowed
-    existing_request = get_existing_deletion_request(record.id)
-
-    if rd_allowed:
-        record_deletion = {
-            "enabled": rd_enabled,
-            "valid_user": rd_valid_user,
-            "allowed": rd_allowed,
-            "recordDeletion": rec_del,
-            "checklist": (
-                current_app.config["RDM_IMMEDIATE_RECORD_DELETION_CHECKLIST"]
-                if immediate.allowed
-                else current_app.config["RDM_REQUEST_RECORD_DELETION_CHECKLIST"]
-            ),
-            "context": {
-                "files": record._record.files.count,
-                "internalDoi": record._record.pids["doi"]["provider"] != "external",
-            },
-        }
-    else:
-        record_deletion = {
-            "enabled": rd_enabled,
-            "valid_user": rd_valid_user,
-            "allowed": rd_allowed,
-        }
-    record_deletion["existing_request"] = (
-        existing_request["links"]["self_html"] if existing_request else None
-    )
+    record_deletion = evaluate_record_deletion(record)
 
     is_draft = record_ui["is_draft"]
     custom_fields = load_custom_fields()