Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/sentry/synapse/endpoints/org_cell_mappings.py
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,8 @@ def get(self, request: Request) -> Response:
Retrieve organization-to-cell mappings.
"""
query = OrganizationMapping.objects.all()
if request.GET.get("locale"):
query = query.filter(region_name=request.GET.get("locale"))
try:
per_page = self.get_per_page(request, max_per_page=self.MAX_LIMIT)
cursor = self.get_cursor_from_request(request)
Expand Down
24 changes: 23 additions & 1 deletion tests/sentry/synapse/endpoints/test_org_cell_mappings.py
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ def test_get_next_page(self) -> None:

@override_regions(region_config)
@patch("sentry.synapse.endpoints.org_cell_mappings.OrgCellMappingsEndpoint.MAX_LIMIT", 2)
def test_get_multiple_pages(self) -> None:
def test_get_multiple_pages_multiple_locales(self) -> None:
org1 = self.create_organization()
org2 = self.create_organization()
org3 = self.create_organization(region=de_region)
Expand Down Expand Up @@ -138,3 +138,25 @@ def test_get_multiple_pages(self) -> None:
assert res.data["metadata"]["cursor"]
assert res.data["metadata"]["cell_to_locality"]
assert res.data["metadata"]["has_more"] is False

@override_regions(region_config)
@patch("sentry.synapse.endpoints.org_cell_mappings.OrgCellMappingsEndpoint.MAX_LIMIT", 2)
def test_get_locale_filter(self) -> None:
# Two orgs in the wrong region to check pagination response data
self.create_organization()
self.create_organization()
org3 = self.create_organization(region=de_region)

url = reverse("sentry-api-0-org-cell-mappings")
res = self.client.get(
url,
data={"locale": "de"},
HTTP_AUTHORIZATION=self.auth_header(url),
)
assert res.status_code == 200
assert res.data["data"][org3.slug] == "de"
assert res.data["data"][str(org3.id)] == "de"
assert len(res.data["data"].keys()) == 2
assert res.data["metadata"]["cursor"]
assert res.data["metadata"]["cell_to_locality"]
assert res.data["metadata"]["has_more"] is False
Loading