Ken Tsang
72000c38aa
Refactor to abstract out post notification errors
2017-07-06 12:27:58 +01:00
Ken Tsang
23618a186c
Further refactoring
2017-07-06 12:27:57 +01:00
Ken Tsang
0b3277b8a4
Refactored to make code clearer
2017-07-06 12:27:57 +01:00
Ken Tsang
e0fbcb0dc6
Add permission check in for v2 post notification
2017-07-06 12:27:57 +01:00
Ken Tsang
46a55c1cdb
Refactor code
2017-07-06 12:27:57 +01:00
Ken Tsang
542bbb2f34
Refactor code
2017-07-06 12:27:56 +01:00
Ken Tsang
815f4d0a81
Removed prints
2017-07-06 12:27:56 +01:00
Ken Tsang
c1caa4a5da
Add tests for when email / sms disabled
2017-07-06 12:27:56 +01:00
Ken Tsang
b04d01ba27
Refactored code to use new service permissions only
2017-07-06 12:27:55 +01:00
Ken Tsang
98cd838510
ken-use-only-new-service-permissions
2017-07-06 12:27:55 +01:00
venusbb
2d8048654c
deleted last check
2017-06-29 11:11:08 +01:00
venusbb
16571c5b3c
IP restriction for inbound sms test 2
2017-06-29 10:47:27 +01:00
Venus Bailey
73e0432a69
Merge pull request #1047 from alphagov/inboundsms_checkip
...
add logs to see the IP address of the inbound sms
2017-06-26 16:47:40 +01:00
venusbb
c5cb70210e
add logs to see the IP address of the inbound sms
2017-06-26 16:15:58 +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
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
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
a1e570dea7
persist created_by_id when using the one off notification endpoint
2017-06-20 12:06:49 +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
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
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
Imdad Ahad
3177a6ddc4
Return personalisation dump of notifications + small refactor
2017-06-05 15:54:40 +01:00
Martyn Inglis
b296e736f2
Reorder the migrations.
2017-06-05 11:51:30 +01:00
Martyn Inglis
f15d235d1e
Merge branch 'master' into firetext-inbound-sms
2017-06-05 11:33:53 +01:00
Martyn Inglis
012f8d2675
Adds provider onto the inbound sms table so we know where this came from.
2017-06-02 16:37:57 +01:00
Martyn Inglis
3e1de2e901
Capture the fire text callbacks.
...
Parse the form data, and stop the message
2017-06-02 15:58:36 +01:00
Leo Hemsted
69c299dd6c
ensure international numbers are handled correctly
...
the international flag semantically means 'Should we throw an error if an
international number is passed in?' (and the answer is no. We should not.)
2017-06-02 15:20:18 +01:00
Leo Hemsted
bf18b179b0
ensure the user_number in inbound sms is international
...
rather than using the `normalise_phone_number` function, use the
`validate_and_format_phone_number` function - this will also convert
all numbers to international format, which means we won't need to
worry about whether the user enters internaional or UK phone numbers
when searching
2017-06-02 15:20:18 +01:00
Leo Hemsted
d9bdacb5cd
parse datetimes from mmg inbound sms
...
the DateRecieved field from MMG comes in with +s instead of spaces,
and uriencoded (the same as how they format their messages)
Make sure we decode this, and then convert to a UTC timestamp
2017-06-02 10:14:01 +01:00
Leo Hemsted
dba4e2ad89
mmg spell received incorrectly, lets use that
2017-06-01 17:27:09 +01:00
Martyn Inglis
c57e2a6894
Merge branch 'master' into inbound-sms
...
Conflicts:
app/notifications/receive_notifications.py
tests/app/notifications/test_receive_notification.py
2017-06-01 15:56:33 +01:00
Leo Hemsted
dd9fd6cf92
still return RECEIVED even if we couldn't find a matching service
...
mmg don't need to retry that message or anything. just log it.
2017-06-01 13:13:51 +01:00
Rebecca Law
40aadf2748
Merge pull request #991 from alphagov/invite-service-to-schedule
...
Invite the service to schedule notifications from the API
2017-06-01 12:37:32 +01:00
Martyn Inglis
a7fd624db5
Added simple logging endpoint for fire text inbound SMS calls
...
- logs post data
- OK to log all as not currently in use so no real user data expected.
2017-06-01 08:21:18 +01:00
Rebecca Law
e3baf71016
Update error message
2017-05-31 16:22:56 +01:00
Martyn Inglis
3c416d3631
Simple end point for fire text inbound SMS callbacks.
2017-05-31 16:15:25 +01:00
Leo Hemsted
4a85818c34
add inbound sms table
2017-05-30 10:47:01 +01:00
Martyn Inglis
75c5e5e5d5
Merge branch 'master' into redo-queue-visibitlity-timeout
...
Conflicts:
app/notifications/process_notifications.py
app/v2/notifications/post_notifications.py
2017-05-30 10:18:18 +01:00
Rebecca Law
3dc70b8c39
Check service.permissions for the existence of schedule_notifications if the notications is being created with a scheduled_for param.
2017-05-26 15:41:14 +01:00
Imdad Ahad
6c4377bd44
Persist normalised email
2017-05-26 10:26:07 +01:00
Imdad Ahad
cbc92a6173
Store the normalised number on the notification
2017-05-26 10:26:07 +01:00
Martyn Inglis
2591d3a1df
This massive set of changes uses the new queue names object throughout the app and tests.
...
Lots of changes, all changing the line of code that puts things into queues, and the code that tests that.
2017-05-25 10:51:49 +01:00
Rebecca Law
9f6c037530
Use iso8601 to validate scheduled_for datetime.
...
Added a validation method that always fails for scheduled notifications.
Comment out config for scheduled task.
The schedule notifications will be turned on once we can invite services to use it.
Waiting for the service permission story, must commit this in order to keep things from going stale.
2017-05-24 16:27:15 +01:00
Rebecca Law
751abb4b99
Update dateformat for scheduled_for to include minutes.
2017-05-22 14:15:35 +01:00
Rebecca Law
3a3161ecc4
Merge branch 'master' into schedule-api-notification
...
Conflicts:
app/celery/scheduled_tasks.py
app/v2/notifications/post_notifications.py
tests/app/celery/test_scheduled_tasks.py
2017-05-22 14:05:57 +01:00
Imdad Ahad
0e0c18583f
Fix test data and how we parse the JSON
2017-05-19 10:16:48 +01:00
Martyn Inglis
8dc7a86148
Merge branch 'master' into async-job-stats
...
Conflicts:
app/dao/services_dao.py
2017-05-18 09:34:54 +01:00
Rebecca Law
973cc2c4c9
Changed the scheduled_for datetime to only send and hour of a day to send.
...
Also expect the date being passed in is BST. The date is converted to UTC before saving. And converted to BST when returning a notification.
2017-05-17 15:06:15 +01:00
