darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2025-12-22 16:31:15 -05:00
Code Issues Packages Projects Releases Wiki Activity

Rename method to be clear it’s recent-only

Browse Source
This commit is contained in:
Chris Hill-Scott
2020-03-05 10:04:20 +00:00
parent 8c47d07845
commit 70b2afa124
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/dao/returned_letters_dao.py
View File

@@ -51,7 +51,7 @@ def insert_or_update_returned_letters(references):
db.session.connection().execute(stmt) db.session.connection().execute(stmt)
def fetch_returned_letter_count(service_id): def fetch_recent_returned_letter_count(service_id):
return db.session.query( return db.session.query(
func.count(ReturnedLetter.notification_id).label('returned_letter_count'), func.count(ReturnedLetter.notification_id).label('returned_letter_count'),
).filter( ).filter(

4
app/service/rest.py
View File

@@ -32,7 +32,7 @@ from app.dao.inbound_numbers_dao import dao_allocate_number_for_service
from app.dao.organisation_dao import dao_get_organisation_by_service_id from app.dao.organisation_dao import dao_get_organisation_by_service_id
from app.dao.returned_letters_dao import ( from app.dao.returned_letters_dao import (
fetch_most_recent_returned_letter, fetch_most_recent_returned_letter,
fetch_returned_letter_count, fetch_recent_returned_letter_count,
fetch_returned_letter_summary, fetch_returned_letter_summary,
fetch_returned_letters, fetch_returned_letters,
) )
@@ -969,7 +969,7 @@ def returned_letter_statistics(service_id):
'most_recent_report': most_recent.reported_at.strftime(DATETIME_FORMAT_NO_TIMEZONE), 'most_recent_report': most_recent.reported_at.strftime(DATETIME_FORMAT_NO_TIMEZONE),
}) })
count = fetch_returned_letter_count(service_id) count = fetch_recent_returned_letter_count(service_id)
return jsonify({ return jsonify({
'returned_letter_count': count.returned_letter_count, 'returned_letter_count': count.returned_letter_count,

4
tests/app/dao/test_returned_letters_dao.py
View File

@@ -6,7 +6,7 @@ from freezegun import freeze_time
from app.dao.returned_letters_dao import ( from app.dao.returned_letters_dao import (
insert_or_update_returned_letters, insert_or_update_returned_letters,
fetch_most_recent_returned_letter, fetch_most_recent_returned_letter,
fetch_returned_letter_count, fetch_recent_returned_letter_count,
fetch_returned_letter_summary, fetch_returned_letter_summary,
fetch_returned_letters fetch_returned_letters
) )
@@ -128,7 +128,7 @@ def test_get_returned_letter_count(sample_service):
) )
with freeze_time('2010-11-08 10:10'): with freeze_time('2010-11-08 10:10'):
result = fetch_returned_letter_count(sample_service.id) result = fetch_recent_returned_letter_count(sample_service.id)
assert result.returned_letter_count == 3 assert result.returned_letter_count == 3