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

Update name of method to clarify the meaning.

Browse Source 
Update group by to use label.
Update test.
This commit is contained in:
Rebecca Law
2018-04-25 17:00:19 +01:00
parent cff731c52d
commit 51af6b27a0
2 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/dao/fact_billing_dao.py
View File

@@ -20,7 +20,7 @@ from app.models import (
from app.utils import convert_utc_to_bst, convert_bst_to_utc
def fetch_annual_billing_for_year(service_id, year):
def fetch_montly_billing_for_year(service_id, year):
year_start_date, year_end_date = get_financial_year(year)
utcnow = datetime.utcnow()
today = convert_utc_to_bst(utcnow).date()
@@ -45,7 +45,7 @@ def fetch_annual_billing_for_year(service_id, year):
FactBilling.bst_date >= year_start_date,
FactBilling.bst_date <= year_end_date
).group_by(
extract('month', FactBilling.bst_date),
'Month',
FactBilling.service_id,
FactBilling.rate,
FactBilling.rate_multiplier,