darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2025-12-16 10:12:32 -05:00
Code Issues Packages Projects Releases Wiki Activity

revert scalars

Browse Source
This commit is contained in:
Kenneth Kehl
2024-10-15 10:29:15 -07:00
parent f52026204e
commit 579d856efb
1 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/dao/fact_billing_dao.py
View File

@@ -471,8 +471,9 @@ def get_rates_for_billing():
def get_service_ids_that_need_billing_populated(start_date, end_date): def get_service_ids_that_need_billing_populated(start_date, end_date):
return ( stmt = (
db.session.query(NotificationHistory.service_id) select(NotificationHistory.service_id)
.select_from(NotificationHistory)
.filter( .filter(
NotificationHistory.created_at >= start_date, NotificationHistory.created_at >= start_date,
NotificationHistory.created_at <= end_date, NotificationHistory.created_at <= end_date,
@@ -482,14 +483,11 @@ def get_service_ids_that_need_billing_populated(start_date, end_date):
NotificationHistory.billable_units != 0, NotificationHistory.billable_units != 0,
) )
.distinct() .distinct()
.all()
) )
return db.session.execute(stmt).all()
def get_rate(rates, notification_type, date): def get_rate(rates, notification_type, date):
print(
f"ENTER get_rate with rates {rates} and notification_type {notification_type}"
)
start_of_day = get_midnight_in_utc(date) start_of_day = get_midnight_in_utc(date)
if notification_type == NotificationType.SMS: if notification_type == NotificationType.SMS:
@@ -560,7 +558,7 @@ def create_billing_record(data, rate, process_day):
def fetch_email_usage_for_organization(organization_id, start_date, end_date): def fetch_email_usage_for_organization(organization_id, start_date, end_date):
query = ( query = (
db.session.query( select(
Service.name.label("service_name"), Service.name.label("service_name"),
Service.id.label("service_id"), Service.id.label("service_id"),
func.sum(FactBilling.notifications_sent).label("emails_sent"), func.sum(FactBilling.notifications_sent).label("emails_sent"),
@@ -583,7 +581,7 @@ def fetch_email_usage_for_organization(organization_id, start_date, end_date):
) )
.order_by(Service.name) .order_by(Service.name)
) )
return query.all() return db.session.execute(query).all()
def fetch_sms_billing_for_organization(organization_id, financial_year): def fetch_sms_billing_for_organization(organization_id, financial_year):