minglis
c1e3317967
Merge pull request #75 from alphagov/update-config
...
Update config
2016-02-16 16:39:41 +00:00
Rebecca Law
af86520e95
Add verify_code_email_address
2016-02-16 16:03:30 +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
Chris Hill-Scott
7ff5f6c45a
Merge pull request #74 from alphagov/update_from_email_address
...
Update to config to pull out from email address.
2016-02-16 11:56: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
NIcholas Staples
025a6fb47e
Merge pull request #72 from alphagov/fix-template-validation
...
Fix validation of template for service.
2016-02-15 15:10:16 +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
Chris Hill-Scott
e7ef5945e5
Merge pull request #71 from alphagov/validate_template_for_a_service
...
Validate template for a service
2016-02-12 15:14:24 +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
Nicholas Staples
4865622128
Merge remote-tracking branch 'origin/master' into validate_template_for_a_service
2016-02-12 10:22:17 +00:00
NIcholas Staples
91164b0afd
Merge pull request #70 from alphagov/return-notification-id
...
Return notification is when adding notification to queue
2016-02-12 09:48:56 +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
0cd5fa278b
Fix a intermittent test.
...
Removed the need for sample_admin_service_id in service/test_rest
2016-02-10 13:09:36 +00:00
Rebecca Law
2db0f9737e
Added a test to check endpoint works with an id in payload.
2016-02-10 12:46:52 +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
minglis
ea22e53453
Merge pull request #68 from alphagov/bump-client
...
Updated python client verion
2016-02-10 12:38:33 +00:00
Martyn Inglis
a1be4e3ca5
Updated python client verion
2016-02-10 12:33:54 +00:00
NIcholas Staples
33dafafece
Merge pull request #67 from alphagov/notfication-job-nullable
...
job on notification now nullable.
2016-02-10 11:20:53 +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
Adam Shimali
a42a99250e
Merge pull request #66 from alphagov/remove_alpha_client_from_api
...
Remove alpha client from api
2016-02-09 16:26:01 +00:00
Nicholas Staples
1b25a3c762
Removed alpha client imports.
2016-02-09 16:13:48 +00:00
Nicholas Staples
09d2f0d79d
Fix tests.
2016-02-09 16:04:49 +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
NIcholas Staples
3fd333ef94
Merge pull request #65 from alphagov/add-notification-status-endpoints
...
[WIP] Added endpoints under /job for creating, updating and reading
2016-02-09 14:53:34 +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
Adam Shimali
6007cdc24e
Merge pull request #64 from alphagov/separate_queue_name_per_environment
...
updated environment variables.
2016-02-09 14:12:01 +00:00
Nicholas Staples
38e30034d1
updated environment variables.
2016-02-09 14:07:43 +00:00
NIcholas Staples
42b18897f0
Merge pull request #63 from alphagov/read-environment-from-file
...
Added code to read environemnt from a file
2016-02-09 14:03:42 +00:00
Martyn Inglis
66763a061c
Added preview and staging config blocks
2016-02-09 13:56:11 +00:00
Martyn Inglis
c2424d6509
Added code to read environemnt from a file
...
If file does not exist default to live config.
2016-02-09 13:41:20 +00:00
Martyn Inglis
fb41acdac9
Celery tests
2016-02-09 13:31:45 +00:00
NIcholas Staples
db3c787caf
Merge pull request #62 from alphagov/add-refs-to-notification
...
[WIP] Added service and template relationship to notification model.
2016-02-09 12:53:07 +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
Rebecca Law
d24a356205
Merge pull request #61 from alphagov/add-notification
...
[WIP] New model class and dao for notification. This will be used for
2016-02-09 12:23:33 +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
NIcholas Staples
c1b0cef864
Merge pull request #60 from alphagov/delivery-new-endpoint
...
New endpoint for delivery app to use.
2016-02-08 16:29:22 +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
Adam Shimali
d99776d6cc
Merge pull request #59 from alphagov/add-logging-for-auth-errors
...
Update the error response from the authentication method
2016-02-08 13:36:46 +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