feat(api-idorslug): Updated Subset of Orgmember and Integration Endpoints to use organization_id_or_slug (#70567)

A subset of changes from #70081!

---------

Co-authored-by: getsantry[bot] <66042841+getsantry[bot]@users.noreply.github.com>

Author: iamrajjoshi

pyproject.toml

@@ -120,14 +120,12 @@ ignore_missing_imports = true
 module = [
     "sentry.api.base",
     "sentry.api.bases.external_actor",
-    "sentry.api.bases.incident",
     "sentry.api.bases.integration",
     "sentry.api.bases.organization_events",
     "sentry.api.bases.organization_request_change",
     "sentry.api.bases.organizationmember",
     "sentry.api.bases.project",
     "sentry.api.bases.project_request_change",
-    "sentry.api.bases.rule",
     "sentry.api.bases.sentryapps",
     "sentry.api.bases.team",
     "sentry.api.endpoints.accept_organization_invite",
@@ -152,11 +150,8 @@ module = [
     "sentry.api.endpoints.integrations.sentry_apps.requests",
     "sentry.api.endpoints.integrations.sentry_apps.stats.details",
     "sentry.api.endpoints.internal.mail",
-    "sentry.api.endpoints.notifications.notification_actions_details",
     "sentry.api.endpoints.organization_code_mapping_codeowners",
-    "sentry.api.endpoints.organization_code_mapping_details",
     "sentry.api.endpoints.organization_code_mappings",
-    "sentry.api.endpoints.organization_dashboard_details",
     "sentry.api.endpoints.organization_details",
     "sentry.api.endpoints.organization_events",
     "sentry.api.endpoints.organization_events_facets",

src/sentry/api/bases/organization.py

@@ -242,30 +242,42 @@ class ControlSiloOrganizationEndpoint(Endpoint):
     def convert_args(
         self,
         request: Request,
-        organization_slug: str | int | None = None,
         *args: Any,
         **kwargs: Any,
     ) -> tuple[tuple[Any, ...], dict[str, Any]]:
+        organization_id_or_slug: int | str | None = None
+        if args and args[0] is not None:
+            organization_id_or_slug = args[0]
+            # Required so it behaves like the original convert_args, where organization_id_or_slug was another parameter
+            # TODO: Remove this once we remove the old `organization_slug` parameter from getsentry
+            args = args[1:]
+        else:
+            organization_id_or_slug = kwargs.pop("organization_id_or_slug", None) or kwargs.pop(
+                "organization_slug", None
+            )
+
+        if not organization_id_or_slug:
+            raise ResourceDoesNotExist
+
         if not subdomain_is_region(request):
             subdomain = getattr(request, "subdomain", None)
-            if subdomain is not None and subdomain != organization_slug:
+            if subdomain is not None and subdomain != organization_id_or_slug:
                 raise ResourceDoesNotExist
 
-        if not organization_slug:
-            raise ResourceDoesNotExist
-
         if (
-            id_or_slug_path_params_enabled(self.convert_args.__qualname__, str(organization_slug))
-            and str(organization_slug).isdecimal()
+            id_or_slug_path_params_enabled(
+                self.convert_args.__qualname__, str(organization_id_or_slug)
+            )
+            and str(organization_id_or_slug).isdecimal()
         ):
             # It is ok that `get_organization_by_id` doesn't check for visibility as we
             # don't check the visibility in `get_organization_by_slug` either (only_active=False).
             organization_context = organization_service.get_organization_by_id(
-                id=int(organization_slug), user_id=request.user.id
+                id=int(organization_id_or_slug), user_id=request.user.id
             )
         else:
             organization_context = organization_service.get_organization_by_slug(
-                slug=str(organization_slug), only_visible=False, user_id=request.user.id
+                slug=str(organization_id_or_slug), only_visible=False, user_id=request.user.id
             )
         if organization_context is None:
             raise ResourceDoesNotExist
@@ -536,32 +548,42 @@ def get_filter_params(
     def convert_args(
         self,
         request: Request,
-        organization_slug: str | int | None = None,
         *args: Any,
         **kwargs: Any,
     ) -> tuple[tuple[Any, ...], dict[str, Any]]:
         """
-        We temporarily allow the organization_slug to be an integer as it actually can be both slug or id
+        We temporarily allow the organization_id_or_slug to be an integer as it actually can be both slug or id
         Eventually, we will rename this method to organization_id_or_slug
         """
+        organization_id_or_slug: int | str | None = None
+        if args and args[0] is not None:
+            organization_id_or_slug = args[0]
+            # Required so it behaves like the original convert_args, where organization_id_or_slug was another parameter
+            # TODO: Remove this once we remove the old `organization_slug` parameter from getsentry
+            args = args[1:]
+        else:
+            organization_id_or_slug = kwargs.pop("organization_id_or_slug", None) or kwargs.pop(
+                "organization_slug", None
+            )
+
+        if not organization_id_or_slug:
+            raise ResourceDoesNotExist
+
         if not subdomain_is_region(request):
             subdomain = getattr(request, "subdomain", None)
-            if subdomain is not None and subdomain != organization_slug:
+            if subdomain is not None and subdomain != organization_id_or_slug:
                 raise ResourceDoesNotExist
 
-        if not organization_slug:
-            raise ResourceDoesNotExist
-
         try:
             if (
                 id_or_slug_path_params_enabled(
-                    self.convert_args.__qualname__, str(organization_slug)
+                    self.convert_args.__qualname__, str(organization_id_or_slug)
                 )
-                and str(organization_slug).isdecimal()
+                and str(organization_id_or_slug).isdecimal()
             ):
-                organization = Organization.objects.get_from_cache(id=organization_slug)
+                organization = Organization.objects.get_from_cache(id=organization_id_or_slug)
             else:
-                organization = Organization.objects.get_from_cache(slug=organization_slug)
+                organization = Organization.objects.get_from_cache(slug=organization_id_or_slug)
         except Organization.DoesNotExist:
             raise ResourceDoesNotExist
 

src/sentry/api/bases/organization_integrations.py

@@ -75,12 +75,12 @@ class RegionOrganizationIntegrationBaseEndpoint(RegionIntegrationEndpoint):
     def convert_args(
         self,
         request: Request,
-        organization_slug: str | int | None = None,
+        organization_id_or_slug: int | str | None = None,
         integration_id: str | None = None,
         *args: Any,
         **kwargs: Any,
     ) -> tuple[tuple[Any, ...], dict[str, Any]]:
-        args, kwargs = super().convert_args(request, organization_slug, *args, **kwargs)
+        args, kwargs = super().convert_args(request, organization_id_or_slug, *args, **kwargs)
 
         kwargs["integration_id"] = self.validate_integration_id(integration_id or "")
         return args, kwargs

src/sentry/api/bases/organizationmember.py

@@ -53,12 +53,12 @@ class OrganizationMemberEndpoint(OrganizationEndpoint):
     def convert_args(
         self,
         request: Request,
-        organization_slug: int | str | None = None,
+        organization_id_or_slug: str | int | None = None,
         member_id: str = "me",
         *args: Any,
         **kwargs: Any,
     ) -> tuple[tuple[Any, ...], dict[str, Any]]:
-        args, kwargs = super().convert_args(request, organization_slug, *args, **kwargs)
+        args, kwargs = super().convert_args(request, organization_id_or_slug, *args, **kwargs)
 
         serializer = MemberSerializer(data={"id": member_id})
         if serializer.is_valid():

src/sentry/api/bases/project.py

@@ -111,10 +111,19 @@ class ProjectEndpoint(Endpoint):
     def convert_args(
         self,
         request: Request,
-        organization_slug: str | int,
         *args,
         **kwargs,
     ):
+        if args and args[0] is not None:
+            organization_id_or_slug: int | str = args[0]
+            # Required so it behaves like the original convert_args, where organization_id_or_slug was another parameter
+            # TODO: Remove this once we remove the old `organization_slug` parameter from getsentry
+            args = args[1:]
+        else:
+            organization_id_or_slug = kwargs.pop("organization_id_or_slug", None) or kwargs.pop(
+                "organization_slug"
+            )
+
         if args and args[0] is not None:
             project_id_or_slug: int | str = args[0]
             # Required so it behaves like the original convert_args, where project_id_or_slug was another parameter
@@ -125,11 +134,11 @@ def convert_args(
             )
         try:
             if id_or_slug_path_params_enabled(
-                self.convert_args.__qualname__, str(organization_slug)
+                self.convert_args.__qualname__, str(organization_id_or_slug)
             ):
                 project = (
                     Project.objects.filter(
-                        organization__slug__id_or_slug=organization_slug,
+                        organization__slug__id_or_slug=organization_id_or_slug,
                         slug__id_or_slug=project_id_or_slug,
                     )
                     .select_related("organization")
@@ -139,7 +148,7 @@ def convert_args(
             else:
                 project = (
                     Project.objects.filter(
-                        organization__slug=organization_slug, slug=project_id_or_slug
+                        organization__slug=organization_id_or_slug, slug=project_id_or_slug
                     )
                     .select_related("organization")
                     .prefetch_related("teams")
@@ -151,24 +160,24 @@ def convert_args(
                 # This will only happen if the passed in project_id_or_slug is a slug and not an id
                 redirect = ProjectRedirect.objects.select_related("project")
                 if id_or_slug_path_params_enabled(
-                    self.convert_args.__qualname__, str(organization_slug)
+                    self.convert_args.__qualname__, str(organization_id_or_slug)
                 ):
                     redirect = redirect.get(
-                        organization__slug__id_or_slug=organization_slug,
+                        organization__slug__id_or_slug=organization_id_or_slug,
                         redirect_slug=project_id_or_slug,
                     )
                 else:
                     redirect = redirect.get(
-                        organization__slug=organization_slug, redirect_slug=project_id_or_slug
+                        organization__slug=organization_id_or_slug, redirect_slug=project_id_or_slug
                     )
                 # Without object permissions don't reveal the rename
                 self.check_object_permissions(request, redirect.project)
 
                 # get full path so that we keep query strings
                 requested_url = request.get_full_path()
                 new_url = requested_url.replace(
-                    f"projects/{organization_slug}/{project_id_or_slug}/",
-                    f"projects/{organization_slug}/{redirect.project.slug}/",
+                    f"projects/{organization_id_or_slug}/{project_id_or_slug}/",
+                    f"projects/{organization_id_or_slug}/{redirect.project.slug}/",
                 )
 
                 # Resource was moved/renamed if the requested url is different than the new url

src/sentry/api/endpoints/accept_organization_invite.py

@@ -85,7 +85,7 @@ def get_invite_state(
         if (
             id_or_slug_path_params_enabled(
                 convert_args_class=AcceptOrganizationInvite,
-                organization_slug=str(organization_id_or_slug),
+                organization_id_or_slug=str(organization_id_or_slug),
             )
             and str(organization_id_or_slug).isdecimal()
         ):
@@ -127,12 +127,12 @@ def get(
         request: Request,
         member_id: int,
         token: str,
-        organization_slug: int | str | None = None,
+        organization_id_or_slug: int | str | None = None,
     ) -> Response:
 
         invite_context = get_invite_state(
             member_id=int(member_id),
-            organization_id_or_slug=organization_slug,
+            organization_id_or_slug=organization_id_or_slug,
             user_id=request.user.id,
             request=request,
         )
@@ -222,11 +222,15 @@ def get(
         return response
 
     def post(
-        self, request: Request, member_id: int, token: str, organization_slug: str | None = None
+        self,
+        request: Request,
+        member_id: int,
+        token: str,
+        organization_id_or_slug: int | str | None = None,
     ) -> Response:
         invite_context = get_invite_state(
             member_id=int(member_id),
-            organization_id_or_slug=organization_slug,
+            organization_id_or_slug=organization_id_or_slug,
             user_id=request.user.id,
             request=request,
         )

src/sentry/api/endpoints/codeowners/details.py

@@ -35,14 +35,14 @@ class ProjectCodeOwnersDetailsEndpoint(ProjectEndpoint, ProjectCodeOwnersMixin):
     def convert_args(
         self,
         request: Request,
-        organization_slug: str | int,
+        organization_id_or_slug: int | str,
         project_id_or_slug: int | str,
         codeowners_id: str,
         *args: Any,
         **kwargs: Any,
     ) -> tuple[Any, Any]:
         args, kwargs = super().convert_args(
-            request, organization_slug, project_id_or_slug, *args, **kwargs
+            request, organization_id_or_slug, project_id_or_slug, *args, **kwargs
         )
         try:
             kwargs["codeowners"] = ProjectCodeOwners.objects.get(

src/sentry/api/endpoints/codeowners/external_actor/user_details.py

@@ -27,7 +27,7 @@ class ExternalUserDetailsEndpoint(OrganizationEndpoint, ExternalActorEndpointMix
     }
     owner = ApiOwner.ENTERPRISE
 
-    def convert_args(  # type: ignore[override]
+    def convert_args(
         self,
         request: Request,
         organization_slug: str,

src/sentry/api/endpoints/organization_event_details.py

@@ -91,19 +91,19 @@ class OrganizationEventDetailsEndpoint(OrganizationEventsEndpointBase):
     def convert_args(
         self,
         request: Request,
-        organization_slug: str | int | None = None,
+        organization_id_or_slug: int | str | None = None,
         *args: Any,
         **kwargs: Any,
     ) -> tuple[tuple[Any, ...], dict[str, Any]]:
-        args, kwargs = super().convert_args(request, organization_slug, *args, **kwargs)
+        args, kwargs = super().convert_args(request, organization_id_or_slug, *args, **kwargs)
 
         organization = kwargs["organization"]
         project_id_or_slug = kwargs.pop("project_id_or_slug")
 
         try:
             if id_or_slug_path_params_enabled(
                 convert_args_class=self.convert_args.__qualname__,
-                organization_slug=organization.slug,
+                organization_id_or_slug=organization.slug,
             ):
                 project = Project.objects.get(
                     slug__id_or_slug=project_id_or_slug,

src/sentry/api/endpoints/organization_member/details.py

@@ -113,7 +113,7 @@ def _get_member(
     @extend_schema(
         operation_id="Retrieve an Organization Member",
         parameters=[
-            GlobalParams.ORG_SLUG,
+            GlobalParams.ORG_ID_OR_SLUG,
             GlobalParams.member_id("The ID of the organization member."),
         ],
         responses={
@@ -146,7 +146,7 @@ def get(
     @extend_schema(
         operation_id="Update an Organization Member's Roles",
         parameters=[
-            GlobalParams.ORG_SLUG,
+            GlobalParams.ORG_ID_OR_SLUG,
             GlobalParams.member_id("The ID of the member to update."),
         ],
         request=inline_serializer(
@@ -357,7 +357,7 @@ def _change_org_role(member: OrganizationMember, role: str) -> None:
     @extend_schema(
         operation_id="Delete an Organization Member",
         parameters=[
-            GlobalParams.ORG_SLUG,
+            GlobalParams.ORG_ID_OR_SLUG,
             GlobalParams.member_id("The ID of the member to delete."),
         ],
         responses={