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

code style changed

Browse Source
This commit is contained in:
venusbb
2017-09-15 15:00:13 +01:00
parent 478858a1b3
commit 13c78d9b9d
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/dao/services_dao.py
View File

@@ -367,7 +367,8 @@ def dao_fetch_todays_stats_for_all_services(include_from_test_key=True, trial_mo
Notification.status, Notification.status,
Notification.service_id, Notification.service_id,
func.count(Notification.id).label('count') func.count(Notification.id).label('count')
).join(Service ).join(
Service
).filter( ).filter(
func.date(Notification.created_at) == date.today(), func.date(Notification.created_at) == date.today(),
Service.restricted == trial_mode_services Service.restricted == trial_mode_services

8
app/service/rest.py
View File

@@ -94,8 +94,9 @@ def get_services():
services = dao_fetch_all_services_by_user(user_id, only_active) services = dao_fetch_all_services_by_user(user_id, only_active)
elif detailed: elif detailed:
result = jsonify(data=get_detailed_services(start_date=start_date, end_date=end_date, result = jsonify(data=get_detailed_services(start_date=start_date, end_date=end_date,
only_active=only_active, include_from_test_key=include_from_test_key, only_active=only_active,
trial_mode_services = trial_mode_services include_from_test_key=include_from_test_key,
trial_mode_services=trial_mode_services
)) ))
return result return result
else: else:
@@ -361,7 +362,8 @@ def get_detailed_services(start_date, end_date, only_active=False, include_from_
trial_mode_services=True): trial_mode_services=True):
services = {service.id: service for service in dao_fetch_all_services(only_active)} services = {service.id: service for service in dao_fetch_all_services(only_active)}
if start_date == datetime.utcnow().date(): if start_date == datetime.utcnow().date():
stats = dao_fetch_todays_stats_for_all_services(include_from_test_key=include_from_test_key, trial_mode_services=trial_mode_services) stats = dao_fetch_todays_stats_for_all_services(include_from_test_key=include_from_test_key,
trial_mode_services=trial_mode_services)
else: else:
stats = fetch_stats_by_date_range_for_all_services(start_date=start_date, stats = fetch_stats_by_date_range_for_all_services(start_date=start_date,