Commit Graph

2894 Commits

Author SHA1 Message Date
Imdad Ahad
dfeda93bc5 Merge pull request #1015 from alphagov/imdad-feat-return-content-outbound
Return notification content for outbound messages
2017-06-13 12:27:16 +01:00
Imdad Ahad
34f4829362 Merge pull request #1025 from alphagov/imdad-feat-remove-dvla-transformed-files
Remove transformed DVLA files older than 7 days
2017-06-13 10:23:31 +01:00
minglis
7242452f8f Merge pull request #1026 from alphagov/update-celery-version
Bumped version of celery
2017-06-12 13:37:14 +01:00
minglis
ea27e37ddf Merge pull request #1013 from alphagov/firetext-inbound-sms-not-null-provider
Firetext inbound sms not null provider
2017-06-09 12:52:16 +01:00
Martyn Inglis
9bbb3c6a56 Merge branch 'master' into firetext-inbound-sms-not-null-provider
Conflicts:
	tests/app/db.py
2017-06-09 11:56:32 +01:00
Rebecca Law
16ce9354da Merge pull request #1028 from alphagov/job-stats-for-dashboard
Update the new job_statistics columns with the right values.
2017-06-09 10:52:18 +01:00
Rebecca Law
7b58886d04 Update the new job_statistics columns with the right values. 2017-06-08 16:24:16 +01:00
Rebecca Law
ca939ab587 Merge pull request #994 from alphagov/ken-migrate-default-service-permissions
Ken migrate default service permissions
2017-06-08 15:44:19 +01:00
Rebecca Law
0cee176d8b Fix merge conflicts 2017-06-08 15:24:18 +01:00
Rebecca Law
4e931733fd Merge branch 'master' into ken-migrate-default-service-permissions 2017-06-08 15:21:08 +01:00
Rebecca Law
03c6e74c46 Merge pull request #1024 from alphagov/job-stats-for-dashboard
Change the job_statistics table structure
2017-06-08 13:19:15 +01:00
Imdad Ahad
c6db12731a Add test to check dvla files (unexpected) are not removed 2017-06-08 13:06:24 +01:00
Martyn Inglis
2fe427ac5a Bumped version of celery 2017-06-08 11:04:07 +01:00
minglis
1b0ff63b1e Merge pull request #1022 from alphagov/remove-nasty-query-from-dashboard
Remove nasty query from dashboard
2017-06-08 10:58:35 +01:00
Imdad Ahad
c4a89b77e3 Add task to remove transformed dvla files:
* Runs at 4:40am
* Remove files older than 7 days and only two day's worth
2017-06-07 16:39:23 +01:00
Imdad Ahad
1d30d93c6f Add s3 method to remove transformed dvla files 2017-06-07 16:31:14 +01:00
Imdad Ahad
fd85a840d3 Merge pull request #1020 from alphagov/service-notification-by-id
Add private endpoint to get notification by ID
2017-06-07 16:24:47 +01:00
Imdad Ahad
7e22f3823f Merge pull request #1021 from alphagov/imdad-feat-get-inbound-by-id
Add endpoint to get inbound sms by id
2017-06-07 16:24:17 +01:00
Martyn Inglis
d5fc02b14b removed print statement :-( 2017-06-07 15:13:48 +01:00
Imdad Ahad
71bfefcea5 Merge pull request #1019 from alphagov/imdad-feat-remove-dvla-files-on-schedule
Remove letter jobs separately
2017-06-07 14:59:41 +01:00
Imdad Ahad
5b4ceda1c6 Refactor:
* Filter inbound by service_id
* Refactor to return 404 instead of 400 for consistency
2017-06-07 14:23:31 +01:00
Martyn Inglis
fa0d51b66c Added the free limit to the detailed service representation. 2017-06-07 14:19:25 +01:00
Chris Hill-Scott
6b5451ea87 Add test for invalid UUID 2017-06-07 13:18:51 +01:00
Chris Hill-Scott
beb1903756 Merge pull request #1023 from alphagov/quis-patch-1
Fix support URLs in Notify emails
2017-06-07 12:28:27 +01:00
Chris Hill-Scott
f1399ca7f1 Fix support URLs in Notify emails 2017-06-07 11:58:10 +01:00
Rebecca Law
1b4097cb16 Add three new columns to job_statistics for sent, delivered and failed.
A job only ever has one notification type.
This is the first deploy, where the columns are added and populated.

Next a data migration will happen to populate these new columns for the older jobs that do not have the values set.
Then we stop populating the old columns and remove them.
This refactoring of the table structure will make the queries to the table much easier to handle.
2017-06-07 11:15:05 +01:00
Martyn Inglis
d97c7c8e56 - Fix up free tier on the service object, use it only on dump not create/update in marshmallow
- Ensure tests leave config as was after a test run that alters free tier quantity
2017-06-07 09:58:57 +01:00
Imdad Ahad
ee488d416a Add endpoint to get inbound by id 2017-06-06 17:12:21 +01:00
Imdad Ahad
23a501af16 Add dao to get inbound sms by id 2017-06-06 17:11:59 +01:00
Chris Hill-Scott
635fb8fe44 Add private endpoint to get notification by ID
We need this for the two way stuff in the admin app.

We already have this as a public endpoint, but the admin app can’t use
it, because the admin app auths with its own key, not that of the
service it’s acting on behalf of.

This endpoint makes sure that a request originating from one service
can’t be used to see notifications belonging to another service.
2017-06-06 16:21:57 +01:00
Martyn Inglis
cad195949a Ensure that the bill includes whatever free allowance is applicable. 2017-06-06 16:21:05 +01:00
Imdad Ahad
74a8905be9 Seperate deletion of jobs:
* Two separate jobs, one for sms&email and another for letter
* Change celery task for delete to accept template type filter
* General refacor of tests to make more readable
2017-06-06 16:02:01 +01:00
Imdad Ahad
6b4597149f Add filter to get jobs to delete (sms, email, letter) 2017-06-06 16:01:27 +01:00
Martyn Inglis
96d30d31b1 Get existing tests to pass.
Done by ensuring that the rate limit is 0, so that all messages are billable.
2017-06-06 14:55:37 +01:00
Martyn Inglis
75bf693f44 Add the yearly free limit to the service model.
This allows us to reference it across the API code base and return it in the API.

But not currently attached to the service DB model - a static method on the class.
2017-06-06 14:49:05 +01:00
Martyn Inglis
18dcc10a06 Fixed typo 2017-06-06 14:04:11 +01:00
Martyn Inglis
941613a8bf Merge branch 'master' into remove-nasty-query-from-dashboard 2017-06-06 14:03:47 +01:00
minglis
43aade9ab5 Merge pull request #1018 from alphagov/fix-firetest-inbound
Strip leading 44 from inbound SMS numbers to normalise to how we stor…
2017-06-06 12:10:52 +01:00
Martyn Inglis
29455b6d3b Strip leading 44 from inbound SMS numbers to normalise to how we store things. 2017-06-06 11:50:30 +01:00
Rebecca Law
d68dc9a868 Merge pull request #1017 from alphagov/fix-migration-conflict
Fix conflict in db migration script
2017-06-06 11:17:31 +01:00
Rebecca Law
d488c592f4 Fix conflict in db migration script 2017-06-06 10:59:01 +01:00
minglis
e3fecd1d57 Merge pull request #1016 from alphagov/data-gov-uk
Add data.gov.uk to the list of organisations
2017-06-06 10:25:05 +01:00
Martyn Inglis
7a03ef3de4 Pseudo Code 2017-06-05 17:25:40 +01:00
minglis
85b9968473 Merge pull request #1012 from alphagov/firetext-inbound-sms
Firetext inbound sms
2017-06-05 16:59:03 +01:00
Chris Hill-Scott
6b01cfd5b5 Add data.gov.uk to the list of organisations
We need to send an email with data.gov.uk branding.

The image for the logo doesn’t exist yet, but doing this migration so
we’re ready when it the logo does exist.
2017-06-05 16:22:02 +01:00
Imdad Ahad
3177a6ddc4 Return personalisation dump of notifications + small refactor 2017-06-05 15:54:40 +01:00
Imdad Ahad
bad0ce3d86 Return personalisation in notification dump in search by to 2017-06-05 15:53:57 +01:00
Martyn Inglis
21a5f01804 Not null in own PR 2017-06-05 13:10:54 +01:00
Imdad Ahad
8f3504a999 Merge pull request #1011 from alphagov/imdad-feat-delete-old-inbound-msgs
Delete inbound messages older than seven days
2017-06-05 12:34:25 +01:00
Martyn Inglis
687b8443d1 Merge branch 'populate_provider_column' into firetext-inbound-sms-not-null-provider 2017-06-05 11:57:39 +01:00