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

Merge branch 'master' into permanent-failure-firetext

Browse Source
This commit is contained in:
Rebecca Law
2016-05-27 12:10:59 +01:00
parent 885abcaf16 b563953626
commit 2bfa9b7e10
2 changed files with 37 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/dao/notifications_dao.py
View File

@@ -1,4 +1,4 @@
from sqlalchemy import (desc, func, Integer, or_, asc)
from sqlalchemy import (desc, func, Integer, or_, and_, asc)
from sqlalchemy.sql.expression import cast
from datetime import (
@@ -62,11 +62,13 @@ def dao_get_potential_notification_statistics_for_day(day):
Service.id,
NotificationStatistics
).outerjoin(
Service.service_notification_stats
).filter(
or_(
NotificationStatistics.day == day,
NotificationStatistics.day == None # noqa
NotificationStatistics,
and_(
Service.id == NotificationStatistics.service_id,
or_(
NotificationStatistics.day == day,
NotificationStatistics.day == None # noqa
)
)
).order_by(
asc(Service.created_at)