Scope ReleaseProjectEnvironment filter by project ids

Author: cmanallen

src/sentry/api/endpoints/organization_releases.py

@@ -314,7 +314,9 @@ def get(self, request: Request, organization) -> Response:
 
         queryset = Release.objects.filter(organization_id=organization.id)
         queryset = filter_releases_by_environments(
-            queryset, [e.id for e in filter_params.get("environment_objects", [])]
+            queryset,
+            filter_params["project_id"],
+            [e.id for e in filter_params.get("environment_objects", [])],
         )
         queryset = queryset.annotate(date=F("date_added"))
 
@@ -673,7 +675,9 @@ def get(self, request: Request, organization) -> Response:
         queryset = add_date_filter_to_queryset(queryset, filter_params)
         queryset = filter_releases_by_projects(queryset, filter_params["project_id"])
         queryset = filter_releases_by_environments(
-            queryset, [e.id for e in filter_params.get("environment_objects", [])]
+            queryset,
+            filter_params["project_id"],
+            [e.id for e in filter_params.get("environment_objects", [])],
         )
         queryset = (
             queryset.annotate(date=F("date_added")).values("version", "date").order_by("-date")

src/sentry/models/release.py

@@ -837,7 +837,11 @@ def filter_releases_by_projects(queryset: QuerySetAny, project_ids: list[int]):
     )
 
 
-def filter_releases_by_environments(queryset: QuerySetAny, environment_ids: list[int]):
+def filter_releases_by_environments(
+    queryset: QuerySetAny,
+    project_ids: list[int],
+    environment_ids: list[int],
+):
     """Return a release queryset filtered by environments."""
     if not environment_ids:
         return queryset
@@ -847,6 +851,7 @@ def filter_releases_by_environments(queryset: QuerySetAny, environment_ids: list
             ReleaseProjectEnvironment.objects.filter(
                 release=OuterRef("pk"),
                 environment_id__in=environment_ids,
+                project_id__in=project_ids,
             )
         )
     )