Commit Graph

2956 Commits

Author SHA1 Message Date
Leo Hemsted
ec5bcee79e Merge pull request #1041 from alphagov/send-notification-fix
ensure created_by_id is being persisted correctly
2017-06-26 12:22:23 +01:00
Rebecca Law
9b287639ce Merge pull request #1043 from alphagov/add-logo-enterprise
Add organisation values for the Enterprise Europe Network.
2017-06-26 12:19:08 +01:00
Rebecca Law
4fe62ac121 Add organisation values for the Enterprise Europe Network. 2017-06-26 11:48:04 +01:00
Venus Bailey
f48a22790e Merge pull request #1042 from alphagov/iprestrict_inboundsms
Iprestrict inboundsms
2017-06-26 11:27:55 +01:00
venusbb
9e9b3f39a1 Check IP address source 2017-06-26 11:08:10 +01:00
venusbb
617253dc36 Check IP address source 2017-06-26 10:24:48 +01:00
venusbb
ad0b6bd0f6 Merge branch 'master' of https://github.com/alphagov/notifications-api 2017-06-23 17:04:27 +01:00
Leo Hemsted
350133e6db ensure created_by_id is being persisted correctly
(also make sure it's well tested 🎉 )
2017-06-23 15:56:47 +01:00
Chris Hill-Scott
1ba175f8a6 Merge pull request #1039 from alphagov/bump-utils-bigger-logos
Update utils to make DAR logo bigger
2017-06-23 14:14:28 +01:00
Rebecca Law
0b22ceb118 Merge pull request #1040 from alphagov/update-push-inbound-json
Update the json in the post to the service for the inbound sms.
2017-06-22 14:01:39 +01:00
Rebecca Law
5ef0450e37 Update the json in the post to the service for the inbound sms. 2017-06-22 10:15:08 +01:00
Chris Hill-Scott
1747f7c76b Update utils
Depends on:
https://github.com/alphagov/notifications-utils/pull/170

Brings in these changes:
https://github.com/alphagov/notifications-utils/compare/17.1.3...make-the-logo-bigger
or when utils PR is merged
https://github.com/alphagov/notifications-utils/compare/17.1.3...17.4.0
2017-06-22 09:15:28 +01:00
Rebecca Law
e0d23f40f6 Merge pull request #1038 from alphagov/push-inbound-sms
Push inbound sms
2017-06-21 15:49:32 +01:00
Rebecca Law
6559da3239 Updates as per review comments 2017-06-21 15:29:55 +01:00
Leo Hemsted
c49eb36371 Merge pull request #1036 from alphagov/one-off
Send one off messages from new admin endpoint
2017-06-21 10:25:44 +01:00
Rebecca Law
c608f5997b New task to send the inbound sms to the service.
If the service has not set the url then nothing happens.
If the request to the service url returns with 500 or greater the task is retries.
The task is created when the SMS provider post the inbound SMS.
2017-06-20 17:13:40 +01:00
Leo Hemsted
ac7665bfc6 celery test cleanup
* Alter config so an error will be raised if you forget to mock out a
  celery call in one of your tests
* Remove an unneeded exception type that was masking errors
2017-06-20 12:06:49 +01:00
Leo Hemsted
88a479a4bb make client request fixture args conform 2017-06-20 12:06:49 +01:00
Leo Hemsted
a1e570dea7 persist created_by_id when using the one off notification endpoint 2017-06-20 12:06:49 +01:00
Leo Hemsted
729faf579d block one-off sms with long content counts 2017-06-20 12:06:47 +01:00
Leo Hemsted
10b851b456 add send_notification file for handling sending one off messages
currently, they're made by creating a one-line job, but we want to
reduce task/csv file noise so we're moving them to persist in the
same vein as API usage. However, we can't just call through to that
since there are some differences:

* no api keys
* tighter control over API format
* no scheduling
* no client references

etc.

So, re-using as much of the v2 validation stuff as possible, I've
created this file that just does basic validation, and then calls
through to persist_notification and schedules a task. Woo.
2017-06-20 11:51:36 +01:00
Leo Hemsted
9f307fd1c5 add created_by to notifications
this is so one-off notifications can be tied to a user
(jobs have a created_by, and api notifications don't make sense
 to have one)
2017-06-20 11:51:17 +01:00
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
ff5e8c1f33 Query to return the inbound api data for the service 2017-06-19 16:35:15 +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
venusbb
30901ebda8 Merge branch 'master' of https://github.com/alphagov/notifications-api 2017-06-19 09:55:41 +01:00
Venus Bailey
7a76b801df Merge pull request #1031 from alphagov/secrets-2FA
Secrets 2 fa
2017-06-19 09:44:22 +01:00
venusbb
cd5dc0f4fa Merge branch 'master' of https://github.com/alphagov/notifications-api 2017-06-19 09:23:23 +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
venusbb
a840f7069f Merge branch 'secrets-2FA' 2017-06-16 11:47:12 +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