Commit Graph

1177 Commits

Author SHA1 Message Date
Rebecca Law
ecd4b76080 Fix bug with expired token error response 2016-07-22 15:10:37 +01:00
Rebecca Law
bdcddfbea3 Merge pull request #543 from alphagov/use-new-mmg-api
Use the new mmg api
2016-07-20 10:45:57 +01:00
Rebecca Law
c8ad5362eb Moved mmg_url to configs.
Fix up the tests
2016-07-20 10:40:50 +01:00
Rebecca Law
30f7377d7e Fix tests 2016-07-19 16:16:12 +01:00
Rebecca Law
aca23472e3 Use the new mmg api 2016-07-19 15:27:52 +01:00
Chris Hill-Scott
ae85baf810 Merge pull request #539 from alphagov/upgrade-bleach
Upgrade bleach to fix dodgy html5lib version
2016-07-19 09:11:00 +01:00
Chris Hill-Scott
ba1c1fd07a Upgrade bleach to fix dodgy html5lib version
Bleach 1.4.2 installs html5lib version 0.999 or greater.

This was fine, until version 0.999999999 (nine nines was released, which
doesn’t work.

Bleach 1.4.3 pins html5lib to 0.9999999 (seven nines), which stops the
bad version getting installed.
2016-07-15 13:39:23 +01:00
Chris Hill-Scott
327b0dcd02 Merge pull request #525 from alphagov/update-bootstrap
updated bootstrap
2016-07-15 10:36:32 +01:00
Leo Hemsted
f034f99b8d Update bootstrap.sh
force python3 when creating virtualenv
2016-07-15 10:24:44 +01:00
Chris Hill-Scott
19dc2c5d99 Merge pull request #532 from alphagov/email-formatting-and-optional-placeholders
Add conditional placeholders and formatting of email messages
2016-07-15 10:13:00 +01:00
Adam Shimali
6f1063ba7f Merge pull request #533 from alphagov/message-limit-fix
Daily message limit imposed for service api calls.
2016-07-14 13:37:07 +01:00
Adam Shimali
9f9040869d Daily message limit imposed for service api calls. 2016-07-14 11:25:45 +01:00
Chris Hill-Scott
a4a934f6ba Add formatting of emails, conditional placeholders
Implements and depends on:
- [x] https://github.com/alphagov/notifications-utils/pull/45
- [x] https://github.com/alphagov/notifications-utils/pull/47
- [x] https://github.com/alphagov/notifications-utils/pull/48
- [x] https://github.com/alphagov/notifications-utils/pull/50
- [ ] https://github.com/alphagov/notifications-utils/pull/51
- [ ] https://github.com/alphagov/notifications-utils/pull/52

Should be deployed ahead of the admin side of these features, which
is in: https://github.com/alphagov/notifications-admin/pull/781
2016-07-13 15:10:54 +01:00
Leo Hemsted
496bc05eea Merge pull request #526 from alphagov/notifications-shadow-table
Notification history table
2016-07-12 13:52:08 +01:00
Rebecca Law
dbd888a891 Merge pull request #529 from alphagov/add-queue
Add queue for email-already-registered tasks.
2016-07-12 13:49:09 +01:00
Leo Hemsted
fb7e9dfcb3 copy existing notifications into history table 2016-07-12 13:45:19 +01:00
Leo Hemsted
4ef084464d update notification_history table from notification_dao create/update functions
please ensure that any changes to notifications table happen through either dao_create_notification or dao_update_notification.
changed the notification status update triggered by the provider callbacks to ensure that sets updated_by and can update the history table.
also re-added the character_count so we can reconstruct billing data if needed.
2016-07-12 13:28:45 +01:00
minglis
7e7f221461 Update bootstrap.sh 2016-07-12 13:28:03 +01:00
Leo Hemsted
722699a72a Update notification_history table on insert/update of notifications
triggered via calls in dao_create_notification and dao_update_notification - if you don't use those functions (eg update in bulk) you'll have to update the history table yourself!
2016-07-12 13:27:31 +01:00
Leo Hemsted
47ef63adbe add notification_history table
table will be used for storing archival versions of notifications. It's an exact duplicate of notifications table, but with the following modifications:
* removed _personalisation
* removed to
* removed content_char_count

All foreign keys to other tables still exist. additionally, removed defaults (for id and created_at) since they'll be set when we create, and we should ensure that we don't forget about them when inserting/udpating this table.
2016-07-12 13:27:31 +01:00
Rebecca Law
c8bc29914f Add queue for email-already-registered tasks. 2016-07-12 13:17:57 +01:00
Rebecca Law
f9004f983a Merge pull request #524 from alphagov/email-registered-users
Email registered users
2016-07-12 10:51:17 +01:00
Rebecca Law
7927901938 Fix indentation 2016-07-12 10:45:47 +01:00
Rebecca Law
8acb373f07 Merge pull request #523 from alphagov/fix-temp-failure-job
Add a lockmode for the update_notifications_status_by_id to prevent t…
2016-07-12 09:49:00 +01:00
Martyn Inglis
2cf5f4ed24 updated bootstrap 2016-07-11 10:22:59 +01:00
Rebecca Law
b2da3f563b Merge branch 'master' into email-registered-users 2016-07-08 14:53:38 +01:00
Rebecca Law
1bfd25107b Add a lockmode for the update_notifications_status_by_id to prevent the timeout task from updating the same notification more than once.
This happens because more than one beat process was creating the timeout task, resulting in multiple workers running the same queries at the same time.
2016-07-08 14:48:07 +01:00
Chris Hill-Scott
6c4f098852 Merge pull request #520 from alphagov/pass-through
Use `PassThrough` renderer
2016-07-08 12:34:58 +01:00
Chris Hill-Scott
aa12c88551 Add a test for sending email to provider
We had a test like this for sending sms, but not email. This meant that,
for example, we weren’t checking that the provider was getting passed
the HTML and plain text versions of the email.
2016-07-08 11:16:45 +01:00
Chris Hill-Scott
bb3c55ca6c Make send sms test use a template with a newline 2016-07-08 11:16:45 +01:00
Rebecca Law
f4976539e4 Make email a required field for the email_data_schema. 2016-07-08 10:57:20 +01:00
Chris Hill-Scott
a8a556d02a Use PassThrough renderer
Implements and depends on:
- [ ] https://github.com/alphagov/notifications-utils/pull/49
2016-07-07 22:48:07 +01:00
Rebecca Law
36ecdca04c Add new email template for the GOV.UK Notify service, to send an email to users that register with the same email address.
Add a new endpoint to send the email.
2016-07-07 17:23:07 +01:00
Chris Hill-Scott
d28775800c Merge pull request #519 from alphagov/update-utils
Bring in changes to template and CSV processing
2016-07-07 16:32:56 +01:00
Chris Hill-Scott
9f3bf763e9 Merge pull request #515 from alphagov/pip-accel
add pip-accel to travis to speed up builds
2016-07-07 16:32:50 +01:00
Chris Hill-Scott
a09333a678 Merge pull request #514 from alphagov/rates
mmg rates set to 1.65p
2016-07-07 16:32:45 +01:00
Rebecca Law
55adc9239f Fix update script 2016-07-07 16:01:04 +01:00
Chris Hill-Scott
824085ead8 Bring in changes to template and CSV processing
Functional changes:
- adds the blue bar

Performance changes
- faster CSV processing

Depends on:

- [ ] https://github.com/alphagov/notifications-utils/pull/47
- [ ] https://github.com/alphagov/notifications-utils/pull/48

Also brings in some breaking changes, which do not affect utils (apart
from a weird import).
2016-07-07 15:44:30 +01:00
Rebecca Law
638ea1b12b Set the start date for the new rate as July 1 2016-07-07 14:31:50 +01:00
Rebecca Law
3e6a59ad46 Merge pull request #516 from alphagov/fix-counts
Fix update script
2016-07-06 16:54:07 +01:00
Rebecca Law
fac5727ad7 Fix update script 2016-07-06 16:42:49 +01:00
Leo Hemsted
a39552f81f add pip-accel to travis to cache builds better 2016-07-06 16:12:23 +01:00
Leo Hemsted
2b7972dc1d mmg rates set to 1.65p
note this db value not actually used in app yet
2016-07-06 16:02:10 +01:00
Rebecca Law
f58ee7a8f8 Merge pull request #512 from alphagov/fix-count
Fix bug where all notifications were getting a type = email.
2016-07-06 15:17:09 +01:00
Rebecca Law
16eb20371f Fix import 2016-07-06 15:07:09 +01:00
Rebecca Law
764bfc6203 Fix file name for migration script 2016-07-06 14:46:46 +01:00
Rebecca Law
a1209ed9a4 Merge branch 'master' into fix-count 2016-07-06 14:45:10 +01:00
Rebecca Law
8bea8b6a8f Fix bug where all notifications were getting a type = email.
Includes a fix to notification and notification_statistics data.
2016-07-06 14:31:52 +01:00
Leo Hemsted
447086d065 Merge pull request #510 from alphagov/test-api-keys
Test api keys
2016-07-06 14:12:07 +01:00
Leo Hemsted
96513442fe notifications from test api keys dont send for real - a la research_mode
also added a bunch more tests around api keys to help ensure we're behaving in at least a consistent way
2016-07-05 16:29:53 +01:00