Rebecca Law
56e017fbbd
Merge pull request #1227 from alphagov/pyup-update-sqlalchemy-utils-0.32.14-to-0.32.16
...
Update sqlalchemy-utils to 0.32.16
2017-09-19 09:21:20 +01:00
Rebecca Law
8323549f6c
Merge branch 'master' into pyup-update-sqlalchemy-utils-0.32.14-to-0.32.16
2017-09-19 09:21:09 +01:00
Chris Waszczuk
be66492de3
Merge pull request #1255 from gov-cjwaszczuk/master
...
Fixed bug where a user with an organisation that wanted the GOVUK only branding ended up with both
2017-09-18 13:44:05 +01:00
chrisw
9ecb666290
Fixed bug where a user with an organisation that wanted the GOVUK only branding ended up with both
...
If a user was to have an organisation selected in the email settings within the platform admin section, they would be sending emails that contained both the organisation's branding and GOV.UK's.
Fix adds a check to ensure that the branding dictionary does not contain organisation details if the the service branding settings is set to 'gov'
2017-09-18 11:33:47 +01:00
Chris Hill-Scott
b81b5bc03c
Merge pull request #1244 from alphagov/return-letter-delivery-estimate
...
Return delivery estimate for letter notifications
2017-09-18 11:09:51 +01:00
Chris Hill-Scott
2e9cecd385
Confirm no delivery estimate for emails and SMS
...
Only letters have a delivery estimate (which we calculate). This commit
adds a test to make sure this remains the case.
2017-09-18 11:02:16 +01:00
Chris Hill-Scott
ec308355ba
Merge pull request #1259 from alphagov/pyup-update-pytest-mock-1.6.2-to-1.6.3
...
Update pytest-mock to 1.6.3
2017-09-18 09:57:44 +01:00
pyup-bot
acf8d663f5
Update pytest-mock from 1.6.2 to 1.6.3
2017-09-16 01:23:26 +01:00
Chris Hill-Scott
29a962060f
Return delivery estimate for letter notifications
...
> For get all or get one letter the response needs to be updated so that
> it looks similar to admin app.
>
> status: created|sending --> received letter
> new column: `estimated delivery date`: derived from created at date.
> (see how the admin app is doing it)
>
> NOTE:
> At the moment we only have 2 statuses for a letter created and
> sending, but we will want to have other internal statuses that make
> sense to the Notify team but not our services. When we know those
> statuses the status map will be updated at that point.
– https://www.pivotaltracker.com/story/show/150512525
This commit implements the date (not status) part of this story.
2017-09-15 14:58:07 +01:00
Venus Bailey
0029a0cc0f
Merge pull request #1254 from alphagov/Inbound-sms-ip
...
fixing minor problem, logged ip variable name changed
2017-09-15 14:48:01 +01:00
Leo Hemsted
69ba0ba743
Merge pull request #1249 from alphagov/rename-tasks
...
use new send-jobs-to-dvla task instead of send-files-to-dvla
2017-09-15 11:33:52 +01:00
Leo Hemsted
c453c06e20
Merge pull request #1224 from alphagov/celery_logging
...
log unhandled celery exceptions
2017-09-15 11:33:25 +01:00
Leo Hemsted
1cc90c870c
Merge pull request #1256 from alphagov/bump_utils
...
Bump utils to 21.2.0
2017-09-15 11:33:06 +01:00
Athanasios Voutsadakis
71f459b2d8
Bump utils to 21.2.0
...
This will stop logging the request, as it is logged by nginx-access logs
2017-09-15 10:58:45 +01:00
venusbb
db977be8d0
delete old variable ip
2017-09-15 10:54:25 +01:00
venusbb
09bc392097
Merge branch 'master' of https://github.com/alphagov/notifications-api into Inbound-sms-ip
2017-09-14 16:55:04 +01:00
venusbb
449bc8d8d0
fixing minor problem, logged ip variable name changed
2017-09-14 13:53:08 +01:00
Katie Smith
45512228e1
Merge pull request #1253 from alphagov/add-multiple-reply-to-email-endpoints
...
Add multiple reply to email endpoints
2017-09-14 13:30:45 +01:00
Rebecca Law
5366968cc9
Added some more tests
2017-09-14 12:23:52 +01:00
Venus Bailey
e9e77382c3
Merge pull request #1252 from alphagov/Inbound-sms-ip
...
Inbound sms monitoring update
2017-09-14 09:28:16 +01:00
venusbb
160b878745
Minor change in how we inteprete Incoming IP
2017-09-13 17:23:23 +01:00
venusbb
d4a3c96a75
Merge branch 'master' of https://github.com/alphagov/notifications-api into Inbound-sms-ip
2017-09-13 17:09:58 +01:00
Katie Smith
72760550bd
Add endpoint to get the email reply to addresses for a service
...
- Changed the dao_get_reply_to_by_service_id method to return a list of
results.
- Added a GET /service/<service_id>/email-reply-to endpoint
2017-09-13 16:58:36 +01:00
Rebecca Law
63b62e74bb
Merge pull request #1251 from alphagov/updating-service_sms_senders
...
Insert or update service sms senders
2017-09-13 15:10:11 +01:00
Rebecca Law
ce8d01fc51
Merge pull request #1250 from alphagov/pyup-update-moto-1.1.4-to-1.1.5
...
Update moto to 1.1.5
2017-09-13 15:09:56 +01:00
Chris Hill-Scott
5f696ca696
Merge pull request #1223 from alphagov/quis-patch-1
...
Warn devs about changing healthcheck page response
2017-09-13 14:11:16 +01:00
venusbb
9efc17a941
Use ipaddress library for the masked bits
2017-09-13 14:08:23 +01:00
venusbb
c285ab0b45
inbound sms monitoring 24bit mask
2017-09-13 11:29:11 +01:00
Rebecca Law
a03c199225
Merge pull request #1238 from alphagov/imdad-migrate-to-new-reply-to
...
[3/5] Migrate existing data to new service_email_reply_to table
2017-09-13 09:17:20 +01:00
Rebecca Law
1c766206a1
Remove moto dependency.
...
We are no longer using moto for testing.
2017-09-13 09:10:54 +01:00
pyup-bot
1f6fa02e48
Update moto from 1.1.4 to 1.1.5
2017-09-12 23:03:22 +01:00
Leo Hemsted
2c758cbccd
use new send-jobs-to-dvla task instead of send-files-to-dvla
...
the tasks (on the ftp app) do the same thing, but to improve clarity
i've renamed it to jobs, because we'll be adding a notifications one
soon
2017-09-12 17:28:07 +01:00
kentsanggds
ca1856eb20
Merge pull request #1246 from alphagov/ken-prevent-blank-letter-address
...
Raise validation errors for empty letter fields
2017-09-12 14:36:54 +01:00
Rebecca Law
3779f9d1df
Merge branch 'master' into updating-service_sms_senders
2017-09-12 12:11:38 +01:00
Rebecca Law
5439b01a6e
When an inbound number is allocated insert or update a row in service_sms_senders.
2017-09-12 12:09:32 +01:00
Katie Smith
d88e437005
Merge pull request #1248 from alphagov/update-reply-to-email-test
...
Update reply to email test
2017-09-12 11:30:06 +01:00
Rebecca Law
d356957974
Change the ServiceEmailReplyTo model to uselist for the backref to services (allow 0 to many reply to emails)
...
Add another assert in the test
2017-09-12 10:14:58 +01:00
Chris Hill-Scott
389eb8e75b
Merge pull request #1247 from alphagov/pyup-update-moto-1.1.2-to-1.1.4
...
Update moto to 1.1.4
2017-09-12 09:50:10 +01:00
Rebecca Law
9bd3ed2dac
Use a unique id
2017-09-12 09:30:55 +01:00
Katie Smith
269e88f7de
Update reply to email test
...
- Updated reply to email test so that the request to create or update
email is not mocked.
- Excluded reply_to_email_addresses from the Service schema
2017-09-12 09:07:34 +01:00
pyup-bot
e912527a61
Update moto from 1.1.2 to 1.1.4
2017-09-11 20:48:22 +01:00
Rebecca Law
f624f4f033
Insert and update methods for service_sms_sender
2017-09-11 17:40:37 +01:00
Leo Hemsted
cfd51fbbed
Merge pull request #1245 from alphagov/bcrypt
...
upgrade flask-bcrypt to 0.7.1
2017-09-11 16:22:14 +01:00
Rebecca Law
a507f74823
Merge pull request #1243 from alphagov/json-response-schema-validation
...
Small refactor to how notification_schemas are tested.
2017-09-11 16:06:32 +01:00
Leo Hemsted
43bda1ae2c
upgrade flask-bcrypt to 0.7.1
...
this uses bcrypt directly rather than using the wrapper python-bcrypt.
WARNING! You'll need to update your local install by running:
```
pip uninstall python-bcrypt
pip install flask-bcrypt==0.7.1
```
2017-09-11 15:47:10 +01:00
Ken Tsang
41f427d6dd
Update definitions to check non empty strings
2017-09-11 15:37:40 +01:00
Leo Hemsted
6187423f7f
Merge branch 'master' into celery_logging
2017-09-11 11:32:49 +01:00
Sakis
62f561c4d1
Merge pull request #1240 from alphagov/bump_utils
...
Bump notifications-utils version to 21.0.0
2017-09-11 11:17:56 +01:00
Athanasios Voutsadakis
4b88ec639f
Remove * from logs matching pattern
...
Now we are only going to have one log file that we're interested in
2017-09-11 11:11:06 +01:00
Rebecca Law
0a21f1f3e8
Small refactor to how notification_schemas are tested.
...
My local build was not always getting the optional requirement for the jsonschema uri format checker (rfc3987).
The requirement has been added to the requirements_for_test file.
I changed the tests to validate the response schema from the post_notifications tests, this way we can tell if we are breaking the contract.
This showed that the email_from was not returning the entire email address but just the username, that has been corrected here.
Removed the response schema validation tests since they are not being testing in the post notification tests.
2017-09-11 11:10:45 +01:00
