-
Notifications
You must be signed in to change notification settings - Fork 429
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix: Limit segment rules and conditions (#3397)
Co-authored-by: Matthew Elwell <[email protected]>
- Loading branch information
1 parent
c666d29
commit c89e96e
Showing
7 changed files
with
431 additions
and
9 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
55 changes: 55 additions & 0 deletions
55
api/segments/migrations/0021_create_whitelisted_segments.py
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,55 @@ | ||
# Generated by Django 3.2.24 on 2024-02-12 19:48 | ||
from django.apps.registry import Apps | ||
from django.db import migrations, models | ||
import django.db.models.deletion | ||
from django.db.backends.base.schema import BaseDatabaseSchemaEditor | ||
from django.conf import settings | ||
from django.db import connection | ||
|
||
|
||
|
||
def create_whitelisted_segments(apps: Apps, schema_editor: BaseDatabaseSchemaEditor) -> None: | ||
model_class = apps.get_model("segments", "WhitelistedSegment") | ||
sql = f""" | ||
SELECT s.id | ||
FROM segments_segment s | ||
LEFT OUTER JOIN segments_segmentrule sr1 ON s.id = sr1.segment_id | ||
LEFT OUTER JOIN segments_segmentrule sr2 ON sr1.id = sr2.rule_id | ||
LEFT OUTER JOIN segments_condition sc ON sr2.id = sc.rule_id | ||
GROUP BY s.id | ||
HAVING COUNT(*) > {settings.SEGMENT_RULES_CONDITIONS_LIMIT} | ||
ORDER BY COUNT(*) DESC; | ||
""" | ||
|
||
whitelisted_segments = [] | ||
with connection.cursor() as cursor: | ||
cursor.execute(sql) | ||
results = cursor.fetchall() | ||
for result in results: | ||
segment_id = result[0] | ||
whitelisted_segments.append(model_class(segment_id=segment_id)) | ||
|
||
model_class.objects.bulk_create(whitelisted_segments) | ||
|
||
|
||
class Migration(migrations.Migration): | ||
|
||
dependencies = [ | ||
('segments', '0020_detach_segment_from_project_cascade_delete'), | ||
] | ||
|
||
operations = [ | ||
migrations.CreateModel( | ||
name='WhitelistedSegment', | ||
fields=[ | ||
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), | ||
('created_at', models.DateTimeField(auto_now_add=True, null=True)), | ||
('updated_at', models.DateTimeField(auto_now=True, null=True)), | ||
('segment', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, related_name='whitelisted_segment', to='segments.segment')), | ||
], | ||
), | ||
migrations.RunPython( | ||
create_whitelisted_segments, | ||
reverse_code=migrations.RunPython.noop, | ||
) | ||
] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,104 @@ | ||
import pytest | ||
from django.conf import settings as test_settings | ||
from django_test_migrations.migrator import Migrator | ||
from flag_engine.segments import constants | ||
from pytest_django.fixtures import SettingsWrapper | ||
|
||
|
||
@pytest.mark.skipif( | ||
test_settings.SKIP_MIGRATION_TESTS is True, | ||
reason="Skip migration tests to speed up tests where necessary", | ||
) | ||
def test_create_whitelisted_segments_migration( | ||
migrator: Migrator, | ||
settings: SettingsWrapper, | ||
) -> None: | ||
# Given - The migration state is at 0020 (before the migration we want to test). | ||
old_state = migrator.apply_initial_migration( | ||
("segments", "0020_detach_segment_from_project_cascade_delete") | ||
) | ||
|
||
Organisation = old_state.apps.get_model("organisations", "Organisation") | ||
Project = old_state.apps.get_model("projects", "Project") | ||
SegmentRule = old_state.apps.get_model("segments", "SegmentRule") | ||
Segment = old_state.apps.get_model("segments", "Segment") | ||
Condition = old_state.apps.get_model("segments", "Condition") | ||
|
||
# Set the limit lower to allow for a faster test. | ||
settings.SEGMENT_RULES_CONDITIONS_LIMIT = 3 | ||
|
||
# Next, create the setup data. | ||
organisation = Organisation.objects.create(name="Big Corp Incorporated") | ||
project = Project.objects.create(name="Huge Project", organisation=organisation) | ||
|
||
segment_1 = Segment.objects.create(name="Segment1", project=project) | ||
segment_2 = Segment.objects.create(name="Segment1", project=project) | ||
segment_rule_1 = SegmentRule.objects.create( | ||
segment=segment_1, | ||
type="ALL", | ||
) | ||
|
||
# Subnested segment rules. | ||
segment_rule_2 = SegmentRule.objects.create( | ||
rule=segment_rule_1, | ||
type="ALL", | ||
) | ||
segment_rule_3 = SegmentRule.objects.create( | ||
rule=segment_rule_1, | ||
type="ALL", | ||
) | ||
|
||
# Lonely segment rules for pass criteria for segment_2. | ||
segment_rule_4 = SegmentRule.objects.create( | ||
segment=segment_2, | ||
type="ALL", | ||
) | ||
segment_rule_5 = SegmentRule.objects.create( | ||
rule=segment_rule_4, | ||
type="ALL", | ||
) | ||
|
||
Condition.objects.create( | ||
operator=constants.EQUAL, | ||
property="age", | ||
value="21", | ||
rule=segment_rule_2, | ||
) | ||
Condition.objects.create( | ||
operator=constants.GREATER_THAN, | ||
property="height", | ||
value="210", | ||
rule=segment_rule_2, | ||
) | ||
Condition.objects.create( | ||
operator=constants.GREATER_THAN, | ||
property="waist", | ||
value="36", | ||
rule=segment_rule_3, | ||
) | ||
Condition.objects.create( | ||
operator=constants.LESS_THAN, | ||
property="shoes", | ||
value="12", | ||
rule=segment_rule_3, | ||
) | ||
|
||
# Sole criteria for segment_2 conditions. | ||
Condition.objects.create( | ||
operator=constants.LESS_THAN, | ||
property="toy_count", | ||
value="7", | ||
rule=segment_rule_5, | ||
) | ||
|
||
# When we run the migration. | ||
new_state = migrator.apply_tested_migration( | ||
("segments", "0021_create_whitelisted_segments") | ||
) | ||
|
||
# Then the first segment is in the whitelist while the second is not. | ||
NewSegment = new_state.apps.get_model("segments", "Segment") | ||
new_segment_1 = NewSegment.objects.get(id=segment_1.id) | ||
new_segment_2 = NewSegment.objects.get(id=segment_2.id) | ||
assert new_segment_1.whitelisted_segment | ||
assert getattr(new_segment_2, "whitelisted_segment", None) is None |
Oops, something went wrong.