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.

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: Include free plans for api use notifications #4204

Merged
merged 9 commits into from
Jun 20, 2024

Conversation

zachaysan
Copy link
Contributor

Thanks for submitting a PR! Please check the boxes below:

  • I have run pre-commit to check linting
  • I have added information to docs/ if required so people know about the feature!
  • I have filled in the "Changes" section below?
  • I have filled in the "How did you test this code" section below?
  • I have used a Conventional Commit title for this Pull Request

Changes

Includes free plans in the API use notifications with a rolling 30 day window as their effective start date. It also included some extra code to ensure that they're not including in automatic payment adjustments since free plans don't have credit cards.

How did you test this code?

Two existing tests and a new one just for free plans.

Copy link

vercel bot commented Jun 20, 2024

The latest updates on your projects. Learn more about Vercel for Git ↗︎

3 Ignored Deployments
Name Status Preview Comments Updated (UTC)
docs ⬜️ Ignored (Inspect) Visit Preview Jun 20, 2024 6:43pm
flagsmith-frontend-preview ⬜️ Ignored (Inspect) Visit Preview Jun 20, 2024 6:43pm
flagsmith-frontend-staging ⬜️ Ignored (Inspect) Visit Preview Jun 20, 2024 6:43pm

@zachaysan zachaysan requested a review from matthewelwell June 20, 2024 15:31
@github-actions github-actions bot added api Issue related to the REST API fix labels Jun 20, 2024
Copy link
Contributor

github-actions bot commented Jun 20, 2024

Uffizzi Preview deployment-53292 was deleted.

Copy link

codecov bot commented Jun 20, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 96.51%. Comparing base (e7fd8bd) to head (f491c2f).
Report is 2 commits behind head on main.

Additional details and impacted files
@@           Coverage Diff           @@
##             main    #4204   +/-   ##
=======================================
  Coverage   96.51%   96.51%           
=======================================
  Files        1177     1177           
  Lines       38230    38290   +60     
=======================================
+ Hits        36896    36956   +60     
  Misses       1334     1334           

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

Copy link
Contributor

@matthewelwell matthewelwell left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Approved with a minor grammatical fix.

assert email.body == (
"Hi there,\n\nThe API usage for Test Org has breached "
"100% within the current subscription period. Please "
"upgrade your organisations account to ensure "
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
"upgrade your organisations account to ensure "
"upgrade your organisation's account to ensure "

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok no problem. I've fixed the other invocations as well in the other tests.

@github-actions github-actions bot added fix and removed fix labels Jun 20, 2024
@github-actions github-actions bot added fix and removed fix labels Jun 20, 2024
@github-actions github-actions bot added fix and removed fix labels Jun 20, 2024
@zachaysan zachaysan added this pull request to the merge queue Jun 20, 2024
Merged via the queue into main with commit e1f3a7b Jun 20, 2024
25 checks passed
@zachaysan zachaysan deleted the fix/include_free_plans_for_api_use_notifications branch June 20, 2024 18:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
api Issue related to the REST API fix
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants