invenio-banners 5.1.1__py2.py3-none-any.whl → 5.2.0__py2.py3-none-any.whl

invenio_banners/__init__.py

@@ -10,6 +10,6 @@
 
 from .ext import InvenioBanners
 
-__version__ = "5.1.1"
+__version__ = "5.2.0"
 
 __all__ = ("__version__", "InvenioBanners")

invenio_banners/records/models.py

@@ -8,7 +8,7 @@
 
 """Models."""
 
-from datetime import datetime
+from datetime import datetime, timezone
 
 import sqlalchemy as sa
 from flask import current_app
@@ -90,7 +90,7 @@ class BannerModel(db.Model, Timestamp):
     @classmethod
     def get_active(cls, url_path):
         """Return active banners."""
-        now = datetime.utcnow()
+        now = datetime.now(timezone.utc).replace(tzinfo=None)
 
         query = (
             db.session.query(cls)
@@ -110,12 +110,12 @@ class BannerModel(db.Model, Timestamp):
         return active_banners.all()
 
     @classmethod
-    def search(cls, search_params, filters):
+    def search(cls, search_params, filters=None):
         """Filter banners accordingly to query params."""
-        if filters == []:
-            filtered = db.session.query(BannerModel).filter()
-        else:
+        if filters:
             filtered = db.session.query(BannerModel).filter(or_(*filters))
+        else:
+            filtered = db.session.query(BannerModel).filter()
 
         banners = filtered.order_by(
             search_params["sort_direction"](text(",".join(search_params["sort"])))
@@ -130,7 +130,7 @@ class BannerModel(db.Model, Timestamp):
     @classmethod
     def disable_expired(cls):
         """Disable any old still active messages to keep everything clean."""
-        now = datetime.utcnow()
+        now = datetime.now(timezone.utc).replace(tzinfo=None)
 
         query = (
             db.session.query(cls)

invenio_banners/resources/config.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2022-2024 CERN.
+# Copyright (C) 2022-2025 CERN.
 #
 # Invenio-Banners is free software; you can redistribute it and/or modify it
 # under the terms of the MIT License; see LICENSE file for more details.
@@ -19,6 +19,8 @@ class BannerServerSearchRequestArgsSchema(SearchRequestArgsSchema):
     """Banner request parameters."""
 
     sort_direction = ma.fields.Str()
+    active = ma.fields.Bool()
+    url_path = ma.fields.Str()
 
 
 class BannerResourceConfig(RecordResourceConfig):

invenio_banners/services/schemas.py

@@ -22,7 +22,7 @@ class BannerSchema(BaseRecordSchema):
     category = fields.String(required=True, metadata={"default": "info"})
     start_datetime = fields.DateTime(
         required=True,
-        metadata={"default": datetime.utcnow().strftime("%Y-%m-%d %H:%M:%S")},
+        metadata={"default": datetime.now(timezone.utc).strftime("%Y-%m-%d %H:%M:%S")},
     )
     end_datetime = fields.DateTime(allow_none=True)
     active = fields.Boolean(required=True, metadata={"default": True})

invenio_banners/services/service.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2022-2023 CERN.
+# Copyright (C) 2022-2025 CERN.
 # Copyright (C) 2024 Graz University of Technology.
 #
 # Invenio-Banners is free software; you can redistribute it and/or modify it
@@ -15,7 +15,7 @@ from invenio_db.uow import unit_of_work
 from invenio_records_resources.services import RecordService
 from invenio_records_resources.services.base import LinksTemplate
 from invenio_records_resources.services.base.utils import map_search_params
-from sqlalchemy import func
+from sqlalchemy import and_, func, literal, or_
 
 from ..records.models import BannerModel
 
@@ -37,14 +37,35 @@ class BannerService(RecordService):
         )
 
     def search(self, identity, params):
-        """Search for banners matching the querystring."""
+        """Search for banners with multiple filter options.
+
+        Supports filtering by:
+        - active: boolean filter
+        - url_path: prefix matching (empty paths match all, specific paths match as prefixes)
+        - q: text or date search across multiple fields
+
+        active and url_path filters are combined with AND logic, while OR is used while combining them with the q filters.
+        """
         self.require_permission(identity, "search")
 
+        active_filter_param = params.pop("active", None)
+        url_path_filter_param = params.pop("url_path", None)
         search_params = map_search_params(self.config.search, params)
 
-        query_param = search_params["q"]
-        filters = []
+        and_filters = []
+        if active_filter_param is not None:
+            and_filters.append(BannerModel.active.is_(active_filter_param))
+
+        if url_path_filter_param is not None:
+            and_filters.append(
+                or_(
+                    BannerModel.url_path == "",
+                    literal(url_path_filter_param).like(BannerModel.url_path + "%"),
+                )
+            )
 
+        filters = [and_(*and_filters)] if and_filters else []
+        query_param = search_params["q"]
         if query_param:
             filters.extend(
                 [
@@ -53,13 +74,6 @@ class BannerService(RecordService):
                     BannerModel.category.ilike(f"%{query_param}%"),
                 ]
             )
-            bool_value = self._validate_bool(query_param)
-            if bool_value is not None:
-                filters.extend(
-                    [
-                        BannerModel.active.is_(bool_value),
-                    ]
-                )
 
             datetime_value = self._validate_datetime(query_param)
             if datetime_value is not None:

{invenio_banners-5.1.1.dist-info → invenio_banners-5.2.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: invenio-banners
-Version: 5.1.1
+Version: 5.2.0
 Summary: Invenio-Banners is a module used to create and show banners with useful messages to users.
 Home-page: https://github.com/inveniosoftware/invenio-banners
 Author: CERN
@@ -66,6 +66,11 @@ https://invenio-banners.readthedocs.io/
 Changes
 =======
 
+Version v5.2.0 (released 2025-08-06)
+
+- search: add query params active and url_path for search, add None as default value for filters
+- global: replace deprecated datetime utcnow() with now(timezone.utc)
+
 Version v5.1.1 (released 2025-07-22)
 
 - fix: mo files not included into build

{invenio_banners-5.1.1.dist-info → invenio_banners-5.2.0.dist-info}/RECORD

@@ -1,4 +1,4 @@
-invenio_banners/__init__.py,sha256=N_NHYX6xP_tyYWkBF8-aJ2hhDiKEGCyiBWwB_kdMpGA,430
+invenio_banners/__init__.py,sha256=zU3w6wJxTF6TfiuRsQhMsCLALwApY56lh1utoLp-Zvk,430
 invenio_banners/config.py,sha256=csFr0XWaYh05hAjvY44pA6taQFDUmocQ08mX4e5jiEY,1364
 invenio_banners/ext.py,sha256=rRIgDgZIyGhm2M8WHWApMPRcBVe3eHkaHzTOt-YH6aw,1836
 invenio_banners/proxies.py,sha256=nfACfpSgfCHiixSy2cO4G9y_lHFQj6onOeBLifYY6IQ,638
@@ -9,9 +9,9 @@ invenio_banners/administration/banners.py,sha256=N-7iBxyp6LRuDXSlktXqncmPnISGHTm
 invenio_banners/alembic/5e02314da32e_create_invenio_banners_db_table.py,sha256=FZ5Z8RsrbrlN8vr43LW0ukVRFTj2DV7B7JgVjnk0zp8,1446
 invenio_banners/alembic/e40d93d99040_create_invenio_banners_branch.py,sha256=KoEbAzpNneVNBwegW3FfMIW_XTH6im0GXz2DvIF6DwA,562
 invenio_banners/records/__init__.py,sha256=-A_Q-oZyJuV2lcgLfqXWeMuTlmv6IrEbcMqs_58PHuE,298
-invenio_banners/records/models.py,sha256=iKlk4dOMRJKVmr5BT1TpgSjXY2D8V16L92Sj3ggnOKA,4427
+invenio_banners/records/models.py,sha256=vK3lTr7qocSC9LWviOXqQhAbdmq_4y2BlOrWVrlc43U,4496
 invenio_banners/resources/__init__.py,sha256=bQbqlVhQKjJXiiNmqsf_Z1R_4PqmmNTb-Kwj-2lEfQQ,402
-invenio_banners/resources/config.py,sha256=Ng0TowZk3GCG1tOv0TKtUpeDwY8RIK6adEUYCVVnKZg,1435
+invenio_banners/resources/config.py,sha256=FuNDsM_WWJoo_DX2ibM6SO2GPvlCwYxbBaH_SvqRc94,1496
 invenio_banners/resources/errors.py,sha256=H-qs9L10KSFaGKq_yDLu7QEiD2WB4JCKV8Xp_jJ4yEM,1231
 invenio_banners/resources/resource.py,sha256=lHTqkX7coKG0gXkgCdL7MEcsutGZ5rYSOEidiXHOztE,2924
 invenio_banners/services/__init__.py,sha256=9URKgFgYq2yUgj-eTB6_jE_ifZNQR9_E9sLP-1UIB1s,484
@@ -19,8 +19,8 @@ invenio_banners/services/config.py,sha256=uzKWmgPIGHAG00Zs5BHlp1Y6WzbNzfS_tkXA3l
 invenio_banners/services/errors.py,sha256=1suJcPwdLyK3hqK0gicgTMUX2OAk_Y8TaqancnkXyEA,542
 invenio_banners/services/permissions.py,sha256=EbC4oeFaBHCYTPnDMrtoS9Cgo4skhjz694qhGEnZYHs,830
 invenio_banners/services/results.py,sha256=sg2z1zPKD8mWgUigwqdFWJqdnA7wOtmf6yKfa3AeUek,3082
-invenio_banners/services/schemas.py,sha256=rWh1WSQR4ps_Ii7RWd82FUMk4_aHbdwd5kYh5gCxlJU,1442
-invenio_banners/services/service.py,sha256=7KdwwrmqvtBsmEschL-i_ydPsijH7RjzLzMFogrKYeQ,4770
+invenio_banners/services/schemas.py,sha256=34oIXNmIU2pkkL3AOGhTkwaUgh9yUFCdJQ4Dp6jClfw,1451
+invenio_banners/services/service.py,sha256=l7AZuH85Xr4He4vORw-pxtVRk3VoKxOOBMXAo43U0eY,5460
 invenio_banners/templates/semantic-ui/invenio_banners/banner.html,sha256=mOPfWsxRMIftoCyU82WeHlEhHFvy56BTF4wDJHpzX-o,811
 invenio_banners/translations/messages.pot,sha256=uqnF8VA0glId6_gSPuRFnOpmH8vspCOX9b6emJw3Gf4,4672
 invenio_banners/translations/ar/LC_MESSAGES/messages.mo,sha256=lneRS0Vp0D7yGmsZUiD2ZThZUvgymnzupcrfPMs9nn8,4395
@@ -81,10 +81,10 @@ invenio_banners/translations/zh_CN/LC_MESSAGES/messages.mo,sha256=NfQYcvNS44LX_k
 invenio_banners/translations/zh_CN/LC_MESSAGES/messages.po,sha256=JHhsMcsmSd8saIK5mOECFBHbfHcWpmYjVk_8elm7whs,4962
 invenio_banners/translations/zh_TW/LC_MESSAGES/messages.mo,sha256=4nTza7lSLzUOcZh19Kmwym0-2xhslmUgsKqRHhFkSnw,590
 invenio_banners/translations/zh_TW/LC_MESSAGES/messages.po,sha256=aqhqHPr0Q6dc_eCGBtn9sqFVpfyd81uPS3_SWGOlPXw,4870
-invenio_banners-5.1.1.dist-info/licenses/AUTHORS.rst,sha256=fQsy2e1bLnwt_a89-kO6CwBwN7o58Ix9F9195b2iTJo,295
-invenio_banners-5.1.1.dist-info/licenses/LICENSE,sha256=UvI8pR8jGWqe0sTkb_hRG6eIrozzWwWzyCGEpuXX4KE,1062
-invenio_banners-5.1.1.dist-info/METADATA,sha256=AxpGD-ZZy-OEpjzsais1xxJo8eB90DtKDLfgclsNPSY,4409
-invenio_banners-5.1.1.dist-info/WHEEL,sha256=JNWh1Fm1UdwIQV075glCn4MVuCRs0sotJIq-J6rbxCU,109
-invenio_banners-5.1.1.dist-info/entry_points.txt,sha256=A6LQWHkrQXiid3LGWKIz2C4eZfaHSGne3mkcy00j2Fg,782
-invenio_banners-5.1.1.dist-info/top_level.txt,sha256=ENJP1dEZ93e4ImCi7AHaVooTUV-6fQnRJ106wHitg5g,16
-invenio_banners-5.1.1.dist-info/RECORD,,
+invenio_banners-5.2.0.dist-info/licenses/AUTHORS.rst,sha256=fQsy2e1bLnwt_a89-kO6CwBwN7o58Ix9F9195b2iTJo,295
+invenio_banners-5.2.0.dist-info/licenses/LICENSE,sha256=UvI8pR8jGWqe0sTkb_hRG6eIrozzWwWzyCGEpuXX4KE,1062
+invenio_banners-5.2.0.dist-info/METADATA,sha256=SZ4a51ARhvG_XbHTdqswHJ3mbpTW_OsgBTt1n2H7by8,4615
+invenio_banners-5.2.0.dist-info/WHEEL,sha256=JNWh1Fm1UdwIQV075glCn4MVuCRs0sotJIq-J6rbxCU,109
+invenio_banners-5.2.0.dist-info/entry_points.txt,sha256=A6LQWHkrQXiid3LGWKIz2C4eZfaHSGne3mkcy00j2Fg,782
+invenio_banners-5.2.0.dist-info/top_level.txt,sha256=ENJP1dEZ93e4ImCi7AHaVooTUV-6fQnRJ106wHitg5g,16
+invenio_banners-5.2.0.dist-info/RECORD,,