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

Make the code neater for the query.

Browse Source
This commit is contained in:
Rebecca Law
2017-04-03 15:52:52 +01:00
parent f9264ea399
commit eee662e5be
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/dao/services_dao.py
View File

@@ -325,8 +325,7 @@ def dao_fetch_todays_stats_for_all_services(include_from_test_key=True):
@statsd(namespace='dao') @statsd(namespace='dao')
def fetch_stats_by_date_range_for_all_services(start_date, end_date, include_from_test_key=True): def fetch_stats_by_date_range_for_all_services(start_date, end_date, include_from_test_key=True):
start_date = get_london_midnight_in_utc(start_date) start_date = get_london_midnight_in_utc(start_date)
end_date = get_london_midnight_in_utc(end_date) end_date = get_london_midnight_in_utc(end_date + timedelta(days=1))
end_date += timedelta(hours=23, minutes=59, seconds=59)
query = db.session.query( query = db.session.query(
NotificationHistory.notification_type, NotificationHistory.notification_type,
@@ -335,7 +334,7 @@ def fetch_stats_by_date_range_for_all_services(start_date, end_date, include_fro
func.count(NotificationHistory.id).label('count') func.count(NotificationHistory.id).label('count')
).filter( ).filter(
NotificationHistory.created_at >= start_date, NotificationHistory.created_at >= start_date,
NotificationHistory.created_at <= end_date NotificationHistory.created_at < end_date
).group_by( ).group_by(
NotificationHistory.notification_type, NotificationHistory.notification_type,
NotificationHistory.status, NotificationHistory.status,