Merge pull request #8 from opendata-swiss/master

Only send notifications for subscriptions that are verified
bellisk · Jan 3, 2023 · 0d41b6c · 0d41b6c
2 parents 8db060c + 895d37e
commit 0d41b6c
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/ckanext/subscribe/notification.py b/ckanext/subscribe/notification.py
@@ -143,10 +143,12 @@ def get_objects_subscribed_to(subscription_frequency):
     objects_subscribed_to = defaultdict(list)  # {object_id: [subscriptions]}
     # direct subscriptions - i.e. datasets, orgs & groups
     for subscription in model.Session.query(Subscription) \
+            .filter(Subscription.verified.is_(True)) \
             .filter(Subscription.frequency == subscription_frequency).all():
         objects_subscribed_to[subscription.object_id].append(subscription)
     # also include the datasets attached to the subscribed orgs
     for subscription, package_id in model.Session.query(Subscription, Package.id) \
+            .filter(Subscription.verified.is_(True)) \
             .filter(Subscription.frequency == subscription_frequency) \
             .join(Group, Group.id == Subscription.object_id) \
             .filter(Group.state == 'active') \
@@ -156,6 +158,7 @@ def get_objects_subscribed_to(subscription_frequency):
         objects_subscribed_to[package_id].append(subscription)
     # also include the datasets attached to the subscribed orgs
     for subscription, package_id in model.Session.query(Subscription, Package.id) \
+            .filter(Subscription.verified.is_(True)) \
             .filter(Subscription.frequency == subscription_frequency) \
             .join(Group, Group.id == Subscription.object_id) \
             .filter(Group.state == 'active') \