venusbb
6a7013fa7a
Enable Inbound sms IP blocking
2017-09-26 10:59:09 +01:00
Sakis
c36ced5b56
Merge pull request #1274 from alphagov/configure-gunicorn-errorlog
...
Configure gunicorn errorlog
2017-09-26 09:53:27 +01:00
Athanasios Voutsadakis
f32a243e47
Change .info to .error
2017-09-25 16:24:35 +01:00
Rebecca Law
0fa16cc9d1
Merge pull request #1270 from alphagov/select-inbound-number-to-assign
...
Select an inbound number for a service
2017-09-25 14:17:36 +01:00
Venus Bailey
e355c870d0
Merge pull request #1275 from alphagov/vb-platform-admin-api
...
Platform Admin Timeout problem
2017-09-25 12:10:48 +01:00
Rebecca Law
b195257d94
Added another test
2017-09-25 11:14:29 +01:00
Rebecca Law
64db8cb18d
Merge branch 'master' into select-inbound-number-to-assign
2017-09-25 11:13:12 +01:00
venusbb
34430ac97e
tidy up codes and tests
2017-09-25 09:44:16 +01:00
venusbb
35cb7a0556
inserted missing codes
2017-09-22 15:52:11 +01:00
venusbb
4e991c26a2
Progress: Filtered day completed
2017-09-22 15:39:53 +01:00
Athanasios Voutsadakis
291071273e
Fix PEP8
2017-09-22 15:34:43 +01:00
Athanasios Voutsadakis
646290e2c4
Implement worker_abort server hook
...
Also update the manifest command to pass the config file in as a parameter
and modify the logs agent to start shipping the error log to cloudwatch
2017-09-22 15:03:45 +01:00
Athanasios Voutsadakis
01611c1936
Configure gunicorn error log file
2017-09-22 11:28:55 +01:00
venusbb
da21248dcf
Merge branch 'master' of https://github.com/alphagov/notifications-api into vb-platform-admin-api
2017-09-22 11:14:09 +01:00
venusbb
d59a1f447a
Progress: Today stats completed
2017-09-22 11:05:36 +01:00
Rebecca Law
9a1410f48d
Merge pull request #1273 from alphagov/add-order-by
...
Add order by in the dao_get_reply_to_by_service_id()
2017-09-22 10:31:33 +01:00
Rebecca Law
03ea09fd6a
Add order by in the dao_get_reply_to_by_service_id()
2017-09-22 10:02:59 +01:00
Rebecca Law
9bc1d13785
Merge pull request #1272 from alphagov/get-reply-to-by-id
...
New endpoint to fetch a single reply-to email address by id
2017-09-22 09:41:19 +01:00
kentsanggds
28c7a2b50c
Merge pull request #1271 from alphagov/ken-add-service-letter-content-model
...
Add ServiceLetterContact data model and migration script
2017-09-21 17:08:01 +01:00
Rebecca Law
795bd4271c
New endpoint to fetch a single reply-to email address by id
2017-09-21 17:02:58 +01:00
Ken Tsang
91a618531d
Update serialization and service schema
...
- added id and service_id in serialization
- added 'letter_contacts' to the exluded list for marshmallow service schema
2017-09-21 16:38:24 +01:00
Ken Tsang
366d07dbbe
Add ServiceLetterContact data model and script
2017-09-21 16:08:49 +01:00
Rebecca Law
18581c754a
Add new endpoint to get available inbound number.
...
Add new endpoint to allocate a specific number to a given service.
This will allow the platform admin user to choose a number when setting the inbound_sms permission for a service.
2017-09-21 15:18:52 +01:00
Chris Hill-Scott
e6d6b6f985
Merge pull request #1269 from alphagov/fix-sending-emails-no-logo
...
Fix sending emails with no logo
2017-09-21 13:40:11 +01:00
Chris Hill-Scott
ee5888f07f
Fix sending emails with no logo
...
Code was not expecting logo to be `None`, thereby causing the task to
throw an exception, and retry until eventually putting the email in
technical error (for services with org branding but no logo).
2017-09-21 13:37:57 +01:00
Chris Hill-Scott
8360b9a122
Merge pull request #1265 from alphagov/logoless-organsations
...
Make organisation logo nullable
2017-09-21 13:01:06 +01:00
Leo Hemsted
e4732c8c4b
Merge pull request #1268 from alphagov/sample-service-permissions
...
update letter tests to use correct service
2017-09-21 12:06:08 +01:00
Leo Hemsted
e18e78180e
update letter tests to use correct service
...
previously they were using sample_service fixture under the hood, but
with full permissions added - this works fine, **unless** there's
already a service with the name "sample service" in the database. This
can happen for two reasons:
* A previous test didn't tear down correctly
* This test already invoked the sample_service fixture somehow
If this happens, we just return the existing service, without modifying
its values - values that we might change in tests, such as
research mode or letters permissions.
In the future, we'll have to be vigilant! and aware! and careful! to
not use sample_service if we're doing tests involving letters, since
they create a service with a different name now
2017-09-21 11:50:49 +01:00
Rebecca Law
76106b9f7f
Merge pull request #1267 from alphagov/add-id-for-reply-to
...
Add id and service_id to the serialize method on ServiceEmailReplyTo
2017-09-21 10:56:17 +01:00
Rebecca Law
0c9f16a8d1
Add id and service_id to the serialize method on ServiceEmailReplyTo
2017-09-21 10:21:32 +01:00
Rebecca Law
08fdcbfc67
Merge pull request #1266 from alphagov/use-reply-to-from-new-table
...
Use reply to email address from new table
2017-09-21 09:54:52 +01:00
Leo Hemsted
9afb2c36e7
Merge pull request #1241 from alphagov/letter-received
...
Letters are accepted, not created or sending
2017-09-20 16:51:31 +01:00
Rebecca Law
9e818a558e
Fix the ServiceSchema to only dump the reply_to_email_address
2017-09-20 15:47:29 +01:00
Leo Hemsted
4174c72f21
allow 'accepted' as a proxy for created + sending as well as 'failed' for the three failure types when querying the api
2017-09-20 15:30:14 +01:00
Rebecca Law
06ffac9a0f
Merge branch 'master' into use-reply-to-from-new-table
2017-09-20 14:00:04 +01:00
Rebecca Law
3a5706994f
Merge pull request #1258 from alphagov/add-multiple-reply-to-email-endpoints
...
Add multiple reply to email endpoints
2017-09-20 13:26:02 +01:00
Rebecca Law
877d8a2877
Remove the default value - expect it to always be set.
2017-09-20 12:20:12 +01:00
Rebecca Law
c6bf38e869
- is_default is required on the add_service_email_reply_to_request schema
...
- Added check that the service exists for the POST reply-to methods.
- Added tests
2017-09-20 11:58:18 +01:00
Leo Hemsted
c8ff45be2d
don't create test db anymore, thats done in pytest
2017-09-20 11:21:27 +01:00
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 Hill-Scott
bde6a9e131
Make organisation logo nullable
...
Now we have the org banner branding, not all organisations need a logo.
So it shouldn’t be an error to not provide one.
2017-09-20 11:06:16 +01:00
Rebecca Law
a53a0da414
[WIP] need to fix the tests
2017-09-20 10:45:35 +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
venusbb
9066e666db
Merge branch 'master' of https://github.com/alphagov/notifications-api into vb-platform_admin_api
2017-09-19 14:43:27 +01:00
