Skip to content

Commit

Permalink
Remove extra argument
Browse files Browse the repository at this point in the history
  • Loading branch information
khvn26 committed Dec 18, 2023
1 parent a6f2c7e commit 306b733
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 15 deletions.
6 changes: 3 additions & 3 deletions api/features/features_service.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
)
from features.dataclasses import EnvironmentFeatureOverridesData
from features.versioning.versioning_service import get_environment_flags_list
from projects.models import IdentityOverridesV2MigrationStatus, Project
from projects.models import IdentityOverridesV2MigrationStatus

if typing.TYPE_CHECKING:
from environments.models import Environment
Expand All @@ -16,15 +16,15 @@


def get_overrides_data(
project: Project,
environment: "Environment",
) -> OverridesData:
"""
Get correct overrides counts for a given project.
Get correct overrides counts for a given environment.
:param project: project to get overrides data for
:return: overrides data getter
"""
project = environment.project
match project.enable_dynamo_db, project.identity_overrides_v2_migration_status:
case True, IdentityOverridesV2MigrationStatus.COMPLETE:
# If v2 migration is complete, count segment overrides from Core
Expand Down
7 changes: 4 additions & 3 deletions api/features/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -152,16 +152,17 @@ def perform_destroy(self, instance):

def get_serializer_context(self):
context = super().get_serializer_context()
project = get_object_or_404(Project.objects.all(), pk=self.kwargs["project_pk"])
context.update(
project=project,
project=get_object_or_404(
Project.objects.all(), pk=self.kwargs["project_pk"]
),
user=self.request.user,
)
if self.action == "list" and "environment" in self.request.query_params:
environment = get_object_or_404(
Environment, id=self.request.query_params["environment"]
)
context["overrides_data"] = get_overrides_data(project, environment)
context["overrides_data"] = get_overrides_data(environment)

return context

Expand Down
16 changes: 7 additions & 9 deletions api/tests/unit/features/test_unit_features_features_service.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
get_overrides_data,
)
from features.models import Feature, FeatureSegment, FeatureState
from projects.models import IdentityOverridesV2MigrationStatus, Project
from projects.models import IdentityOverridesV2MigrationStatus
from util.mappers.engine import (
map_feature_state_to_engine,
map_identity_to_engine,
Expand Down Expand Up @@ -90,7 +90,6 @@ def distinct_identity_featurestate(
)
def test_feature_get_overrides_data__call_expected(
mocker: "MockerFixture",
project: Project,
environment: "Environment",
enable_dynamo_db: bool,
identity_overrides_v2_migration_status: str,
Expand All @@ -108,13 +107,13 @@ def test_feature_get_overrides_data__call_expected(
autospec=True,
),
}
project.enable_dynamo_db = enable_dynamo_db
project.identity_overrides_v2_migration_status = (
environment.project.enable_dynamo_db = enable_dynamo_db
environment.project.identity_overrides_v2_migration_status = (
identity_overrides_v2_migration_status
)

# When
get_overrides_data(project, environment)
get_overrides_data(environment)

# Then
mocked_override_getters.pop(expected_overrides_getter_name).assert_called_once_with(
Expand All @@ -133,20 +132,19 @@ def test_feature_get_overrides_data__call_expected(
],
)
def test_feature_get_overrides_data__edge_project_not_migrated_to_v2__return_expected(
project: Project,
environment: "Environment",
distinct_identity_featurestate: FeatureState,
distinct_segment_featurestate: FeatureState,
identity_overrides_v2_migration_status: str,
) -> None:
# Given
project.enable_dynamo_db = True
project.identity_overrides_v2_migration_status = (
environment.project.enable_dynamo_db = True
environment.project.identity_overrides_v2_migration_status = (
identity_overrides_v2_migration_status
)

# When
overrides_data = get_overrides_data(project, environment)
overrides_data = get_overrides_data(environment)

# Then
assert (
Expand Down

0 comments on commit 306b733

Please sign in to comment.