Moo

Author: corps

src/sentry/api/serializers/models/notification_setting2.py

@@ -58,7 +58,7 @@ def get_attrs(
             if notifications_setting.user_id:
                 target_user = user_map[notifications_setting.user_id]
                 result[target_user]["settings"].add(notifications_setting)
-            if notifications_setting.team_id:
+            elif notifications_setting.team_id:
                 target_team = team_map[notifications_setting.team_id]
                 result[target_team]["settings"].add(notifications_setting)
             else:

static/app/views/settings/account/notifications/notificationSettings.spec.tsx

@@ -17,7 +17,6 @@ function renderMockRequests({
     url: '/users/me/notification-settings/',
     method: 'GET',
     body: notificationSettings,
-    match: [MockApiClient.matchQuery({v2: 'serializer'})],
   });
 
   MockApiClient.addMockResponse({

static/app/views/settings/account/notifications/notificationSettingsByType.spec.tsx

@@ -15,7 +15,6 @@ function renderMockRequests(
     url: '/users/me/notification-settings/',
     method: 'GET',
     body: notificationSettings,
-    match: [MockApiClient.matchQuery({v2: 'serializer'})],
   });
 
   MockApiClient.addMockResponse({