Commit Graph

5586 Commits

Author SHA1 Message Date
Rebecca Law
bffef09d3d Merge pull request #2038 from alphagov/fix-delete-s3
Fix bug with deleting the S3 file.
2018-08-13 11:49:08 +01:00
Tom Byers
a5eefe00b8 Bump utils to 29.3.6
Brings in the changes from:

https://github.com/alphagov/notifications-utils/pull/513
2018-08-13 11:48:53 +01:00
Rebecca Law
2a7f3faec9 Merge branch 'master' into fix-delete-s3 2018-08-13 11:44:44 +01:00
Rebecca Law
eb2c878edd Fix bug with deleting the S3 file.
Removed the duplicate method.
2018-08-13 11:33:19 +01:00
Rebecca Law
69ab649256 Use the EmailBranding.text for the bannder instead of the name. 2018-08-13 10:29:06 +01:00
Rebecca Law
febc6f4e23 This PR fixes the check for the text key in the post data. 2018-08-10 17:27:58 +01:00
Rebecca Law
dd4b711ba4 Merge pull request #2036 from alphagov/fix-deleted-count
Fix deleted count for logs and delete with letters that have not been sent
2018-08-10 16:53:09 +01:00
Rebecca Law
ccaa1dfeb2 Merge pull request #2034 from alphagov/remove-caseworking-permission
Remove caseworking permission
2018-08-10 16:30:50 +01:00
Rebecca Law
ebb43082d5 Deal with letters that have not been sent, this can be test letters or letters in tech-failure. 2018-08-10 16:22:25 +01:00
Rebecca Law
85a0fd3b46 Merge pull request #2031 from alphagov/fix_data_retention
Use days of retention when deleting notifications in the nightly job.
2018-08-10 15:35:42 +01:00
Rebecca Law
f844a39ea6 Move the condition outside the method, remove the notification_type variable. 2018-08-10 13:11:23 +01:00
pyup-bot
33c0256363 Update moto from 1.3.3 to 1.3.4 2018-08-10 09:23:52 +01:00
Chris Hill-Scott
e0570c1773 Remove caseworking permission
What became ‘caseworking view’ is now available to all services.
2018-08-10 09:09:18 +01:00
Leo Hemsted
0e284701b9 Merge pull request #2028 from alphagov/requirements
bump requirements
2018-08-09 16:56:26 +01:00
Leo Hemsted
ef447931fd bump utils 2018-08-09 16:49:30 +01:00
Leo Hemsted
1ff729e75f read first file returned from s3
rather than looping through, just use `next`. We only expect to return
one file, so this won't actually affect the code flow. If, for whatever
reason, the file isn't on s3, whereas previously it would error when
trying to return an uninstantiated variable, now it will raise a
StopIteration
2018-08-09 16:47:35 +01:00
Leo Hemsted
62d70dbd4d use contextmanager freeze time instead of decorator
it doesn't appear to work nicely with pytest fixtures in the newer
versions of pytest
2018-08-09 16:47:35 +01:00
Leo Hemsted
804f489b51 bump requirements 2018-08-09 16:47:35 +01:00
Rebecca Law
d0e9ab4972 If the notifications that are being deleted are letters then we need to delete the letter from s3 as well. 2018-08-08 16:20:25 +01:00
Rebecca Law
43000b2253 Add a new test 2018-08-06 15:13:08 +01:00
Rebecca Law
517608dff5 Update method to delete notifications that are a week old, to look at the days of retention set for the service.
If the service does not have the days of retention set, then use 7 days.
Added a method to get days of retention for a service and notificaiton type
2018-08-06 13:51:54 +01:00
Rebecca Law
76be01b123 Merge pull request #2029 from alphagov/revert-1965-check-data-retention-before-purging-notifications
Revert "Purge notifications for configured days of retention"
2018-08-03 14:41:39 +01:00
Rebecca Law
019c6a4e3a Revert "Purge notifications for configured days of retention" 2018-08-03 14:35:36 +01:00
Chris Hill-Scott
691f24f94e Merge pull request #2015 from alphagov/bump-utils-29.3.4
Bump utils to 29.3.4
2018-08-03 13:50:07 +01:00
Rebecca Law
78f8c17fe8 Merge pull request #1965 from alphagov/check-data-retention-before-purging-notifications
Purge notifications for configured days of retention
2018-08-03 13:49:49 +01:00
Chris Hill-Scott
1ad6984bdd Bump utils to 29.3.4
https://github.com/alphagov/notifications-utils/compare/29.3.3...bullet-for-bullet
2018-08-03 13:25:43 +01:00
Rebecca Law
5c52679685 Merge pull request #1989 from alphagov/email_branding_name_and_text
Email branding name and text
2018-08-02 16:32:44 +01:00
Rebecca Law
c30e58eaad Instead of deleting the data in the name field just copy it to the text field.
The admin app still needs to use the name column.
Add the text field to the post data schemas.
If the text is not in the post data, then populate it with the data in the name field.
This should make the migration to text easier, and will work until we are able to update the admin app.
2018-08-02 15:55:45 +01:00
Sakis
b10ea754a1 Merge pull request #2024 from alphagov/celery-dev-null
Celery dev null
2018-08-01 13:41:59 +01:00
Athanasios Voutsadakis
56ba5d207b Refactor test fix 2018-08-01 11:31:53 +01:00
Pea Tyczynska
4345771547 Update migration file version number for email_branding update 2018-07-31 18:01:58 +01:00
Pea Tyczynska
d8d94b431f Find email_branding by name 2018-07-31 17:58:19 +01:00
Pea Tyczynska
f69bc50985 Move data back before dropping the column for downgrade 2018-07-31 17:58:19 +01:00
Pea Tyczynska
c5792f4d79 Migration file for email_branding fields update 2018-07-31 17:58:19 +01:00
Pea Tyczynska
c4bfd5479e Update EmailBranding model so it has separate name and text fields 2018-07-31 17:58:19 +01:00
Athanasios Voutsadakis
f14107b723 Fix test that checks queues 2018-07-31 17:26:33 +01:00
Athanasios Voutsadakis
63ffb01800 Bump python from 3.5.4 to 3.5.5 2018-07-31 17:09:14 +01:00
Athanasios Voutsadakis
0511fa70d0 Redirect stderr of workers to /dev/null
Celery prints its own stuff to stderr in a non-json format.

These get picked up by syslog drain and are shipped to
logstash together with the normal json-formatted logs resulting in
duplicate information and reducing the usability of the logs.
2018-07-31 17:09:14 +01:00
Pea (Malgorzata Tyczynska)
6cbf73b491 Merge pull request #2025 from alphagov/fix_migration_versioning
Fix migration version numbering
2018-07-31 16:49:49 +01:00
Pea Tyczynska
cf20cea81c Fix migration version numbering 2018-07-31 16:44:21 +01:00
Pea (Malgorzata Tyczynska)
ea28b65871 Merge pull request #1999 from alphagov/drop_monthly_billing_table
Drop monthly billing table
2018-07-31 16:35:48 +01:00
Rebecca Law
f419bf7bdb Merge pull request #2022 from alphagov/fix-letter-rate-bug
Handle zero as a letter page count in billing.
2018-07-31 14:18:52 +01:00
Rebecca Law
2f120b30e8 Fix codestyle 2018-07-31 14:13:15 +01:00
Rebecca Law
ab28691a70 Add number to migration file name 2018-07-31 14:06:29 +01:00
Rebecca Law
cc36209564 Fix file name for migration script 2018-07-31 14:00:18 +01:00
Rebecca Law
7378232353 Added migration script 2018-07-31 13:54:37 +01:00
Rebecca Law
19890412c9 Added a cancelled notification status so that we can cancel letters before they are sent. 2018-07-31 13:52:04 +01:00
Pea Tyczynska
885ed1e8e3 Remove monthly_billing table from the database 2018-07-31 11:47:13 +01:00
Rebecca Law
67639bf49c Merge branch 'master' into check-data-retention-before-purging-notifications 2018-07-31 11:40:58 +01:00
Chris Hill-Scott
c8f307e838 Merge pull request #2016 from alphagov/quis-patch-1
Fix broken Markdown headings in README
2018-07-31 11:08:32 +01:00