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

remove letters from TEMPLATE_TYPES

Browse Source
This commit is contained in:
stvnrlly
2023-02-27 15:34:43 -05:00
parent f55b7bf931
commit fe24af7342
24 changed files with 380 additions and 648 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
app/dao/fact_billing_dao.py
View File

@@ -863,16 +863,16 @@ def fetch_daily_volumes_for_platform(start_date, end_date):
(FactBilling.notification_type == EMAIL_TYPE, FactBilling.notifications_sent)
], else_=0
)).label('email_totals'),
func.sum(case(
[
(FactBilling.notification_type == LETTER_TYPE, FactBilling.notifications_sent)
], else_=0
)).label('letter_totals'),
func.sum(case(
[
(FactBilling.notification_type == LETTER_TYPE, FactBilling.billable_units)
], else_=0
)).label('letter_sheet_totals')
# func.sum(case(
# [
# (FactBilling.notification_type == LETTER_TYPE, FactBilling.notifications_sent)
# ], else_=0
# )).label('letter_totals'),
# func.sum(case(
# [
# (FactBilling.notification_type == LETTER_TYPE, FactBilling.billable_units)
# ], else_=0
# )).label('letter_sheet_totals')
).filter(
FactBilling.local_date >= start_date,
FactBilling.local_date <= end_date
@@ -888,8 +888,8 @@ def fetch_daily_volumes_for_platform(start_date, end_date):
func.sum(
daily_volume_stats.c.sms_fragments_times_multiplier).label('sms_chargeable_units'),
func.sum(daily_volume_stats.c.email_totals).label('email_totals'),
func.sum(daily_volume_stats.c.letter_totals).label('letter_totals'),
func.sum(daily_volume_stats.c.letter_sheet_totals).label('letter_sheet_totals')
# func.sum(daily_volume_stats.c.letter_totals).label('letter_totals'),
# func.sum(daily_volume_stats.c.letter_sheet_totals).label('letter_sheet_totals')
).group_by(
daily_volume_stats.c.local_date
).order_by(

5
app/dao/fact_notification_status_dao.py
View File

@@ -419,11 +419,6 @@ def get_total_notifications_for_date_range(start_date, end_date):
(FactNotificationStatus.notification_type == 'sms', FactNotificationStatus.notification_count)
],
else_=0)).label('sms'),
func.sum(case(
[
(FactNotificationStatus.notification_type == 'letter', FactNotificationStatus.notification_count)
],
else_=0)).label('letters'),
).filter(
FactNotificationStatus.key_type != KEY_TYPE_TEST,
).group_by(