From cdbf34eddb3718d805cd120dcd0287fef2de7703 Mon Sep 17 00:00:00 2001 From: Rebecca Law Date: Tue, 19 Dec 2017 13:50:21 +0000 Subject: [PATCH] Change order of query --- app/dao/notification_usage_dao.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/dao/notification_usage_dao.py b/app/dao/notification_usage_dao.py index 387c5b2b0..1bb327af8 100644 --- a/app/dao/notification_usage_dao.py +++ b/app/dao/notification_usage_dao.py @@ -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 > NotificationHistory.created_at)) ).filter( - *billing_data_filter(LETTER_TYPE, start_date, end_date, service_id), LetterRate.sheet_count == NotificationHistory.billable_units, LetterRate.crown == crown, 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( NotificationHistory.notification_type, month,