darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2026-08-14 23:07:49 -04:00
Code Issues Packages Projects Releases Wiki Activity

Change order of query

Browse Source
This commit is contained in:
Rebecca Law
2017-12-19 13:50:21 +00:00
parent e599db2684
commit cdbf34eddb
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/dao/notification_usage_dao.py
View File

@@ -162,11 +162,11 @@ def billing_letter_data_per_month_query(service_id, start_date, end_date):
(LetterRate.end_date == None) | # noqa (LetterRate.end_date == None) | # noqa
(LetterRate.end_date > NotificationHistory.created_at)) (LetterRate.end_date > NotificationHistory.created_at))
).filter( ).filter(
*billing_data_filter(LETTER_TYPE, start_date, end_date, service_id),
LetterRate.sheet_count == NotificationHistory.billable_units, LetterRate.sheet_count == NotificationHistory.billable_units,
LetterRate.crown == crown, LetterRate.crown == crown,
LetterRate.post_class == 'second', LetterRate.post_class == 'second',
NotificationHistory.created_at < end_date NotificationHistory.created_at < end_date,
*billing_data_filter(LETTER_TYPE, start_date, end_date, service_id)
).group_by( ).group_by(
NotificationHistory.notification_type, NotificationHistory.notification_type,
month, month,