Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(sentry-FLAGSMITH-API-4FY): resolve metadata segment n+1 #4030

Merged
merged 2 commits into from
Jun 3, 2024
Merged

fix(sentry-FLAGSMITH-API-4FY): resolve metadata segment n+1 #4030

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
71e4c6c
fix(sentry-FLAGSMITH-API-4FY): resolve metadata segment n+1
gagantrivedi May 27, 2024
14eeaa6
fixup! fix(sentry-FLAGSMITH-API-4FY): resolve metadata segment n+1
gagantrivedi Jun 3, 2024
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
1 change: 1 addition & 0 deletions api/segments/views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ def get_queryset(self):
"rules__rules",
"rules__rules__conditions",
"rules__rules__rules",
"metadata",
)

query_serializer = SegmentListQuerySerializer(data=self.request.query_params)
Expand Down
21 changes: 17 additions & 4 deletions api/tests/unit/segments/test_unit_segments_views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@

import pytest
from django.contrib.auth import get_user_model
from django.contrib.contenttypes.models import ContentType
from django.urls import reverse
from flag_engine.segments.constants import EQUAL
from pytest_django.fixtures import SettingsWrapper
Expand All @@ -15,7 +16,7 @@
from audit.related_object_type import RelatedObjectType
from environments.models import Environment
from features.models import Feature
from metadata.models import MetadataModelField
from metadata.models import Metadata, MetadataModelField
from projects.models import Project
from projects.permissions import MANAGE_SEGMENTS, VIEW_PROJECT
from segments.models import Condition, Segment, SegmentRule, WhitelistedSegment
Expand Down Expand Up @@ -337,16 +338,28 @@ def test_get_segment_by_uuid(client, project, segment):
@pytest.mark.parametrize(
"client, num_queries",
[
(lazy_fixture("admin_master_api_key_client"), 16),
(lazy_fixture("admin_client"), 15),
(lazy_fixture("admin_master_api_key_client"), 12),
(lazy_fixture("admin_client"), 11),
],
)
def test_list_segments(django_assert_num_queries, project, client, num_queries):
def test_list_segments(
django_assert_num_queries,
project,
client,
num_queries,
required_a_segment_metadata_field,
):
# Given
num_segments = 5
segments = []
for i in range(num_segments):
segment = Segment.objects.create(project=project, name=f"segment {i}")
Metadata.objects.create(
object_id=segment.id,
content_type=ContentType.objects.get_for_model(segment),
model_field=required_a_segment_metadata_field,
field_value="test",
)
all_rule = SegmentRule.objects.create(
segment=segment, type=SegmentRule.ALL_RULE
)
Expand Down