From b4d1a590b71b22d89cb3ab634e377fc20c379b84 Mon Sep 17 00:00:00 2001 From: Leo Hemsted Date: Thu, 28 Feb 2019 13:59:28 +0000 Subject: [PATCH] rename days_ago_to_start to limit_days consistency with the rest of the app --- app/dao/inbound_sms_dao.py | 6 +++--- tests/app/dao/test_inbound_sms_dao.py | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/dao/inbound_sms_dao.py b/app/dao/inbound_sms_dao.py index cb086899a..88ab0e356 100644 --- a/app/dao/inbound_sms_dao.py +++ b/app/dao/inbound_sms_dao.py @@ -14,14 +14,14 @@ def dao_create_inbound_sms(inbound_sms): db.session.add(inbound_sms) -def dao_get_inbound_sms_for_service(service_id, limit=None, user_number=None, days_ago_to_start=6): +def dao_get_inbound_sms_for_service(service_id, limit=None, user_number=None, limit_days=6): q = InboundSms.query.filter( InboundSms.service_id == service_id ).order_by( InboundSms.created_at.desc() ) - if days_ago_to_start is not None: - start_date = midnight_n_days_ago(days_ago_to_start) + if limit_days is not None: + start_date = midnight_n_days_ago(limit_days) q = q.filter(InboundSms.created_at >= start_date) if user_number: diff --git a/tests/app/dao/test_inbound_sms_dao.py b/tests/app/dao/test_inbound_sms_dao.py index f35103f1c..e8419dae6 100644 --- a/tests/app/dao/test_inbound_sms_dao.py +++ b/tests/app/dao/test_inbound_sms_dao.py @@ -121,13 +121,13 @@ def test_should_delete_inbound_sms_according_to_data_retention(notify_db_session # four deleted for the 3-day service, two for the default seven days one, one for the 30 day assert deleted_count == 7 assert { - x.created_at for x in dao_get_inbound_sms_for_service(short_retention_service.id, days_ago_to_start=None) + x.created_at for x in dao_get_inbound_sms_for_service(short_retention_service.id, limit_days=None) } == set(dates[:1]) assert { - x.created_at for x in dao_get_inbound_sms_for_service(no_retention_service.id, days_ago_to_start=None) + x.created_at for x in dao_get_inbound_sms_for_service(no_retention_service.id, limit_days=None) } == set(dates[:3]) assert { - x.created_at for x in dao_get_inbound_sms_for_service(long_retention_service.id, days_ago_to_start=None) + x.created_at for x in dao_get_inbound_sms_for_service(long_retention_service.id, limit_days=None) } == set(dates[:4])