mirror of
https://github.com/GSA/notifications-api.git
synced 2026-02-01 07:35:34 -05:00
Merge branch 'master' into populate-monthly-letter-usages
This commit is contained in:
@@ -24,6 +24,7 @@ from app.celery.scheduled_tasks import (
|
||||
remove_transformed_dvla_files,
|
||||
run_scheduled_jobs,
|
||||
run_letter_jobs,
|
||||
trigger_letter_pdfs_for_day,
|
||||
run_letter_api_notifications,
|
||||
populate_monthly_billing,
|
||||
s3,
|
||||
@@ -43,6 +44,7 @@ from app.dao.provider_details_dao import (
|
||||
dao_update_provider_details,
|
||||
get_current_provider
|
||||
)
|
||||
from app.dao.service_permissions_dao import dao_add_service_permission
|
||||
from app.models import (
|
||||
MonthlyBilling,
|
||||
NotificationHistory,
|
||||
@@ -724,6 +726,36 @@ def test_run_letter_jobs(client, mocker, sample_letter_template):
|
||||
queue=QueueNames.PROCESS_FTP)
|
||||
|
||||
|
||||
@freeze_time("2017-12-18 17:50")
|
||||
def test_trigger_letter_pdfs_for_day(client, mocker, sample_letter_template):
|
||||
dao_add_service_permission(sample_letter_template.service.id, 'letters_as_pdf')
|
||||
|
||||
create_notification(template=sample_letter_template, created_at='2017-12-17 17:30:00')
|
||||
create_notification(template=sample_letter_template, created_at='2017-12-18 17:29:59')
|
||||
|
||||
mock_celery = mocker.patch("app.celery.tasks.notify_celery.send_task")
|
||||
|
||||
trigger_letter_pdfs_for_day()
|
||||
|
||||
mock_celery.assert_called_once_with(name='collate-letter-pdfs-for-day',
|
||||
args=('2017-12-18',),
|
||||
queue=QueueNames.LETTERS)
|
||||
|
||||
|
||||
@freeze_time("2017-12-18 17:50")
|
||||
def test_trigger_letter_pdfs_for_day_send_task_not_called_if_no_notis_for_day(
|
||||
client, mocker, sample_letter_template):
|
||||
dao_add_service_permission(sample_letter_template.service.id, 'letters_as_pdf')
|
||||
|
||||
create_notification(template=sample_letter_template, created_at='2017-12-15 17:30:00')
|
||||
|
||||
mock_celery = mocker.patch("app.celery.tasks.notify_celery.send_task")
|
||||
|
||||
trigger_letter_pdfs_for_day()
|
||||
|
||||
assert not mock_celery.called
|
||||
|
||||
|
||||
def test_run_letter_jobs_does_nothing_if_no_ready_jobs(client, mocker, sample_letter_template):
|
||||
create_job(sample_letter_template, job_status=JOB_STATUS_IN_PROGRESS)
|
||||
create_job(sample_letter_template, job_status=JOB_STATUS_SENT_TO_DVLA)
|
||||
|
||||
Reference in New Issue
Block a user