darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2026-08-24 00:06:16 -04:00
Code Issues Packages Projects Releases Wiki Activity

Add send_task to antivirus app for scanning precompiled letters

Browse Source
This commit is contained in:
Ken Tsang
2018-03-19 16:25:13 +00:00
parent b1ac580e0a
commit 65733a30a1
2 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
app/v2/notifications/post_notifications.py
View File

@@ -4,12 +4,11 @@ import io
import math import math
from flask import request, jsonify, current_app, abort from flask import request, jsonify, current_app, abort
from notifications_utils.pdf import pdf_page_count, PdfReadError from notifications_utils.pdf import pdf_page_count, PdfReadError
from notifications_utils.recipients import try_validate_and_format_phone_number from notifications_utils.recipients import try_validate_and_format_phone_number
from app import api_user, authenticated_service from app import api_user, authenticated_service, notify_celery
from app.config import QueueNames from app.config import QueueNames, TaskNames
from app.dao.notifications_dao import dao_update_notification, update_notification_status_by_reference from app.dao.notifications_dao import dao_update_notification, update_notification_status_by_reference
from app.dao.templates_dao import dao_create_template from app.dao.templates_dao import dao_create_template
from app.dao.users_dao import get_user_by_id from app.dao.users_dao import get_user_by_id
@@ -246,10 +245,21 @@ def process_letter_notification(*, letter_data, api_key, template, reply_to_text
if should_send: if should_send:
if precompiled: if precompiled:
upload_letter_pdf(notification, letter_content) filename = upload_letter_pdf(notification, letter_content)
pages_per_sheet = 2 pages_per_sheet = 2
notification.billable_units = math.ceil(pages / pages_per_sheet) notification.billable_units = math.ceil(pages / pages_per_sheet)
dao_update_notification(notification) dao_update_notification(notification)
current_app.logger.info(
'Calling task scan-file for {}'.format(filename)
)
# call task to add the filename to anti virus queue
notify_celery.send_task(
name=TaskNames.SCAN_FILE,
kwargs={'filename': filename},
queue=QueueNames.ANTIVIRUS,
)
else: else:
create_letters_pdf.apply_async( create_letters_pdf.apply_async(
[str(notification.id)], [str(notification.id)],

1
tests/app/v2/notifications/test_post_letter_notifications.py
View File

@@ -479,6 +479,7 @@ def test_post_precompiled_letter_notification_returns_201(client, notify_user, m
sample_service = create_service(service_permissions=['letter', 'precompiled_letter']) sample_service = create_service(service_permissions=['letter', 'precompiled_letter'])
s3mock = mocker.patch('app.v2.notifications.post_notifications.upload_letter_pdf') s3mock = mocker.patch('app.v2.notifications.post_notifications.upload_letter_pdf')
mocker.patch('app.v2.notifications.post_notifications.pdf_page_count', return_value=5) mocker.patch('app.v2.notifications.post_notifications.pdf_page_count', return_value=5)
mocker.patch("app.letters.rest.notify_celery.send_task")
data = { data = {
"reference": "letter-reference", "reference": "letter-reference",
"content": "bGV0dGVyLWNvbnRlbnQ=" "content": "bGV0dGVyLWNvbnRlbnQ="