Martyn Inglis
838bf1d7d4
Merge branch 'master' into split-sms-and-retry
...
Conflicts:
app/celery/tasks.py
tests/app/celery/test_tasks.py
2016-06-17 16:39:03 +01:00
Martyn Inglis
51c6d57a86
Changed the delay period. Now waits
...
10 seconds, 1 minute, 5 minutes, 1 hour and 4 hours.
Total elapsed wait is max 5 hours 6 minutes and 10 seconds.
Changed visibility window of SQS to be 4 hours 10 seconds, longer the max retry period.
2016-06-17 16:32:56 +01:00
Chris Hill-Scott
9a79f0fbbb
Merge pull request #432 from alphagov/replace-placeholders-template
...
Add a ‘preview template’ endpoint
2016-06-17 15:30:04 +01:00
Rebecca Law
fa6ae864d6
Remove the invitation email and reset password email tasks.
2016-06-17 13:49:33 +01:00
Chris Hill-Scott
0d9519c656
Remove wrapper around response object
...
Before:
```json
{'data': {'template': '…'}}
```
There’s no need to wrap the response in key because there will only
ever be one valid key for the template preview endpoint.
Flatter is better:
```json
{
'content': '…',
'subject': '…',
'template_type': '…',
…
}
```
The response will be different if there’s an error, but you should be
checking the status code first anyway.
This commit:
- changes the template preview endpoint to return the above format
- adds a test to make sure that the original `/service/…/template/…`
endpoint still returns JSON in the same format (with a `data` key)
2016-06-17 12:57:43 +01:00
Adam Shimali
5378e6ebc1
Merge pull request #434 from alphagov/notification-stats-by-day
...
Endpoint for reading notification stats for a given day.
2016-06-17 12:03:40 +01:00
Rebecca Law
595a1d04db
Merge pull request #435 from alphagov/use-notify-to-send-forgot-password
...
Use notify to send forgot password and invitation emails
2016-06-17 11:07:25 +01:00
Rebecca Law
4e640eea6d
Remove print
2016-06-17 11:01:26 +01:00
Rebecca Law
2a142dd36b
Merge pull request #429 from alphagov/refactor-query-filters
...
Refactor permissions dao
2016-06-17 10:55:40 +01:00
Chris Hill-Scott
cf91ce57fc
Add a ‘preview template’ endpoint
...
There’s a need for users of the API to be able to take advantage of
Notify’s template rendering.
For example, there’s a service that’s building a case management system.
Their users are sending emails on a case-by-case basis. Before they
send an email, it’s ressuring to double check that the right data is
being inserted, that the right template is being used, etc.
This commit:
- adds a separate endpoint for previewing a template, with
personalisation taken from the get parameters of the request
- beefs up the tests around getting a template
Not part of this pull request:
- making this enpoint publicly accessible
2016-06-17 09:19:22 +01:00
Rebecca Law
3766d30d07
Merge pull request #428 from alphagov/rename-tasks-final-deploy
...
Remove the extra task
2016-06-16 17:43:42 +01:00
Rebecca Law
95c687b649
Merge branch 'master' into refactor-query-filters
2016-06-16 17:39:58 +01:00
Rebecca Law
b6c6b25032
Use the send email task to send the password reset and invitation email.
...
Next PR can remove those tasks.
2016-06-16 17:34:33 +01:00
Adam Shimali
db22373a6b
Endpoint for reading notification stats for a given day.
2016-06-16 17:02:33 +01:00
Leo Hemsted
f7ceaf9009
Merge pull request #426 from alphagov/api-template-response
...
add template body, version, and subject to send_notification api
2016-06-16 11:36:08 +01:00
Rebecca Law
d6e920fa89
Use GOV.UK Notify service to send the forgot password email link using the template to create the message.
2016-06-16 10:43:41 +01:00
Rebecca Law
39c9d9ebe9
Merge branch 'master' into refactor-query-filters
...
Conflicts:
app/permission/rest.py
2016-06-16 10:26:17 +01:00
Adam Shimali
92fdba7010
Merge pull request #424 from alphagov/more-error-logging
...
Make errors return via error handlers in errors.py
2016-06-16 09:34:20 +01:00
Rebecca Law
f8262b13c1
Refactor permissions dao - removed custom query filter
...
Removed permissions rest - not being used.
2016-06-15 16:32:52 +01:00
Adam Shimali
c268401554
Updated for pr comments
2016-06-15 16:19:28 +01:00
Rebecca Law
0200d3ab11
Remove the extra task created to handle the change to the send_email signature
2016-06-15 15:28:53 +01:00
Leo Hemsted
2b13033e85
add template body, version, and subject to send_notification api
2016-06-15 14:51:35 +01:00
Adam Shimali
b33312b855
Change endpoint responses where there are marshalling, unmarshalling
...
or param errors to raise invalid data exception. That will cause
those responses to be handled in by errors.py, which will log
the errors.
Set most of schemas to strict mode so that marshmallow will raise
exception rather than checking for errors in return tuple from load.
Added handler to errors.py for marshmallow validation errors.
2016-06-15 14:37:51 +01:00
Rebecca Law
e942793521
Rename the task so that it is the name we want to use.
...
Next deploy will remove the extra task.
2016-06-15 14:11:17 +01:00
Rebecca Law
470bf7281a
Merge pull request #420 from alphagov/use-notify-to-send-email-verification-links
...
Use notify to send email verification links
2016-06-14 17:00:28 +01:00
Rebecca Law
4c34238a88
Fix send_email task requested from notifications endpoint.
2016-06-14 16:53:52 +01:00
Rebecca Law
6c8e108982
Merge pull request #379 from alphagov/remove_twilio_config_variables
...
Twilio config variables removed.
2016-06-14 15:54:06 +01:00
Rebecca Law
a55b44a333
Merge pull request #412 from alphagov/use-notify-to-send-email-verification-links
...
Safely change task signature - first deploy
2016-06-14 15:42:59 +01:00
Martyn Inglis
0a933021d6
Merge branch 'master' into split-sms-and-retry
2016-06-14 12:55:16 +01:00
Rebecca Law
b31c4e801e
Remove old email_registration_verification task
2016-06-14 11:43:13 +01:00
Martyn Inglis
f143aade71
Added new tests/code to ensure failure stats recorded
2016-06-13 16:40:46 +01:00
Rebecca Law
a6ce109c62
Rename first send_email to send_email_v1.
...
Fix the tests
2016-06-13 16:16:56 +01:00
Rebecca Law
cd2627e5ed
Create a new task called send_email_v2 so that I can get rid of the from_address in the signature.
...
This is done to make sure we do not lose any messages in the queue during deployment.
2016-06-13 15:31:45 +01:00
Rebecca Law
6299e5b9df
Merge pull request #411 from alphagov/use-notify-to-send-email-verification-links
...
Use notify to send email verification links
2016-06-13 15:21:32 +01:00
Rebecca Law
5fc14940f3
Let the send_email task set the from address
2016-06-13 14:58:00 +01:00
Rebecca Law
c9f1eb65a7
Build the from address in the task instead of the rest call.
2016-06-13 14:57:59 +01:00
Rebecca Law
ea80596e73
Correct template id for email verification template in the history table.
...
Correct personalisation name when sending registration message.
2016-06-13 14:57:59 +01:00
Rebecca Law
877fd6fdc4
Make template id a string in the json messge
2016-06-13 14:57:59 +01:00
Rebecca Law
cfd31541f4
Use notify to send email verification
2016-06-13 14:57:41 +01:00
Adam Shimali
3d55c47d1e
Rest methods that explicitly return errors by pass the error handlers as
...
they do not raise exceptions.
Introduced a simple exception that contains error messages and status
code that can be used rather than return json + status code from rest
methods directly.
The handler in errors for this exception can then log the error before
returning json.
2016-06-13 13:50:35 +01:00
Martyn Inglis
bec882ba41
Merge branch 'master' into split-sms-and-retry
2016-06-13 11:39:13 +01:00
Martyn Inglis
6b5b40b953
Added tests for statsd and provider stats outcomes with the new provider stats tasks
...
- note large change to DAO to remove provider from create notification. Added on send now not creation.
2016-06-13 11:38:25 +01:00
Rebecca Law
b677768de1
Merge pull request #400 from alphagov/remove-task-send-sms-code
...
Remove task send_sms_code.
2016-06-13 11:34:26 +01:00
Nicholas Staples
dd9a7f09c5
Twilio config variables removed.
2016-06-13 08:39:33 +01:00
Leo Hemsted
7083be429a
exclude notifications from job
...
was being lazily loaded to get notification ids, so every time a job is loaded it would potentially select thousands of notifications from the database
2016-06-10 15:37:05 +01:00
Leo Hemsted
fd2a0a0b10
fix firetext research mode requests
...
requests converts dicts into query parameters anyway if you don't specify so dont try and encode the data ourselves, also hardened up tests
2016-06-09 15:15:44 +01:00
Rebecca Law
50ec2eb7fc
Remove task send_sms_code.
...
We use a notify service to send the sms code via using a template.
2016-06-09 11:54:34 +01:00
Leo Hemsted
3e72440f38
fix template api tests being inconsistent by adding ordering
2016-06-09 11:24:04 +01:00
Leo Hemsted
511e65b9f9
Merge pull request #398 from alphagov/firetext-log
...
log firetext extended error codes
2016-06-09 10:46:01 +01:00
NIcholas Staples
964fd5ac35
Merge pull request #377 from alphagov/single_from_number
...
Replaced mmg from number and firetext from number with single from nu…
2016-06-09 10:41:39 +01:00