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

Small change to use the current datetime stamp for the Notification.created_at timestamp rather than the job.created_at start date. This will give us better more reflective data.

Browse Source
This commit is contained in:
Rebecca Law
2017-10-17 16:05:31 +01:00
parent b384b13213
commit 24a87d8260
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/celery/tasks.py
View File

@@ -209,7 +209,7 @@ def send_sms(self,
notification_type=SMS_TYPE, notification_type=SMS_TYPE,
api_key_id=api_key_id, api_key_id=api_key_id,
key_type=key_type, key_type=key_type,
created_at=created_at, created_at=datetime.utcnow(),
job_id=notification.get('job', None), job_id=notification.get('job', None),
job_row_number=notification.get('row_number', None), job_row_number=notification.get('row_number', None),
notification_id=notification_id notification_id=notification_id
@@ -254,7 +254,7 @@ def send_email(self,
notification_type=EMAIL_TYPE, notification_type=EMAIL_TYPE,
api_key_id=api_key_id, api_key_id=api_key_id,
key_type=key_type, key_type=key_type,
created_at=created_at, created_at=datetime.utcnow(),
job_id=notification.get('job', None), job_id=notification.get('job', None),
job_row_number=notification.get('row_number', None), job_row_number=notification.get('row_number', None),
notification_id=notification_id notification_id=notification_id
@@ -295,7 +295,7 @@ def persist_letter(
notification_type=LETTER_TYPE, notification_type=LETTER_TYPE,
api_key_id=None, api_key_id=None,
key_type=KEY_TYPE_NORMAL, key_type=KEY_TYPE_NORMAL,
created_at=created_at, created_at=datetime.utcnow(),
job_id=notification['job'], job_id=notification['job'],
job_row_number=notification['row_number'], job_row_number=notification['row_number'],
notification_id=notification_id, notification_id=notification_id,

12
tests/app/celery/test_tasks.py
View File

@@ -700,7 +700,7 @@ def test_should_send_sms_template_to_and_persist_with_job_id(sample_job, sample_
assert persisted_notification.template_id == sample_job.template.id assert persisted_notification.template_id == sample_job.template.id
assert persisted_notification.status == 'created' assert persisted_notification.status == 'created'
assert not persisted_notification.sent_at assert not persisted_notification.sent_at
assert persisted_notification.created_at <= now assert persisted_notification.created_at >= now
assert not persisted_notification.sent_by assert not persisted_notification.sent_by
assert persisted_notification.job_row_number == 2 assert persisted_notification.job_row_number == 2
assert persisted_notification.api_key_id == sample_api_key.id assert persisted_notification.api_key_id == sample_api_key.id
@@ -794,7 +794,7 @@ def test_should_use_email_template_and_persist(sample_email_template_with_placeh
assert persisted_notification.to == 'my_email@my_email.com' assert persisted_notification.to == 'my_email@my_email.com'
assert persisted_notification.template_id == sample_email_template_with_placeholders.id assert persisted_notification.template_id == sample_email_template_with_placeholders.id
assert persisted_notification.template_version == sample_email_template_with_placeholders.version assert persisted_notification.template_version == sample_email_template_with_placeholders.version
assert persisted_notification.created_at == now assert persisted_notification.created_at >= now
assert not persisted_notification.sent_at assert not persisted_notification.sent_at
assert persisted_notification.status == 'created' assert persisted_notification.status == 'created'
assert not persisted_notification.sent_by assert not persisted_notification.sent_by
@@ -831,7 +831,7 @@ def test_send_email_should_use_template_version_from_job_not_latest(sample_email
assert persisted_notification.to == 'my_email@my_email.com' assert persisted_notification.to == 'my_email@my_email.com'
assert persisted_notification.template_id == sample_email_template.id assert persisted_notification.template_id == sample_email_template.id
assert persisted_notification.template_version == version_on_notification assert persisted_notification.template_version == version_on_notification
assert persisted_notification.created_at == now assert persisted_notification.created_at >= now
assert not persisted_notification.sent_at assert not persisted_notification.sent_at
assert persisted_notification.status == 'created' assert persisted_notification.status == 'created'
assert not persisted_notification.sent_by assert not persisted_notification.sent_by
@@ -857,7 +857,7 @@ def test_should_use_email_template_subject_placeholders(sample_email_template_wi
assert persisted_notification.to == 'my_email@my_email.com' assert persisted_notification.to == 'my_email@my_email.com'
assert persisted_notification.template_id == sample_email_template_with_placeholders.id assert persisted_notification.template_id == sample_email_template_with_placeholders.id
assert persisted_notification.status == 'created' assert persisted_notification.status == 'created'
assert persisted_notification.created_at == now assert persisted_notification.created_at >= now
assert not persisted_notification.sent_by assert not persisted_notification.sent_by
assert persisted_notification.personalisation == {"name": "Jo"} assert persisted_notification.personalisation == {"name": "Jo"}
assert not persisted_notification.reference assert not persisted_notification.reference
@@ -883,7 +883,7 @@ def test_should_use_email_template_and_persist_without_personalisation(sample_em
persisted_notification = Notification.query.one() persisted_notification = Notification.query.one()
assert persisted_notification.to == 'my_email@my_email.com' assert persisted_notification.to == 'my_email@my_email.com'
assert persisted_notification.template_id == sample_email_template.id assert persisted_notification.template_id == sample_email_template.id
assert persisted_notification.created_at == now assert persisted_notification.created_at >= now
assert not persisted_notification.sent_at assert not persisted_notification.sent_at
assert persisted_notification.status == 'created' assert persisted_notification.status == 'created'
assert not persisted_notification.sent_by assert not persisted_notification.sent_by
@@ -1019,7 +1019,7 @@ def test_persist_letter_saves_letter_to_database(sample_letter_job, mocker):
assert notification_db.template_id == sample_letter_job.template.id assert notification_db.template_id == sample_letter_job.template.id
assert notification_db.template_version == sample_letter_job.template.version assert notification_db.template_version == sample_letter_job.template.version
assert notification_db.status == 'created' assert notification_db.status == 'created'
assert notification_db.created_at == created_at assert notification_db.created_at >= created_at
assert notification_db.notification_type == 'letter' assert notification_db.notification_type == 'letter'
assert notification_db.sent_at is None assert notification_db.sent_at is None
assert notification_db.sent_by is None assert notification_db.sent_by is None