Rename task from create_letters_pdf to get_pdf_for_templated_letter

In a separate PR we will have to delete vestigial create_letters_pdf
tasks that now only redirects to get_pdf_for_templated_letter.
This commit is contained in:
Pea Tyczynska
2020-05-06 18:23:56 +01:00
parent 879d15b736
commit 5d6f2da155
11 changed files with 52 additions and 46 deletions

View File

@@ -49,6 +49,12 @@ from app.cronitor import cronitor
@notify_celery.task(bind=True, name="create-letters-pdf", max_retries=15, default_retry_delay=300)
@statsd(namespace="tasks")
def create_letters_pdf(self, notification_id):
get_pdf_for_templated_letter(notification_id)
@notify_celery.task(bind=True, name="get-pdf-for-templated-letter", max_retries=15, default_retry_delay=300)
@statsd(namespace="tasks")
def get_pdf_for_templated_letter(self, notification_id):
try:
notification = get_notification_by_id(notification_id, _raise=True)

View File

@@ -14,7 +14,7 @@ from app.celery.tasks import (
get_recipient_csv_and_template_and_sender_id,
process_row
)
from app.celery.letters_pdf_tasks import create_letters_pdf
from app.celery.letters_pdf_tasks import get_pdf_for_templated_letter
from app.config import QueueNames, TaskNames
from app.dao.invited_org_user_dao import delete_org_invitations_created_more_than_two_days_ago
from app.dao.invited_user_dao import delete_invitations_created_more_than_two_days_ago
@@ -188,7 +188,7 @@ def replay_created_notifications():
current_app.logger.info(msg)
for letter in letters:
create_letters_pdf.apply_async([str(letter.id)], queue=QueueNames.CREATE_LETTERS_PDF)
get_pdf_for_templated_letter.apply_async([str(letter.id)], queue=QueueNames.CREATE_LETTERS_PDF)
@notify_celery.task(name='check-precompiled-letter-state')

View File

@@ -371,7 +371,7 @@ def save_letter(
)
if not service.research_mode:
letters_pdf_tasks.create_letters_pdf.apply_async(
letters_pdf_tasks.get_pdf_for_templated_letter.apply_async(
[str(saved_notification.id)],
queue=QueueNames.CREATE_LETTERS_PDF
)

View File

@@ -20,7 +20,7 @@ from app.aws import s3
from app.celery.tasks import record_daily_sorted_counts, process_row
from app.celery.nightly_tasks import send_total_sent_notifications_to_performance_platform
from app.celery.service_callback_tasks import send_delivery_status_to_service
from app.celery.letters_pdf_tasks import create_letters_pdf
from app.celery.letters_pdf_tasks import get_pdf_for_templated_letter
from app.celery.reporting_tasks import create_nightly_notification_status_for_day
from app.config import QueueNames
from app.dao.annual_billing_dao import dao_create_or_update_annual_billing_for_year
@@ -315,10 +315,10 @@ def insert_inbound_numbers_from_file(file_name):
@notify_command(name='replay-create-pdf-letters')
@click.option('-n', '--notification_id', type=click.UUID, required=True,
help="Notification id of the letter that needs the create_letters_pdf task replayed")
help="Notification id of the letter that needs the get_pdf_for_templated_letter task replayed")
def replay_create_pdf_letters(notification_id):
print("Create task to create_letters_pdf for notification: {}".format(notification_id))
create_letters_pdf.apply_async([str(notification_id)], queue=QueueNames.CREATE_LETTERS_PDF)
print("Create task to get_pdf_for_templated_letter for notification: {}".format(notification_id))
get_pdf_for_templated_letter.apply_async([str(notification_id)], queue=QueueNames.CREATE_LETTERS_PDF)
@notify_command(name='replay-service-callbacks')

View File

@@ -13,7 +13,7 @@ from notifications_utils.timezones import convert_bst_to_utc
from app import redis_store
from app.celery import provider_tasks
from app.celery.letters_pdf_tasks import create_letters_pdf
from app.celery.letters_pdf_tasks import get_pdf_for_templated_letter
from app.config import QueueNames
from app.models import (
@@ -139,7 +139,7 @@ def send_notification_to_queue(notification, research_mode, queue=None):
if notification.notification_type == LETTER_TYPE:
if not queue:
queue = QueueNames.CREATE_LETTERS_PDF
deliver_task = create_letters_pdf
deliver_task = get_pdf_for_templated_letter
try:
deliver_task.apply_async([str(notification.id)], queue=queue)

View File

@@ -16,7 +16,7 @@ from app import (
encryption,
DATETIME_FORMAT
)
from app.celery.letters_pdf_tasks import create_letters_pdf, sanitise_letter
from app.celery.letters_pdf_tasks import get_pdf_for_templated_letter, sanitise_letter
from app.celery.research_mode_tasks import create_fake_letter_response_file
from app.celery.tasks import save_api_email
from app.clients.document_download import DocumentDownloadError
@@ -382,7 +382,7 @@ def process_letter_notification(*, letter_data, api_key, template, reply_to_text
status=status,
reply_to_text=reply_to_text)
create_letters_pdf.apply_async(
get_pdf_for_templated_letter.apply_async(
[str(notification.id)],
queue=queue
)