ref(notifications): remove some unused hybrid cloud service methods (#60488)

This removes `get_settings_for_recipient_by_parent`,
`get_settings_for_users`, and `get_settings_for_user_by_projects` which
are not used anymore

Author: Stephen Cefali

src/sentry/services/hybrid_cloud/notifications/impl.py

@@ -1,21 +1,19 @@
 from __future__ import annotations
 
-from typing import Callable, List, Mapping, MutableMapping, Optional, Sequence, Tuple
+from typing import Callable, List, Mapping, MutableMapping, Optional, Tuple
 
 from django.db import router, transaction
-from django.db.models import Q, QuerySet
+from django.db.models import QuerySet
 
 from sentry.api.serializers.base import Serializer
 from sentry.api.serializers.models.notification_setting import NotificationSettingsSerializer
 from sentry.models.notificationsetting import NotificationSetting
 from sentry.models.notificationsettingoption import NotificationSettingOption
 from sentry.models.notificationsettingprovider import NotificationSettingProvider
 from sentry.models.user import User
-from sentry.notifications.helpers import get_scope_type
 from sentry.notifications.notificationcontroller import NotificationController
 from sentry.notifications.types import (
     NotificationScopeEnum,
-    NotificationScopeType,
     NotificationSettingEnum,
     NotificationSettingOptionValues,
     NotificationSettingsOptionEnum,
@@ -112,73 +110,6 @@ def update_notification_options(
             **kwargs,
         )
 
-    # TODO(snigdha): This can be removed in V2.
-    def get_settings_for_users(
-        self,
-        *,
-        types: List[NotificationSettingTypes],
-        users: List[RpcUser],
-        value: NotificationSettingOptionValues,
-    ) -> List[RpcNotificationSetting]:
-        settings = NotificationSetting.objects.filter(
-            user_id__in=[u.id for u in users],
-            type__in=types,
-            value=value.value,
-            scope_type=NotificationScopeType.USER.value,
-        )
-        return [serialize_notification_setting(u) for u in settings]
-
-    def get_settings_for_recipient_by_parent(
-        self, *, type: NotificationSettingTypes, parent_id: int, recipients: Sequence[RpcActor]
-    ) -> List[RpcNotificationSetting]:
-        team_ids = [r.id for r in recipients if r.actor_type == ActorType.TEAM]
-        user_ids = [r.id for r in recipients if r.actor_type == ActorType.USER]
-
-        parent_specific_scope_type = get_scope_type(type)
-        notification_settings = NotificationSetting.objects.filter(
-            Q(
-                scope_type=parent_specific_scope_type.value,
-                scope_identifier=parent_id,
-            )
-            | Q(
-                scope_type=NotificationScopeType.USER.value,
-                scope_identifier__in=user_ids,
-            )
-            | Q(
-                scope_type=NotificationScopeType.TEAM.value,
-                scope_identifier__in=team_ids,
-            ),
-            (Q(team_id__in=team_ids) | Q(user_id__in=user_ids)),
-            type=type.value,
-        )
-
-        return [serialize_notification_setting(s) for s in notification_settings]
-
-    def get_settings_for_user_by_projects(
-        self, *, type: NotificationSettingTypes, user_id: int, parent_ids: List[int]
-    ) -> List[RpcNotificationSetting]:
-        try:
-            User.objects.get(id=user_id)
-        except User.DoesNotExist:
-            return []
-
-        scope_type = get_scope_type(type)
-        return [
-            serialize_notification_setting(s)
-            for s in NotificationSetting.objects.filter(
-                Q(
-                    scope_type=scope_type.value,
-                    scope_identifier__in=parent_ids,
-                )
-                | Q(
-                    scope_type=NotificationScopeType.USER.value,
-                    scope_identifier=user_id,
-                ),
-                type=type.value,
-                user_id=user_id,
-            )
-        ]
-
     def remove_notification_settings(
         self, *, team_id: Optional[int], user_id: Optional[int], provider: ExternalProviders
     ) -> None:

src/sentry/services/hybrid_cloud/notifications/service.py

@@ -3,7 +3,7 @@
 # in modules such as this one where hybrid cloud data models or service classes are
 # defined, because we want to reflect on type annotations and avoid forward references.
 from abc import abstractmethod
-from typing import List, Mapping, MutableMapping, Optional, Sequence, Set, Tuple
+from typing import List, Mapping, MutableMapping, Optional, Set, Tuple
 
 from sentry.notifications.types import (
     NotificationScopeEnum,
@@ -35,35 +35,6 @@ def get_local_implementation(cls) -> RpcService:
 
         return DatabaseBackedNotificationsService()
 
-    @rpc_method
-    @abstractmethod
-    def get_settings_for_recipient_by_parent(
-        self,
-        *,
-        type: NotificationSettingTypes,
-        parent_id: int,
-        recipients: Sequence[RpcActor],
-    ) -> List[RpcNotificationSetting]:
-        pass
-
-    @rpc_method
-    @abstractmethod
-    def get_settings_for_users(
-        self,
-        *,
-        types: List[NotificationSettingTypes],
-        users: List[RpcUser],
-        value: NotificationSettingOptionValues,
-    ) -> List[RpcNotificationSetting]:
-        pass
-
-    @rpc_method
-    @abstractmethod
-    def get_settings_for_user_by_projects(
-        self, *, type: NotificationSettingTypes, user_id: int, parent_ids: List[int]
-    ) -> List[RpcNotificationSetting]:
-        pass
-
     @rpc_method
     @abstractmethod
     def update_settings(

tests/sentry/api/endpoints/test_rpc.py

@@ -6,16 +6,9 @@
 from django.urls import reverse
 from rest_framework.exceptions import ErrorDetail
 
-from sentry.models.notificationsetting import NotificationSetting
-from sentry.notifications.types import (
-    NotificationScopeType,
-    NotificationSettingOptionValues,
-    NotificationSettingTypes,
-)
 from sentry.services.hybrid_cloud.organization import RpcUserOrganizationContext
 from sentry.services.hybrid_cloud.rpc import generate_request_signature
 from sentry.testutils.cases import APITestCase
-from sentry.types.integrations import ExternalProviders
 from sentry.utils import json
 
 
@@ -137,36 +130,3 @@ def test_with_invalid_arguments(self):
         assert response.data == {
             "detail": ErrorDetail(string="Malformed request.", code="parse_error")
         }
-
-    def test_with_enum_serialization(self):
-        path = self._get_path("notifications", "get_settings_for_user_by_projects")
-        NotificationSetting.objects.update_settings(
-            ExternalProviders.EMAIL,
-            NotificationSettingTypes.ISSUE_ALERTS,
-            NotificationSettingOptionValues.ALWAYS,
-            user_id=self.user.id,
-        )
-        data = {
-            "args": {
-                "type": 20,
-                "user_id": self.user.id,
-                "parent_ids": [self.project.id],
-            }
-        }
-        response = self._send_post_request(path, data)
-        assert response.status_code == 200
-        response_body = response.json()
-        setting = NotificationSetting.objects.filter(user_id=self.user.id).get()
-        assert response_body["value"] == [
-            {
-                "id": setting.id,
-                "scope_type": NotificationScopeType.USER.value,
-                "scope_identifier": self.user.id,
-                "target_id": response_body["value"][0]["target_id"],
-                "team_id": None,
-                "user_id": self.user.id,
-                "provider": ExternalProviders.EMAIL.value,
-                "type": NotificationSettingTypes.ISSUE_ALERTS.value,
-                "value": 20,
-            }
-        ]