mirror of
https://github.com/GSA/notifications-api.git
synced 2026-02-04 02:11:11 -05:00
merge from main
This commit is contained in:
Kenneth Kehl
@@ -9,7 +9,13 @@ from freezegun import freeze_time
|
||||
|
||||
import app.celery.tasks
|
||||
from app.dao.templates_dao import dao_update_template
|
||||
from app.models import JOB_STATUS_PENDING, JOB_STATUS_TYPES
|
||||
from app.enums import (
|
||||
JobStatus,
|
||||
KeyType,
|
||||
NotificationStatus,
|
||||
NotificationType,
|
||||
TemplateType,
|
||||
)
|
||||
from tests import create_admin_authorization_header
|
||||
from tests.app.db import (
|
||||
create_ft_notification_status,
|
||||
@@ -22,7 +28,7 @@ from tests.conftest import set_config
|
||||
|
||||
|
||||
def test_get_job_with_invalid_service_id_returns404(client, sample_service):
|
||||
path = "/service/{}/job".format(sample_service.id)
|
||||
path = f"/service/{sample_service.id}/job"
|
||||
auth_header = create_admin_authorization_header()
|
||||
response = client.get(path, headers=[auth_header])
|
||||
assert response.status_code == 200
|
||||
@@ -32,7 +38,7 @@ def test_get_job_with_invalid_service_id_returns404(client, sample_service):
|
||||
|
||||
def test_get_job_with_invalid_job_id_returns404(client, sample_template):
|
||||
service_id = sample_template.service.id
|
||||
path = "/service/{}/job/{}".format(service_id, "bad-id")
|
||||
path = f"/service/{service_id}/job/{'bad-id'}"
|
||||
auth_header = create_admin_authorization_header()
|
||||
response = client.get(path, headers=[auth_header])
|
||||
assert response.status_code == 404
|
||||
@@ -43,7 +49,7 @@ def test_get_job_with_invalid_job_id_returns404(client, sample_template):
|
||||
|
||||
def test_get_job_with_unknown_id_returns404(client, sample_template, fake_uuid):
|
||||
service_id = sample_template.service.id
|
||||
path = "/service/{}/job/{}".format(service_id, fake_uuid)
|
||||
path = f"/service/{service_id}/job/{fake_uuid}"
|
||||
auth_header = create_admin_authorization_header()
|
||||
response = client.get(path, headers=[auth_header])
|
||||
assert response.status_code == 404
|
||||
@@ -54,20 +60,20 @@ def test_get_job_with_unknown_id_returns404(client, sample_template, fake_uuid):
|
||||
def test_cancel_job(client, sample_scheduled_job):
|
||||
job_id = str(sample_scheduled_job.id)
|
||||
service_id = sample_scheduled_job.service.id
|
||||
path = "/service/{}/job/{}/cancel".format(service_id, job_id)
|
||||
path = f"/service/{service_id}/job/{job_id}/cancel"
|
||||
auth_header = create_admin_authorization_header()
|
||||
response = client.post(path, headers=[auth_header])
|
||||
assert response.status_code == 200
|
||||
resp_json = json.loads(response.get_data(as_text=True))
|
||||
assert resp_json["data"]["id"] == job_id
|
||||
assert resp_json["data"]["job_status"] == "cancelled"
|
||||
assert resp_json["data"]["job_status"] == JobStatus.CANCELLED
|
||||
|
||||
|
||||
def test_cant_cancel_normal_job(client, sample_job, mocker):
|
||||
job_id = str(sample_job.id)
|
||||
service_id = sample_job.service.id
|
||||
mock_update = mocker.patch("app.dao.jobs_dao.dao_update_job")
|
||||
path = "/service/{}/job/{}/cancel".format(service_id, job_id)
|
||||
path = f"/service/{service_id}/job/{job_id}/cancel"
|
||||
auth_header = create_admin_authorization_header()
|
||||
response = client.post(path, headers=[auth_header])
|
||||
assert response.status_code == 404
|
||||
@@ -89,7 +95,7 @@ def test_create_unscheduled_job(client, sample_template, mocker, fake_uuid):
|
||||
"id": fake_uuid,
|
||||
"created_by": str(sample_template.created_by.id),
|
||||
}
|
||||
path = "/service/{}/job".format(sample_template.service.id)
|
||||
path = f"/service/{sample_template.service.id}/job"
|
||||
auth_header = create_admin_authorization_header()
|
||||
headers = [("Content-Type", "application/json"), auth_header]
|
||||
|
||||
@@ -104,9 +110,9 @@ def test_create_unscheduled_job(client, sample_template, mocker, fake_uuid):
|
||||
|
||||
assert resp_json["data"]["id"] == fake_uuid
|
||||
assert resp_json["data"]["statistics"] == []
|
||||
assert resp_json["data"]["job_status"] == "pending"
|
||||
assert resp_json["data"]["job_status"] == JobStatus.PENDING
|
||||
assert not resp_json["data"]["scheduled_for"]
|
||||
assert resp_json["data"]["job_status"] == "pending"
|
||||
assert resp_json["data"]["job_status"] == JobStatus.PENDING
|
||||
assert resp_json["data"]["template"] == str(sample_template.id)
|
||||
assert resp_json["data"]["original_file_name"] == "thisisatest.csv"
|
||||
assert resp_json["data"]["notification_count"] == 1
|
||||
@@ -130,7 +136,7 @@ def test_create_unscheduled_job_with_sender_id_in_metadata(
|
||||
"id": fake_uuid,
|
||||
"created_by": str(sample_template.created_by.id),
|
||||
}
|
||||
path = "/service/{}/job".format(sample_template.service.id)
|
||||
path = f"/service/{sample_template.service.id}/job"
|
||||
auth_header = create_admin_authorization_header()
|
||||
headers = [("Content-Type", "application/json"), auth_header]
|
||||
|
||||
@@ -138,7 +144,9 @@ def test_create_unscheduled_job_with_sender_id_in_metadata(
|
||||
assert response.status_code == 201
|
||||
|
||||
app.celery.tasks.process_job.apply_async.assert_called_once_with(
|
||||
([str(fake_uuid)]), {"sender_id": fake_uuid}, queue="job-tasks"
|
||||
([str(fake_uuid)]),
|
||||
{"sender_id": fake_uuid},
|
||||
queue="job-tasks",
|
||||
)
|
||||
|
||||
|
||||
@@ -160,7 +168,7 @@ def test_create_scheduled_job(client, sample_template, mocker, fake_uuid):
|
||||
"created_by": str(sample_template.created_by.id),
|
||||
"scheduled_for": scheduled_date,
|
||||
}
|
||||
path = "/service/{}/job".format(sample_template.service.id)
|
||||
path = f"/service/{sample_template.service.id}/job"
|
||||
auth_header = create_admin_authorization_header()
|
||||
headers = [("Content-Type", "application/json"), auth_header]
|
||||
|
||||
@@ -176,7 +184,7 @@ def test_create_scheduled_job(client, sample_template, mocker, fake_uuid):
|
||||
resp_json["data"]["scheduled_for"]
|
||||
== datetime(2016, 1, 5, 11, 59, 0, tzinfo=pytz.UTC).isoformat()
|
||||
)
|
||||
assert resp_json["data"]["job_status"] == "scheduled"
|
||||
assert resp_json["data"]["job_status"] == JobStatus.SCHEDULED
|
||||
assert resp_json["data"]["template"] == str(sample_template.id)
|
||||
assert resp_json["data"]["original_file_name"] == "thisisatest.csv"
|
||||
assert resp_json["data"]["notification_count"] == 1
|
||||
@@ -189,7 +197,7 @@ def test_create_job_returns_403_if_service_is_not_active(
|
||||
mock_job_dao = mocker.patch("app.dao.jobs_dao.dao_create_job")
|
||||
auth_header = create_admin_authorization_header()
|
||||
response = client.post(
|
||||
"/service/{}/job".format(sample_service.id),
|
||||
f"/service/{sample_service.id}/job",
|
||||
data="",
|
||||
headers=[("Content-Type", "application/json"), auth_header],
|
||||
)
|
||||
@@ -221,12 +229,12 @@ def test_create_job_returns_400_if_file_is_invalid(
|
||||
template_id=str(sample_template.id),
|
||||
original_file_name="thisisatest.csv",
|
||||
notification_count=1,
|
||||
**extra_metadata
|
||||
**extra_metadata,
|
||||
)
|
||||
mocker.patch("app.job.rest.get_job_metadata_from_s3", return_value=metadata)
|
||||
data = {"id": fake_uuid}
|
||||
response = client.post(
|
||||
"/service/{}/job".format(sample_template.service.id),
|
||||
f"/service/{sample_template.service.id}/job",
|
||||
data=json.dumps(data),
|
||||
headers=[("Content-Type", "application/json"), auth_header],
|
||||
)
|
||||
@@ -258,7 +266,7 @@ def test_should_not_create_scheduled_job_more_then_96_hours_in_the_future(
|
||||
"created_by": str(sample_template.created_by.id),
|
||||
"scheduled_for": scheduled_date,
|
||||
}
|
||||
path = "/service/{}/job".format(sample_template.service.id)
|
||||
path = f"/service/{sample_template.service.id}/job"
|
||||
auth_header = create_admin_authorization_header()
|
||||
headers = [("Content-Type", "application/json"), auth_header]
|
||||
|
||||
@@ -295,7 +303,7 @@ def test_should_not_create_scheduled_job_in_the_past(
|
||||
"created_by": str(sample_template.created_by.id),
|
||||
"scheduled_for": scheduled_date,
|
||||
}
|
||||
path = "/service/{}/job".format(sample_template.service.id)
|
||||
path = f"/service/{sample_template.service.id}/job"
|
||||
auth_header = create_admin_authorization_header()
|
||||
headers = [("Content-Type", "application/json"), auth_header]
|
||||
|
||||
@@ -319,7 +327,7 @@ def test_create_job_returns_400_if_missing_id(client, sample_template, mocker):
|
||||
},
|
||||
)
|
||||
data = {}
|
||||
path = "/service/{}/job".format(sample_template.service.id)
|
||||
path = f"/service/{sample_template.service.id}/job"
|
||||
auth_header = create_admin_authorization_header()
|
||||
headers = [("Content-Type", "application/json"), auth_header]
|
||||
response = client.post(path, data=json.dumps(data), headers=headers)
|
||||
@@ -346,7 +354,7 @@ def test_create_job_returns_400_if_missing_data(
|
||||
"id": fake_uuid,
|
||||
"valid": "True",
|
||||
}
|
||||
path = "/service/{}/job".format(sample_template.service.id)
|
||||
path = f"/service/{sample_template.service.id}/job"
|
||||
auth_header = create_admin_authorization_header()
|
||||
headers = [("Content-Type", "application/json"), auth_header]
|
||||
response = client.post(path, data=json.dumps(data), headers=headers)
|
||||
@@ -377,7 +385,7 @@ def test_create_job_returns_404_if_template_does_not_exist(
|
||||
data = {
|
||||
"id": fake_uuid,
|
||||
}
|
||||
path = "/service/{}/job".format(sample_service.id)
|
||||
path = f"/service/{sample_service.id}/job"
|
||||
auth_header = create_admin_authorization_header()
|
||||
headers = [("Content-Type", "application/json"), auth_header]
|
||||
response = client.post(path, data=json.dumps(data), headers=headers)
|
||||
@@ -400,7 +408,7 @@ def test_create_job_returns_404_if_missing_service(client, sample_template, mock
|
||||
)
|
||||
random_id = str(uuid.uuid4())
|
||||
data = {}
|
||||
path = "/service/{}/job".format(random_id)
|
||||
path = f"/service/{random_id}/job"
|
||||
auth_header = create_admin_authorization_header()
|
||||
headers = [("Content-Type", "application/json"), auth_header]
|
||||
response = client.post(path, data=json.dumps(data), headers=headers)
|
||||
@@ -429,7 +437,7 @@ def test_create_job_returns_400_if_archived_template(
|
||||
"id": fake_uuid,
|
||||
"valid": "True",
|
||||
}
|
||||
path = "/service/{}/job".format(sample_template.service.id)
|
||||
path = f"/service/{sample_template.service.id}/job"
|
||||
auth_header = create_admin_authorization_header()
|
||||
headers = [("Content-Type", "application/json"), auth_header]
|
||||
response = client.post(path, data=json.dumps(data), headers=headers)
|
||||
@@ -482,14 +490,18 @@ def test_get_all_notifications_for_job_in_order_of_job_number(
|
||||
@pytest.mark.parametrize(
|
||||
"expected_notification_count, status_args",
|
||||
[
|
||||
(1, ["created"]),
|
||||
(0, ["sending"]),
|
||||
(1, ["created", "sending"]),
|
||||
(0, ["sending", "delivered"]),
|
||||
(1, [NotificationStatus.CREATED]),
|
||||
(0, [NotificationStatus.SENDING]),
|
||||
(1, [NotificationStatus.CREATED, NotificationStatus.SENDING]),
|
||||
(0, [NotificationStatus.SENDING, NotificationStatus.DELIVERED]),
|
||||
],
|
||||
)
|
||||
def test_get_all_notifications_for_job_filtered_by_status(
|
||||
admin_request, sample_job, expected_notification_count, status_args, mocker
|
||||
admin_request,
|
||||
sample_job,
|
||||
expected_notification_count,
|
||||
status_args,
|
||||
mocker,
|
||||
):
|
||||
mock_s3 = mocker.patch("app.job.rest.get_phone_number_from_s3")
|
||||
mock_s3.return_value = "15555555555"
|
||||
@@ -497,7 +509,7 @@ def test_get_all_notifications_for_job_filtered_by_status(
|
||||
mock_s3_personalisation = mocker.patch("app.job.rest.get_personalisation_from_s3")
|
||||
mock_s3_personalisation.return_value = {}
|
||||
|
||||
create_notification(job=sample_job, to_field="1", status="created")
|
||||
create_notification(job=sample_job, to_field="1", status=NotificationStatus.CREATED)
|
||||
|
||||
resp = admin_request.get(
|
||||
"job.get_all_notifications_for_service_job",
|
||||
@@ -587,31 +599,54 @@ def test_get_job_by_id_should_return_summed_statistics(admin_request, sample_job
|
||||
job_id = str(sample_job.id)
|
||||
service_id = sample_job.service.id
|
||||
|
||||
create_notification(job=sample_job, status="created")
|
||||
create_notification(job=sample_job, status="created")
|
||||
create_notification(job=sample_job, status="created")
|
||||
create_notification(job=sample_job, status="sending")
|
||||
create_notification(job=sample_job, status="failed")
|
||||
create_notification(job=sample_job, status="failed")
|
||||
create_notification(job=sample_job, status="failed")
|
||||
create_notification(job=sample_job, status="technical-failure")
|
||||
create_notification(job=sample_job, status="temporary-failure")
|
||||
create_notification(job=sample_job, status="temporary-failure")
|
||||
create_notification(job=sample_job, status=NotificationStatus.CREATED)
|
||||
create_notification(job=sample_job, status=NotificationStatus.CREATED)
|
||||
create_notification(job=sample_job, status=NotificationStatus.CREATED)
|
||||
create_notification(job=sample_job, status=NotificationStatus.SENDING)
|
||||
create_notification(job=sample_job, status=NotificationStatus.FAILED)
|
||||
create_notification(job=sample_job, status=NotificationStatus.FAILED)
|
||||
create_notification(job=sample_job, status=NotificationStatus.FAILED)
|
||||
create_notification(job=sample_job, status=NotificationStatus.TECHNICAL_FAILURE)
|
||||
create_notification(job=sample_job, status=NotificationStatus.TEMPORARY_FAILURE)
|
||||
create_notification(job=sample_job, status=NotificationStatus.TEMPORARY_FAILURE)
|
||||
|
||||
resp_json = admin_request.get(
|
||||
"job.get_job_by_service_and_job_id", service_id=service_id, job_id=job_id
|
||||
"job.get_job_by_service_and_job_id",
|
||||
service_id=service_id,
|
||||
job_id=job_id,
|
||||
)
|
||||
|
||||
assert resp_json["data"]["id"] == job_id
|
||||
assert {"status": "created", "count": 3} in resp_json["data"]["statistics"]
|
||||
assert {"status": "sending", "count": 1} in resp_json["data"]["statistics"]
|
||||
assert {"status": "failed", "count": 3} in resp_json["data"]["statistics"]
|
||||
assert {"status": "technical-failure", "count": 1} in resp_json["data"][
|
||||
"statistics"
|
||||
]
|
||||
assert {"status": "temporary-failure", "count": 2} in resp_json["data"][
|
||||
"statistics"
|
||||
]
|
||||
assert {
|
||||
"status": NotificationStatus.CREATED,
|
||||
"count": 3,
|
||||
} in resp_json[
|
||||
"data"
|
||||
]["statistics"]
|
||||
assert {
|
||||
"status": NotificationStatus.SENDING,
|
||||
"count": 1,
|
||||
} in resp_json[
|
||||
"data"
|
||||
]["statistics"]
|
||||
assert {
|
||||
"status": NotificationStatus.FAILED,
|
||||
"count": 3,
|
||||
} in resp_json[
|
||||
"data"
|
||||
]["statistics"]
|
||||
assert {
|
||||
"status": NotificationStatus.TECHNICAL_FAILURE,
|
||||
"count": 1,
|
||||
} in resp_json[
|
||||
"data"
|
||||
]["statistics"]
|
||||
assert {
|
||||
"status": NotificationStatus.TEMPORARY_FAILURE,
|
||||
"count": 2,
|
||||
} in resp_json[
|
||||
"data"
|
||||
]["statistics"]
|
||||
assert resp_json["data"]["created_by"]["name"] == "Test User"
|
||||
|
||||
|
||||
@@ -622,26 +657,26 @@ def test_get_job_by_id_with_stats_for_old_job_where_notifications_have_been_purg
|
||||
sample_template,
|
||||
notification_count=10,
|
||||
created_at=datetime.utcnow() - timedelta(days=9),
|
||||
job_status="finished",
|
||||
job_status=JobStatus.FINISHED,
|
||||
)
|
||||
|
||||
def __create_ft_status(job, status, count):
|
||||
create_ft_notification_status(
|
||||
local_date=job.created_at.date(),
|
||||
notification_type="sms",
|
||||
notification_type=NotificationType.SMS,
|
||||
service=job.service,
|
||||
job=job,
|
||||
template=job.template,
|
||||
key_type="normal",
|
||||
key_type=KeyType.NORMAL,
|
||||
notification_status=status,
|
||||
count=count,
|
||||
)
|
||||
|
||||
__create_ft_status(old_job, "created", 3)
|
||||
__create_ft_status(old_job, "sending", 1)
|
||||
__create_ft_status(old_job, "failed", 3)
|
||||
__create_ft_status(old_job, "technical-failure", 1)
|
||||
__create_ft_status(old_job, "temporary-failure", 2)
|
||||
__create_ft_status(old_job, NotificationStatus.CREATED, 3)
|
||||
__create_ft_status(old_job, NotificationStatus.SENDING, 1)
|
||||
__create_ft_status(old_job, NotificationStatus.FAILED, 3)
|
||||
__create_ft_status(old_job, NotificationStatus.TECHNICAL_FAILURE, 1)
|
||||
__create_ft_status(old_job, NotificationStatus.TEMPORARY_FAILURE, 2)
|
||||
|
||||
resp_json = admin_request.get(
|
||||
"job.get_job_by_service_and_job_id",
|
||||
@@ -650,15 +685,36 @@ def test_get_job_by_id_with_stats_for_old_job_where_notifications_have_been_purg
|
||||
)
|
||||
|
||||
assert resp_json["data"]["id"] == str(old_job.id)
|
||||
assert {"status": "created", "count": 3} in resp_json["data"]["statistics"]
|
||||
assert {"status": "sending", "count": 1} in resp_json["data"]["statistics"]
|
||||
assert {"status": "failed", "count": 3} in resp_json["data"]["statistics"]
|
||||
assert {"status": "technical-failure", "count": 1} in resp_json["data"][
|
||||
"statistics"
|
||||
]
|
||||
assert {"status": "temporary-failure", "count": 2} in resp_json["data"][
|
||||
"statistics"
|
||||
]
|
||||
assert {
|
||||
"status": NotificationStatus.CREATED,
|
||||
"count": 3,
|
||||
} in resp_json[
|
||||
"data"
|
||||
]["statistics"]
|
||||
assert {
|
||||
"status": NotificationStatus.SENDING,
|
||||
"count": 1,
|
||||
} in resp_json[
|
||||
"data"
|
||||
]["statistics"]
|
||||
assert {
|
||||
"status": NotificationStatus.FAILED,
|
||||
"count": 3,
|
||||
} in resp_json[
|
||||
"data"
|
||||
]["statistics"]
|
||||
assert {
|
||||
"status": NotificationStatus.TECHNICAL_FAILURE,
|
||||
"count": 1,
|
||||
} in resp_json[
|
||||
"data"
|
||||
]["statistics"]
|
||||
assert {
|
||||
"status": NotificationStatus.TEMPORARY_FAILURE,
|
||||
"count": 2,
|
||||
} in resp_json[
|
||||
"data"
|
||||
]["statistics"]
|
||||
assert resp_json["data"]["created_by"]["name"] == "Test User"
|
||||
|
||||
|
||||
@@ -678,7 +734,7 @@ def test_get_jobs(admin_request, sample_template):
|
||||
"name": "Test User",
|
||||
},
|
||||
"id": ANY,
|
||||
"job_status": "pending",
|
||||
"job_status": JobStatus.PENDING,
|
||||
"notification_count": 1,
|
||||
"original_file_name": "some.csv",
|
||||
"processing_finished": None,
|
||||
@@ -689,7 +745,7 @@ def test_get_jobs(admin_request, sample_template):
|
||||
"statistics": [],
|
||||
"template": str(sample_template.id),
|
||||
"template_name": sample_template.name,
|
||||
"template_type": "sms",
|
||||
"template_type": TemplateType.SMS,
|
||||
"template_version": 1,
|
||||
"updated_at": None,
|
||||
}
|
||||
@@ -719,12 +775,12 @@ def test_get_jobs_should_return_statistics(admin_request, sample_template):
|
||||
earlier = datetime.utcnow() - timedelta(days=1)
|
||||
job_1 = create_job(sample_template, processing_started=earlier)
|
||||
job_2 = create_job(sample_template, processing_started=now)
|
||||
create_notification(job=job_1, status="created")
|
||||
create_notification(job=job_1, status="created")
|
||||
create_notification(job=job_1, status="created")
|
||||
create_notification(job=job_2, status="sending")
|
||||
create_notification(job=job_2, status="sending")
|
||||
create_notification(job=job_2, status="sending")
|
||||
create_notification(job=job_1, status=NotificationStatus.CREATED)
|
||||
create_notification(job=job_1, status=NotificationStatus.CREATED)
|
||||
create_notification(job=job_1, status=NotificationStatus.CREATED)
|
||||
create_notification(job=job_2, status=NotificationStatus.SENDING)
|
||||
create_notification(job=job_2, status=NotificationStatus.SENDING)
|
||||
create_notification(job=job_2, status=NotificationStatus.SENDING)
|
||||
|
||||
resp_json = admin_request.get(
|
||||
"job.get_jobs_by_service", service_id=sample_template.service_id
|
||||
@@ -732,13 +788,24 @@ def test_get_jobs_should_return_statistics(admin_request, sample_template):
|
||||
|
||||
assert len(resp_json["data"]) == 2
|
||||
assert resp_json["data"][0]["id"] == str(job_2.id)
|
||||
assert {"status": "sending", "count": 3} in resp_json["data"][0]["statistics"]
|
||||
assert {
|
||||
"status": NotificationStatus.SENDING,
|
||||
"count": 3,
|
||||
} in resp_json["data"][
|
||||
0
|
||||
]["statistics"]
|
||||
assert resp_json["data"][1]["id"] == str(job_1.id)
|
||||
assert {"status": "created", "count": 3} in resp_json["data"][1]["statistics"]
|
||||
assert {
|
||||
"status": NotificationStatus.CREATED,
|
||||
"count": 3,
|
||||
} in resp_json["data"][
|
||||
1
|
||||
]["statistics"]
|
||||
|
||||
|
||||
def test_get_jobs_should_return_no_stats_if_no_rows_in_notifications(
|
||||
admin_request, sample_template
|
||||
admin_request,
|
||||
sample_template,
|
||||
):
|
||||
now = datetime.utcnow()
|
||||
earlier = datetime.utcnow() - timedelta(days=1)
|
||||
@@ -791,11 +858,11 @@ def test_get_jobs_accepts_page_parameter(admin_request, sample_template):
|
||||
@pytest.mark.parametrize(
|
||||
"statuses_filter, expected_statuses",
|
||||
[
|
||||
("", JOB_STATUS_TYPES),
|
||||
("pending", [JOB_STATUS_PENDING]),
|
||||
("", list(JobStatus)),
|
||||
("pending", [JobStatus.PENDING]),
|
||||
(
|
||||
"pending, in progress, finished, sending limits exceeded, scheduled, cancelled, ready to send, sent to dvla, error", # noqa
|
||||
JOB_STATUS_TYPES,
|
||||
list(JobStatus),
|
||||
),
|
||||
# bad statuses are accepted, just return no data
|
||||
("foo", []),
|
||||
@@ -804,15 +871,15 @@ def test_get_jobs_accepts_page_parameter(admin_request, sample_template):
|
||||
def test_get_jobs_can_filter_on_statuses(
|
||||
admin_request, sample_template, statuses_filter, expected_statuses
|
||||
):
|
||||
create_job(sample_template, job_status="pending")
|
||||
create_job(sample_template, job_status="in progress")
|
||||
create_job(sample_template, job_status="finished")
|
||||
create_job(sample_template, job_status="sending limits exceeded")
|
||||
create_job(sample_template, job_status="scheduled")
|
||||
create_job(sample_template, job_status="cancelled")
|
||||
create_job(sample_template, job_status="ready to send")
|
||||
create_job(sample_template, job_status="sent to dvla")
|
||||
create_job(sample_template, job_status="error")
|
||||
create_job(sample_template, job_status=JobStatus.PENDING)
|
||||
create_job(sample_template, job_status=JobStatus.IN_PROGRESS)
|
||||
create_job(sample_template, job_status=JobStatus.FINISHED)
|
||||
create_job(sample_template, job_status=JobStatus.SENDING_LIMITS_EXCEEDED)
|
||||
create_job(sample_template, job_status=JobStatus.SCHEDULED)
|
||||
create_job(sample_template, job_status=JobStatus.CANCELLED)
|
||||
create_job(sample_template, job_status=JobStatus.READY_TO_SEND)
|
||||
create_job(sample_template, job_status=JobStatus.SENT_TO_DVLA)
|
||||
create_job(sample_template, job_status=JobStatus.ERROR)
|
||||
|
||||
resp_json = admin_request.get(
|
||||
"job.get_jobs_by_service",
|
||||
@@ -888,40 +955,61 @@ def test_get_jobs_should_retrieve_from_ft_notification_status_for_old_jobs(
|
||||
|
||||
# some notifications created more than three days ago, some created after the midnight cutoff
|
||||
create_ft_notification_status(
|
||||
date(2017, 6, 6), job=job_1, notification_status="delivered", count=2
|
||||
date(2017, 6, 6),
|
||||
job=job_1,
|
||||
notification_status=NotificationStatus.DELIVERED,
|
||||
count=2,
|
||||
)
|
||||
create_ft_notification_status(
|
||||
date(2017, 6, 7), job=job_1, notification_status="delivered", count=4
|
||||
date(2017, 6, 7),
|
||||
job=job_1,
|
||||
notification_status=NotificationStatus.DELIVERED,
|
||||
count=4,
|
||||
)
|
||||
# job2's new enough
|
||||
create_notification(
|
||||
job=job_2, status="created", created_at=not_quite_three_days_ago
|
||||
job=job_2,
|
||||
status=NotificationStatus.CREATED,
|
||||
created_at=not_quite_three_days_ago,
|
||||
)
|
||||
|
||||
# this isn't picked up because the job is too new
|
||||
create_ft_notification_status(
|
||||
date(2017, 6, 7), job=job_2, notification_status="delivered", count=8
|
||||
date(2017, 6, 7),
|
||||
job=job_2,
|
||||
notification_status=NotificationStatus.DELIVERED,
|
||||
count=8,
|
||||
)
|
||||
# this isn't picked up - while the job is old, it started in last 3 days so we look at notification table instead
|
||||
create_ft_notification_status(
|
||||
date(2017, 6, 7), job=job_3, notification_status="delivered", count=16
|
||||
date(2017, 6, 7),
|
||||
job=job_3,
|
||||
notification_status=NotificationStatus.DELIVERED,
|
||||
count=16,
|
||||
)
|
||||
|
||||
# this isn't picked up because we're using the ft status table for job_1 as it's old
|
||||
create_notification(
|
||||
job=job_1, status="created", created_at=not_quite_three_days_ago
|
||||
job=job_1,
|
||||
status=NotificationStatus.CREATED,
|
||||
created_at=not_quite_three_days_ago,
|
||||
)
|
||||
|
||||
resp_json = admin_request.get(
|
||||
"job.get_jobs_by_service", service_id=sample_template.service_id
|
||||
"job.get_jobs_by_service",
|
||||
service_id=sample_template.service_id,
|
||||
)
|
||||
|
||||
assert resp_json["data"][0]["id"] == str(job_3.id)
|
||||
assert resp_json["data"][0]["statistics"] == []
|
||||
assert resp_json["data"][1]["id"] == str(job_2.id)
|
||||
assert resp_json["data"][1]["statistics"] == [{"status": "created", "count": 1}]
|
||||
assert resp_json["data"][1]["statistics"] == [
|
||||
{"status": NotificationStatus.CREATED, "count": 1},
|
||||
]
|
||||
assert resp_json["data"][2]["id"] == str(job_1.id)
|
||||
assert resp_json["data"][2]["statistics"] == [{"status": "delivered", "count": 6}]
|
||||
assert resp_json["data"][2]["statistics"] == [
|
||||
{"status": NotificationStatus.DELIVERED, "count": 6},
|
||||
]
|
||||
|
||||
|
||||
@freeze_time("2017-07-17 07:17")
|
||||
@@ -947,26 +1035,38 @@ def test_get_scheduled_job_stats(admin_request):
|
||||
|
||||
# Shouldn’t be counted – wrong status
|
||||
create_job(
|
||||
service_1_template, job_status="finished", scheduled_for="2017-07-17 07:00"
|
||||
service_1_template,
|
||||
job_status=JobStatus.FINISHED,
|
||||
scheduled_for="2017-07-17 07:00",
|
||||
)
|
||||
create_job(
|
||||
service_1_template, job_status="in progress", scheduled_for="2017-07-17 08:00"
|
||||
service_1_template,
|
||||
job_status=JobStatus.IN_PROGRESS,
|
||||
scheduled_for="2017-07-17 08:00",
|
||||
)
|
||||
|
||||
# Should be counted – service 1
|
||||
create_job(
|
||||
service_1_template, job_status="scheduled", scheduled_for="2017-07-17 09:00"
|
||||
service_1_template,
|
||||
job_status=JobStatus.SCHEDULED,
|
||||
scheduled_for="2017-07-17 09:00",
|
||||
)
|
||||
create_job(
|
||||
service_1_template, job_status="scheduled", scheduled_for="2017-07-17 10:00"
|
||||
service_1_template,
|
||||
job_status=JobStatus.SCHEDULED,
|
||||
scheduled_for="2017-07-17 10:00",
|
||||
)
|
||||
create_job(
|
||||
service_1_template, job_status="scheduled", scheduled_for="2017-07-17 11:00"
|
||||
service_1_template,
|
||||
job_status=JobStatus.SCHEDULED,
|
||||
scheduled_for="2017-07-17 11:00",
|
||||
)
|
||||
|
||||
# Should be counted – service 2
|
||||
create_job(
|
||||
service_2_template, job_status="scheduled", scheduled_for="2017-07-17 11:00"
|
||||
service_2_template,
|
||||
job_status=JobStatus.SCHEDULED,
|
||||
scheduled_for="2017-07-17 11:00",
|
||||
)
|
||||
|
||||
assert admin_request.get(
|
||||
|
||||
Reference in New Issue
Block a user