feat(sentry-apps): Expose sentryAppId in SentryAppInstallation API (#109496)

Author: souredoutlook

src/sentry/sentry_apps/api/serializers/sentry_app_installation.py

@@ -17,6 +17,7 @@
 class SentryAppInstallationAppResult(TypedDict):
     uuid: str
     slug: str
+    sentryAppId: int
 
 
 class SentryAppInstallationOrganizationResult(TypedDict):
@@ -64,7 +65,11 @@ def serialize(
     ) -> SentryAppInstallationResult:
         access = kwargs.get("access")
         data: SentryAppInstallationResult = {
-            "app": {"uuid": attrs["sentry_app"].uuid, "slug": attrs["sentry_app"].slug},
+            "app": {
+                "uuid": attrs["sentry_app"].uuid,
+                "slug": attrs["sentry_app"].slug,
+                "sentryAppId": attrs["sentry_app"].id,
+            },
             "organization": {"slug": attrs["organization"].slug, "id": attrs["organization"].id},
             "uuid": obj.uuid,
             "status": SentryAppInstallationStatus.as_str(obj.status),

tests/sentry/sentry_apps/api/endpoints/test_organization_sentry_app_installation_details.py

@@ -71,7 +71,11 @@ def test_access_within_installs_organization_by_member(self) -> None:
 
         assert response.status_code == 200, response.content
         assert response.data == {
-            "app": {"uuid": self.unpublished_app.uuid, "slug": self.unpublished_app.slug},
+            "app": {
+                "uuid": self.unpublished_app.uuid,
+                "slug": self.unpublished_app.slug,
+                "sentryAppId": self.unpublished_app.id,
+            },
             "organization": {"slug": self.org.slug, "id": self.org.id},
             "uuid": self.installation2.uuid,
             "status": "pending",
@@ -86,7 +90,11 @@ def test_access_within_installs_organization_by_manager(self) -> None:
 
         assert response.status_code == 200, response.content
         assert response.data == {
-            "app": {"uuid": self.unpublished_app.uuid, "slug": self.unpublished_app.slug},
+            "app": {
+                "uuid": self.unpublished_app.uuid,
+                "slug": self.unpublished_app.slug,
+                "sentryAppId": self.unpublished_app.id,
+            },
             "organization": {"slug": self.org.slug, "id": self.org.id},
             "uuid": self.installation2.uuid,
             "code": self.installation2.api_grant.code,

tests/sentry/sentry_apps/api/endpoints/test_organization_sentry_app_installations.py

@@ -53,7 +53,11 @@ def test_superuser_sees_all_installs(self) -> None:
 
         assert response.data == [
             {
-                "app": {"slug": self.unpublished_app.slug, "uuid": self.unpublished_app.uuid},
+                "app": {
+                    "slug": self.unpublished_app.slug,
+                    "uuid": self.unpublished_app.uuid,
+                    "sentryAppId": self.unpublished_app.id,
+                },
                 "organization": {"slug": self.org.slug, "id": self.org.id},
                 "uuid": self.installation2.uuid,
                 "code": self.installation2.api_grant.code,
@@ -65,7 +69,11 @@ def test_superuser_sees_all_installs(self) -> None:
 
         assert response.data == [
             {
-                "app": {"slug": self.published_app.slug, "uuid": self.published_app.uuid},
+                "app": {
+                    "slug": self.published_app.slug,
+                    "uuid": self.published_app.uuid,
+                    "sentryAppId": self.published_app.id,
+                },
                 "organization": {"slug": self.super_org.slug, "id": self.super_org.id},
                 "uuid": self.installation.uuid,
                 "code": self.installation.api_grant.code,
@@ -97,7 +105,11 @@ def test_users_only_sees_installs_on_their_org(self) -> None:
 
         assert response.data == [
             {
-                "app": {"slug": self.unpublished_app.slug, "uuid": self.unpublished_app.uuid},
+                "app": {
+                    "slug": self.unpublished_app.slug,
+                    "uuid": self.unpublished_app.uuid,
+                    "sentryAppId": self.unpublished_app.id,
+                },
                 "organization": {"slug": self.org.slug, "id": self.org.id},
                 "uuid": self.installation2.uuid,
                 "code": self.installation2.api_grant.code,
@@ -118,7 +130,7 @@ def get_expected_response(self, app: SentryApp, org: Organization) -> dict[str,
         installation = SentryAppInstallation.objects.get(sentry_app=app, organization_id=org.id)
         assert installation.api_grant is not None
         return {
-            "app": {"slug": app.slug, "uuid": app.uuid},
+            "app": {"slug": app.slug, "uuid": app.uuid, "sentryAppId": app.id},
             "organization": {"slug": org.slug, "id": org.id},
             "code": installation.api_grant.code,
         }

tests/sentry/sentry_apps/test_sentry_app_installation_notifier.py

@@ -56,7 +56,11 @@ def test_task_enqueued(self, safe_urlopen: MagicMock) -> None:
             "installation": {"uuid": self.install.uuid},
             "data": {
                 "installation": {
-                    "app": {"uuid": self.sentry_app.uuid, "slug": self.sentry_app.slug},
+                    "app": {
+                        "uuid": self.sentry_app.uuid,
+                        "slug": self.sentry_app.slug,
+                        "sentryAppId": self.sentry_app.id,
+                    },
                     "organization": {"slug": self.organization.slug, "id": self.organization.id},
                     "uuid": self.install.uuid,
                     "code": self.install.api_grant.code,
@@ -89,7 +93,11 @@ def test_uninstallation_enqueued(self, safe_urlopen: MagicMock) -> None:
             "installation": {"uuid": self.install.uuid},
             "data": {
                 "installation": {
-                    "app": {"uuid": self.sentry_app.uuid, "slug": self.sentry_app.slug},
+                    "app": {
+                        "uuid": self.sentry_app.uuid,
+                        "slug": self.sentry_app.slug,
+                        "sentryAppId": self.sentry_app.id,
+                    },
                     "organization": {"slug": self.organization.slug, "id": self.organization.id},
                     "uuid": self.install.uuid,
                     "code": self.install.api_grant.code,