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
3 changes: 3 additions & 0 deletions src/sentry/api/endpoints/organization_events.py
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,9 @@ def data_fn(offset, limit):
referrer=referrer,
use_aggregate_conditions=True,
orderby=self.get_orderby(request) or maybe_aggregate,
use_snql=features.has(
"organizations:discover-use-snql", organization, actor=request.user
),
)

with self.handle_query_errors():
Expand Down
8 changes: 8 additions & 0 deletions tests/snuba/api/endpoints/test_organization_events_geo.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,12 @@ class OrganizationEventsGeoEndpointTest(APITestCase, SnubaTestCase):
def setUp(self):
super().setUp()
self.min_ago = iso_format(before_now(minutes=1))
self.features = {}

def do_request(self, query, features=None):
if features is None:
features = {"organizations:dashboards-basic": True}
features.update(self.features)
self.login_as(user=self.user)
url = reverse(
"sentry-api-0-organization-events-geo",
Expand Down Expand Up @@ -183,3 +185,9 @@ def get_mock_data(index, geo):
{"count": 2, "geo.country_code": "JP"},
{"count": 3, "geo.country_code": "BR"},
]


class OrganizationEventsGeoEndpointTestWithSnql(OrganizationEventsGeoEndpointTest):
def setUp(self):
super().setUp()
self.features["organizations:discover-use-snql"] = True