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

Updated sort order, endpoint defenition, and tests

Browse Source 
for REQUESTED attribute
This commit is contained in:
Anastasia Gradova
2024-06-06 22:11:24 -06:00
parent cd188180ca
commit 0082ba3dd0
3 changed files with 24 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/dao/services_dao.py
View File

@@ -27,8 +27,8 @@ from app.models import (
InvitedUser,
Job,
Notification,
NotificationHistory,
NotificationAllTimeView,
NotificationHistory,
Organization,
Permission,
Service,

25
app/service/rest.py
View File

@@ -243,20 +243,31 @@ def get_service_statistics_for_specific_days(service_id, start, days=1):
return stats
@service_blueprint.route("/<uuid:service_id>/statistics/user/<uuid:user_id>/<string:start>/<int:days>")
def get_service_notification_statistics_by_day_by_user(service_id, user_id, start, days):
@service_blueprint.route(
"/<uuid:service_id>/statistics/user/<uuid:user_id>/<string:start>/<int:days>"
)
def get_service_notification_statistics_by_day_by_user(
service_id, user_id, start, days
):
return jsonify(
data=get_service_statistics_for_specific_days_by_user(service_id, user_id, start, int(days))
data=get_service_statistics_for_specific_days_by_user(
service_id, user_id, start, int(days)
)
)
def get_service_statistics_for_specific_days_by_user(service_id, user_id, start, days=1):
def get_service_statistics_for_specific_days_by_user(
service_id, user_id, start, days=1
):
start_date = datetime.strptime(start, "%Y-%m-%d").date()
if days == 1:
stats = {}
stats[start] = statistics.format_statistics(
dao_fetch_stats_for_service_from_day_for_user(service_id, start_date, user_id)
dao_fetch_stats_for_service_from_day_for_user(
service_id, start_date, user_id
)
)
else:
stats = {}
@@ -264,7 +275,9 @@ def get_service_statistics_for_specific_days_by_user(service_id, user_id, start,
new_date = start_date - timedelta(days=d)
key = new_date.strftime("%Y-%m-%d")
stats[key] = statistics.format_statistics(
dao_fetch_stats_for_service_from_day_for_user(service_id, new_date, user_id)
dao_fetch_stats_for_service_from_day_for_user(
service_id, new_date, user_id
)
)
return stats