This commit is contained in:
Kenneth Kehl
2023-08-29 14:54:30 -07:00
parent 19dcd7a48b
commit 1ecb747c6d
588 changed files with 34100 additions and 23589 deletions

View File

@@ -13,7 +13,7 @@ from tests.app.db import (
)
def create_uploaded_letter(letter_template, service, status='created', created_at=None):
def create_uploaded_letter(letter_template, service, status="created", created_at=None):
return create_notification(
template=letter_template,
to_field="file-name",
@@ -22,7 +22,7 @@ def create_uploaded_letter(letter_template, service, status='created', created_a
client_reference="file-name",
one_off=True,
created_by_id=service.users[0].id,
created_at=created_at
created_at=created_at,
)
@@ -30,8 +30,8 @@ def create_uploaded_template(service):
return create_template(
service,
template_type=LETTER_TYPE,
template_name='Pre-compiled PDF',
subject='Pre-compiled PDF',
template_name="Pre-compiled PDF",
subject="Pre-compiled PDF",
content="",
hidden=True,
)
@@ -39,7 +39,7 @@ def create_uploaded_template(service):
@freeze_time("2020-02-02 09:00") # GMT time
def test_get_uploads_for_service(sample_template):
create_service_data_retention(sample_template.service, 'sms', days_of_retention=9)
create_service_data_retention(sample_template.service, "sms", days_of_retention=9)
job = create_job(sample_template, processing_started=datetime.utcnow())
other_service = create_service(service_name="other service")
@@ -55,7 +55,7 @@ def test_get_uploads_for_service(sample_template):
job.id,
job.original_file_name,
job.notification_count,
'sms',
"sms",
9,
job.created_at,
job.scheduled_for,
@@ -66,29 +66,37 @@ def test_get_uploads_for_service(sample_template):
)
assert len(other_uploads_from_db) == 1
assert other_uploads_from_db[0] == (other_job.id,
other_job.original_file_name,
other_job.notification_count,
other_job.template.template_type,
7,
other_job.created_at,
other_job.scheduled_for,
other_job.processing_started,
other_job.job_status,
"job",
None)
assert other_uploads_from_db[0] == (
other_job.id,
other_job.original_file_name,
other_job.notification_count,
other_job.template.template_type,
7,
other_job.created_at,
other_job.scheduled_for,
other_job.processing_started,
other_job.job_status,
"job",
None,
)
assert uploads_from_db[0] != other_uploads_from_db[0]
def test_get_uploads_orders_by_processing_started_desc(sample_template):
days_ago = datetime.utcnow() - timedelta(days=3)
upload_1 = create_job(sample_template, processing_started=datetime.utcnow() - timedelta(days=1),
created_at=days_ago,
job_status=JOB_STATUS_IN_PROGRESS)
upload_2 = create_job(sample_template, processing_started=datetime.utcnow() - timedelta(days=2),
created_at=days_ago,
job_status=JOB_STATUS_IN_PROGRESS)
upload_1 = create_job(
sample_template,
processing_started=datetime.utcnow() - timedelta(days=1),
created_at=days_ago,
job_status=JOB_STATUS_IN_PROGRESS,
)
upload_2 = create_job(
sample_template,
processing_started=datetime.utcnow() - timedelta(days=2),
created_at=days_ago,
job_status=JOB_STATUS_IN_PROGRESS,
)
results = dao_get_uploads_by_service_id(service_id=sample_template.service_id).items