darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2026-02-05 02:41:14 -05:00
Code Issues Packages Projects Releases Wiki Activity

rename days_ago_to_start to limit_days

Browse Source 
consistency with the rest of the app
This commit is contained in:
Leo Hemsted
2019-02-28 13:59:28 +00:00
parent 88303140ec
commit b4d1a590b7
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/dao/inbound_sms_dao.py
View File

@@ -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:

6
tests/app/dao/test_inbound_sms_dao.py
View File

@@ -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])