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

Merge pull request #3542 from alphagov/optimise-historic-billing-query-182116071

Browse Source 
Optimise billing query for notification history
This commit is contained in:
Ben Thorner
2022-05-18 10:27:43 +01:00
committed by GitHub
parent 1d4512e34b 4a520bce78
commit 7e536d1c2b
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/dao/fact_billing_dao.py
View File

@@ -15,7 +15,8 @@ from app.dao.organisation_dao import dao_get_organisation_live_services
from app.models import ( from app.models import (
EMAIL_TYPE, EMAIL_TYPE,
INTERNATIONAL_POSTAGE_TYPES, INTERNATIONAL_POSTAGE_TYPES,
KEY_TYPE_TEST, KEY_TYPE_NORMAL,
KEY_TYPE_TEAM,
LETTER_TYPE, LETTER_TYPE,
NOTIFICATION_STATUS_TYPES_BILLABLE_FOR_LETTERS, NOTIFICATION_STATUS_TYPES_BILLABLE_FOR_LETTERS,
NOTIFICATION_STATUS_TYPES_BILLABLE_SMS, NOTIFICATION_STATUS_TYPES_BILLABLE_SMS,
@@ -483,7 +484,7 @@ def _query_for_billing_data(table, notification_type, start_date, end_date, serv
func.count().label('notifications_sent'), func.count().label('notifications_sent'),
).filter( ).filter(
table.status.in_(NOTIFICATION_STATUS_TYPES_SENT_EMAILS), table.status.in_(NOTIFICATION_STATUS_TYPES_SENT_EMAILS),
table.key_type != KEY_TYPE_TEST, table.key_type.in_((KEY_TYPE_NORMAL, KEY_TYPE_TEAM)),
table.created_at >= start_date, table.created_at >= start_date,
table.created_at < end_date, table.created_at < end_date,
table.notification_type == notification_type, table.notification_type == notification_type,
@@ -510,7 +511,7 @@ def _query_for_billing_data(table, notification_type, start_date, end_date, serv
func.count().label('notifications_sent'), func.count().label('notifications_sent'),
).filter( ).filter(
table.status.in_(NOTIFICATION_STATUS_TYPES_BILLABLE_SMS), table.status.in_(NOTIFICATION_STATUS_TYPES_BILLABLE_SMS),
table.key_type != KEY_TYPE_TEST, table.key_type.in_((KEY_TYPE_NORMAL, KEY_TYPE_TEAM)),
table.created_at >= start_date, table.created_at >= start_date,
table.created_at < end_date, table.created_at < end_date,
table.notification_type == notification_type, table.notification_type == notification_type,
@@ -539,7 +540,7 @@ def _query_for_billing_data(table, notification_type, start_date, end_date, serv
func.count().label('notifications_sent'), func.count().label('notifications_sent'),
).filter( ).filter(
table.status.in_(NOTIFICATION_STATUS_TYPES_BILLABLE_FOR_LETTERS), table.status.in_(NOTIFICATION_STATUS_TYPES_BILLABLE_FOR_LETTERS),
table.key_type != KEY_TYPE_TEST, table.key_type.in_((KEY_TYPE_NORMAL, KEY_TYPE_TEAM)),
table.created_at >= start_date, table.created_at >= start_date,
table.created_at < end_date, table.created_at < end_date,
table.notification_type == notification_type, table.notification_type == notification_type,