-
Notifications
You must be signed in to change notification settings - Fork 429
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.
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: add reverse sql to versioning migration #4491
Merged
Merged
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
3 changes: 3 additions & 0 deletions
3
api/segments/migrations/sql/0023_add_versioning_to_segments_reverse.sql
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,3 @@ | ||
UPDATE segments_segment | ||
SET deleted_at = now() | ||
WHERE version_of_id <> id; |
This file was deleted.
Oops, something went wrong.
239 changes: 239 additions & 0 deletions
239
api/tests/unit/segments/test_unit_segments_migrations.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,239 @@ | ||
import uuid | ||
|
||
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 | ||
|
||
|
||
@pytest.mark.skipif( | ||
test_settings.SKIP_MIGRATION_TESTS is True, | ||
reason="Skip migration tests to speed up tests where necessary", | ||
) | ||
def test_add_versioning_to_segments_forwards(migrator: Migrator) -> None: | ||
# Given - The migration state is at 0021 (before the migration we want to test). | ||
old_state = migrator.apply_initial_migration( | ||
("segments", "0022_add_soft_delete_to_segment_rules_and_conditions") | ||
) | ||
|
||
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") | ||
|
||
# Next, create the setup data. | ||
organisation = Organisation.objects.create(name="Test Org") | ||
project = Project.objects.create(name="Test Project", organisation_id=organisation.id) | ||
|
||
segment = Segment.objects.create(name="Segment1", project_id=project.id) | ||
segment_rule_1 = SegmentRule.objects.create( | ||
segment_id=segment.id, | ||
type="ALL", | ||
) | ||
|
||
# Subnested segment rules. | ||
segment_rule_2 = SegmentRule.objects.create( | ||
rule_id=segment_rule_1.id, | ||
type="ALL", | ||
) | ||
|
||
Condition.objects.create( | ||
operator=constants.EQUAL, | ||
property="age", | ||
value="21", | ||
rule_id=segment_rule_2.id, | ||
) | ||
|
||
# When we run the migration. | ||
new_state = migrator.apply_tested_migration( | ||
("segments", "0023_add_versioning_to_segments") | ||
) | ||
|
||
# Then the version_of attribute is correctly set. | ||
NewSegment = new_state.apps.get_model("segments", "Segment") | ||
new_segment = NewSegment.objects.get(id=segment.id) | ||
assert new_segment.version_of == new_segment | ||
|
||
|
||
@pytest.mark.skipif( | ||
test_settings.SKIP_MIGRATION_TESTS is True, | ||
reason="Skip migration tests to speed up tests where necessary", | ||
) | ||
def test_add_versioning_to_segments_reverse(migrator: Migrator) -> None: | ||
# Given - The migration state is at 0023 (after the migration we want to test). | ||
old_state = migrator.apply_initial_migration( | ||
("segments", "0023_add_versioning_to_segments") | ||
) | ||
|
||
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") | ||
|
||
# Next, create the setup data. | ||
organisation = Organisation.objects.create(name="Test Org") | ||
project = Project.objects.create(name="Test Project", organisation=organisation) | ||
|
||
# Set the version manually since this is normally done via a lifecycle hook | ||
# that doesn't run for models created in a migration state. | ||
segment = Segment.objects.create(name="Segment1", project=project, version=1) | ||
segment_rule_1 = SegmentRule.objects.create( | ||
segment=segment, | ||
type="ALL", | ||
) | ||
|
||
# We ideally want to call Segment.deep_clone but that's not | ||
# possible when working in a migration state. As such, we | ||
# do the basic amount necessary from that method to allow | ||
# us to test the migration behaviour. | ||
def _deep_clone(segment: Segment) -> Segment: | ||
cloned_segment = Segment.objects.create( | ||
name=segment.name, | ||
project_id=segment.project_id, | ||
description=segment.description, | ||
feature=segment.feature, | ||
uuid=uuid.uuid4(), | ||
version_of_id=segment.id, | ||
) | ||
|
||
segment.version += 1 | ||
segment.save() | ||
|
||
return cloned_segment | ||
|
||
version_1 = _deep_clone(segment) | ||
version_2 = _deep_clone(segment) | ||
|
||
version_3 = segment | ||
|
||
# Subnested segment rules. | ||
segment_rule_2 = SegmentRule.objects.create( | ||
rule=segment_rule_1, | ||
type="ALL", | ||
) | ||
|
||
Condition.objects.create( | ||
operator=constants.EQUAL, | ||
property="age", | ||
value="21", | ||
rule=segment_rule_2, | ||
) | ||
|
||
# When we run the migration in reverse. | ||
new_state = migrator.apply_tested_migration( | ||
("segments", "0022_add_soft_delete_to_segment_rules_and_conditions") | ||
) | ||
|
||
# Then any historical versions of the segment are deleted. | ||
NewSegment = new_state.apps.get_model("segments", "Segment") | ||
|
||
new_segment_v1 = NewSegment.objects.get(id=version_1.id) | ||
assert new_segment_v1.deleted_at is not None | ||
|
||
new_segment_v2 = NewSegment.objects.get(id=version_2.id) | ||
assert new_segment_v2.deleted_at is not None | ||
|
||
new_segment_v3 = NewSegment.objects.get(id=version_3.id) | ||
assert new_segment_v3.deleted_at is None |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Hmm... this test was not modified. The diff is showing that a file was deleted / created vs the renaming action that actually happened. This test function does not need to be reviewed.