fix(stats): make active patrons period 12 months

- The correct date range for number_of_active_patrons in the pricing stats should be 12 months and not the default `RERO_ILS_STATS_BILLING_TIMEFRAME_IN_MONTHS`. - Fix isort 6.0.0 compatibility and update black formatter. Co-Authored-by: Pascal Repond <[email protected]>
rero · Feb 4, 2025 · a674297 · a674297
1 parent 9d7de8c
commit a674297
Show file tree

Hide file tree

Showing 9 changed files with 60 additions and 38 deletions.
diff --git a/poetry.lock b/poetry.lock
diff --git a/rero_ils/dojson/utils.py b/rero_ils/dojson/utils.py
@@ -444,7 +444,7 @@ def remove_trailing_punctuation(data, punctuation=",", spaced_punctuation=":;/-"
     ).rstrip()
 
 
-def remove_special_characters(value, chars=["\u0098", "\u009C"]):
+def remove_special_characters(value, chars=["\u0098", "\u009c"]):
     """Remove special characters from a string.
 
     :params value: string to clean.

diff --git a/rero_ils/modules/serializers/__init__.py b/rero_ils/modules/serializers/__init__.py
@@ -18,7 +18,9 @@
 
 """RERO ILS Record serialization."""
 
-from invenio_records_rest.serializers.response import record_responsify
+from invenio_records_rest.serializers.response import (
+    record_responsify,
+)
 from invenio_records_rest.serializers.response import (
     search_responsify as _search_responsify,
 )

diff --git a/rero_ils/modules/stats/api/pricing.py b/rero_ils/modules/stats/api/pricing.py
@@ -171,11 +171,16 @@ def number_of_active_patrons(self, library_pid):
         :return: the number of matched active patrons
         :rtype: integer
         """
+        _to = self.to_date.format(fmt="YYYY-MM-DDT23:59:59")
+        _from = (self.to_date - relativedelta(months=12)).format(
+            fmt="YYYY-MM-DDT00:00:00"
+        )
+        date_range = {"gte": _from, "lte": _to}
         op_logs_query = (
             LoanOperationLogsSearch()
             .get_logs_by_trigger(
                 triggers=[ItemCirculationAction.CHECKOUT, ItemCirculationAction.EXTEND],
-                date_range=self.date_range,
+                date_range=date_range,
             )
             .filter("term", loan__item__library_pid=library_pid)
         )

diff --git a/rero_ils/modules/utils.py b/rero_ils/modules/utils.py
@@ -1111,7 +1111,7 @@ def get_objects(record_class, query):
 
 def strip_chars(string, extra=""):
     """Remove control characters from string."""
-    remove_re = re.compile("[\x00-\x08\x0B-\x0C\x0E-\x1F\x7F%s]" % extra)
+    remove_re = re.compile("[\x00-\x08\x0b-\x0c\x0e-\x1f\x7f%s]" % extra)
     new_string, _ = remove_re.subn("", string)
     return new_string
 

diff --git a/rero_ils/modules/views.py b/rero_ils/modules/views.py
@@ -41,7 +41,9 @@
     manage_role_permissions,
 )
 from .permissions import permission_management as permission_management_action
-from .permissions import record_permissions
+from .permissions import (
+    record_permissions,
+)
 
 api_blueprint = Blueprint("api_blueprint", __name__, url_prefix="")
 

diff --git a/tests/ui/locations/test_locations_other.py b/tests/ui/locations/test_locations_other.py
@@ -17,8 +17,8 @@
 
 """Other location Record tests.
 
-   Some tests cannot be added in other files for several reason such as
-   scope level fixtures.
+Some tests cannot be added in other files for several reason such as
+scope level fixtures.
 """
 
 from rero_ils.modules.items.api import ItemsSearch

diff --git a/tests/ui/patron_transactions/test_patron_transactions_api.py b/tests/ui/patron_transactions/test_patron_transactions_api.py
@@ -23,7 +23,9 @@
 
 import pytest
 
-from rero_ils.modules.patron_transactions.api import PatronTransaction
+from rero_ils.modules.patron_transactions.api import (
+    PatronTransaction,
+)
 from rero_ils.modules.patron_transactions.api import (
     patron_transaction_id_fetcher as fetcher,
 )

diff --git a/tests/ui/test_permissions.py b/tests/ui/test_permissions.py
@@ -15,7 +15,7 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 
-""""Test permissions."""
+"""Test permissions."""
 from utils import login_user_for_view
 
 from rero_ils.modules.permissions import has_superuser_access