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

Fix issue where monthly billing data was not being updated:

Browse Source
This commit is contained in:
Imdad Ahad
2017-07-31 17:47:53 +01:00
parent 20f3be0bae
commit d01d875f7e
2 changed files with 77 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
app/dao/monthly_billing_dao.py
View File

@@ -25,20 +25,33 @@ def create_or_update_monthly_billing_sms(service_id, billing_month):
monthly = get_billing_data_for_month(service_id=service_id, start_date=start_date, end_date=end_date)
# update monthly
monthly_totals = _monthly_billing_data_to_json(monthly)
row = MonthlyBilling.query.filter_by(start_date=start_date,
notification_type='sms').first()
row = get_monthly_billing_entry(service_id, start_date, SMS_TYPE)
if row:
row.monthly_totals = monthly_totals
row.updated_at = datetime.utcnow()
else:
row = MonthlyBilling(service_id=service_id,
notification_type=SMS_TYPE,
monthly_totals=monthly_totals,
start_date=start_date,
end_date=end_date)
row = MonthlyBilling(
service_id=service_id,
notification_type=SMS_TYPE,
monthly_totals=monthly_totals,
start_date=start_date,
end_date=end_date
)
db.session.add(row)
def get_monthly_billing_entry(service_id, start_date, notification_type):
entry = MonthlyBilling.query.filter_by(
service_id=service_id,
start_date=start_date,
notification_type=notification_type
).first()
return entry
@statsd(namespace="dao")
def get_monthly_billing_sms(service_id, billing_month):
start_date, end_date = get_month_start_end_date(billing_month)