darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-04-07 02:51:06 -04:00
Code Issues Packages Projects Releases Wiki Activity
12,545 Commits 49 Branches 59 Tags
7f94232f4e2f4b019cf43f297a67cf4068ad284e
Commit Graph

12545 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chris Hill-Scott
7f94232f4e Clean up old text message price 
Now that the new price is in effect, we don’t need to check the date to
see which price should be displayed to the user.
 2022-05-03 10:14:35 +01:00
Ben Thorner
3a1ac189ff Merge pull request #4225 from alphagov/free-allowance-api-181934027 
Change annual usage to work with multiple SMS rates
 2022-04-29 13:22:54 +01:00
Chris Hill-Scott
208985aa25 Merge pull request #4222 from alphagov/1-may-price-change 
Update text message rate on 1 May 2022
 2022-04-29 11:16:57 +01:00
Chris Hill-Scott
b142136380 Merge pull request #4224 from alphagov/bump-utils-55.1.6 
Bump utils to 55.1.6
 2022-04-29 11:16:50 +01:00
Chris Hill-Scott
4a0f5e8a41 Make text message price dependent on date 
So we don’t have to deploy a change on a Saturday.

In the future this could pull from the rates in the database, but while
that code is shifting around I didn’t want to touoch it. We’d also have
to think about caching so as not to have a non-authenticated route
hitting the database.
 2022-04-28 10:48:44 +01:00
Ben Thorner
5511f15ae8 Add missing dashboard test for zero SMS cost 2022-04-27 17:08:44 +01:00
Ben Thorner
e6c04ef556 Support variable rates for annual usage stats 
Note: I've removed the pricing assertion in the "0_free_allowance"
test as it's covered elsewhere - the value of the test is really to
check that we don't show the remainder if there never was any.
 2022-04-27 17:06:17 +01:00
Ben Thorner
715a3c137f Rename ambiguous "sms_chargeable" Jinja variable 
Now that we have the term "charge*able*_units" we should clarify
this variable is the number we will actually charge for.
 2022-04-27 17:06:16 +01:00
Ben Thorner
e0aa51c306 Use new "cost" field in usage APIs 
The previous, manual calculation could be incorrect depending on
which SMS rates the free allowance was attributed to.

The new field also supersedes the old "letter_total" bolt-on so we
can get cost information consistently for both types.
 2022-04-27 17:06:12 +01:00
Ben Thorner
82c3e8093d Remove redundant SMS test data for annual usage 2022-04-27 16:58:18 +01:00
Ben Thorner
4925264fb7 Remove duplicate test for usage page 
This is covered by the main test for the page.
 2022-04-27 16:57:11 +01:00
Ben Thorner
c6f5467009 Extend main test for service usage page 
This adds missing assertions for email and SMS usage, as well as
letters with the help of some additional test data.

Previously we were only checking monthly usage (in other tests).
 2022-04-27 16:57:06 +01:00
Ben Thorner
2aa3e78db2 Tidy up monthly usage test assertions 
The "with_letters" was mostly a duplicate of the one before - no
change in test setup - bar the three assertions at the end.

Having the assertions in a separate test will help keep the one
above manageable as we add more assertions for the annual usage.
 2022-04-27 16:37:17 +01:00
Ben Thorner
55ea5d90c7 Migrate away from ambiguous "billing_units" 
This uses two new fields in the annual usage API instead of the
old one, which was actually a mix of two kinds of data [^1].

[^1]: fc378fed96
 2022-04-27 16:32:52 +01:00
Ben Thorner
0648f80b9d Refactor "calculate_usage" function 
This will make the following changes clearer.

In the next commits we'll go into more detail about "billing_units"
and how it differs for SMS vs. emails and letters.
 2022-04-27 16:30:26 +01:00
Ben Thorner
afd3f5461a Merge pull request #4221 from alphagov/usage-tidyup 
Show monthly usage rate correctly if the sms rate has changed during the financial year
 2022-04-27 15:37:45 +01:00
Ben Thorner
e671df1d2c Merge pull request #4226 from alphagov/update-accessibility-statement-april-2022 
Review accessibility statement
 2022-04-27 15:37:39 +01:00
karlchillmaid
ef9332fce5 Update review and completion dates 2022-04-27 10:53:12 +01:00
Katie Smith
417e7370bb Merge pull request #4223 from alphagov/roadmap-april-2022 
Update public roadmap, April 2022
 2022-04-27 08:55:38 +01:00
karlchillmaid
fdc121d529 Bump date 2022-04-27 08:38:51 +01:00
Chris Hill-Scott
a5517f2360 Bump utils to 55.1.6 
Brings in:
- [x] https://github.com/alphagov/notifications-utils/pull/966/files
 2022-04-26 16:40:22 +01:00
karlchillmaid
ae2644b81c Update roadmap content 2022-04-26 16:20:29 +01:00
Ben Thorner
a02e1adbc5 Tweak usage dashboard test to cover rate changes 2022-04-26 14:02:54 +01:00
karlchillmaid
dfc37c2371 Update date 2022-04-26 12:31:19 +01:00
karlchillmaid
fa40c70267 Update dates 2022-04-26 12:21:40 +01:00
karlchillmaid
d4c19140e8 Update text message rate 2022-04-26 12:05:57 +01:00
karlchillmaid
45884b6a2e Update text message rate 2022-04-26 12:05:16 +01:00
David McDonald
2706ec4c73 Take sms_rate from monthly usage data 
At the moment, we put the sms rate on the usage page for each
months billing data by taking the single sms rate for the year.

The assumption that there will be a single sms rate for the year is
no longer going to be true. Therefore, instead we take the sms
rate from the monthly data itself which tells us the rate for
a months worth of sent SMS.
 2022-04-26 10:38:10 +01:00
David McDonald
d18c787a02 Give better names to usage page variables 
`free` becomes `sms_free_count`
`paid` becomes `sms_paid_count`

This small change is just to help with readability for this
complex area of code
 2022-04-25 11:27:03 +01:00
David McDonald
c5d729b5f2 Remove unused letter_cumulative field 
I have searched for this in the code and can't see it being used
anywhere so have removed it!
 2022-04-25 11:11:45 +01:00
karlchillmaid
c63660d56d Merge pull request #4217 from alphagov/may-2022-price-changes 
Announce May 2022 text message price increase
 2022-04-22 15:20:56 +01:00
karlchillmaid
e1ff1bc4b2 Update date 2022-04-22 14:57:37 +01:00
Leo Hemsted
19d501e2aa Merge pull request #4214 from alphagov/0-free-allowance 
Hide remaining free allowance if it starts at 0
 2022-04-22 13:32:16 +01:00
Leo Hemsted
46658de009 Merge pull request #4219 from alphagov/enable-redis 
remove redis_enabled flag
 2022-04-22 13:04:43 +01:00
Leo Hemsted
3bda2aa36c remove redis_enabled flag 
there's no reason we need to configure this per environment. You can
still use it as before for local development
 2022-04-22 12:21:27 +01:00
Sakis
77a96b3e5f Merge pull request #4218 from alphagov/custom-prometheus-preparation 
Use our own fork of gds_metrics_python and add shared auth token
 2022-04-21 13:57:24 +01:00
sakisv
76b9e28d4d Use our own fork of gds_metrics_python and add shared auth token 
This will allow both prometheis (the shared one and our own) to scrape
the /metrics endpoint, each with their own authentication

See alphagov/gds_metrics_python#1 for more details
 2022-04-21 15:32:57 +03:00
Leo Hemsted
cc5af6fabb Merge pull request #4213 from alphagov/enable-redis 
bind to notify-redis automatically
 2022-04-20 11:52:51 +01:00
Ben Thorner
4a3ba97115 Remove redundant conditional for CF Redis 
This is now used in all environments and we've removed support for
non-CF Redis [1].

[1]: https://github.com/alphagov/notifications-admin/pull/4213
 2022-04-20 11:32:57 +01:00
Leo Hemsted
d4a58c706b bind to notify-redis automatically 
this ensures that if we create a new version of the app, it'll connect
to redis properly (for example a UR prototype)
 2022-04-20 11:32:28 +01:00
karlchillmaid
518ef0b272 Add announcement of text message price change 2022-04-20 11:30:22 +01:00
Chris Hill-Scott
d11beee5b6 Hide remaining free allowance if it starts at 0 
If your free allowance starts a 0 (which we have done for some services
this year) it’s redundant to say ‘0 of 0 remaining’.
 2022-04-20 10:53:05 +01:00
Ben Thorner
d636bd9ae0 Merge pull request #4211 from alphagov/remove-redundant-cf-code 
Remove redundant CloudFoundry config code
 2022-04-20 09:56:15 +01:00
Ben Thorner
be1fc9de79 Remove redundant CloudFoundry config code 
These env vars can be set directly in the manifest, like we do for
Template Preview [^1].

[^1]: c08036189b/manifest.yml.j2 (L23-L26)
 2022-04-13 14:45:29 +01:00
Ben Thorner
5f84ea938c Merge pull request #4210 from alphagov/paas-redis-migration-181796569 
Prepare to switch to Redis on PaaS
 2022-04-13 11:53:30 +01:00
Sakis
4b6b7efc6a Merge pull request #4208 from alphagov/add-internal-routes 
Add internal routes
 2022-04-13 08:54:15 +01:00
Ben Thorner
43a2f2f271 Fix rediss ssl eventlet sslerror bug 
This is the same as [^1].

I did a test deploy to double check that Redis on PaaS doesn't work
without this.

[^1]: a2cbe20325
 2022-04-12 17:46:51 +01:00
Ben Thorner
339ca93d9b Add support for migrating to Redis on PaaS 
Similarly to https://github.com/alphagov/notifications-api/pull/3508
 2022-04-12 17:46:45 +01:00
Leo Hemsted
1bed87b67d Merge pull request #4206 from alphagov/daily-sms-vols-reports 
add new daily sms provider volumes report
 2022-04-12 15:48:36 +01:00
Ben Thorner
ffd8bdac6c Merge pull request #4209 from alphagov/bump-utils-55-1-4 
Bump utils to 55.1.4
 2022-04-12 15:42:58 +01:00