oarepo-runtime 1.5.81__tar.gz → 1.5.83__tar.gz

{oarepo_runtime-1.5.81/oarepo_runtime.egg-info → oarepo_runtime-1.5.83}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: oarepo-runtime
-Version: 1.5.81
+Version: 1.5.83
 Summary: A set of runtime extensions of Invenio repository
 Description-Content-Type: text/markdown
 License-File: LICENSE

oarepo_runtime-1.5.83/oarepo_runtime/records/mappings/rdm_parent_mapping.json

@@ -0,0 +1,39 @@
+{
+  "is_verified": {
+    "type": "boolean"
+  },
+  "access": {
+    "properties": {
+      "owned_by": {
+        "properties": {
+          "user": {
+            "type": "keyword"
+          }
+        }
+      },
+      "grants": {
+        "properties": {
+          "subject": {
+            "type": "keyword"
+          },
+          "id": {
+            "type": "keyword"
+          },
+          "level": {
+            "type": "keyword"
+          }
+        }
+      },
+      "grant_tokens": {
+        "type": "keyword"
+      },
+      "links": {
+        "properties": {
+          "id": {
+            "type": "keyword"
+          }
+        }
+      }
+    }
+  }
+}

{oarepo_runtime-1.5.81 → oarepo_runtime-1.5.83}/oarepo_runtime/services/custom_fields/mappings.py

@@ -13,8 +13,12 @@ from invenio_search import current_search_client
 from invenio_search.engine import dsl, search
 from invenio_search.utils import build_alias_name
 
+from deepmerge import always_merger
 from oarepo_runtime.records.systemfields.mapping import MappingSystemFieldMixin
+import json
+import os
 
+from pathlib import Path
 
 class Mapping(InvenioMapping):
     @classmethod
@@ -116,6 +120,16 @@ def prepare_cf_index(record_class, config, path=[]):
 def prepare_parent_mapping(parent_class, config):
     if not parent_class:
         return
+
+    script_dir = str(Path(__file__).resolve().parent)
+    path_parts = script_dir.split('/')
+    path_parts = path_parts[:-2]
+    base_path = '/'.join(path_parts)
+    mapping_path = f"{base_path}/records/mappings/rdm_parent_mapping.json"
+
+    with open(mapping_path, 'r') as f:
+        rdm_parent = json.load(f)
+
     parent_mapping = {
         "parent": {
             "type": "object",
@@ -142,7 +156,11 @@ def prepare_parent_mapping(parent_class, config):
             },
         }
     }
-
+    parent_mapping_merged = always_merger.merge(parent_mapping, {
+        "parent": {
+            "properties": rdm_parent
+        }
+    })
     # upload mapping
     try:
         record_index = dsl.Index(
@@ -151,7 +169,7 @@ def prepare_parent_mapping(parent_class, config):
             ),
             using=current_search_client,
         )
-        update_index(record_index, {}, parent_mapping)
+        update_index(record_index, {}, parent_mapping_merged)
 
         if hasattr(config, "draft_cls"):
             draft_index = dsl.Index(
@@ -160,7 +178,7 @@ def prepare_parent_mapping(parent_class, config):
                 ),
                 using=current_search_client,
             )
-            update_index(draft_index, {}, parent_mapping)
+            update_index(record_index, {}, parent_mapping_merged)
 
     except search.RequestError as e:
         click.secho("An error occurred while creating parent mapping.", fg="red")

{oarepo_runtime-1.5.81 → oarepo_runtime-1.5.83}/oarepo_runtime/services/permissions/generators.py

@@ -1,7 +1,7 @@
 from flask_principal import RoleNeed, UserNeed
 from invenio_records_permissions.generators import Generator
 from invenio_search.engine import dsl
-
+from flask import current_app
 
 class RecordOwners(Generator):
     """Allows record owners."""
@@ -12,7 +12,10 @@ class RecordOwners(Generator):
             # 'record' is required, so if not passed we default to empty array,
             # i.e. superuser-access.
             return []
-        owners = getattr(record.parent, "owners", None)
+        if current_app.config.get('INVENIO_RDM_ENABLED', False):
+            owners = getattr(record.parent.access, "owned_by", None)
+        else:
+            owners = getattr(record.parent, "owners", None)
         if owners is not None:
             return [UserNeed(owner.id) for owner in owners]
         return []
@@ -21,8 +24,10 @@ class RecordOwners(Generator):
         """Filters for current identity as owner."""
         users = [n.value for n in identity.provides if n.method == "id"]
         if users:
-            return dsl.Q("terms", **{"parent.owners.user": users})
-
+            if current_app.config.get('INVENIO_RDM_ENABLED', False):
+                return dsl.Q("terms", **{"parent.access.owned_by.user": users})
+            else:
+                return dsl.Q("terms", **{"parent.owners.user": users})
 
 class UserWithRole(Generator):
     def __init__(self, *roles):

{oarepo_runtime-1.5.81 → oarepo_runtime-1.5.83/oarepo_runtime.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: oarepo-runtime
-Version: 1.5.81
+Version: 1.5.83
 Summary: A set of runtime extensions of Invenio repository
 Description-Content-Type: text/markdown
 License-File: LICENSE

{oarepo_runtime-1.5.81 → oarepo_runtime-1.5.83}/oarepo_runtime.egg-info/SOURCES.txt

@@ -62,6 +62,8 @@ oarepo_runtime/records/dumpers/edtf_interval.py
 oarepo_runtime/records/dumpers/multilingual_dumper.py
 oarepo_runtime/records/entity_resolvers/__init__.py
 oarepo_runtime/records/entity_resolvers/proxies.py
+oarepo_runtime/records/mappings/__init__.py
+oarepo_runtime/records/mappings/rdm_parent_mapping.json
 oarepo_runtime/records/owners/__init__.py
 oarepo_runtime/records/owners/registry.py
 oarepo_runtime/records/relations/__init__.py

{oarepo_runtime-1.5.81 → oarepo_runtime-1.5.83}/setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = oarepo-runtime
-version = 1.5.81
+version = 1.5.83
 description = A set of runtime extensions of Invenio repository
 authors = Alzbeta Pokorna
 readme = README.md