Commit Graph

147 Commits

Author SHA1 Message Date
Martyn Inglis
73d0e67e68 Removed alpha api client 2016-02-17 09:22:06 +00:00
Martyn Inglis
cb265896a7 Merge branch 'master' into move-sms-notifications-into-celery
Conflicts:
	app/__init__.py
	tests/conftest.py
2016-02-17 09:14:37 +00:00
Martyn Inglis
1311af5920 Twilio client takes a 'to' number not a notification 2016-02-17 09:12:13 +00:00
Martyn Inglis
a2341be0e2 Don't send the SMS if we have failed to save in the database 2016-02-16 17:42:04 +00:00
Martyn Inglis
0933e5c647 Building tests for the tasks class 2016-02-16 17:17:02 +00:00
Rebecca Law
08ba5de61b Update config
Source the configuration from an environment file, this way it is similar to how the aws environment works
2016-02-16 16:01:50 +00:00
Martyn Inglis
18d63e241b Extracted serialiser for encryption into a flask module
- allows mocking easier
- shared across methods
- not built everytime
2016-02-16 15:28:30 +00:00
Martyn Inglis
e42da7dd54 Fixing up tests to validate the call to the celery tasks.
- mocker used to test call or otherwise of the task
- no new tests just a spring clean
2016-02-16 14:06:56 +00:00
Martyn Inglis
655beddba6 Fixed up the get_notitication endpoint
- returns a notification
2016-02-16 11:22:44 +00:00
Nicholas Staples
20650a91e0 Update to config to pull out from email address. 2016-02-16 11:10:02 +00:00
Martyn Inglis
223cb8c2dd Made SMS messages go through celery
- twilio client pulled in from delivery app
- made method to perform task
2016-02-15 16:01:14 +00:00
Rebecca Law
fcaed04918 Fix validation of template for service.
When the delivery app creates the sms on behalf of the service,
the validation was failing.
2016-02-15 15:02:19 +00:00
Martyn Inglis
ffbe94f390 Merge branch 'master' into celery-spike
Conflicts:
	app/notifications/rest.py
2016-02-15 11:12:07 +00:00
Martyn Inglis
16c5e7bf10 Celery task added 2016-02-15 11:11:20 +00:00
Nicholas Staples
1eb18e7f07 Code review fix. 2016-02-12 14:08:48 +00:00
Nicholas Staples
918c561726 Code added to now check service id matches the authorization token service for sending an sms. 2016-02-12 11:13:54 +00:00
Martyn Inglis
fcc1585fdf Merge branch 'master' into celery-spike
Conflicts:
	app/__init__.py
	app/notifications/rest.py
	config.py
	wsgi.py
2016-02-12 09:36:49 +00:00
Rebecca Law
a01828a6d0 Return notification_id on create notification endpoints
- /notification/sms
 - /notification/email
 - /notificaiton/sms/service/<service_id>
Update message attribute on SQS to notification_id from message_id
2016-02-10 12:46:52 +00:00
Adam Shimali
3a2cfc96e6 job on notification now nullable. 2016-02-10 11:08:24 +00:00
Martyn Inglis
d38ba0d36a bumped client version 2016-02-09 18:48:02 +00:00
Adam Shimali
e6a7e07505 Fix for create job id on api side 2016-02-09 18:28:28 +00:00
Nicholas Staples
1b25a3c762 Removed alpha client imports. 2016-02-09 16:13:48 +00:00
Nicholas Staples
68b6444eed Comment added for missing code. 2016-02-09 16:02:38 +00:00
Nicholas Staples
bd947d0743 Merge remote-tracking branch 'origin/master' into remove_alpha_client_from_api 2016-02-09 15:54:21 +00:00
Adam Shimali
17e5e70f6c [WIP] Added endpoints under /job for creating, updating and reading
notification status.
2016-02-09 14:17:42 +00:00
Martyn Inglis
fb41acdac9 Celery tests 2016-02-09 13:31:45 +00:00
Adam Shimali
e5e049d735 Added service and template relationship to notification model.
This makes it more consistent with other model classes with respect
to marhmallow serialisation/deserialisation.
2016-02-09 12:48:27 +00:00
Adam Shimali
c7121be5a2 [WIP] New model class and dao for notification. This will be used for
recording status and outcome of sending notifications.
2016-02-09 12:03:40 +00:00
Nicholas Staples
2fda7ee59b Alpha client removed from code. Tests fixed but will wait till other notifications jobs are done before creating a pull request. 2016-02-09 11:38:57 +00:00
Adam Shimali
0580f5ab06 New endpoint for delivery app to use.
Once removal of code that uses existing alpha is done, then
duplicated code from /notifications/sms and the new endpoint
can be merged.

Job id is now avaiable in notificaiton but is not used yet.
2016-02-08 14:54:15 +00:00
Rebecca Law
416dd00ac8 Added a test for the case when there is no secret for the api client.
Fix codestyle
2016-02-08 11:33:24 +00:00
Rebecca Law
877a8a0411 Added logging for the authentication errors.
Moved the "no api secret" error message to the end and only create it if there are no
api client secrets
2016-02-08 11:10:54 +00:00
NIcholas Staples
db1c6749a6 Merge pull request #57 from alphagov/job-details-bug
Fix for incorrect property name for service and template.
2016-02-08 10:51:01 +00:00
Nicholas Staples
409857fba6 Now done. 2016-02-08 09:43:19 +00:00
Nicholas Staples
4ecdc9e420 Bug fixed for posting the correct type of notification to the aws queue. 2016-02-08 09:41:10 +00:00
Adam Shimali
23f4ce7255 Fix for incorrect property name for service and template. 2016-02-05 16:33:07 +00:00
Adam Shimali
e024db6858 As job update is a PUT then all non nullable fields
need to be sent with update.

Also bug in not committing update fixed.
2016-02-05 13:07:02 +00:00
Nicholas Staples
cc5dad3744 Update queues with a prefix. 2016-02-05 11:12:59 +00:00
Adam Shimali
bec4bbe04e Endpoint and dao method for updating job status. 2016-02-04 20:55:09 +00:00
Adam Shimali
aa57730fc9 Add more properties of job to job message. 2016-02-04 12:36:53 +00:00
Rebecca Law
1d4d03dbe8 Update to create_sms_notification
Removed the logic to check the api_user is the admin client user name.
There is another controller method to handle sending the verification codes.
2016-02-04 12:07:26 +00:00
Nicholas Staples
6286646d7f Fix for review comments. 2016-02-03 15:53:16 +00:00
Nicholas Staples
8fd15b44eb Missed a couple of places where we should push to the queue. 2016-02-03 13:52:09 +00:00
Nicholas Staples
aba1cd2ed5 Sqs queues now populated from all create_notification api calls. Marshmallow schemas added for notification. 2016-02-03 13:16:19 +00:00
Adam Shimali
0ade39e63f Add job to queue as soon as it in created.
Added status to job.
2016-02-02 15:14:04 +00:00
Rebecca Law
b5c662eca8 Change services.id to a UUID
Ideally all the primary keys in the db would be UUID in order to guarantee unique ids across distributed dbs.
This updates the services.id to a UUID. All the tables with a foreign key to the services.id are also updated.
The endpoints no longer state a data type of the <service_id> path param.
All the tests are updated to reflect this update.

The thing to pay attention to is the 0011_uuid_service_id.py migration script.
This commit must go with a commit on the notifications_admin app to keep things working.
There will be a small outage until both deploys have happened.
2016-02-02 14:22:22 +00:00
Adam Shimali
1277837e00 Merge pull request #46 from alphagov/update_version_file_with_travis_details
version file has been updated to include a travis commit and time of …
2016-02-02 11:16:15 +00:00
Nicholas Staples
238e8942af Fix for pull request comment. 2016-02-02 11:06:22 +00:00
Adam Shimali
459dc193a3 Merge pull request #44 from alphagov/production_exception_handling
Added exception handling for 500 error messages. Actually just logging added.
2016-02-02 10:23:24 +00:00
Nicholas Staples
cd5a91d4c8 version file has been updated to include a travis commit and time of build. 2016-02-01 11:37:22 +00:00