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

Changed notifications stats day column to date type from string.

Browse Source
This commit is contained in:
Adam Shimali
2016-04-20 15:38:06 +01:00
parent 794e922d94
commit 054d8baa0a
4 changed files with 67 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
app/dao/notifications_dao.py
View File

@@ -1,8 +1,5 @@
import math
from sqlalchemy import (
desc,
func
)
from sqlalchemy import desc
from datetime import (
datetime,
@@ -59,7 +56,7 @@ def dao_get_notification_statistics_for_service_and_previous_days(service_id, li
service_id=service_id
).filter(
NotificationStatistics.day.in_((
(date.today() - timedelta(days=days_ago)).strftime('%Y-%m-%d')
(date.today() - timedelta(days=days_ago))
for days_ago in range(0, limit_days + 1)
))
).order_by(
@@ -87,13 +84,13 @@ def dao_create_notification(notification, notification_type):
})
update_count = db.session.query(NotificationStatistics).filter_by(
day=notification.created_at.strftime('%Y-%m-%d'),
day=notification.created_at.date(),
service_id=notification.service_id
).update(update_query(notification_type, 'requested'))
if update_count == 0:
stats = NotificationStatistics(
day=notification.created_at.strftime('%Y-%m-%d'),
day=notification.created_at.date(),
service_id=notification.service_id,
sms_requested=1 if notification_type == TEMPLATE_TYPE_SMS else 0,
emails_requested=1 if notification_type == TEMPLATE_TYPE_EMAIL else 0
@@ -149,7 +146,7 @@ def update_notification_status_by_id(notification_id, status, notification_stati
notification = Notification.query.get(notification_id)
db.session.query(NotificationStatistics).filter_by(
day=notification.created_at.strftime('%Y-%m-%d'),
day=notification.created_at.date(),
service_id=notification.service_id
).update(
update_query(notification.template.template_type, notification_statistics_status)
@@ -172,7 +169,7 @@ def update_notification_status_by_reference(reference, status, notification_stat
).first()
db.session.query(NotificationStatistics).filter_by(
day=notification.created_at.strftime('%Y-%m-%d'),
day=notification.created_at.date(),
service_id=notification.service_id
).update(
update_query(notification.template.template_type, notification_statistics_status)

2
app/models.py
View File

@@ -121,7 +121,7 @@ class NotificationStatistics(db.Model):
__tablename__ = 'notification_statistics'
id = db.Column(UUID(as_uuid=True), primary_key=True, default=uuid.uuid4)
day = db.Column(db.String(255), nullable=False)
day = db.Column(db.Date, index=True, nullable=False, unique=False, default=datetime.date.today)
service_id = db.Column(UUID(as_uuid=True), db.ForeignKey('services.id'), index=True, nullable=False)
service = db.relationship('Service', backref=db.backref('service_notification_stats', lazy='dynamic'))
emails_requested = db.Column(db.BigInteger, index=False, unique=False, nullable=False, default=0)