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

Progress: Today stats completed

Browse Source
This commit is contained in:
venusbb
2017-09-22 11:05:36 +01:00
parent 9066e666db
commit d59a1f447a
3 changed files with 30 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/dao/services_dao.py
View File

@@ -2,7 +2,7 @@ import uuid
from datetime import date, datetime, timedelta
from sqlalchemy import asc, func
from sqlalchemy.orm import joinedload
from sqlalchemy.orm import joinedload, lazyload
from flask import current_app
from app import db
@@ -48,6 +48,9 @@ def dao_fetch_all_services(only_active=False):
joinedload('users')
)
# import pdb
# pdb.set_trace()
if only_active:
query = query.filter(Service.active)
@@ -358,7 +361,7 @@ def dao_fetch_monthly_historical_stats_for_service(service_id, year):
@statsd(namespace='dao')
def dao_fetch_todays_stats_for_all_services(include_from_test_key=True, trial_mode_services=True):
def dao_fetch_todays_stats_for_all_services(include_from_test_key=True, trial_mode_services=None):
# service_id = db.session.query(Service.id).filter(Service.restricted == True)
@@ -371,7 +374,7 @@ def dao_fetch_todays_stats_for_all_services(include_from_test_key=True, trial_mo
Service
).filter(
func.date(Notification.created_at) == date.today(),
Service.restricted == trial_mode_services
# Service.restricted == trial_mode_services
).group_by(
Notification.notification_type,
Notification.status,
@@ -383,6 +386,9 @@ def dao_fetch_todays_stats_for_all_services(include_from_test_key=True, trial_mo
if not include_from_test_key:
query = query.filter(Notification.key_type != KEY_TYPE_TEST)
if trial_mode_services is not None:
query = query.filter(Service.restricted == trial_mode_services)
return query.all()