-
Notifications
You must be signed in to change notification settings - Fork 458
fix: Use data instead of parsed data for recording analytics #6196
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
Open
existentialcoder
wants to merge
4
commits into
Flagsmith:main
Choose a base branch
from
existentialcoder:iss-5906
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+43
−1
Open
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
379afd3
fix: parsing for features with .
existentialcoder 99b35dc
fix: use data instead and add test
existentialcoder 2221473
fix: address review comment
existentialcoder eea586b
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] 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 hidden or 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 |
|---|---|---|
|
|
@@ -8,3 +8,4 @@ features/workflows/logic/ | |
|
|
||
| # Unit test coverage | ||
| .coverage | ||
| .coverage.* | ||
This file contains hidden or 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 hidden or 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 |
|---|---|---|
|
|
@@ -23,9 +23,15 @@ | |
| Organisation, | ||
| OrganisationSubscriptionInformationCache, | ||
| ) | ||
| from projects.models import Project | ||
| from tests.types import EnableFeaturesFixture | ||
|
|
||
|
|
||
| @pytest.fixture() | ||
| def feature_with_dots(project: Project) -> Feature: | ||
| return Feature.objects.create(name="feature.with.dots", project=project) # type: ignore[no-any-return] | ||
|
Comment on lines
+30
to
+32
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This doesn't need to be a fixture since it's only used in a single test. I'd rather that we just instantiate the feature directly in the test. |
||
|
|
||
|
|
||
| def test_sdk_analytics_ignores_bad_data( | ||
| mocker: MockerFixture, | ||
| environment: Environment, | ||
|
|
@@ -59,6 +65,39 @@ def test_sdk_analytics_ignores_bad_data( | |
| ) | ||
|
|
||
|
|
||
| def test_sdk_analytics_ignores_feature_data_with_dots( | ||
| mocker: MockerFixture, | ||
| environment: Environment, | ||
| feature_with_dots: Feature, | ||
| api_client: APIClient, | ||
| ) -> None: | ||
| # Given | ||
| api_client.credentials(HTTP_X_ENVIRONMENT_KEY=environment.api_key) | ||
|
|
||
| data = {feature_with_dots.name: 20} | ||
| mocked_feature_eval_cache = mocker.patch( | ||
| "app_analytics.views.feature_evaluation_cache" | ||
| ) | ||
|
|
||
| url = reverse("api-v1:analytics-flags") | ||
|
|
||
| # When | ||
| response = api_client.post( | ||
| url, data=json.dumps(data), content_type="application/json" | ||
| ) | ||
|
|
||
| # Then | ||
| assert response.status_code == status.HTTP_200_OK | ||
| assert mocked_feature_eval_cache.track_feature_evaluation.call_count == 1 | ||
|
|
||
| mocked_feature_eval_cache.track_feature_evaluation.assert_called_once_with( | ||
| environment_id=environment.id, | ||
| feature_name=feature_with_dots.name, | ||
| evaluation_count=data[feature_with_dots.name], | ||
| labels={}, | ||
| ) | ||
|
|
||
|
|
||
| def test_get_usage_data(mocker, admin_client, organisation): # type: ignore[no-untyped-def] | ||
| # Given | ||
| url = reverse("api-v1:organisations:usage-data", args=[organisation.id]) | ||
|
|
||
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.
This comment doesn't make sense to me. Surely we want the "." in the feature name. Can we be more explicit here about what the difference is between
validated_dataanddatain this scenario?Also, is there a neater way to solve this in the serializer rather than the view? I wonder if skipping validated_data here might lead to other problems down the line.