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 pull request #268 from alphagov/align-statistics

Browse Source 
Align date range for template + notification stats
This commit is contained in:
Chris Hill-Scott
2016-04-27 11:54:51 +01:00
parent c2d3e021cc d7f6bb9976
commit deb8889e8e
4 changed files with 24 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
app/dao/notifications_dao.py
View File

@@ -39,10 +39,15 @@ def get_sms_message_count(char_count):
return 1 if char_count <= 160 else math.ceil(float(char_count) / 153)
def dao_get_notification_statistics_for_service(service_id):
return NotificationStatistics.query.filter_by(
service_id=service_id
).order_by(desc(NotificationStatistics.day)).all()
def dao_get_notification_statistics_for_service(service_id, limit_days=None):
filter = [NotificationStatistics.service_id == service_id]
if limit_days is not None:
filter.append(NotificationStatistics.day >= days_ago(limit_days))
return NotificationStatistics.query.filter(
*filter
).order_by(
desc(NotificationStatistics.day)
).all()
def dao_get_notification_statistics_for_service_and_day(service_id, day):
@@ -52,24 +57,10 @@ def dao_get_notification_statistics_for_service_and_day(service_id, day):
).order_by(desc(NotificationStatistics.day)).first()
def dao_get_notification_statistics_for_service_and_previous_days(service_id, limit_days):
return NotificationStatistics.query.filter_by(
service_id=service_id
).filter(
NotificationStatistics.day.in_((
(date.today() - timedelta(days=days_ago))
for days_ago in range(0, limit_days + 1)
))
).order_by(
desc(NotificationStatistics.day)
).all()
def dao_get_template_statistics_for_service(service_id, limit_days=None):
filter = [TemplateStatistics.service_id == service_id]
if limit_days:
last_date_to_fetch = date.today() - timedelta(days=limit_days)
filter.append(TemplateStatistics.day > last_date_to_fetch)
if limit_days is not None:
filter.append(TemplateStatistics.day >= days_ago(limit_days))
return TemplateStatistics.query.filter(*filter).order_by(
desc(TemplateStatistics.updated_at)).all()
@@ -264,3 +255,7 @@ def delete_notifications_created_more_than_a_week_ago(status):
).delete(synchronize_session='fetch')
db.session.commit()
return deleted
def days_ago(number_of_days):
return date.today() - timedelta(days=number_of_days)

7
app/notifications_statistics/rest.py
View File

@@ -4,10 +4,7 @@ from flask import (
request
)
from app.dao.notifications_dao import (
dao_get_notification_statistics_for_service,
dao_get_notification_statistics_for_service_and_previous_days
)
from app.dao.notifications_dao import dao_get_notification_statistics_for_service
from app.schemas import notifications_statistics_schema
notifications_statistics = Blueprint(
@@ -25,7 +22,7 @@ def get_all_notification_statistics_for_service(service_id):
if request.args.get('limit_days'):
try:
statistics = dao_get_notification_statistics_for_service_and_previous_days(
statistics = dao_get_notification_statistics_for_service(
service_id=service_id,
limit_days=int(request.args['limit_days'])
)