Return report_at date as a date not datetime. I haven't converted this date from UTC to BST because we always upload the returned-letters during business hours.

This commit is contained in:
Rebecca Law
2019-12-11 14:41:35 +00:00
parent 3908f2ad59
commit 140cb65554
4 changed files with 12 additions and 4 deletions

View File

@@ -50,7 +50,7 @@ def test_insert_or_update_returned_letters_updates(sample_letter_template):
assert x.notification_id in [notification.id, history.id]
def test_insert_or_update_returned_letters_when_no_notification(sample_letter_template):
def test_insert_or_update_returned_letters_when_no_notification(notify_db_session):
insert_or_update_returned_letters(['ref1'])
assert ReturnedLetter.query.count() == 0
@@ -104,6 +104,7 @@ def test_get_returned_letter_summary_orders_by_reported_at(sample_service):
create_returned_letter(sample_service, reported_at=now)
create_returned_letter(sample_service, reported_at=last_month)
create_returned_letter(sample_service, reported_at=last_month)
create_returned_letter() # returned letter for a different service
results = get_returned_letter_summary(sample_service.id)

View File

@@ -944,7 +944,7 @@ def set_up_usage_data(start_date):
return org, org_3, service, service_3, service_4, service_sms_only
def create_returned_letter(service, reported_at=None):
def create_returned_letter(service=None, reported_at=None):
if not service:
service = create_service(service_name='a - with sms and letter')
template = create_template(service=service, template_type=LETTER_TYPE)

View File

@@ -3374,10 +3374,14 @@ def test_get_monthly_notification_data_by_service(mocker, admin_request):
assert response == []
@freeze_time('2019-12-11 13:30')
def test_get_returned_letter_summary(admin_request, sample_service):
create_returned_letter(sample_service, reported_at=datetime.utcnow())
create_returned_letter(sample_service, reported_at=datetime.utcnow() - timedelta(days=3))
create_returned_letter(sample_service, reported_at=datetime.utcnow())
create_returned_letter(sample_service, reported_at=datetime.utcnow())
response = admin_request.get('service.returned_letter_summary', service_id=sample_service.id)
assert len(response) == 2
assert response[0] == {'returned_letter_count': 2, 'reported_at': '2019-12-11'}
assert response[1] == {'returned_letter_count': 1, 'reported_at': '2019-12-08'}