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

Testing with latest

Browse Source
This commit is contained in:
Rebecca Law
2019-11-13 13:40:42 +00:00
parent 516190262a
commit 6155f7666e
2 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/celery/scheduled_tasks.py
View File

@@ -239,12 +239,9 @@ def check_for_missing_rows_in_completed_jobs():
job = x[1] job = x[1]
missing_rows = find_missing_row_for_job(job.id, job.notification_count) missing_rows = find_missing_row_for_job(job.id, job.notification_count)
for row_to_process in missing_rows: for row_to_process in missing_rows:
# The sender_id is passed in with job, at this point we no longer have the sender that is passed in.
# The notification will be created with the default sender.
# There is a bug to fix this https://www.pivotaltracker.com/story/show/169569144
recipient_csv, template, sender_id = get_recipient_csv_and_template_and_sender_id(job) recipient_csv, template, sender_id = get_recipient_csv_and_template_and_sender_id(job)
for row in recipient_csv.get_rows(): for row in recipient_csv.get_rows():
if row.index == row_to_process.missing_row: if row.index == row_to_process.missing_row:
current_app.logger.info( current_app.logger(
"Processing missing row: {} for job: {}".format(row_to_process.missing_row, job.id)) "Processing missing row: {} for job: {}".format(row_to_process.missing_row, job.id))
process_row(row, template, job, job.service, sender_id=sender_id) process_row(row, template, job, job.service, sender_id=sender_id)

4
app/celery/tasks.py
View File

@@ -27,7 +27,6 @@ from app import (
notify_celery, notify_celery,
) )
from app.aws import s3 from app.aws import s3
from app.aws.s3 import get_job_and_metadata_from_s3
from app.celery import provider_tasks, letters_pdf_tasks, research_mode_tasks from app.celery import provider_tasks, letters_pdf_tasks, research_mode_tasks
from app.config import QueueNames from app.config import QueueNames
from app.dao.daily_sorted_letter_dao import dao_create_or_update_daily_sorted_letter from app.dao.daily_sorted_letter_dao import dao_create_or_update_daily_sorted_letter
@@ -98,7 +97,6 @@ def process_job(job_id, sender_id=None):
job.processing_started = start job.processing_started = start
dao_update_job(job) dao_update_job(job)
# should I rename the variable?
recipient_csv, template, sender_id = get_recipient_csv_and_template_and_sender_id(job) recipient_csv, template, sender_id = get_recipient_csv_and_template_and_sender_id(job)
current_app.logger.info("Starting job {} processing {} notifications".format(job_id, job.notification_count)) current_app.logger.info("Starting job {} processing {} notifications".format(job_id, job.notification_count))
@@ -131,7 +129,7 @@ def get_recipient_csv_and_template_and_sender_id(job):
TemplateClass = get_template_class(db_template.template_type) TemplateClass = get_template_class(db_template.template_type)
template = TemplateClass(db_template.__dict__) template = TemplateClass(db_template.__dict__)
contents, meta_data = get_job_and_metadata_from_s3(service_id=str(job.service_id), job_id=str(job.id)) contents, meta_data = s3.get_job_and_metadata_from_s3(service_id=str(job.service_id), job_id=str(job.id))
recipient_csv = RecipientCSV(file_data=contents, recipient_csv = RecipientCSV(file_data=contents,
template_type=template.template_type, template_type=template.template_type,
placeholders=template.placeholders) placeholders=template.placeholders)