Commit Graph

4262 Commits

Author SHA1 Message Date
venusbb
11152ab117 Add new queue for callbacks 2017-12-13 10:57:08 +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
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
Ken Tsang
ab72d6f555 Call the create letters pdf task in api calls for services with letters as pdf 2017-12-12 12:07:55 +00:00
Ken Tsang
f42df8af73 Ignore services that have letters_as_pdf permission
- We don't want to process the letters as a build file for api calls when the service is generating letters as pdf.
2017-12-12 12:07:55 +00:00
Ken Tsang
d0fcfa7d0c Update sample_service_full_perms to leave out letters_as_pdf permissions
- as letters_as_pdf is a temporary service permission until the build dvla file process is deprecated rather than update all the tests to remove the permission so that they pass, lets remove it here instead
2017-12-12 12:07:55 +00:00
Ken Tsang
3e71e9a294 Update save_letter to handle research mode 2017-12-12 12:07:55 +00:00
Ken Tsang
02b67c95e5 Use crown flag from service 2017-12-12 12:07:55 +00:00
Ken Tsang
3464336aff Refactored tasks.py to split out letters_pdf tasks
- Added has_permission helper in models.py to check permission in service
- Moved letters pdf tasks to separate file
- Moved letters pdf tests to own file
2017-12-12 12:07:55 +00:00
Ken Tsang
aca52952d8 Add tests for letters as pdf permission
- test that `create_letters_pdf` only gets called when `letters_as_pdf` permission set
- test that `build_dvla_file` does not get called when `letters_as_pdf` permission set
- test creating the pdf call to notifications template preview service
- test uploading the data to s3 calls upload_letters_pdf function
2017-12-12 12:07:55 +00:00
Ken Tsang
7970cd3d4e Update test for queue names 2017-12-12 12:07:55 +00:00
Ken Tsang
bc316dd1fe Add reference as part of sample_letter_notification 2017-12-12 12:07:55 +00:00
Ken Tsang
9784ee438a Refactored code in tasks.py 2017-12-12 12:07:55 +00:00
Ken Tsang
6b118ec1ef Add create-letters-pdf queue name 2017-12-12 12:07:55 +00:00
Ken Tsang
bad129c5e9 Add extra logging for upload_letters_pdf 2017-12-12 12:07:55 +00:00
Ken Tsang
16136317f9 Add letters pdf task 2017-12-12 12:07:55 +00:00
Ken Tsang
c8a434fe98 Updated config for template preview env vars 2017-12-12 12:07:55 +00:00
Rebecca Law
5a68793e7e Merge pull request #1482 from alphagov/update-callback-json
Update JSON in callback task
2017-12-12 10:03:04 +00:00
Rebecca Law
a26588decd Update the json in the service callback task to read completed_at rather than updated_at 2017-12-11 17:14:36 +00:00
Rebecca Law
46c88db13d Merge pull request #1478 from alphagov/fix-service-history
Removed the events data for the service/{id}/history page.
2017-12-11 15:40:30 +00:00
Rebecca Law
0e93e98c6a Merge branch 'master' into fix-service-history 2017-12-08 15:03:07 +00:00
Rebecca Law
624acf9ffe Removed the events data for the service/{id}/history page. It does not make sense there. 2017-12-08 15:01:19 +00:00
Venus Bailey
70890e9dfc Merge pull request #1476 from alphagov/vb-delivery-status-2
modified dao_timeout_notifications
2017-12-08 09:58:05 +00:00
venusbb
46226a25b4 modified dao_timeout_notifications
added send delivery status in scheduled timeout sending email/sms tasks
2017-12-07 16:44:08 +00:00
Chris Hill-Scott
aa8b092081 Merge pull request #1475 from alphagov/quis-patch-1
Fix incomplete version number specification
2017-12-07 15:41:33 +00:00
Chris Hill-Scott
21f6e78495 Fix incomplete version number specification
It needs setting to the new one in both places.
2017-12-07 15:07:54 +00:00
kentsanggds
96c382fdc7 Merge pull request #1474 from alphagov/ken-pin-html5lib
Update requirements to fix html5lib issue
2017-12-07 15:06:28 +00:00
kentsanggds
7e5005b4df Update requirements to fix html5lib issue 2017-12-07 14:47:00 +00:00
kentsanggds
1c1e5b230e Merge pull request #1472 from alphagov/ken-fix-incomplete-jobs-letters-processing
Fixed processing of incomplete letter jobs
2017-12-07 13:48:58 +00:00
Ken Tsang
68659bab1b Fixed processing of incomplete letter jobs
- `template` argument passed in to `job_complete` should be `template.template_type` otherwise the job status is incorrectly set
2017-12-07 12:03:16 +00:00
Rebecca Law
a08411bde0 Merge pull request #1470 from alphagov/refactor-letter-rates
Refactor letter rates
2017-12-07 11:15:50 +00:00
Rebecca Law
da656af6e0 Fix merge conflict with db script 2017-12-06 17:26:32 +00:00
Rebecca Law
ad060435ca Merge branch 'master' into refactor-letter-rates 2017-12-06 17:25:39 +00:00
Rebecca Law
14be85160c Insert initial letter rates.
Create letter rates dao.
Query to fetch letter rates.
2017-12-06 16:40:38 +00:00
Leo Hemsted
58fa6b2a4e Merge pull request #1468 from alphagov/pyup-update-pytest-3.3.0-to-3.3.1
Update pytest to 3.3.1
2017-12-06 16:24:26 +00:00
Leo Hemsted
53fe567cdc Merge branch 'master' into pyup-update-pytest-3.3.0-to-3.3.1 2017-12-06 16:08:42 +00:00
Leo Hemsted
0bb76dc972 Merge pull request #1466 from alphagov/pyup-update-requests-mock-1.3.0-to-1.4.0
Update requests-mock to 1.4.0
2017-12-06 16:08:29 +00:00
Leo Hemsted
a1daeea7c5 Merge branch 'master' into pyup-update-requests-mock-1.3.0-to-1.4.0 2017-12-06 15:51:48 +00:00
Leo Hemsted
cd5273eb62 Merge pull request #1460 from alphagov/pyup-update-marshmallow-2.14.0-to-2.15.0
Update marshmallow to 2.15.0
2017-12-06 15:51:36 +00:00
Leo Hemsted
6fe54e220b Merge branch 'master' into pyup-update-marshmallow-2.14.0-to-2.15.0 2017-12-06 15:36:29 +00:00
Leo Hemsted
093fe5dd8e Merge pull request #1467 from alphagov/pyup-update-awscli-1.14.2-to-1.14.4
Update awscli to 1.14.4
2017-12-06 15:36:20 +00:00
Leo Hemsted
c69d7be732 Merge branch 'master' into pyup-update-awscli-1.14.2-to-1.14.4 2017-12-06 15:17:03 +00:00
Leo Hemsted
8c170d859e Merge pull request #1457 from alphagov/bye-bye-free-fragments
Bye bye free fragments
2017-12-06 15:16:50 +00:00
Leo Hemsted
f63a67823d Merge branch 'master' into pyup-update-pytest-3.3.0-to-3.3.1 2017-12-06 15:01:47 +00:00
Leo Hemsted
ca152d8281 Merge branch 'master' into pyup-update-requests-mock-1.3.0-to-1.4.0 2017-12-06 15:01:35 +00:00
Leo Hemsted
f29e08c778 don't update current year twice 2017-12-06 14:45:44 +00:00
Leo Hemsted
78099de776 make sure POST /free-sms-fragment-limit always creates
refactored billing/rest.py and annual_billing_dao.py to remove logic
from the dao, and simplify the process around creating new rows. Make
sure that the POST always creates (it previously wouldn't create rows
for years that don't already exist). Clean up some tests that were
doing too much set-up/data verification via rest calls rather than
directly inserting test data in to the DB.
2017-12-06 14:45:44 +00:00