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

Change get_financial_year to return ending date as 1 microsecond earlier.

Browse Source 
That way we can write the queries as between start and end dates, making it easier to read.
This makes more sense.
This commit is contained in:
Rebecca Law
2017-05-02 10:00:47 +01:00
parent 88d92d6070
commit 3e0221adec
5 changed files with 13 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/dao/services_dao.py
View File

@@ -237,8 +237,7 @@ def dao_fetch_monthly_historical_stats_by_template_for_service(service_id, year)
func.count().label('count')
).filter(
NotificationHistory.service_id == service_id,
NotificationHistory.created_at >= start_date,
NotificationHistory.created_at < end_date
NotificationHistory.created_at.between(start_date, end_date)
).group_by(
month,
@@ -273,8 +272,7 @@ def dao_fetch_monthly_historical_stats_for_service(service_id, year):
func.count(NotificationHistory.id).label('count')
).filter(
NotificationHistory.service_id == service_id,
NotificationHistory.created_at >= start_date,
NotificationHistory.created_at < end_date
NotificationHistory.created_at.between(start_date, end_date)
).group_by(
NotificationHistory.notification_type,
NotificationHistory.status,