Merge pull request #132 from silverlogic/BA-1473-be-notifications-settings

BA-1400 Notifications Settings

Author: mathieubouhelier

baseapp-comments/baseapp_comments/notifications.py

@@ -18,7 +18,7 @@ def send_reply_created_notification(comment_pk):
         send_email=True,
         sender=comment.profile or comment.user,
         recipient=comment.in_reply_to.user,
-        verb="COMMENT_REPLY_CREATED",
+        verb="COMMENTS.COMMENT_REPLY_CREATED",
         action_object=comment,
         target=comment.in_reply_to,
         level="info",
@@ -40,7 +40,7 @@ def send_comment_created_notification(comment_pk, recipient_id):
         send_email=True,
         sender=comment.profile or comment.user,
         recipient=recipient,
-        verb="COMMENT_CREATED",
+        verb="COMMENTS.COMMENT_CREATED",
         action_object=comment,
         target=comment.target,
         level="info",

baseapp-notifications/baseapp_notifications/utils.py

@@ -121,11 +121,16 @@ def send_email_notification(to, context):
 
 def can_user_receive_notification(user_id, verb, channel):
     NotificationSetting = swapper.load_model("baseapp_notifications", "NotificationSetting")
-    user_setting = NotificationSetting.objects.filter(
-        Q(channel=channel) | Q(channel=NotificationSetting.NotificationChannelTypes.ALL),
-        user_id=user_id,
-        verb=get_setting_from_verb(verb),
-    ).first()
+    user_setting = (
+        NotificationSetting.objects.filter(
+            Q(channel=channel) | Q(channel=NotificationSetting.NotificationChannelTypes.ALL),
+            Q(verb=get_setting_from_verb(verb)) | Q(verb="_ALL_"),
+            user_id=user_id,
+        )
+        .order_by("is_active")
+        .first()
+    )
+
     if user_setting:
         return user_setting.is_active
     return True

baseapp-notifications/setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = baseapp_notifications
-version = 0.3.0
+version = 0.3.1
 description = BaseApp Notifications
 long_description = file: README.md
 url = https://github.com/silverlogic/baseapp-backend