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

Use old monthly_billing-related routes for new functions

Browse Source
This commit is contained in:
Pea Tyczynska
2018-07-27 14:41:53 +01:00
parent 4e49df2479
commit b28ec8beda
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/billing/rest.py
View File

@@ -33,6 +33,7 @@ register_errors(billing_blueprint)
@billing_blueprint.route('/ft-monthly-usage') @billing_blueprint.route('/ft-monthly-usage')
@billing_blueprint.route('/monthly-usage')
def get_yearly_usage_by_monthly_from_ft_billing(service_id): def get_yearly_usage_by_monthly_from_ft_billing(service_id):
try: try:
year = int(request.args.get('year')) year = int(request.args.get('year'))
@@ -44,6 +45,7 @@ def get_yearly_usage_by_monthly_from_ft_billing(service_id):
@billing_blueprint.route('/ft-yearly-usage-summary') @billing_blueprint.route('/ft-yearly-usage-summary')
@billing_blueprint.route('/yearly-usage-summary')
def get_yearly_billing_usage_summary_from_ft_billing(service_id): def get_yearly_billing_usage_summary_from_ft_billing(service_id):
try: try:
year = int(request.args.get('year')) year = int(request.args.get('year'))

8
app/commands.py
View File

@@ -17,11 +17,11 @@ from app.celery.scheduled_tasks import send_total_sent_notifications_to_performa
from app.celery.service_callback_tasks import send_delivery_status_to_service from app.celery.service_callback_tasks import send_delivery_status_to_service
from app.celery.letters_pdf_tasks import create_letters_pdf from app.celery.letters_pdf_tasks import create_letters_pdf
from app.config import QueueNames from app.config import QueueNames
from app.dao.date_util import get_financial_year
from app.dao.fact_billing_dao import ( from app.dao.fact_billing_dao import (
delete_billing_data_for_service_for_day,
fetch_billing_data_for_day, fetch_billing_data_for_day,
get_service_ids_that_need_billing_populated,
update_fact_billing, update_fact_billing,
delete_billing_data_for_service_for_day
) )
from app.dao.provider_rates_dao import create_provider_rates as dao_create_provider_rates from app.dao.provider_rates_dao import create_provider_rates as dao_create_provider_rates
@@ -31,9 +31,9 @@ from app.dao.services_dao import (
dao_fetch_all_services_by_user, dao_fetch_all_services_by_user,
dao_fetch_service_by_id dao_fetch_service_by_id
) )
from app.dao.users_dao import (delete_model_user, delete_user_verify_codes) from app.dao.users_dao import delete_model_user, delete_user_verify_codes
from app.models import PROVIDERS, User, Notification from app.models import PROVIDERS, User, Notification
from app.performance_platform.processing_time import (send_processing_time_for_start_and_end) from app.performance_platform.processing_time import send_processing_time_for_start_and_end
from app.utils import ( from app.utils import (
cache_key_for_service_template_usage_per_day, cache_key_for_service_template_usage_per_day,
get_london_midnight_in_utc, get_london_midnight_in_utc,