Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

patrons: fix subscriptions renewal problem. #1372

Merged
merged 1 commit into from
Nov 5, 2020
Merged

patrons: fix subscriptions renewal problem. #1372

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions rero_ils/modules/patrons/api.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
from datetime import datetime
from functools import partial

from elasticsearch_dsl import Q
from flask import current_app
from flask_login import current_user
from flask_security.confirmable import confirm_user
Expand Down Expand Up @@ -426,8 +425,7 @@ def get_patrons_without_subscription(cls, patron_type_pid):
"""Get patrons linked to patron_type that haven't any subscription."""
query = PatronsSearch() \
.filter('term', patron__type__pid=patron_type_pid) \
.filter('bool', must_not=[
Q('exists', field="patron__subscriptions")])
.exclude('exists', field='patron.subscriptions')
for res in query.source('pid').scan():
yield Patron.get_record_by_pid(res.pid)

Expand Down
4 changes: 2 additions & 2 deletions tests/api/patrons/test_patrons_rest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,9 +114,9 @@ def test_patron_has_valid_subscriptions(
patron_sion.add_subscription(patron_type_grown_sion, start, end)
# !! As `add_subscription` use the method `Patron.update`, then the signal
# `after_record_update` are send by invenio_records and the patron
# listener `reate_subscription_patron_transaction` is called. This
# listener `create_subscription_patron_transaction` is called. This
# listener found that user doesn't have any subscription and add a valid
# one for this patron. So after `add_subscription` call, i just removed
# one for this patron. So after `add_subscription` call, I just removed
# the valid subscription created.
del patron_sion['patron']['subscriptions'][1]
assert not patron_sion.has_valid_subscription
Expand Down