address comment

devketanpro · Jul 23, 2024 · 127c6f1 · 127c6f1
1 parent d2ef1af
commit 127c6f1
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 14 deletions.
diff --git a/apps/preferences.py b/apps/preferences.py
@@ -213,7 +213,7 @@ class PreferencesResource(Resource):
     )
 
     superdesk.register_default_user_preference(
-        "mark_for_user:notification",
+        "email:notification:mark_for_user",
         {
             "type": "bool",
             "enabled": True,
@@ -412,22 +412,15 @@ def has_missing_privileges(prefs):
 
         doc[_user_preferences_key] = {k: v for k, v in preferences.items() if not has_missing_privileges(v)}
 
-    def assignment_notification_is_enabled(self, user_id=None, preferences=None):
+    def check_preference_email_notification_is_enabled(self, preference_name, user_id=None, preferences=None):
         """
-        This function checks if email notification is enabled or not based on the preferences.
-        """
-        if user_id:
-            preferences = self.get_user_preference(user_id)
-        send_email = preferences.get("assignment:notification", {}) if isinstance(preferences, dict) else {}
-        return send_email and send_email.get("enabled", False)
-
-    def check_notification_is_enabled(self, preference_name, user_id=None, preferences=None):
-        """
-        This function checks if email notification is enabled or not based on the preferences.
+        This function checks if email notification is enabled or not based on the preference.
         """
         send_email = {}
         if user_id:
             preferences = self.get_user_preference(user_id)
         if preference_name:
-            send_email = preferences.get(f"{preference_name}:notification", {}) if isinstance(preferences, dict) else {}
+            send_email = (
+                preferences.get(f"email:notification:{preference_name}", {}) if isinstance(preferences, dict) else {}
+            )
         return send_email and send_email.get("enabled", False)
diff --git a/superdesk/activity.py b/superdesk/activity.py
@@ -277,7 +277,7 @@ def get_recipients(user_list, activity_name, preference_notification_name=None):
         )
         and (
             preference_notification_name
-            and get_resource_service("preferences").check_notification_is_enabled(
+            and get_resource_service("preferences").check_preference_email_notification_is_enabled(
                 preference_notification_name, preferences=user.get("user_preferences", {})
             )
         )