Rebecca Law
ec28f48968
Merge branch 'master' into populate-monthly-letter-usages
2017-12-18 10:41:33 +00:00
Rebecca Law
995d70740a
Add letter type when getting billing data for financial year
2017-12-18 10:40:13 +00:00
Rebecca Law
e0e64d51d5
[WIP]
...
Fix the query to count rather than sum the billing units.
Need to fix the query that returns the monhtly billing, there is only one row but there should be two if there are two rates.
2017-12-15 17:29:32 +00:00
Venus Bailey
3015d4fc07
Merge pull request #1492 from alphagov/add-mmg-inbound-sms-auth
...
Add MMG_INBOUND_SMS_AUTH config variable and auth check
2017-12-15 15:01:10 +00:00
Rebecca Law
c08f67ea63
Merge branch 'master' into populate-monthly-letter-usages
2017-12-15 14:26:39 +00:00
venusbb
a374f94dbb
Merge branch 'add-mmg-inbound-sms-auth' of https://github.com/alphagov/notifications-api into add-mmg-inbound-sms-auth
2017-12-15 12:22:30 +00:00
venusbb
a57264d5c8
Merge branch 'master' of https://github.com/alphagov/notifications-api into add-mmg-inbound-sms-auth
2017-12-15 12:21:24 +00:00
venusbb
ab66f5c0ac
Change MMG username to look at env variable
2017-12-15 12:19:58 +00:00
Rebecca Law
9b884770e5
Remove extra if clause added when trying to merge.
2017-12-15 11:58:55 +00:00
Leo Hemsted
cc574474eb
Merge pull request #1485 from alphagov/letters-tomorrow
...
put pdfs in tomorrow's dvla bucket after 17:30
2017-12-15 11:55:48 +00:00
Leo Hemsted
1ca252dcf9
put pdfs in tomorrow's dvla bucket after 17:30
...
So if someone sends a letter in the evening, it gets picked up the
next day
2017-12-15 11:47:52 +00:00
Rebecca Law
6ae8415974
Update test
2017-12-15 10:47:55 +00:00
Rebecca Law
63799f5ff2
Merge branch 'populate-monthly-letter-usages' of github.com:alphagov/notifications-api into populate-monthly-letter-usages
2017-12-15 10:34:20 +00:00
Venus Bailey
189692773d
Merge branch 'master' into add-mmg-inbound-sms-auth
2017-12-15 09:21:39 +00:00
venusbb
2e6c46c163
Merge branch 'master' of https://github.com/alphagov/notifications-api into add-mmg-inbound-sms-auth
2017-12-15 09:15:49 +00:00
Rebecca Law
012d80003a
Update montly billing with letters
2017-12-14 17:17:05 +00:00
kentsanggds
42318cc335
Merge pull request #1488 from alphagov/ken-update-letters_pdf-billable_units
...
Update billable units for letters pdf task
2017-12-14 16:30:20 +00:00
kentsanggds
5dc238671f
Merge branch 'master' into ken-update-letters_pdf-billable_units
2017-12-14 16:16:00 +00:00
kentsanggds
cf8770d0c1
Merge pull request #1494 from alphagov/ken-rename-create-letters-pdf-queue
...
Create letters pdf queue was renamed with tasks, but was lost in another merge
2017-12-14 16:14:04 +00:00
Ken Tsang
0ad43f0c5b
Create letters pdf queue was renamed with tasks, but was lost in another merge
...
- needs to be correct name otherwise the delivery worker will not pick up the queue
2017-12-14 16:00:51 +00:00
Leo Hemsted
87ea027824
Merge pull request #1493 from alphagov/error-on-app-crash
...
fix makefile syntax
2017-12-14 15:32:02 +00:00
Leo Hemsted
7d1c4ea722
fix makefile syntax
2017-12-14 15:16:43 +00:00
Ken Tsang
0045cd6b72
Use dao_update_notification to update billable_units for letter notifications
2017-12-14 15:09:25 +00:00
Ken Tsang
f23074596b
Update billable units for letters pdf task
2017-12-14 15:09:25 +00:00
Leo Hemsted
5430eb9fc7
Merge pull request #1491 from alphagov/error-on-app-crash
...
if apps crash on startup, then fail deploy process
2017-12-14 15:06:12 +00:00
Leo Hemsted
c6e6fad01f
if apps crash on startup, then fail deploy process
...
we saw an issue where the app started, then immediately crashed due to
a setup error. However, jenkins had already returned positively, and
the deploy continued.
cf-deploy should fail if the app doesn't start up.
We do this by looking through the cloudfoundry events, and aborting
if there are any `app.crash` events for the new GUID.
2017-12-14 14:23:32 +00:00
Leo Hemsted
304d500078
Merge pull request #1490 from alphagov/leohemsted-patch-1
...
Can't have spaces between queue names in manifest
2017-12-14 13:51:00 +00:00
Katie Smith
a8d3b0952f
Add MMG_INBOUND_SMS_AUTH config variable and auth check
...
Checks authentication header value on inbound SMS requests from
MMG against a list of allowed API keys set in the application
config.
At the moment, we're only logging the attempts without aborting the
requests. Once this is rolled out to production and we've checked
the logs we'll switch on the aborts and add the tests for 401 and 403
responses.
This work has already been done for Firetext in a previous PR:
https://github.com/alphagov/notifications-api/pull/1409
2017-12-14 13:37:50 +00:00
Leo Hemsted
5d3a3ab042
Can't have spaces between queue names
2017-12-14 13:26:38 +00:00
Venus Bailey
a9a8ef8ff1
Merge pull request #1489 from alphagov/vb-callback-seperate-queue
...
Create and use separate queue for callbacks
2017-12-14 11:04:26 +00:00
venusbb
2e7b3cf5e5
Merge branch 'master' of https://github.com/alphagov/notifications-api into vb-callback-seperate-queue
2017-12-14 10:29:31 +00:00
kentsanggds
b37cd69650
Merge pull request #1487 from alphagov/ken-update-delivery-base-letters-pdf-task
...
Add create-letters-pdf-tasks to notify-delivery-worker
2017-12-14 10:27:26 +00:00
venusbb
c81c89a9e6
Merge branch 'master' of https://github.com/alphagov/notifications-api into vb-callback-seperate-queue
2017-12-13 11:56:03 +00:00
venusbb
cef8d6e294
use callback queue
2017-12-13 11:55:08 +00:00
Ken Tsang
fdf97fd8b5
Add create-letters-pdf-tasks to notify-delivery-worker
2017-12-13 11:34:05 +00:00
venusbb
11152ab117
Add new queue for callbacks
2017-12-13 10:57:08 +00:00
Chris Hill-Scott
c143b480d2
Merge pull request #1481 from alphagov/hr
...
Add undocumented support for <hr>s in emails
2017-12-13 10:40:46 +00:00
Chris Hill-Scott
c09511bc41
Merge branch 'master' into hr
2017-12-13 10:28:17 +00:00
Venus Bailey
dbd4f96459
Merge pull request #1458 from alphagov/remove-fragments-from-db
...
remove fragments from db
2017-12-13 10:11:52 +00:00
Pete Herlihy
5b2d62fe10
Merge branch 'master' into hr
2017-12-13 10:06:06 +00:00
venusbb
689ece75a0
db version change
2017-12-13 10:03:40 +00:00
Leo Hemsted
df725aaff0
Merge branch 'master' into remove-fragments-from-db
2017-12-12 17:07:04 +00:00
kentsanggds
d18b81093c
Merge pull request #1484 from alphagov/ken-add-template-preview-to-cf
...
Add template preview host url and key to cf config
2017-12-12 17:01:15 +00:00
Pete Herlihy
c8f7f3d0fe
Merge branch 'master' into hr
2017-12-12 16:38:30 +00:00
Leo Hemsted
ea71af695d
Merge branch 'master' into remove-fragments-from-db
2017-12-12 16:32:07 +00:00
Rebecca Law
4ea79d9eb1
Monthly billing has been updated to populate for letters.
2017-12-12 15:54:59 +00:00
kentsanggds
8081ba9438
Merge branch 'master' into ken-add-template-preview-to-cf
2017-12-12 14:57:04 +00:00
Ken Tsang
ebfd78f3cf
Add template preview host url and key to cf config
2017-12-12 14:53:38 +00:00
kentsanggds
ea8135c69a
Merge pull request #1479 from alphagov/ken-add-letters-pdf-task
...
Add letters pdf task & api
2017-12-12 13:37:25 +00:00
Ken Tsang
da93ba296e
Refactored notifications_dao
...
- Introduce a `_raise` flag for `get_notification_by_id` so that sql alchemy will raise the NoResults error rather than the app
- Refactor `dao_set_created_live_letter_api_notifications_to_pending` to use a join for getting services that don't have `letters_as_pdf` as marginally faster.
2017-12-12 12:07:55 +00:00
