oarepo-runtime 1.5.21__py3-none-any.whl → 1.5.23__py3-none-any.whl

oarepo_runtime/records/entity_resolvers/__init__.py

@@ -7,8 +7,84 @@ from oarepo_runtime.records.entity_resolvers.proxies import DraftProxy
 if oarepo_version.split(".")[0] == "11":
     from invenio_records_resources.references import EntityResolver, RecordResolver
     from invenio_users_resources.resolvers import UserResolver
+
+    #copyied from newer invenio_users_resources, GroupResolver isn't in older versions
+    from flask_principal import RoleNeed
+    from invenio_accounts.models import Role
+    from invenio_records_resources.references.resolvers import (
+        EntityProxy,
+        EntityResolver,
+    )
+    from invenio_users_resources.services.groups.config import GroupsServiceConfig
+    from sqlalchemy.exc import NoResultFound
+
+    class GroupProxy(EntityProxy):
+        """Resolver proxy for a Role entity."""
+
+        def _resolve(self):
+            """Resolve the User from the proxy's reference dict, or system_identity."""
+            # Resolves to role name, not id
+            role_id = self._parse_ref_dict_id()
+            try:
+                return Role.query.filter(
+                    Role.name == role_id  # TODO to be changed to role id
+                ).one()
+            except NoResultFound:
+                return {}
+
+        def pick_resolved_fields(self, identity, resolved_dict):
+            """Select which fields to return when resolving the reference."""
+            serialized_role = {}
+
+            return serialized_role
+
+        def get_needs(self, ctx=None):
+            """Return needs based on the given roles."""
+            role_id = self._parse_ref_dict_id()
+            return [RoleNeed(role_id)]
+
+        def ghost_record(self, value):
+            """Return default representation of not resolved group.
+
+            .. note::
+
+                Only groups that are not indexed should need this. Non-indexed groups include groups that were not created by users
+                e.g. user-moderation.
+            """
+            return {}
+
+
+    class GroupResolver(EntityResolver):
+        """Group entity resolver."""
+
+        type_id = "group"
+        """Type identifier for this resolver."""
+
+        def __init__(self):
+            """Constructor."""
+            # There's a bit of a mixup of type_key and type_id. Base resolver has no
+            # type_key, but RecordResolvers have.
+            self.type_key = self.type_id
+            super().__init__(GroupsServiceConfig.service_id)
+
+        def matches_reference_dict(self, ref_dict):
+            """Check if the reference dict references a role."""
+            return self._parse_ref_dict_type(ref_dict) == self.type_id
+
+        def _reference_entity(self, entity):
+            """Create a reference dict for the given user."""
+            return {"group": str(entity.id)}
+
+        def matches_entity(self, entity):
+            """Check if the entity is a Role."""
+            return isinstance(entity, Role)
+
+        def _get_entity_proxy(self, ref_dict):
+            """Return a GroupProxy for the given reference dict."""
+            return GroupProxy(self, ref_dict)
+
 else:
     from invenio_records_resources.references import EntityResolver, RecordResolver
-    from invenio_users_resources.entity_resolvers import UserResolver
+    from invenio_users_resources.entity_resolvers import UserResolver, GroupResolver
 
-__all__ = ["DraftProxy", "UserResolver", "RecordResolver", "EntityResolver"]
+__all__ = ["DraftProxy", "UserResolver", "GroupResolver", "RecordResolver", "EntityResolver"]

oarepo_runtime/records/systemfields/has_draftcheck.py

@@ -1,3 +1,5 @@
+from inspect import isfunction
+
 from invenio_records.dictutils import dict_set
 from invenio_records.systemfields import SystemField
 from sqlalchemy.orm.exc import NoResultFound
@@ -34,6 +36,8 @@ class HasDraftCheckField(CustomFieldsMixin, SystemField):
             return False
 
         try:
+            if isfunction(self.draft_cls):
+                self.draft_cls = self.draft_cls()
             self.draft_cls.get_record(record.id)
             return True
         except NoResultFound:

{oarepo_runtime-1.5.21.dist-info → oarepo_runtime-1.5.23.dist-info}/METADATA

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

{oarepo_runtime-1.5.21.dist-info → oarepo_runtime-1.5.23.dist-info}/RECORD

@@ -46,7 +46,7 @@ oarepo_runtime/records/__init__.py,sha256=Bxm2XNtB9j6iOAKGSVsjXTKIZS-iXKPzakCqyN
 oarepo_runtime/records/dumpers/__init__.py,sha256=OmzNhLdMNKibmCksnj9eTX9xPBG30dziiK3j3bAAp3k,233
 oarepo_runtime/records/dumpers/edtf_interval.py,sha256=YCShZAoqBQYaxVilEVotS-jXZsxxoXO67yu2urhkaMA,1198
 oarepo_runtime/records/dumpers/multilingual_dumper.py,sha256=PbNFCLsiH4XV3E1v8xga_fzlcEImHy8OXn_UKh_8VBU,1090
-oarepo_runtime/records/entity_resolvers/__init__.py,sha256=UTMhRqlzzla-oVqqkOgkmr4uam6Ci7tr8EE0vOv5Ggk,674
+oarepo_runtime/records/entity_resolvers/__init__.py,sha256=QvGxjfDRCg21eD5zDjWf0TSGFotEYG1PydrjT2wG7DY,3465
 oarepo_runtime/records/entity_resolvers/proxies.py,sha256=hHUzJA1yDhp7nM35gHoAAv7w4zWuaSE-tLBNvIR0tD8,882
 oarepo_runtime/records/owners/__init__.py,sha256=R4hudCBqLRRzgCnkEjXIL7hSp068z-s6YOwYSkWyuaw,93
 oarepo_runtime/records/owners/registry.py,sha256=fYgBuW5nBKn6pyz2OBgfNlynk64_yhQ9J7FzPk8QU1U,795
@@ -57,7 +57,7 @@ oarepo_runtime/records/relations/lookup.py,sha256=wi3jPfOedazOmhOMrgu50PUETc1jfS
 oarepo_runtime/records/relations/pid_relation.py,sha256=zJjSf_ocFBViYsOuMMZLbQZpNZeKiOK33dPD4tk74Qo,2786
 oarepo_runtime/records/systemfields/__init__.py,sha256=SPaMWM6t-azz6gZLUKvvXbOyE2_-LW6i_szQk8nhbAc,455
 oarepo_runtime/records/systemfields/featured_file.py,sha256=MbSaYR130_o5S9gEOblnChq-PVK4xGPGpSCrzwG3cwc,1720
-oarepo_runtime/records/systemfields/has_draftcheck.py,sha256=3XLRsZJWRpT4BFF1HTg6C27ECVmIcZ4RrdGzYC8S7v0,1518
+oarepo_runtime/records/systemfields/has_draftcheck.py,sha256=4JkMEefPLpqtPtlTgK3UT0KzTRgyw5_Qtkss2qcz5xk,1643
 oarepo_runtime/records/systemfields/icu.py,sha256=tAwplzy9y7C9Dm7HqcGZsDu2AKqVGXhCbKLsFlgVWg8,5921
 oarepo_runtime/records/systemfields/mapping.py,sha256=tXOK_jkdY1pOUO7_VfChfDNB8UTi21GUXaidpugTnO8,1017
 oarepo_runtime/records/systemfields/owner.py,sha256=46-EKkGq77FYQgZFvUhWxvaVlu9KbRWg5nveZL4cAP4,3633
@@ -114,9 +114,9 @@ oarepo_runtime/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hS
 oarepo_runtime/utils/functools.py,sha256=gKS9YZtlIYcDvdNA9cmYO00yjiXBYV1jg8VpcRUyQyg,1324
 oarepo_runtime/utils/path.py,sha256=V1NVyk3m12_YLbj7QHYvUpE1wScO78bYsX1LOLeXDkI,3108
 tests/pkg_data/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-oarepo_runtime-1.5.21.dist-info/LICENSE,sha256=h2uWz0OaB3EN-J1ImdGJZzc7yvfQjvHVYdUhQ-H7ypY,1064
-oarepo_runtime-1.5.21.dist-info/METADATA,sha256=QTVlPjO2IEW3KLWmLE9z_sy4J7q3r9mIgzAC-KuCG8g,4680
-oarepo_runtime-1.5.21.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-oarepo_runtime-1.5.21.dist-info/entry_points.txt,sha256=QrlXAKuPDVBinaSh_v3yO9_Nb9ZNmJCJ0VFcCW-z0Jg,327
-oarepo_runtime-1.5.21.dist-info/top_level.txt,sha256=bHhlkT1_RQC4IkfTQCqA3iN4KCB6cSFQlsXpQMSP-bE,21
-oarepo_runtime-1.5.21.dist-info/RECORD,,
+oarepo_runtime-1.5.23.dist-info/LICENSE,sha256=h2uWz0OaB3EN-J1ImdGJZzc7yvfQjvHVYdUhQ-H7ypY,1064
+oarepo_runtime-1.5.23.dist-info/METADATA,sha256=JLABtcMnZtHXdB-EmREq34LgYDAxJq5cswfxaz9YJ8w,4680
+oarepo_runtime-1.5.23.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+oarepo_runtime-1.5.23.dist-info/entry_points.txt,sha256=QrlXAKuPDVBinaSh_v3yO9_Nb9ZNmJCJ0VFcCW-z0Jg,327
+oarepo_runtime-1.5.23.dist-info/top_level.txt,sha256=bHhlkT1_RQC4IkfTQCqA3iN4KCB6cSFQlsXpQMSP-bE,21
+oarepo_runtime-1.5.23.dist-info/RECORD,,