darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2026-04-11 20:59:39 -04:00
Code Issues Packages Projects Releases Wiki Activity

Move the casting the column as an int to the the endpoint, we need to

Browse Source 
convert the Decimal data type to datatype json can work with.
This commit is contained in:
Rebecca Law
2022-03-09 11:55:47 +00:00
parent 466b7fa341
commit 29ebf0eb9a
2 changed files with 26 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
app/dao/fact_billing_dao.py
View File

@@ -2,7 +2,7 @@ from datetime import date, datetime, timedelta
from flask import current_app
from notifications_utils.timezones import convert_utc_to_bst
from sqlalchemy import Date, Integer, Numeric, and_, desc, func
from sqlalchemy import Date, Integer, and_, desc, func
from sqlalchemy.dialects.postgresql import insert
from sqlalchemy.sql.expression import case, literal
@@ -763,13 +763,13 @@ def fetch_daily_volumes_for_platform(start_date, end_date):
aggregated_totals = db.session.query(
daily_volume_stats.c.bst_date.cast(db.Text).label('bst_date'),
func.sum(daily_volume_stats.c.sms_totals).cast(Integer).label('sms_totals'),
func.sum(daily_volume_stats.c.sms_fragment_totals).cast(Integer).label('sms_fragment_totals'),
func.sum(daily_volume_stats.c.sms_totals).label('sms_totals'),
func.sum(daily_volume_stats.c.sms_fragment_totals).label('sms_fragment_totals'),
func.sum(
daily_volume_stats.c.sms_fragments_times_multiplier).cast(Integer).label('sms_chargeable_units'),
func.sum(daily_volume_stats.c.email_totals).cast(Integer).label('email_totals'),
func.sum(daily_volume_stats.c.letter_totals).cast(Integer).label('letter_totals'),
func.sum(daily_volume_stats.c.letter_sheet_totals).cast(Integer).label('letter_sheet_totals')
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')
).group_by(
daily_volume_stats.c.bst_date
).order_by(
@@ -832,14 +832,14 @@ def fetch_volumes_by_service(start_date, end_date):
Service.id.label("service_id"),
Service.organisation_id.label("organisation_id"),
Organisation.name.label("organisation_name"),
annual_billing.c.free_sms_fragment_limit.cast(Integer).label("free_allowance"),
func.coalesce(func.sum(volume_stats.c.sms_totals), 0).cast(Integer).label("sms_notifications"),
annual_billing.c.free_sms_fragment_limit.label("free_allowance"),
func.coalesce(func.sum(volume_stats.c.sms_totals), 0).label("sms_notifications"),
func.coalesce(func.sum(volume_stats.c.sms_fragments_times_multiplier), 0
).cast(Integer).label("sms_chargeable_units"),
func.coalesce(func.sum(volume_stats.c.email_totals), 0).cast(Integer).label("email_totals"),
func.coalesce(func.sum(volume_stats.c.letter_totals), 0).cast(Integer).label("letter_totals"),
func.coalesce(func.sum(volume_stats.c.letter_cost), 0).cast(Numeric).label("letter_cost"),
func.coalesce(func.sum(volume_stats.c.letter_sheet_totals), 0).cast(Integer).label("letter_sheet_totals")
).label("sms_chargeable_units"),
func.coalesce(func.sum(volume_stats.c.email_totals), 0).label("email_totals"),
func.coalesce(func.sum(volume_stats.c.letter_totals), 0).label("letter_totals"),
func.coalesce(func.sum(volume_stats.c.letter_cost), 0).label("letter_cost"),
func.coalesce(func.sum(volume_stats.c.letter_sheet_totals), 0).label("letter_sheet_totals")
).select_from(
Service
).outerjoin(

24
app/platform_stats/rest.py
View File

@@ -151,12 +151,12 @@ def daily_volumes_report():
for row in daily_volumes:
report.append({
"day": row.bst_date,
"sms_totals": row.sms_totals,
"sms_fragment_totals": row.sms_fragment_totals,
"sms_chargeable_units": row.sms_chargeable_units,
"email_totals": row.email_totals,
"letter_totals": row.letter_totals,
"letter_sheet_totals": row.letter_sheet_totals
"sms_totals": int(row.sms_totals),
"sms_fragment_totals": int(row.sms_fragment_totals),
"sms_chargeable_units": int(row.sms_chargeable_units),
"email_totals": int(row.email_totals),
"letter_totals": int(row.letter_totals),
"letter_sheet_totals": int(row.letter_sheet_totals)
})
return jsonify(report)
@@ -175,12 +175,12 @@ def volumes_by_service_report():
"service_id": str(row.service_id),
"organisation_name": row.organisation_name if row.organisation_name else '',
"organisation_id": str(row.organisation_id) if row.organisation_id else '',
"free_allowance": row.free_allowance,
"sms_notifications": row.sms_notifications,
"sms_chargeable_units": row.sms_chargeable_units,
"email_totals": row.email_totals,
"letter_totals": row.letter_totals,
"letter_sheet_totals": row.letter_sheet_totals,
"free_allowance": int(row.free_allowance),
"sms_notifications": int(row.sms_notifications),
"sms_chargeable_units": int(row.sms_chargeable_units),
"email_totals": int(row.email_totals),
"letter_totals": int(row.letter_totals),
"letter_sheet_totals": int(row.letter_sheet_totals),
"letter_cost": float(row.letter_cost),
})