Commit Graph

3347 Commits

Author SHA1 Message Date
pyup-bot
fe30942889 Update psycopg2 from 2.7.3 to 2.7.3.1 2017-08-26 14:56:56 +01:00
Leo Hemsted
741210d5b4 Merge pull request #1214 from alphagov/letters-v1
make sure letters are handled properly by the v1 api
2017-08-25 17:00:55 +01:00
Leo Hemsted
c863b33c8d make sure letters are handled properly by the v1 api 2017-08-25 16:47:17 +01:00
Leo Hemsted
23fdbe2897 Merge pull request #1212 from alphagov/logging
Letter fixes and multi-process logging
2017-08-25 15:02:34 +01:00
Leo Hemsted
4e7c19a98f update utils to v20 - log from multiple app.log*.json files
the rotating file handler puts the date on the end, so those old files won't be pushed
2017-08-25 14:38:04 +01:00
kentsanggds
549601a6df Merge pull request #1200 from alphagov/ken-refactor-inbound_numbers
Refactor inbound numbers
2017-08-25 13:27:16 +01:00
Chris Hill-Scott
6848a50ae1 Bump utils to 19.0.4
Brings in:
- [ ] https://github.com/alphagov/notifications-utils/pull/210
- [ ] https://github.com/alphagov/notifications-utils/pull/212
2017-08-25 09:36:43 +01:00
Chris Hill-Scott
73d1154661 Merge pull request #1210 from alphagov/nbsp-fix
Bump utils to 19.0.2
2017-08-24 17:40:31 +01:00
Chris Hill-Scott
ce2c157f8f Bump utils to 19.0.2
Brings in:
- [ ] https://github.com/alphagov/notifications-utils/pull/211
2017-08-24 17:11:46 +01:00
Rebecca Law
f9ee8bba91 Merge pull request #1209 from alphagov/remove-unused-endpoint
Removed unused endpoint and dao methods.
2017-08-24 16:32:37 +01:00
Rebecca Law
717c0510a3 Merge pull request #1202 from alphagov/v1-send-letter-error-msg
Added a proper error response if the notification type is not supported.
2017-08-24 16:31:21 +01:00
Rebecca Law
17f62723fa Removed unused endpoint and dao methods. 2017-08-24 16:09:48 +01:00
kentsanggds
aeb817614f Merge pull request #1204 from alphagov/ken-fix-scheduled-letter-job
Made celery task arg a tuple
2017-08-24 15:15:16 +01:00
Ken Tsang
1b35731fb2 Refactor code
- updated dao_get_letter_jobs_by_status to dao_get_letter_job_ids_by_status to return array of strings
2017-08-24 11:57:46 +01:00
Leo Hemsted
7a6c6c4855 Merge pull request #1208 from alphagov/pyup-ignore
make pyup ignore flask-bcrypt
2017-08-24 11:40:42 +01:00
Leo Hemsted
336ee69f02 make pyup ignore flask-bcrypt
pyup is trying to upgrade flask-bcrypt, which causes errors in all subsequent PR builds for #reasons. Lets make pyup ignore flask-bcrypt until we figure out why the upgrade doesn't work
2017-08-24 11:16:21 +01:00
Ken Tsang
451c5a9f1a Made celery task arg a tuple 2017-08-23 18:05:48 +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