update typing and tests since list[tuple] is not valid for pydantic

Author: Christinarlong

src/sentry/sentry_apps/services/hook/impl.py

@@ -7,6 +7,7 @@
 from sentry.sentry_apps.logic import expand_events
 from sentry.sentry_apps.models.servicehook import ServiceHook
 from sentry.sentry_apps.services.hook import HookService, RpcServiceHook
+from sentry.sentry_apps.services.hook.model import RpcInstallationOrganizationPair
 from sentry.sentry_apps.services.hook.serial import serialize_service_hook
 from sentry.sentry_apps.utils.errors import SentryAppSentryError
 
@@ -148,12 +149,13 @@ def bulk_create_service_hooks_for_app(
         region_name: str,
         application_id: int,
         events: list[str],
-        installation_organization_ids: list[tuple[int, int]],
+        installation_organization_ids: list[RpcInstallationOrganizationPair],
         url: str,
     ) -> list[RpcServiceHook]:
         with transaction.atomic(router.db_for_write(ServiceHook)):
             expanded_events = expand_events(events)
-            installation_ids = [installation for installation, _ in installation_organization_ids]
+            # breakpoint()
+            installation_ids = [pair.installation_id for pair in installation_organization_ids]
 
             # There shouldn't be any existing hooks for this app but in case we don't want to create duplicates
             existing_hooks = ServiceHook.objects.filter(
@@ -180,7 +182,10 @@ def bulk_create_service_hooks_for_app(
                 )
 
             hooks_to_create = []
-            for installation_id, organization_id in installation_organization_ids:
+            for pair in installation_organization_ids:
+                installation_id = pair.installation_id
+                organization_id = pair.organization_id
+
                 if installation_id in existing_installation_ids:
                     continue
 

src/sentry/sentry_apps/services/hook/model.py

@@ -23,3 +23,8 @@ class RpcServiceHook(RpcModel):
 
     def get_audit_log_data(self) -> dict[str, Any]:
         return {"url": self.url}
+
+
+class RpcInstallationOrganizationPair(RpcModel):
+    installation_id: int
+    organization_id: int

src/sentry/sentry_apps/services/hook/service.py

@@ -8,6 +8,7 @@
 from sentry.hybridcloud.rpc.resolvers import ByOrganizationId, ByRegionName
 from sentry.hybridcloud.rpc.service import RpcService, regional_rpc_method
 from sentry.sentry_apps.services.hook import RpcServiceHook
+from sentry.sentry_apps.services.hook.model import RpcInstallationOrganizationPair
 from sentry.silo.base import SiloMode
 
 
@@ -90,7 +91,7 @@ def bulk_create_service_hooks_for_app(
         region_name: str,
         application_id: int,
         events: list[str],
-        installation_organization_ids: list[tuple[int, int]],
+        installation_organization_ids: list[RpcInstallationOrganizationPair],
         url: str,
     ) -> list[RpcServiceHook]:
         """Meant for bulk creating ServiceHooks for all installations of a given Sentry App in a given region"""

tests/sentry/sentry_apps/services/test_hook_service.py

@@ -1,6 +1,7 @@
 from sentry.sentry_apps.logic import consolidate_events, expand_events
 from sentry.sentry_apps.models.servicehook import ServiceHook
 from sentry.sentry_apps.services.hook import RpcServiceHook, hook_service
+from sentry.sentry_apps.services.hook.model import RpcInstallationOrganizationPair
 from sentry.sentry_apps.utils.webhooks import EVENT_EXPANSION, SentryAppResourceType
 from sentry.silo.base import SiloMode
 from sentry.testutils.cases import TestCase
@@ -355,8 +356,12 @@ def test_bulk_create_service_hooks_for_app_success(self) -> None:
 
         # Prepare installation-organization pairs
         installation_org_pairs = [
-            (installation1.id, self.org.id),
-            (installation2.id, org2.id),
+            RpcInstallationOrganizationPair(
+                installation_id=installation1.id, organization_id=self.org.id
+            ),
+            RpcInstallationOrganizationPair(
+                installation_id=installation2.id, organization_id=org2.id
+            ),
         ]
 
         result = hook_service.bulk_create_service_hooks_for_app(
@@ -402,7 +407,11 @@ def test_bulk_create_service_hooks_for_app_with_event_expansion(self) -> None:
             region_name="us",
             application_id=self.sentry_app.application.id,
             events=["issue", "comment"],  # These should expand
-            installation_organization_ids=[(installation.id, self.org.id)],
+            installation_organization_ids=[
+                RpcInstallationOrganizationPair(
+                    installation_id=installation.id, organization_id=self.org.id
+                )
+            ],
             url="https://example.com/webhook",
         )
 
@@ -454,7 +463,11 @@ def test_bulk_create_service_hooks_for_app_ignore_conflicts(self) -> None:
             region_name="us",
             application_id=self.sentry_app.application.id,
             events=["error.created"],
-            installation_organization_ids=[(installation.id, self.org.id)],
+            installation_organization_ids=[
+                RpcInstallationOrganizationPair(
+                    installation_id=installation.id, organization_id=self.org.id
+                )
+            ],
             url="https://different-url.com/webhook",
         )
 
@@ -483,12 +496,16 @@ def test_bulk_create_service_hooks_for_app_large_batch(self) -> None:
             installation = self.create_sentry_app_installation(
                 slug=self.sentry_app.slug, organization=org, user=self.user
             )
-            installation_org_pairs.append((installation.id, org.id))
+            installation_org_pairs.append(
+                RpcInstallationOrganizationPair(
+                    installation_id=installation.id, organization_id=org.id
+                )
+            )
 
         # Delete existing hooks to test clean bulk creation
         with assume_test_silo_mode(SiloMode.REGION):
             ServiceHook.objects.filter(
-                installation_id__in=[pair[0] for pair in installation_org_pairs]
+                installation_id__in=[pair.installation_id for pair in installation_org_pairs]
             ).delete()
 
         # Call bulk create
@@ -505,7 +522,9 @@ def test_bulk_create_service_hooks_for_app_large_batch(self) -> None:
 
         # Verify all hooks were created correctly
         with assume_test_silo_mode(SiloMode.REGION):
-            for installation_id, org_id in installation_org_pairs:
+            for pair in installation_org_pairs:
+                installation_id = pair.installation_id
+                org_id = pair.organization_id
                 hook = ServiceHook.objects.get(
                     installation_id=installation_id, application_id=self.sentry_app.application.id
                 )