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.

Sign up for GitHub

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

feat: Tweak email wording for grace periods #4482

Merged
merged 4 commits into from
Aug 13, 2024
Merged

feat: Tweak email wording for grace periods #4482

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4e2477f
Add check for grace period
zachaysan Aug 12, 2024
ff9ff4b
Add check for grace period wording
zachaysan Aug 12, 2024
694687d
Add grace period check to test suite
zachaysan Aug 12, 2024
0dd3322
Remove pointless bool cast
zachaysan Aug 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions api/organisations/task_helpers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@ def _send_api_usage_notification(
context = {
"organisation": organisation,
"matched_threshold": matched_threshold,
"grace_period": not hasattr(organisation, "breached_grace_period"),
}

send_mail(
Expand Down
4 changes: 2 additions & 2 deletions api/organisations/templates/organisations/api_usage_notification.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
for overages after our first grace period of 30 days.
{% else %}
Please note that once 100% use has been breached, the serving of feature flags and admin access may
be disabled after a 7-day grace period. Please reach out to [email protected] in order to upgrade
your account.
be disabled{% if grace_period %} after a 7-day grace period{% endif %}. Please reach out to
[email protected] in order to upgrade your account.
{% endif %}

</td>
Expand Down
4 changes: 2 additions & 2 deletions api/organisations/templates/organisations/api_usage_notification.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ If this is expected, no action is required. If you are expecting to go over, you
limits by reaching out to [email protected]. We will automatically charge for overages after our first grace period
of 30 days.
{% else %}
Please note that once 100% use has been breached, the serving of feature flags and admin access may be disabled after a
7-day grace period. Please reach out to [email protected] in order to upgrade your account.
Please note that once 100% use has been breached, the serving of feature flags and admin access may be disabled{% if grace_period %}
after a 7-day grace period{% endif %}. Please reach out to [email protected] in order to upgrade your account.
{% endif %}

Thank you!
Expand Down
4 changes: 2 additions & 2 deletions api/organisations/templates/organisations/api_usage_notification_limit.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
more information. You can reach out to [email protected] if you’d like to take advantage of better
contracted rates.
{% else %}
Please note that the serving of feature flags and admin access will be disabled after a 7 day grace
period until the next subscription period. If you’d like to continue service you can upgrade your
Please note that the serving of feature flags and admin access will be disabled{% if grace_period %} after a 7 day grace
period{% endif %} until the next subscription period. If you’d like to continue service you can upgrade your
organisation’s account (see pricing page).
{% endif %}
</td>
Expand Down
6 changes: 3 additions & 3 deletions api/organisations/templates/organisations/api_usage_notification_limit.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ has reached {{ matched_threshold }}% of your API usage within the current subscr
We will charge for overages after our first grace period of 30 days. Please see the pricing page for more information.
You can reach out to [email protected] if you’d like to take advantage of better contracted rates.
{% else %}
Please note that the serving of feature flags and admin access will be disabled after a 7 day grace period until the
next subscription period. If you’d like to continue service you can upgrade your organisation’s account (see pricing
page).
Please note that the serving of feature flags and admin access will be disabled{% if grace_period %} after a 7 day
grace period{% endif %} until the next subscription period. If you’d like to continue service you can upgrade your
organisation’s account (see pricing page).
{% endif %}

Thank you!
Expand Down
12 changes: 10 additions & 2 deletions api/tests/unit/organisations/test_unit_organisations_tasks.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -664,7 +664,11 @@ def test_handle_api_usage_notifications_for_free_accounts(
assert email.subject == "Flagsmith API use has reached 100%"
assert email.body == render_to_string(
"organisations/api_usage_notification_limit.txt",
context={"organisation": organisation, "matched_threshold": 100},
context={
"organisation": organisation,
"matched_threshold": 100,
"grace_period": True,
},
)

assert len(email.alternatives) == 1
Expand All @@ -673,7 +677,11 @@ def test_handle_api_usage_notifications_for_free_accounts(

assert email.alternatives[0][0] == render_to_string(
"organisations/api_usage_notification_limit.html",
context={"organisation": organisation, "matched_threshold": 100},
context={
"organisation": organisation,
"matched_threshold": 100,
"grace_period": True,
},
)

assert email.from_email == "[email protected]"
Expand Down
Loading