Leo Hemsted
f3b4a06a07
check both sms and email
2017-09-20 11:20:51 +01:00
Leo Hemsted
cb3379d0b6
rename received_by_notify to accepted
...
accepted is nice since it both implies that things look good, while
not being commital about next steps.
2017-09-20 11:20:51 +01:00
Leo Hemsted
18639354fa
changed conftest to put underscores in sample_letter_template
...
this gets tests passing for now, but we'll need to make sure that
notifications.serialize handles letters with personalisation that
doesn't include underscores in future - for example, address_line_1
may also be addressline1 if someone uploaded a CSV
2017-09-20 11:20:51 +01:00
Leo Hemsted
10ceb0467e
fix ordering to prevent random test failures
2017-09-20 11:20:13 +01:00
Leo Hemsted
4936fa384c
return fake "received_by_notify" status for letter notifications
...
created and sending aren't quite as helpful for letters, since their
journey through notify and our providers is so different to emails/sms.
So instead, we should return estimated_dispatch_date (in a future PR)
and the status should just read received_by_notify
2017-09-20 11:20:13 +01:00
Chris Waszczuk
4d1c0a36c6
Merge pull request #1263 from gov-cjwaszczuk/master
...
Bumped utils version
2017-09-19 16:21:48 +01:00
chrisw
e3661440d6
bumped utils version
2017-09-19 16:13:42 +01:00
Chris Waszczuk
4b30961d48
Merge pull request #1262 from gov-cjwaszczuk/master
...
Add a non-GOV.UK banner option for email branding
2017-09-19 15:07:15 +01:00
chrisw
f49eca5324
Add a non-GOV.UK banner option for email branding
...
Added an extra name, 'org_banner', for branding types into branding_type table
Added org banner into user model in database
Added checks for new branding type to ensure that the correct data is passed into the dict
Tested new checks in html email options
2017-09-19 14:40:22 +01:00
Chris Hill-Scott
d0cbb4041b
Merge pull request #1261 from alphagov/running-without-six
...
Remove six dependency
2017-09-19 10:15:20 +01:00
Chris Hill-Scott
21817aa865
Merge branch 'master' into running-without-six
2017-09-19 09:53:40 +01:00
Rebecca Law
e11b9cd498
Merge pull request #1229 from alphagov/pyup-update-pyjwt-1.5.2-to-1.5.3
...
Update pyjwt to 1.5.3
2017-09-19 09:21:39 +01:00
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
Chris Hill-Scott
a539b3a3bd
Remove six dependency
...
six is used for Python 2/3 compatibility. We never run under Python 2.
2017-09-18 09:36:56 +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
