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

remove datetime.utcnow()

Browse Source
This commit is contained in:
Kenneth Kehl
2024-05-23 13:59:51 -07:00
parent 752a13fbd2
commit 905df17f65
83 changed files with 591 additions and 570 deletions
Download Patch File Download Diff File Expand all files Collapse all files

81
tests/app/dao/notification_dao/test_notification_dao.py
View File

@@ -36,6 +36,7 @@ from app.enums import (
TemplateType,
)
from app.models import Job, Notification, NotificationHistory
from app.utils import utc_now
from tests.app.db import (
create_ft_notification_status,
create_job,
@@ -701,7 +702,7 @@ def test_should_limit_notifications_return_by_day_limit_plus_one(sample_template
with freeze_time(past_date):
create_notification(
sample_template,
created_at=datetime.utcnow(),
created_at=utc_now(),
status=NotificationStatus.FAILED,
)
@@ -777,7 +778,7 @@ def _notification_json(sample_template, job_id=None, id=None, status=None):
"service_id": sample_template.service.id,
"template_id": sample_template.id,
"template_version": sample_template.version,
"created_at": datetime.utcnow(),
"created_at": utc_now(),
"billable_units": 1,
"notification_type": sample_template.template_type,
"key_type": KeyType.NORMAL,
@@ -792,7 +793,7 @@ def _notification_json(sample_template, job_id=None, id=None, status=None):
def test_dao_timeout_notifications(sample_template):
with freeze_time(datetime.utcnow() - timedelta(minutes=2)):
with freeze_time(utc_now() - timedelta(minutes=2)):
created = create_notification(
sample_template,
status=NotificationStatus.CREATED,
@@ -810,7 +811,7 @@ def test_dao_timeout_notifications(sample_template):
status=NotificationStatus.DELIVERED,
)
temporary_failure_notifications = dao_timeout_notifications(datetime.utcnow())
temporary_failure_notifications = dao_timeout_notifications(utc_now())
assert len(temporary_failure_notifications) == 2
assert Notification.query.get(created.id).status == NotificationStatus.CREATED
@@ -828,7 +829,7 @@ def test_dao_timeout_notifications(sample_template):
def test_dao_timeout_notifications_only_updates_for_older_notifications(
sample_template,
):
with freeze_time(datetime.utcnow() + timedelta(minutes=10)):
with freeze_time(utc_now() + timedelta(minutes=10)):
sending = create_notification(
sample_template,
status=NotificationStatus.SENDING,
@@ -838,7 +839,7 @@ def test_dao_timeout_notifications_only_updates_for_older_notifications(
status=NotificationStatus.PENDING,
)
temporary_failure_notifications = dao_timeout_notifications(datetime.utcnow())
temporary_failure_notifications = dao_timeout_notifications(utc_now())
assert len(temporary_failure_notifications) == 0
assert Notification.query.get(sending.id).status == NotificationStatus.SENDING
@@ -913,23 +914,23 @@ def test_get_notifications_created_by_api_or_csv_are_returned_correctly_excludin
sample_test_api_key,
):
create_notification(
template=sample_job.template, created_at=datetime.utcnow(), job=sample_job
template=sample_job.template, created_at=utc_now(), job=sample_job
)
create_notification(
template=sample_job.template,
created_at=datetime.utcnow(),
created_at=utc_now(),
api_key=sample_api_key,
key_type=sample_api_key.key_type,
)
create_notification(
template=sample_job.template,
created_at=datetime.utcnow(),
created_at=utc_now(),
api_key=sample_team_api_key,
key_type=sample_team_api_key.key_type,
)
create_notification(
template=sample_job.template,
created_at=datetime.utcnow(),
created_at=utc_now(),
api_key=sample_test_api_key,
key_type=sample_test_api_key.key_type,
)
@@ -959,24 +960,24 @@ def test_get_notifications_with_a_live_api_key_type(
):
create_notification(
template=sample_job.template,
created_at=datetime.utcnow(),
created_at=utc_now(),
job=sample_job,
)
create_notification(
template=sample_job.template,
created_at=datetime.utcnow(),
created_at=utc_now(),
api_key=sample_api_key,
key_type=sample_api_key.key_type,
)
create_notification(
template=sample_job.template,
created_at=datetime.utcnow(),
created_at=utc_now(),
api_key=sample_team_api_key,
key_type=sample_team_api_key.key_type,
)
create_notification(
template=sample_job.template,
created_at=datetime.utcnow(),
created_at=utc_now(),
api_key=sample_test_api_key,
key_type=sample_test_api_key.key_type,
)
@@ -1001,23 +1002,23 @@ def test_get_notifications_with_a_test_api_key_type(
sample_job, sample_api_key, sample_team_api_key, sample_test_api_key
):
create_notification(
template=sample_job.template, created_at=datetime.utcnow(), job=sample_job
template=sample_job.template, created_at=utc_now(), job=sample_job
)
create_notification(
template=sample_job.template,
created_at=datetime.utcnow(),
created_at=utc_now(),
api_key=sample_api_key,
key_type=sample_api_key.key_type,
)
create_notification(
template=sample_job.template,
created_at=datetime.utcnow(),
created_at=utc_now(),
api_key=sample_team_api_key,
key_type=sample_team_api_key.key_type,
)
create_notification(
template=sample_job.template,
created_at=datetime.utcnow(),
created_at=utc_now(),
api_key=sample_test_api_key,
key_type=sample_test_api_key.key_type,
)
@@ -1045,24 +1046,24 @@ def test_get_notifications_with_a_team_api_key_type(
):
create_notification(
template=sample_job.template,
created_at=datetime.utcnow(),
created_at=utc_now(),
job=sample_job,
)
create_notification(
template=sample_job.template,
created_at=datetime.utcnow(),
created_at=utc_now(),
api_key=sample_api_key,
key_type=sample_api_key.key_type,
)
create_notification(
template=sample_job.template,
created_at=datetime.utcnow(),
created_at=utc_now(),
api_key=sample_team_api_key,
key_type=sample_team_api_key.key_type,
)
create_notification(
sample_job.template,
created_at=datetime.utcnow(),
created_at=utc_now(),
api_key=sample_test_api_key,
key_type=sample_test_api_key.key_type,
)
@@ -1090,25 +1091,25 @@ def test_should_exclude_test_key_notifications_by_default(
):
create_notification(
template=sample_job.template,
created_at=datetime.utcnow(),
created_at=utc_now(),
job=sample_job,
)
create_notification(
template=sample_job.template,
created_at=datetime.utcnow(),
created_at=utc_now(),
api_key=sample_api_key,
key_type=sample_api_key.key_type,
)
create_notification(
template=sample_job.template,
created_at=datetime.utcnow(),
created_at=utc_now(),
api_key=sample_team_api_key,
key_type=sample_team_api_key.key_type,
)
create_notification(
template=sample_job.template,
created_at=datetime.utcnow(),
created_at=utc_now(),
api_key=sample_test_api_key,
key_type=sample_test_api_key.key_type,
)
@@ -1699,9 +1700,9 @@ def test_dao_get_notifications_by_to_field_orders_by_created_at_desc(sample_temp
)
notification_a_minute_ago = notification(
created_at=datetime.utcnow() - timedelta(minutes=1)
created_at=utc_now() - timedelta(minutes=1)
)
notification = notification(created_at=datetime.utcnow())
notification = notification(created_at=utc_now())
notifications = dao_get_notifications_by_recipient_or_reference(
sample_template.service_id,
@@ -1718,9 +1719,9 @@ def test_dao_get_last_notification_added_for_job_id_valid_job_id(sample_template
job = create_job(
template=sample_template,
notification_count=10,
created_at=datetime.utcnow() - timedelta(hours=2),
scheduled_for=datetime.utcnow() - timedelta(minutes=31),
processing_started=datetime.utcnow() - timedelta(minutes=31),
created_at=utc_now() - timedelta(hours=2),
scheduled_for=utc_now() - timedelta(minutes=31),
processing_started=utc_now() - timedelta(minutes=31),
job_status=JobStatus.IN_PROGRESS,
)
create_notification(sample_template, job, 0)
@@ -1734,9 +1735,9 @@ def test_dao_get_last_notification_added_for_job_id_no_notifications(sample_temp
job = create_job(
template=sample_template,
notification_count=10,
created_at=datetime.utcnow() - timedelta(hours=2),
scheduled_for=datetime.utcnow() - timedelta(minutes=31),
processing_started=datetime.utcnow() - timedelta(minutes=31),
created_at=utc_now() - timedelta(hours=2),
scheduled_for=utc_now() - timedelta(minutes=31),
processing_started=utc_now() - timedelta(minutes=31),
job_status=JobStatus.IN_PROGRESS,
)
@@ -1890,17 +1891,17 @@ def test_notifications_not_yet_sent(sample_service, notification_type):
template = create_template(service=sample_service, template_type=notification_type)
old_notification = create_notification(
template=template,
created_at=datetime.utcnow() - timedelta(seconds=older_than),
created_at=utc_now() - timedelta(seconds=older_than),
status=NotificationStatus.CREATED,
)
create_notification(
template=template,
created_at=datetime.utcnow() - timedelta(seconds=older_than),
created_at=utc_now() - timedelta(seconds=older_than),
status=NotificationStatus.SENDING,
)
create_notification(
template=template,
created_at=datetime.utcnow(),
created_at=utc_now(),
status=NotificationStatus.CREATED,
)
@@ -1917,17 +1918,17 @@ def test_notifications_not_yet_sent_return_no_rows(sample_service, notification_
template = create_template(service=sample_service, template_type=notification_type)
create_notification(
template=template,
created_at=datetime.utcnow(),
created_at=utc_now(),
status=NotificationStatus.CREATED,
)
create_notification(
template=template,
created_at=datetime.utcnow(),
created_at=utc_now(),
status=NotificationStatus.SENDING,
)
create_notification(
template=template,
created_at=datetime.utcnow(),
created_at=utc_now(),
status=NotificationStatus.DELIVERED,
)

53
tests/app/dao/notification_dao/test_notification_dao_delete_notifications.py
View File

@@ -9,6 +9,7 @@ from app.dao.notifications_dao import (
)
from app.enums import KeyType, NotificationStatus, NotificationType, TemplateType
from app.models import Notification, NotificationHistory
from app.utils import utc_now
from tests.app.db import (
create_notification,
create_notification_history,
@@ -22,20 +23,20 @@ def test_move_notifications_does_nothing_if_notification_history_row_already_exi
):
notification = create_notification(
template=sample_email_template,
created_at=datetime.utcnow() - timedelta(days=8),
created_at=utc_now() - timedelta(days=8),
status=NotificationStatus.TEMPORARY_FAILURE,
)
create_notification_history(
id=notification.id,
template=sample_email_template,
created_at=datetime.utcnow() - timedelta(days=8),
created_at=utc_now() - timedelta(days=8),
status=NotificationStatus.DELIVERED,
)
move_notifications_to_notification_history(
NotificationType.EMAIL,
sample_email_template.service_id,
datetime.utcnow(),
utc_now(),
1,
)
@@ -184,58 +185,58 @@ def test_insert_notification_history_delete_notifications(sample_email_template)
# should be deleted
n1 = create_notification(
template=sample_email_template,
created_at=datetime.utcnow() - timedelta(days=1, minutes=4),
created_at=utc_now() - timedelta(days=1, minutes=4),
status=NotificationStatus.DELIVERED,
)
n2 = create_notification(
template=sample_email_template,
created_at=datetime.utcnow() - timedelta(days=1, minutes=20),
created_at=utc_now() - timedelta(days=1, minutes=20),
status=NotificationStatus.PERMANENT_FAILURE,
)
n3 = create_notification(
template=sample_email_template,
created_at=datetime.utcnow() - timedelta(days=1, minutes=30),
created_at=utc_now() - timedelta(days=1, minutes=30),
status=NotificationStatus.TEMPORARY_FAILURE,
)
n4 = create_notification(
template=sample_email_template,
created_at=datetime.utcnow() - timedelta(days=1, minutes=59),
created_at=utc_now() - timedelta(days=1, minutes=59),
status=NotificationStatus.TEMPORARY_FAILURE,
)
n5 = create_notification(
template=sample_email_template,
created_at=datetime.utcnow() - timedelta(days=1, hours=1),
created_at=utc_now() - timedelta(days=1, hours=1),
status=NotificationStatus.SENDING,
)
n6 = create_notification(
template=sample_email_template,
created_at=datetime.utcnow() - timedelta(days=1, minutes=61),
created_at=utc_now() - timedelta(days=1, minutes=61),
status=NotificationStatus.PENDING,
)
n7 = create_notification(
template=sample_email_template,
created_at=datetime.utcnow() - timedelta(days=1, hours=1, seconds=1),
created_at=utc_now() - timedelta(days=1, hours=1, seconds=1),
status=NotificationStatus.VALIDATION_FAILED,
)
n8 = create_notification(
template=sample_email_template,
created_at=datetime.utcnow() - timedelta(days=1, minutes=20),
created_at=utc_now() - timedelta(days=1, minutes=20),
status=NotificationStatus.CREATED,
)
# should NOT be deleted - wrong status
n9 = create_notification(
template=sample_email_template,
created_at=datetime.utcnow() - timedelta(hours=1),
created_at=utc_now() - timedelta(hours=1),
status=NotificationStatus.DELIVERED,
)
n10 = create_notification(
template=sample_email_template,
created_at=datetime.utcnow() - timedelta(hours=1),
created_at=utc_now() - timedelta(hours=1),
status=NotificationStatus.TECHNICAL_FAILURE,
)
n11 = create_notification(
template=sample_email_template,
created_at=datetime.utcnow() - timedelta(hours=23, minutes=59),
created_at=utc_now() - timedelta(hours=23, minutes=59),
status=NotificationStatus.CREATED,
)
@@ -244,7 +245,7 @@ def test_insert_notification_history_delete_notifications(sample_email_template)
del_count = insert_notification_history_delete_notifications(
notification_type=sample_email_template.template_type,
service_id=sample_email_template.service_id,
timestamp_to_delete_backwards_from=datetime.utcnow() - timedelta(days=1),
timestamp_to_delete_backwards_from=utc_now() - timedelta(days=1),
)
assert del_count == 8
notifications = Notification.query.all()
@@ -260,24 +261,24 @@ def test_insert_notification_history_delete_notifications_more_notifications_tha
):
create_notification(
template=sample_template,
created_at=datetime.utcnow() + timedelta(minutes=4),
created_at=utc_now() + timedelta(minutes=4),
status=NotificationStatus.DELIVERED,
)
create_notification(
template=sample_template,
created_at=datetime.utcnow() + timedelta(minutes=20),
created_at=utc_now() + timedelta(minutes=20),
status=NotificationStatus.PERMANENT_FAILURE,
)
create_notification(
template=sample_template,
created_at=datetime.utcnow() + timedelta(minutes=30),
created_at=utc_now() + timedelta(minutes=30),
status=NotificationStatus.TEMPORARY_FAILURE,
)
del_count = insert_notification_history_delete_notifications(
notification_type=sample_template.template_type,
service_id=sample_template.service_id,
timestamp_to_delete_backwards_from=datetime.utcnow() + timedelta(hours=1),
timestamp_to_delete_backwards_from=utc_now() + timedelta(hours=1),
qry_limit=1,
)
@@ -293,7 +294,7 @@ def test_insert_notification_history_delete_notifications_only_insert_delete_for
):
notification_to_move = create_notification(
template=sample_email_template,
created_at=datetime.utcnow() + timedelta(minutes=4),
created_at=utc_now() + timedelta(minutes=4),
status=NotificationStatus.DELIVERED,
)
another_service = create_service(service_name="Another service")
@@ -302,14 +303,14 @@ def test_insert_notification_history_delete_notifications_only_insert_delete_for
)
notification_to_stay = create_notification(
template=another_template,
created_at=datetime.utcnow() + timedelta(minutes=4),
created_at=utc_now() + timedelta(minutes=4),
status=NotificationStatus.DELIVERED,
)
del_count = insert_notification_history_delete_notifications(
notification_type=sample_email_template.template_type,
service_id=sample_email_template.service_id,
timestamp_to_delete_backwards_from=datetime.utcnow() + timedelta(hours=1),
timestamp_to_delete_backwards_from=utc_now() + timedelta(hours=1),
)
assert del_count == 1
@@ -326,19 +327,19 @@ def test_insert_notification_history_delete_notifications_insert_for_key_type(
):
create_notification(
template=sample_template,
created_at=datetime.utcnow() - timedelta(hours=4),
created_at=utc_now() - timedelta(hours=4),
status=NotificationStatus.DELIVERED,
key_type=KeyType.NORMAL,
)
create_notification(
template=sample_template,
created_at=datetime.utcnow() - timedelta(hours=4),
created_at=utc_now() - timedelta(hours=4),
status=NotificationStatus.DELIVERED,
key_type=KeyType.TEAM,
)
with_test_key = create_notification(
template=sample_template,
created_at=datetime.utcnow() - timedelta(hours=4),
created_at=utc_now() - timedelta(hours=4),
status=NotificationStatus.DELIVERED,
key_type=KeyType.TEST,
)
@@ -346,7 +347,7 @@ def test_insert_notification_history_delete_notifications_insert_for_key_type(
del_count = insert_notification_history_delete_notifications(
notification_type=sample_template.template_type,
service_id=sample_template.service_id,
timestamp_to_delete_backwards_from=datetime.utcnow(),
timestamp_to_delete_backwards_from=utc_now(),
)
assert del_count == 2

9
tests/app/dao/notification_dao/test_notification_dao_template_usage.py
View File

@@ -1,13 +1,14 @@
from datetime import datetime, timedelta
from datetime import timedelta
from app.dao.notifications_dao import dao_get_last_date_template_was_used
from app.utils import utc_now
from tests.app.db import create_ft_notification_status, create_notification
def test_dao_get_last_date_template_was_used_returns_local_date_from_stats_table(
sample_template,
):
last_status_date = (datetime.utcnow() - timedelta(days=2)).date()
last_status_date = (utc_now() - timedelta(days=2)).date()
create_ft_notification_status(local_date=last_status_date, template=sample_template)
last_used_date = dao_get_last_date_template_was_used(
@@ -19,10 +20,10 @@ def test_dao_get_last_date_template_was_used_returns_local_date_from_stats_table
def test_dao_get_last_date_template_was_used_returns_created_at_from_notifications(
sample_template,
):
last_notification_date = datetime.utcnow() - timedelta(hours=2)
last_notification_date = utc_now() - timedelta(hours=2)
create_notification(template=sample_template, created_at=last_notification_date)
last_status_date = (datetime.utcnow() - timedelta(days=2)).date()
last_status_date = (utc_now() - timedelta(days=2)).date()
create_ft_notification_status(local_date=last_status_date, template=sample_template)
last_used_date = dao_get_last_date_template_was_used(
template_id=sample_template.id, service_id=sample_template.service_id