invenio-app-ils 1.0.0a54__py2.py3-none-any.whl → 6.1.0__py2.py3-none-any.whl

invenio_app_ils/records/serializers/__init__.py

@@ -10,10 +10,7 @@
 from flask import current_app
 from invenio_records_rest.serializers.csv import CSVSerializer
 from invenio_records_rest.serializers.json import JSONSerializer
-from invenio_records_rest.serializers.response import (
-    add_link_header,
-    search_responsify,
-)
+from invenio_records_rest.serializers.response import add_link_header, search_responsify
 
 from invenio_app_ils.records.schemas.json import ILSRecordSchemaJSONV1
 

invenio_app_ils/records/views.py

@@ -10,7 +10,6 @@
 from flask import Blueprint, abort, current_app, request
 from flask_login import current_user
 from invenio_files_rest.models import ObjectVersion
-from invenio_files_rest.signals import file_downloaded
 from invenio_records_rest.utils import obj_or_import_string
 from invenio_records_rest.views import pass_record
 from invenio_rest import ContentNegotiatedMethodView
@@ -18,10 +17,10 @@ from invenio_rest import ContentNegotiatedMethodView
 from invenio_app_ils.documents.api import DOCUMENT_PID_TYPE
 from invenio_app_ils.eitems.api import EITEM_PID_TYPE
 from invenio_app_ils.errors import StatsError
-from invenio_app_ils.permissions import backoffice_permission
+from invenio_app_ils.permissions import backoffice_read_permission
 from invenio_app_ils.records.permissions import RecordPermission
 from invenio_app_ils.series.api import SERIES_PID_TYPE
-from invenio_app_ils.signals import record_viewed
+from invenio_app_ils.signals import file_downloaded, record_viewed
 
 
 def create_document_stats_blueprint(app):
@@ -34,8 +33,7 @@ def create_document_stats_blueprint(app):
         default_media_type = options.get("default_media_type", "")
         rec_serializers = options.get("record_serializers", {})
         serializers = {
-            mime: obj_or_import_string(func)
-            for mime, func in rec_serializers.items()
+            mime: obj_or_import_string(func) for mime, func in rec_serializers.items()
         }
 
         stats_view = DocumentStatsResource.as_view(
@@ -64,11 +62,10 @@ class DocumentStatsResource(ContentNegotiatedMethodView):
     def post(self, pid, record, **kwargs):
         """Send a signal to count record view for the record stats."""
         factory = RecordPermission(record, "read")
-        if not factory.is_public() and not backoffice_permission().can():
+        if not factory.is_public() and not backoffice_read_permission().can():
             if not current_user.is_authenticated:
                 abort(401)
             abort(403)
-
         data = request.get_json()
         event_name = data.get("event")
         if event_name == "record-view":

invenio_app_ils/records_relations/api.py

@@ -9,10 +9,7 @@
 
 from copy import deepcopy
 
-from invenio_app_ils.errors import (
-    RecordHasReferencesError,
-    RecordRelationsError,
-)
+from invenio_app_ils.errors import RecordHasReferencesError, RecordRelationsError
 from invenio_app_ils.records.api import IlsRecord
 from invenio_app_ils.relations.api import (
     MULTIPART_MONOGRAPH_RELATION,
@@ -44,9 +41,7 @@ class RecordRelationsExtraMetadata(object):
         return r
 
     @classmethod
-    def get_extra_metadata_from(
-        cls, record, relation_name, pid_value, pid_type
-    ):
+    def get_extra_metadata_from(cls, record, relation_name, pid_value, pid_type):
         """Return the extra metadata dict for the given PID and type."""
         metadata = record.get(cls.field_name(), {}).get(relation_name, [])
         for m in metadata:
@@ -83,9 +78,7 @@ class RecordRelationsExtraMetadata(object):
         record.commit()
 
     @classmethod
-    def remove_extra_metadata_from(
-        cls, record, relation_name, pid_value, pid_type
-    ):
+    def remove_extra_metadata_from(cls, record, relation_name, pid_value, pid_type):
         """Remove any presence of the given PID in extra metadata."""
         field = cls.field_name()
         if field in record and relation_name in record[field]:
@@ -171,9 +164,7 @@ class RecordRelationsParentChild(RecordRelations):
                 )
 
         # when child is Document, parent is any type of Series
-        is_series_doc = isinstance(child, Document) and isinstance(
-            parent, Series
-        )
+        is_series_doc = isinstance(child, Document) and isinstance(parent, Series)
         # when child is Multipart Monograph, parent is only Serials
         is_serial_mm = (
             isinstance(child, Series)
@@ -215,9 +206,7 @@ class RecordRelationsParentChild(RecordRelations):
 
         if relation_allows_metadata and has_allowed_metadata:
             # filter and keep only allowed metadata
-            allowed = {
-                k: v for k, v in kwargs.items() if k in self.allowed_metadata
-            }
+            allowed = {k: v for k, v in kwargs.items() if k in self.allowed_metadata}
             # store relation metadata in the child record
             RecordRelationsExtraMetadata.add_extra_metadata_to(
                 child,
@@ -261,9 +250,7 @@ class RecordRelationsSiblings(RecordRelations):
         from invenio_app_ils.series.api import Series
 
         # records must be of the same type
-        same_document = isinstance(first, Document) and isinstance(
-            second, Document
-        )
+        same_document = isinstance(first, Document) and isinstance(second, Document)
         same_series = (
             isinstance(first, Series)
             and isinstance(second, Series)
@@ -312,9 +299,7 @@ class RecordRelationsSiblings(RecordRelations):
                 )
             )
 
-        if not (
-            valid_edition_fields or valid_language_fields or valid_other_fields
-        ):
+        if not (valid_edition_fields or valid_language_fields or valid_other_fields):
             raise RecordRelationsError(
                 "Cannot create relation `{}` "
                 "between PID `{}` and  PID `{}`,"
@@ -357,9 +342,7 @@ class RecordRelationsSiblings(RecordRelations):
 
         if has_allowed_metadata:
             # filter and keep only allowed metadata
-            allowed = {
-                k: v for k, v in kwargs.items() if k in self.allowed_metadata
-            }
+            allowed = {k: v for k, v in kwargs.items() if k in self.allowed_metadata}
             # store relation metadata in the first record
             RecordRelationsExtraMetadata.add_extra_metadata_to(
                 first,
@@ -394,9 +377,7 @@ class RecordRelationsSequence(RecordRelations):
         """Constructor."""
         self.relation_types = SEQUENCE_RELATION_TYPES
 
-    def _validate_relation_between_records(
-        self, previous_rec, next_rec, relation_name
-    ):
+    def _validate_relation_between_records(self, previous_rec, next_rec, relation_name):
         """Validate relation between type of records."""
         from invenio_app_ils.series.api import Series
 
@@ -428,17 +409,13 @@ class RecordRelationsSequence(RecordRelations):
         )
 
         sequence_relation = SequenceRelation(relation_type)
-        sequence_relation.add(
-            previous_pid=previous_rec.pid, next_pid=next_rec.pid
-        )
+        sequence_relation.add(previous_pid=previous_rec.pid, next_pid=next_rec.pid)
 
     def remove(self, previous_rec, next_rec, relation_type):
         """Remove sequence relation between previous and next records."""
         self._validate_relation_type(relation_type)
         sequence_relation = SequenceRelation(relation_type)
-        sequence_relation.remove(
-            previous_pid=previous_rec.pid, next_pid=next_rec.pid
-        )
+        sequence_relation.remove(previous_pid=previous_rec.pid, next_pid=next_rec.pid)
 
 
 class IlsRecordWithRelations(IlsRecord):

invenio_app_ils/records_relations/indexer.py

@@ -43,9 +43,7 @@ class RecordRelationIndexer(RecordIndexer):
         indexed = dict(pid_type=record._pid_type, record=record)
 
         def add_referenced(pid_value, pid_type):
-            same_record = (
-                pid_value == record["pid"] and pid_type == record._pid_type
-            )
+            same_record = pid_value == record["pid"] and pid_type == record._pid_type
             pid = (pid_value, pid_type)
             if not same_record and pid not in referenced:
                 referenced.add(pid)

invenio_app_ils/records_relations/retriever.py

@@ -23,9 +23,7 @@ from .api import RecordRelationsExtraMetadata as RelationsExtraMetadata
 class RelationObjectBuilderMixin(object):
     """Relations object builder."""
 
-    def build_relations_object(
-        self, pid_value, pid_type, relation_name, **kwargs
-    ):
+    def build_relations_object(self, pid_value, pid_type, relation_name, **kwargs):
         """Build and return each object of `relations` field."""
         r = {
             "pid_value": pid_value,
@@ -92,9 +90,7 @@ class ParentChildRetriever(RelationObjectBuilderMixin):
             name = relation_type.name
 
             for parent_pid in pcr.get_parents_of(self.child_record.pid):
-                r = self._build_relation_obj(
-                    self.child_record, parent_pid, name
-                )
+                r = self._build_relation_obj(self.child_record, parent_pid, name)
                 relations.setdefault(name, [])
                 relations[name].append(r)
         return relations
@@ -154,9 +150,7 @@ class SiblingsRetriever(RelationObjectBuilderMixin):
 
         sibling = IlsRecord.get_record_by_pid(pid_value, pid_type=pid_type)
 
-        metadata = self._get_extra_metadata(
-            self.record, sibling, relation_type
-        )
+        metadata = self._get_extra_metadata(self.record, sibling, relation_type)
         # copy the extra metadata into the relation, if any
         r.update(metadata)
 
@@ -176,6 +170,17 @@ class SiblingsRetriever(RelationObjectBuilderMixin):
                 r = self._build_relation_obj(sibling_pid, name)
                 relations.setdefault(name, [])
                 relations[name].append(r)
+
+            # Pre-requisite: fields being sorted should be of the same type.
+            # Sort by the keys available in the data in order
+            if relation_type.sort_by:
+                relations.get(name, []).sort(
+                    key=lambda rec: [
+                        rec.get("record_metadata", {}).get(key)
+                        for key in relation_type.sort_by
+                    ]
+                )
+
         return relations
 
 

invenio_app_ils/records_relations/views.py

@@ -43,8 +43,7 @@ def create_relations_blueprint(app):
         default_media_type = options.get("default_media_type", "")
         rec_serializers = options.get("record_serializers", {})
         serializers = {
-            mime: obj_or_import_string(func)
-            for mime, func in rec_serializers.items()
+            mime: obj_or_import_string(func) for mime, func in rec_serializers.items()
         }
         record_relations = view_class.as_view(
             view_class.view_name.format(pid_type),
@@ -86,9 +85,7 @@ class RecordRelationsResource(ContentNegotiatedMethodView):
             child_pid_value = payload.pop("child_pid_value")
             child_pid_type = payload.pop("child_pid_type")
         except KeyError as key:
-            raise RecordRelationsError(
-                "The `{}` is a required field".format(key)
-            )
+            raise RecordRelationsError("The `{}` is a required field".format(key))
 
         return (
             parent_pid_value,
@@ -167,9 +164,7 @@ class RecordRelationsResource(ContentNegotiatedMethodView):
             pid_value = payload.pop("pid_value")
             pid_type = payload.pop("pid_type")
         except KeyError as key:
-            raise RecordRelationsError(
-                "The `{}` is a required field".format(key)
-            )
+            raise RecordRelationsError("The `{}` is a required field".format(key))
 
         return pid_value, pid_type, payload
 
@@ -193,19 +188,14 @@ class RecordRelationsResource(ContentNegotiatedMethodView):
 
         if pid_value == record["pid"] and pid_type == record._pid_type:
             raise RecordRelationsError(
-                "Cannot create a relation for PID `{}` with itself".format(
-                    pid_value
-                )
+                "Cannot create a relation for PID `{}` with itself".format(pid_value)
             )
 
         second = IlsRecord.get_record_by_pid(pid_value, pid_type=pid_type)
 
         rr = RecordRelationsSiblings()
         modified_record = rr.add(
-            first=record,
-            second=second,
-            relation_type=relation_type,
-            **metadata
+            first=record, second=second, relation_type=relation_type, **metadata
         )
         return modified_record, record, second
 
@@ -220,9 +210,7 @@ class RecordRelationsResource(ContentNegotiatedMethodView):
                 relation_type: "<relation name>"
             }
         """
-        pid_value, pid_type, _ = self._validate_siblings_creation_payload(
-            payload
-        )
+        pid_value, pid_type, _ = self._validate_siblings_creation_payload(payload)
 
         second = IlsRecord.get_record_by_pid(pid_value, pid_type=pid_type)
 
@@ -240,14 +228,9 @@ class RecordRelationsResource(ContentNegotiatedMethodView):
             previous_pid_value = payload.pop("previous_pid_value")
             previous_pid_type = payload.pop("previous_pid_type")
         except KeyError as key:
-            raise RecordRelationsError(
-                "The `{}` is a required field".format(key)
-            )
+            raise RecordRelationsError("The `{}` is a required field".format(key))
 
-        if (
-            record["pid"] != next_pid_value
-            and record["pid"] != previous_pid_value
-        ):
+        if record["pid"] != next_pid_value and record["pid"] != previous_pid_value:
             raise RecordRelationsError(
                 "Cannot create a relation for other record than one with PID "
                 "`{}`".format(record["pid"])
@@ -256,9 +239,7 @@ class RecordRelationsResource(ContentNegotiatedMethodView):
         if next_pid_value == previous_pid_value:
             raise RecordRelationsError(
                 "Cannot create a sequence with the same next PID `{}`"
-                "and previous PID `{}`".format(
-                    next_pid_value, previous_pid_value
-                )
+                "and previous PID `{}`".format(next_pid_value, previous_pid_value)
             )
 
         return (
@@ -290,9 +271,7 @@ class RecordRelationsResource(ContentNegotiatedMethodView):
             metadata,
         ) = self._validate_sequence_creation_payload(record, payload)
 
-        next_rec = IlsRecord.get_record_by_pid(
-            next_pid_value, pid_type=next_pid_type
-        )
+        next_rec = IlsRecord.get_record_by_pid(next_pid_value, pid_type=next_pid_type)
 
         previous_rec = IlsRecord.get_record_by_pid(
             previous_pid_value, pid_type=previous_pid_type
@@ -327,9 +306,7 @@ class RecordRelationsResource(ContentNegotiatedMethodView):
             metadata,
         ) = self._validate_sequence_creation_payload(record, payload)
 
-        next_rec = IlsRecord.get_record_by_pid(
-            next_pid_value, pid_type=next_pid_type
-        )
+        next_rec = IlsRecord.get_record_by_pid(next_pid_value, pid_type=next_pid_type)
 
         previous_rec = IlsRecord.get_record_by_pid(
             prev_pid_value, pid_type=prev_pid_type
@@ -364,14 +341,10 @@ class RecordRelationsResource(ContentNegotiatedMethodView):
                     record, rt, payload
                 )
             elif rt in SEQUENCE_RELATION_TYPES:
-                first, second = self._create_sequence_relation(
-                    record, rt, payload
-                )
+                first, second = self._create_sequence_relation(record, rt, payload)
                 modified = second
             else:
-                raise RecordRelationsError(
-                    "Invalid relation type `{}`".format(rt.name)
-                )
+                raise RecordRelationsError("Invalid relation type `{}`".format(rt.name))
 
             db.session.commit()
 
@@ -426,14 +399,10 @@ class RecordRelationsResource(ContentNegotiatedMethodView):
                     record, rt, payload
                 )
             elif rt in SEQUENCE_RELATION_TYPES:
-                first, second = self._delete_sequence_relation(
-                    record, rt, payload
-                )
+                first, second = self._delete_sequence_relation(record, rt, payload)
                 modified = first
             else:
-                raise RecordRelationsError(
-                    "Invalid relation type `{}`".format(rt.name)
-                )
+                raise RecordRelationsError("Invalid relation type `{}`".format(rt.name))
 
             db.session.commit()
 
@@ -441,10 +410,7 @@ class RecordRelationsResource(ContentNegotiatedMethodView):
             records_to_index.append(second)
 
             # if the record is the modified, return the modified version
-            if (
-                modified.pid == record.pid
-                and modified._pid_type == record._pid_type
-            ):
+            if modified.pid == record.pid and modified._pid_type == record._pid_type:
                 return modified
             return record
 

invenio_app_ils/relations/api.py

@@ -17,7 +17,12 @@ from sqlalchemy import and_, or_
 from invenio_app_ils.errors import RecordRelationsError
 
 ILS_RELATION_TYPE = namedtuple(
-    "IlsRelationType", RelationType._fields + ("relation_class",)
+    "IlsRelationType",
+    RelationType._fields
+    + (
+        "relation_class",
+        "sort_by",
+    ),
 )
 
 LANGUAGE_RELATION = ILS_RELATION_TYPE(
@@ -27,6 +32,7 @@ LANGUAGE_RELATION = ILS_RELATION_TYPE(
     "invenio_app_ils.relations.nodes:PIDNodeRelated",
     "invenio_pidrelations.serializers.schemas.RelationSchema",
     "invenio_app_ils.relations.api.SiblingsRelation",
+    None,
 )
 EDITION_RELATION = ILS_RELATION_TYPE(
     1,
@@ -35,6 +41,7 @@ EDITION_RELATION = ILS_RELATION_TYPE(
     "invenio_app_ils.relations.nodes:PIDNodeRelated",
     "invenio_pidrelations.serializers.schemas.RelationSchema",
     "invenio_app_ils.relations.api.SiblingsRelation",
+    ["edition"],
 )
 OTHER_RELATION = ILS_RELATION_TYPE(
     2,
@@ -43,6 +50,7 @@ OTHER_RELATION = ILS_RELATION_TYPE(
     "invenio_app_ils.relations.nodes:PIDNodeRelated",
     "invenio_pidrelations.serializers.schemas.RelationSchema",
     "invenio_app_ils.relations.api.SiblingsRelation",
+    None,
 )
 MULTIPART_MONOGRAPH_RELATION = ILS_RELATION_TYPE(
     3,
@@ -51,6 +59,7 @@ MULTIPART_MONOGRAPH_RELATION = ILS_RELATION_TYPE(
     "invenio_app_ils.relations.nodes:PIDNodeRelated",
     "invenio_pidrelations.serializers.schemas.RelationSchema",
     "invenio_app_ils.relations.api.ParentChildRelation",
+    None,
 )
 SERIAL_RELATION = ILS_RELATION_TYPE(
     4,
@@ -59,6 +68,7 @@ SERIAL_RELATION = ILS_RELATION_TYPE(
     "invenio_app_ils.relations.nodes:PIDNodeRelated",
     "invenio_pidrelations.serializers.schemas.RelationSchema",
     "invenio_app_ils.relations.api.ParentChildRelation",
+    None,
 )
 SEQUENCE_RELATION = ILS_RELATION_TYPE(
     5,
@@ -67,6 +77,7 @@ SEQUENCE_RELATION = ILS_RELATION_TYPE(
     "invenio_app_ils.relations.nodes:PIDNodeRelated",
     "invenio_pidrelations.serializers.schemas.RelationSchema",
     "invenio_app_ils.relations.api.SequenceRelation",
+    None,
 )
 
 
@@ -77,9 +88,7 @@ SIBLINGS_RELATION_TYPES = [LANGUAGE_RELATION, EDITION_RELATION, OTHER_RELATION]
 SEQUENCE_RELATION_TYPES = [SEQUENCE_RELATION]
 
 ILS_PIDRELATIONS_TYPES = (
-    PARENT_CHILD_RELATION_TYPES
-    + SIBLINGS_RELATION_TYPES
-    + SEQUENCE_RELATION_TYPES
+    PARENT_CHILD_RELATION_TYPES + SIBLINGS_RELATION_TYPES + SEQUENCE_RELATION_TYPES
 )
 
 
@@ -185,9 +194,7 @@ class ParentChildRelation(Relation):
             )
 
         with db.session.begin_nested():
-            return PIDRelation.create(
-                parent_pid, child_pid, self.relation_type.id
-            )
+            return PIDRelation.create(parent_pid, child_pid, self.relation_type.id)
 
     def remove(self, parent_pid, child_pid):
         """Delete the relation for the given PIDs."""
@@ -299,9 +306,7 @@ class SiblingsRelation(Relation):
             pids_to_relate.add(first_pid)
             pids_to_relate.add(second_pid)
 
-            self._recreate_relations_with_random_parent(
-                all_relations, pids_to_relate
-            )
+            self._recreate_relations_with_random_parent(all_relations, pids_to_relate)
 
     def remove(self, pid):
         """Remove the only possible relation of this given PID.
@@ -357,9 +362,7 @@ class SiblingsRelation(Relation):
                     )
                 )
 
-            self._recreate_relations_with_random_parent(
-                all_relations, pids_to_relate
-            )
+            self._recreate_relations_with_random_parent(all_relations, pids_to_relate)
 
 
 class SequenceRelation(Relation):
@@ -386,9 +389,7 @@ class SequenceRelation(Relation):
             )
 
         with db.session.begin_nested():
-            return PIDRelation.create(
-                previous_pid, next_pid, self.relation_type.id
-            )
+            return PIDRelation.create(previous_pid, next_pid, self.relation_type.id)
 
     def remove(self, previous_pid, next_pid):
         """Delete the relation for the given PIDs."""

invenio_app_ils/search_permissions.py

@@ -9,11 +9,11 @@
 
 import re
 
-from elasticsearch_dsl import Q
 from flask import current_app, g, has_request_context, request
+from invenio_search.engine import dsl
 
 from invenio_app_ils.errors import SearchQueryError, UnauthorizedSearchError
-from invenio_app_ils.permissions import backoffice_permission
+from invenio_app_ils.permissions import backoffice_read_permission
 
 
 def _get_user_provides():
@@ -30,12 +30,12 @@ def _get_user_provides():
 
 def search_filter_record_permissions():
     """Filter list of results by `_access` and `restricted` fields."""
-    if not has_request_context() or backoffice_permission().allows(g.identity):
-        return Q()
+    if not has_request_context() or backoffice_read_permission().allows(g.identity):
+        return dsl.Q()
 
     # A record is public if `restricted` field False or missing
-    restricted_field_missing = ~Q("exists", field="restricted")
-    is_restricted = restricted_field_missing | Q("term", restricted=False)
+    restricted_field_missing = ~dsl.Q("exists", field="restricted")
+    is_restricted = restricted_field_missing | dsl.Q("term", restricted=False)
 
     combined_filter = is_restricted
 
@@ -43,28 +43,28 @@ def search_filter_record_permissions():
         # if `_access`, check `_access.read` against the user. It takes
         # precedence over `restricted`.
         # if not `_access`, check if open access as before.
-        _access_field_exists = Q("exists", field="_access.read")
+        _access_field_exists = dsl.Q("exists", field="_access.read")
         provides = _get_user_provides()
-        user_can_read = _access_field_exists & Q(
+        user_can_read = _access_field_exists & dsl.Q(
             "terms", **{"_access.read": provides}
         )
-        combined_filter = user_can_read | (
-            ~_access_field_exists & ~is_restricted
-        )
+        combined_filter = user_can_read | (~_access_field_exists & ~is_restricted)
 
-    return Q("bool", filter=[combined_filter])
+    return dsl.Q("bool", filter=[combined_filter])
 
 
-def ils_search_factory(self, search, validator=None):
-    """Search factory with Query String validator.
+def ils_search_factory(self, search, query_parser=None, validator=None):
+    """Search factory with Query String parser and validator.
 
     :param self: REST view.
     :param search: Elastic search DSL search instance.
+    :param query_parser: Custom Query parser DSL.
+    :param validator: Custom Validator for query string.
     :returns: Tuple with search instance and URL arguments.
     """
 
-    def query_parser(search, qstr=None):
-        """Default parser that uses the Q() from elasticsearch_dsl."""
+    def _query_parser(search, qstr=None, query_params_modifier=None):
+        """Default parser that uses the Q() from invenio_search.engine.dsl."""
         if qstr:
             boosted = getattr(search, "boosted_fields", [])
             extra_params = {}
@@ -74,8 +74,10 @@ def ils_search_factory(self, search, validator=None):
                 # parsing exception on data fields, see known issues
                 # https://www.elastic.co/guide/en/elasticsearch/reference/current/release-notes-7.1.1.html  # noqa
                 extra_params["lenient"] = True
-            return Q("query_string", query=qstr, **extra_params)
-        return Q()
+            if query_params_modifier:
+                query_params_modifier(extra_params)
+            return dsl.Q("query_string", query=qstr, **extra_params)
+        return dsl.Q()
 
     from invenio_records_rest.facets import default_facets_factory
     from invenio_records_rest.sorter import default_sorter_factory
@@ -84,7 +86,7 @@ def ils_search_factory(self, search, validator=None):
 
     if validator:
         search, query_string = validator(search, query_string)
-    query = query_parser(search, qstr=query_string)
+    query = _query_parser(search, qstr=query_string, query_params_modifier=query_parser)
 
     try:
         search = search.query(query)
@@ -118,13 +120,11 @@ def _filter_by_patron(patron_id, search, query_string=None):
 def _filter_by_current_patron(search, query_string=None):
     """Filter search results by patron_pid."""
     # if the logged in user is not librarian or admin, validate the query
-    if has_request_context() and not backoffice_permission().allows(
-        g.identity
-    ):
+    if has_request_context() and not backoffice_read_permission().allows(g.identity):
         return _filter_by_patron(g.identity.id, search, query_string)
     return search, query_string
 
 
-def search_factory_filter_by_patron(self, search):
+def search_factory_filter_by_patron(self, search, query_parser=None):
     """Prepare query string to filter records by current logged in user."""
-    return ils_search_factory(self, search, _filter_by_current_patron)
+    return ils_search_factory(self, search, query_parser, _filter_by_current_patron)

invenio_app_ils/series/api.py

@@ -42,10 +42,8 @@ class Series(IlsRecordWithRelations):
     SERIES_TYPES = ["SERIAL", "PERIODICAL"]
 
     _pid_type = SERIES_PID_TYPE
-    _schema = "series/series-v1.0.0.json"
-    _relations_path = (
-        "{scheme}://{host}/api/resolver/series/{series_pid}/relations"
-    )
+    _schema = "series/series-v2.0.0.json"
+    _relations_path = "{scheme}://{host}/api/resolver/series/{series_pid}/relations"
 
     MODE_OF_ISSUANCE = [
         "MULTIPART_MONOGRAPH",
@@ -80,14 +78,14 @@ class Series(IlsRecordWithRelations):
         related_refs = set()
         pcr_multipart = ParentChildRelation(MULTIPART_MONOGRAPH_RELATION)
         pcr_serial = ParentChildRelation(SERIAL_RELATION)
-        related_multipart_volumes = pcr_multipart.get_children_of(
-            self.pid)
-        related_serial_volumes = pcr_serial.get_children_of(
-            self.pid)
-        for child_pid in related_serial_volumes + \
-                related_multipart_volumes:
-            related_refs.add("{pid_value}:{pid_type}".format(
-                pid_value=child_pid.pid_value, pid_type=child_pid.pid_type))
+        related_multipart_volumes = pcr_multipart.get_children_of(self.pid)
+        related_serial_volumes = pcr_serial.get_children_of(self.pid)
+        for child_pid in related_serial_volumes + related_multipart_volumes:
+            related_refs.add(
+                "{pid_value}:{pid_type}".format(
+                    pid_value=child_pid.pid_value, pid_type=child_pid.pid_type
+                )
+            )
 
         if related_refs:
             raise RecordHasReferencesError(