Commit Graph

4782 Commits

Author SHA1 Message Date
Ken Tsang
451c5a9f1a Made celery task arg a tuple 2017-08-23 18:05:48 +01:00
Leo Hemsted
89f4f5173e refactor performance platform code
so that it doesn't appear generic when it's actually specific to
sending the daily notification totals. To do this, split it out into a
separate performance_platform directory, containing the business logic,
and make the performance_platform_client incredibly thin - all it
handles is adding ids to payloads, and sending stats.

Also, some changes to the config (not all done yet) since there is one
token per endpoint, not one for the whole platform as we'd previously
coded
2017-08-23 17:37:29 +01:00
Rebecca Law
7aaef8fc09 Merge pull request #1197 from alphagov/bump-utils-19.0.0
Bump utils to 19.0.0
2017-08-23 16:55:46 +01:00
Rebecca Law
d4422dd35f Added a proper error response if the notification type is not supported. 2017-08-23 14:56:03 +01:00
Ken Tsang
d99ab329eb Refactored code to use inbound_number.number
- Removed filter on sms_sender for `dao_fetch_services_by_inbound_number`
2017-08-23 14:14:32 +01:00
Ken Tsang
fb2623962f Moved create_inbound after dao_create_service
- Need to do this otherwise no service.id is available to link the servce to the inbound number
2017-08-23 14:03:41 +01:00
kentsanggds
3794722203 Merge pull request #1196 from alphagov/ken-add-scheduled-letter-job
Add scheduled letter job
2017-08-23 13:52:25 +01:00
Ken Tsang
c3ce828635 Updated letter jobs schedule to 5:30pm 2017-08-23 13:22:07 +01:00
Ken Tsang
665420402e Improved code style 2017-08-23 13:22:07 +01:00
Ken Tsang
4fb5e68ce7 Refactor code
- Created TaskNames for DVLA_FILES rather than have DVLA_FILES in QueueNames
- Removed PROCESS_FTP from all_queues() as this was causing problems in picking up letter job tasks
- Created test to ensure that we don't arbitrarily add queue names to all_queues
2017-08-23 13:22:07 +01:00
Ken Tsang
41fce57932 Removed PROCESS_FTP from all_queues 2017-08-23 13:22:07 +01:00
Ken Tsang
b2b74e2b5d Fixed bug in letter job schedule 2017-08-23 13:22:07 +01:00
Ken Tsang
62172ce39b Updated schedule to run at 5:15pm 2017-08-23 13:22:07 +01:00
Ken Tsang
bd79a6f770 Improved tests on letter jobs by status 2017-08-23 13:22:07 +01:00
Ken Tsang
18881cd580 Add scheduled letter jobs 2017-08-23 13:22:07 +01:00
Ken Tsang
8c4a084a0d Refactor letters filename 2017-08-23 13:22:07 +01:00
Rebecca Law
5b43c0af79 Merge branch 'master' into bump-utils-19.0.0 2017-08-23 10:56:25 +01:00
Rebecca Law
f84bbf530b Bump utils to 19.0.1
To eliminate flask deprecation warnings.
2017-08-23 10:55:56 +01:00
Rebecca Law
789492060c Merge pull request #1198 from alphagov/fix-redis-error
Stop redis cache from throwing an error
2017-08-23 09:38:20 +01:00
Leo Hemsted
12cf36f6fa Merge pull request #1142 from alphagov/log-ip-block
log ip address as separate field to allow analysis of messages
2017-08-22 17:01:54 +01:00
Rebecca Law
029daf1820 Added an assert that the set cache method is not called if the cache values are empty 2017-08-22 16:43:22 +01:00
Leo Hemsted
843812cbe9 Merge pull request #1199 from alphagov/flask-marshmallow
re-introduce flask-marshmallow
2017-08-22 16:21:59 +01:00
Leo Hemsted
077a5e62f5 re-introduce flask-marshmallow 2017-08-22 16:15:11 +01:00
Leo Hemsted
ae683cad6e Merge pull request #1192 from alphagov/deps
update dependencies
2017-08-22 15:39:49 +01:00
Rebecca Law
bf6e671e96 The logs kept reporting a data error from the redis client. This would happen any time we set the cache with empty cache values.
Added a check for values before setting the cache
2017-08-22 14:59:50 +01:00
Chris Hill-Scott
6d1611ef12 Bump utils to 19.0.0
Brings in:
- [ ] https://github.com/alphagov/notifications-utils/pull/201

https://github.com/alphagov/notifications-utils/compare/18.0.1...19.0.0
2017-08-22 14:43:00 +01:00
Chris Hill-Scott
66d1c3ca03 Merge pull request #1194 from alphagov/no-test-key-search
Exclude test keys when searching by recipient
2017-08-22 12:31:00 +01:00
kentsanggds
6cd6e70fe4 Merge pull request #1193 from alphagov/ken-update-inbound_numbers-service_id
Update inbound_numbers to services that have sms_sender in inbound_numbers
2017-08-22 10:02:57 +01:00
Chris Hill-Scott
bdc935a8b1 Exclude test keys when searching by recipient
The activity page doesn’t show notifications sent with a test key.

However it _does_ when you search by recipient. This is confusing
and inconsistent.
2017-08-21 17:38:21 +01:00
Ken Tsang
27ccbb0cd1 Removed trailing whitespace 2017-08-21 13:31:35 +01:00
Leo Hemsted
c2152f9cb8 remove billable-units endpoint
it wasn't used anywhere, and the return value changed when flask was upgraded
2017-08-21 10:57:15 +01:00
Leo Hemsted
c36e50bef1 update dependencies 2017-08-18 17:02:31 +01:00
Imdad Ahad
8795280ebf Merge pull request #1191 from alphagov/imdad-fix-aggregate-monthly-totals
Fix: Aggregate monthly totals from billing data
2017-08-18 16:24:47 +01:00
Imdad Ahad
e05160bdfb Aggregate monthly totals from billing data 2017-08-18 16:12:01 +01:00
Imdad Ahad
58baa9919c Merge pull request #1190 from alphagov/imdad-feat-get-monthly-usage-from-billing-table
Get monthly usage breakdown from the correct table
2017-08-18 14:21:12 +01:00
Imdad Ahad
dfd431516b Remove redundant method 2017-08-18 13:52:13 +01:00
Imdad Ahad
d7d2ff7af4 Query the correct table for monthly billing usage:
* Query `MonthlyBilling` for the monthly usage and transform
 response for admin
2017-08-18 13:38:53 +01:00
Imdad Ahad
2371c2c9a7 Add helper to get months for a financial year:
* No tests have been added as this was taken from the admin
  where it is already tested thoroughly.
* TODO: Move to utils
2017-08-18 12:45:05 +01:00
Ken Tsang
39cb66a882 Update script to only update unassigned inbound 2017-08-18 11:49:05 +01:00
Ken Tsang
e6582b90be Add db command to update inbound_numbers
Updates the service_id with the service.id that matches the sms_sender
2017-08-18 11:49:05 +01:00
kentsanggds
3bfbb9d71f Merge pull request #1178 from alphagov/ken-use-inbound-number
Use inbound number for delivering sms and to show on service settings
2017-08-18 11:42:52 +01:00
Ken Tsang
5bb20e41b3 Update dao_fetch_services_by_ss_sender 2017-08-17 18:15:22 +01:00
Chris Hill-Scott
953e2ae5bd Merge pull request #1180 from alphagov/return-template-name
Return template name in public API
2017-08-17 12:44:24 +01:00
Imdad Ahad
f30b6c4386 Merge pull request #1181 from alphagov/imdad-feat-add-new-billing-endpoints
Add endpoints to retrieve billing data
2017-08-17 11:22:15 +01:00
Imdad Ahad
f40889e6e0 This adds new endpoints to retrieve billing data from the new table:
1. Create a separate billing blueprint to house these endpoints

2. Return monthly breakdown in same format as we did before

3. Return yearly breakdown but only return {billing units, rate,
notification_type}. Admin only makes use of these.
2017-08-17 11:10:42 +01:00
Imdad Ahad
9085cc1a57 Merge pull request #1185 from alphagov/imdad-feat-update-billing-data-for-services
Update command populate billing data for services that require it
2017-08-17 09:56:06 +01:00
Ken Tsang
3a70d63a7c Test for inbound_number when no inbound_sms permissions 2017-08-16 16:28:56 +01:00
Ken Tsang
9ab1dfd6d0 Just order by updated_at for inbound_numbers 2017-08-16 16:28:21 +01:00
Ken Tsang
902b28e00f Refactor to check active flag 2017-08-16 16:27:42 +01:00
Katie Smith
2f84e1cc45 Merge pull request #1159 from alphagov/pyup-update-sqlalchemy-utils-0.32.9-to-0.32.14
Update sqlalchemy-utils to 0.32.14
2017-08-16 15:58:06 +01:00