ref(api): Refactored OrganizationUnsubscribe for id_or_slug (#70009)

Author: iamrajjoshi

src/sentry/api/endpoints/organization_unsubscribe.py

@@ -84,8 +84,12 @@ def fetch_instance(self, request: Request, organization_slug: str, id: int) -> P
             project = Project.objects.select_related("organization").get(id=id)
         except Project.DoesNotExist:
             raise NotFound()
-        if project.organization.slug != organization_slug:
-            raise NotFound()
+        if str(organization_slug).isdecimal():
+            if project.organization.id != int(organization_slug):
+                raise NotFound()
+        else:
+            if project.organization.slug != organization_slug:
+                raise NotFound()
         if not OrganizationMember.objects.filter(
             user_id=request.user.pk, organization_id=project.organization_id
         ).exists():
@@ -116,8 +120,13 @@ def fetch_instance(self, request: Request, organization_slug: str, issue_id: int
             issue = Group.objects.get_from_cache(id=issue_id)
         except Group.DoesNotExist:
             raise NotFound()
-        if issue.organization.slug != organization_slug:
-            raise NotFound()
+        if str(organization_slug).isdecimal():
+            if issue.organization.id != int(organization_slug):
+                raise NotFound()
+        else:
+            if issue.organization.slug != organization_slug:
+                raise NotFound()
+
         if not OrganizationMember.objects.filter(
             user_id=request.user.pk, organization=issue.organization
         ).exists():

tests/sentry/api/endpoints/test_organization_unsubscribe.py

@@ -72,7 +72,7 @@ def test_post_no_signature(self):
         resp = self.client.get(path)
         assert resp.status_code == 404
 
-    def test_post_success(self):
+    def test_post_success_slug(self):
         project = self.create_project(organization=self.organization)
         path = generate_signed_link(
             user=self.user, viewname=self.endpoint, args=[self.organization.slug, project.id]
@@ -88,6 +88,22 @@ def test_post_success(self):
                 value="never",
             ).exists()
 
+    def test_post_success_id(self):
+        project = self.create_project(organization=self.organization)
+        path = generate_signed_link(
+            user=self.user, viewname=self.endpoint, args=[self.organization.id, project.id]
+        )
+        resp = self.client.post(path, data={"cancel": "1"})
+        assert resp.status_code == 201
+        with assume_test_silo_mode(SiloMode.CONTROL):
+            assert NotificationSettingOption.objects.filter(
+                user_id=self.user.id,
+                scope_type="project",
+                scope_identifier=project.id,
+                type="alerts",
+                value="never",
+            ).exists()
+
 
 class OrganizationUnsubscribeIssueTest(APITestCase):
     endpoint = "sentry-api-0-organization-unsubscribe-issue"
@@ -139,7 +155,7 @@ def test_post_missing_record(self):
         resp = self.client.post(path)
         assert resp.status_code == 404
 
-    def test_post_success(self):
+    def test_post_success_slug(self):
         group = self.create_group(project=self.project)
         path = generate_signed_link(
             user=self.user, viewname=self.endpoint, args=[self.organization.slug, group.id]
@@ -149,3 +165,14 @@ def test_post_success(self):
 
         sub = GroupSubscription.objects.get(group=group, user_id=self.user.id)
         assert sub.is_active is False
+
+    def test_post_success_id(self):
+        group = self.create_group(project=self.project)
+        path = generate_signed_link(
+            user=self.user, viewname=self.endpoint, args=[self.organization.id, group.id]
+        )
+        resp = self.client.post(path, data={"cancel": "1"})
+        assert resp.status_code == 201
+
+        sub = GroupSubscription.objects.get(group=group, user_id=self.user.id)
+        assert sub.is_active is False