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

merge from main

Browse Source
This commit is contained in:
Kenneth Kehl
2023-06-19 07:56:10 -07:00
parent a46bd94650 59f4574af8
commit 37e790f19f
20 changed files with 138 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/service/rest.py
View File

@@ -16,7 +16,7 @@ from app.dao.api_key_dao import (
save_model_api_key,
)
from app.dao.dao_utils import dao_rollback, transaction
from app.dao.date_util import get_financial_year
from app.dao.date_util import get_calendar_year
from app.dao.fact_notification_status_dao import (
fetch_monthly_template_usage_for_service,
fetch_notification_status_for_service_by_month,
@@ -488,7 +488,7 @@ def get_monthly_notification_stats(service_id):
except ValueError:
raise InvalidRequest('Year must be a number', status_code=400)
start_date, end_date = get_financial_year(year)
start_date, end_date = get_calendar_year(year)
data = statistics.create_empty_monthly_notification_status_stats_dict(year)
@@ -629,7 +629,7 @@ def resume_service(service_id):
@service_blueprint.route('/<uuid:service_id>/notifications/templates_usage/monthly', methods=['GET'])
def get_monthly_template_usage(service_id):
try:
start_date, end_date = get_financial_year(int(request.args.get('year', 'NaN')))
start_date, end_date = get_calendar_year(int(request.args.get('year', 'NaN')))
data = fetch_monthly_template_usage_for_service(
start_date=start_date,
end_date=end_date,