Commit Graph

2930 Commits

Author SHA1 Message Date
Chris Hill-Scott
8a49afc06c Merge pull request #1037 from alphagov/dar-conflict
Unpick migration conflict
2017-06-20 11:05:56 +01:00
Chris Hill-Scott
24b9e7b059 Unpick migration conflict
Inbound provider and Dial-a-Ride migrations happened at the same time
and got the same revision numbers.

This commit puts DAR after inbound provider.
2017-06-20 10:56:50 +01:00
Chris Hill-Scott
92c92ba368 Merge pull request #1035 from alphagov/tfl-dar
Add organisation for TFL Dial a Ride
2017-06-20 10:47:26 +01:00
Rebecca Law
bd3704d123 Merge pull request #1034 from alphagov/push-inbound-sms
Push inbound sms
2017-06-19 15:15:07 +01:00
Rebecca Law
3a66027d6a Refactor ApiKeys.secret and ServiceInboundApi.bearer_token to use the same encryption method and get rid of the duplicate code. 2017-06-19 14:32:22 +01:00
Rebecca Law
6202da7dea Update model to remove the string length restriction.
Moved logic to the dao from the endpoint.
2017-06-19 12:25:05 +01:00
Venus Bailey
7a76b801df Merge pull request #1031 from alphagov/secrets-2FA
Secrets 2 fa
2017-06-19 09:44:22 +01:00
minglis
d936b33bce Merge pull request #1027 from alphagov/template-query-to-not-limit-by-days
Template query to not limit by days
2017-06-16 15:23:19 +01:00
Martyn Inglis
9280648ca5 Some more tests for under, over and exactly 7 days 2017-06-16 14:51:45 +01:00
Martyn Inglis
e3644bae96 Merge branch 'master' into template-query-to-not-limit-by-days 2017-06-16 14:06:56 +01:00
Rebecca Law
effb99dca8 Add fetch request for service inbound api.
Add unique constraint on service_id for service_inbound_api.
2017-06-15 16:19:12 +01:00
Chris Hill-Scott
87565c1e60 Add organisation for TFL Dial a Ride
References image added in:
- [ ] https://github.com/alphagov/notifications-admin/pull/1321
2017-06-15 14:59:36 +01:00
Rebecca Law
828d5cd493 New table to store the inbound api information for a service. The table is versioned.
There is a new endpoint to create the inbound api and one to update it.
2017-06-15 11:32:51 +01:00
venusbb
332fe14680 fixed pep 8 issues 2017-06-13 18:11:13 +01:00
Rebecca Law
3fdd180515 New endpoint to set ServiceInboundApi data. 2017-06-13 18:00:25 +01:00
Imdad Ahad
7faf444534 Merge pull request #1032 from alphagov/imdad-feat-remove-dvla-response-files
Remove DVLA response files older than 7 days
2017-06-13 17:23:58 +01:00
kentsanggds
ac136cf1ca Merge pull request #1029 from alphagov/post-version-of-search-form
Post version of search form
2017-06-13 15:49:02 +01:00
Rebecca Law
b186cad046 Add a new table to store the api information for a service inbound sms message.
Including:
 - url to push the inbound sms to
 - bearer_token to be added to the header of the request.

The services will be expected to manage these properties.
2017-06-13 15:27:13 +01:00
Imdad Ahad
1dacc6c3a3 Updates:
* Skip the decorated tests as that doesn't work as we expect
* Remove magic numbers in tests
2017-06-13 15:22:31 +01:00
Rebecca Law
0596b210a5 Merge pull request #1033 from alphagov/job-stats-for-dashboard
Job stats for dashboard
2017-06-13 14:35:58 +01:00
Imdad Ahad
f29ebb34f6 Add scheduled task to delete response files older than 7 days 2017-06-13 12:40:58 +01:00
Imdad Ahad
a1a5377f9c Add methods to get and remove s3 bucket objects 2017-06-13 12:36:34 +01:00
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
Rebecca Law
b65ee1d99a Fix missing slash 2017-06-13 12:08:09 +01:00
Rebecca Law
a83e744c68 Remove join to Template table.
Fix typo in unit test.
2017-06-13 11:55:14 +01:00
venusbb
8188dfa7d3 secret-2fa using SystemRandom library 2017-06-13 11:51:11 +01:00
Rebecca Law
4fefec6aa3 New endpoints to return job stats.
Next step is to use the new endpoints in admin.
2017-06-13 10:56:03 +01:00
venusbb
cbb7072a83 Merge branch 'master' of https://github.com/alphagov/notifications-api into secrets-2FA 2017-06-13 10:52:59 +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
Rebecca Law
cc04b5eb1d Added new endpoint for job statistics.
The structure has been flattened, so I need to create a new endpoint, start using that endpoint, then change the name back.
Added template_id and version to the get job stats by id.
2017-06-12 17:15:32 +01:00
Rebecca Law
c7707873e4 Queries to get job statistics by job_id or by service_id. 2017-06-12 14:25:17 +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
venusbb
270173fd5c 2FA use secret cryptopgraphy 2017-06-09 17:15:51 +01:00
venusbb
7c318cd90e Merge branch 'master' of https://github.com/alphagov/notifications-api into secrets-2FA 2017-06-09 17:05:39 +01:00
venusbb
a0640bb803 Generate 2FA secret code cryptographically install of using random number 2017-06-09 16:19:30 +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
Martyn Inglis
ccfcb5678f Missing white space 2017-06-09 10:44:48 +01:00
Martyn Inglis
7dccf796dd Adds a POST version of get inbound messages by phone number. Allows us to POST the search so the phone number is hidden 2017-06-09 10:34:02 +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
Martyn Inglis
1bc8073a83 Tried to make this clearer 2017-06-08 15:11:41 +01:00
Martyn Inglis
3702ebdd93 This is a bit gnarly. When querying the notifications table for template usage, we don't apply the days limit if we're trying to get exactly 7 days.
This is because 7days should be the amount of data in that table so don't restrict.

Note not all queries do this in the same way and a pivotal bug has been raised to align this. This is a bug fix as right now the numbers are out in prod.
2017-06-08 13:42:41 +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