mirror of
https://github.com/GSA/notifications-api.git
synced 2025-12-20 15:31:15 -05:00
Rename method to be clear it’s recent-only
This commit is contained in:
@@ -51,7 +51,7 @@ def insert_or_update_returned_letters(references):
|
||||
db.session.connection().execute(stmt)
|
||||
|
||||
|
||||
def fetch_returned_letter_count(service_id):
|
||||
def fetch_recent_returned_letter_count(service_id):
|
||||
return db.session.query(
|
||||
func.count(ReturnedLetter.notification_id).label('returned_letter_count'),
|
||||
).filter(
|
||||
|
||||
@@ -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.returned_letters_dao import (
|
||||
fetch_most_recent_returned_letter,
|
||||
fetch_returned_letter_count,
|
||||
fetch_recent_returned_letter_count,
|
||||
fetch_returned_letter_summary,
|
||||
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),
|
||||
})
|
||||
|
||||
count = fetch_returned_letter_count(service_id)
|
||||
count = fetch_recent_returned_letter_count(service_id)
|
||||
|
||||
return jsonify({
|
||||
'returned_letter_count': count.returned_letter_count,
|
||||
|
||||
@@ -6,7 +6,7 @@ from freezegun import freeze_time
|
||||
from app.dao.returned_letters_dao import (
|
||||
insert_or_update_returned_letters,
|
||||
fetch_most_recent_returned_letter,
|
||||
fetch_returned_letter_count,
|
||||
fetch_recent_returned_letter_count,
|
||||
fetch_returned_letter_summary,
|
||||
fetch_returned_letters
|
||||
)
|
||||
@@ -128,7 +128,7 @@ def test_get_returned_letter_count(sample_service):
|
||||
)
|
||||
|
||||
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
|
||||
|
||||
|
||||
Reference in New Issue
Block a user