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

Order jobs on dashboard page

Browse Source
This commit is contained in:
Martyn Inglis
2016-03-14 16:31:57 +00:00
parent beb6f7ca57
commit b88b0499b9
3 changed files with 17 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/models.py
View File

@@ -150,7 +150,7 @@ class Template(db.Model):
index=False, index=False,
unique=False, unique=False,
nullable=True, nullable=True,
onupdate=datetime.datetime.now) onupdate=datetime.datetime.utcnow())
content = db.Column(db.Text, index=False, unique=False, nullable=False) content = db.Column(db.Text, index=False, unique=False, nullable=False)
service_id = db.Column(UUID(as_uuid=True), db.ForeignKey('services.id'), index=True, unique=False, nullable=False) service_id = db.Column(UUID(as_uuid=True), db.ForeignKey('services.id'), index=True, unique=False, nullable=False)
service = db.relationship('Service', backref=db.backref('templates', lazy='dynamic')) service = db.relationship('Service', backref=db.backref('templates', lazy='dynamic'))
@@ -176,13 +176,13 @@ class Job(db.Model):
index=False, index=False,
unique=False, unique=False,
nullable=False, nullable=False,
default=datetime.datetime.now) default=datetime.datetime.utcnow())
updated_at = db.Column( updated_at = db.Column(
db.DateTime, db.DateTime,
index=False, index=False,
unique=False, unique=False,
nullable=True, nullable=True,
onupdate=datetime.datetime.now) onupdate=datetime.datetime.utcnow())
status = db.Column(db.Enum(*JOB_STATUS_TYPES, name='job_status_types'), nullable=False, default='pending') status = db.Column(db.Enum(*JOB_STATUS_TYPES, name='job_status_types'), nullable=False, default='pending')
notification_count = db.Column(db.Integer, nullable=False) notification_count = db.Column(db.Integer, nullable=False)
notifications_sent = db.Column(db.Integer, nullable=False, default=0) notifications_sent = db.Column(db.Integer, nullable=False, default=0)
@@ -217,7 +217,7 @@ class VerifyCode(db.Model):
index=False, index=False,
unique=False, unique=False,
nullable=False, nullable=False,
default=datetime.datetime.now) default=datetime.datetime.utcnow())
@property @property
def code(self): def code(self):
@@ -262,7 +262,7 @@ class Notification(db.Model):
index=False, index=False,
unique=False, unique=False,
nullable=True, nullable=True,
onupdate=datetime.datetime.now) onupdate=datetime.datetime.utcnow())
status = db.Column( status = db.Column(
db.Enum(*NOTIFICATION_STATUS_TYPES, name='notification_status_types'), nullable=False, default='sent') db.Enum(*NOTIFICATION_STATUS_TYPES, name='notification_status_types'), nullable=False, default='sent')
reference = db.Column(db.String, nullable=True, index=True) reference = db.Column(db.String, nullable=True, index=True)
@@ -286,7 +286,7 @@ class InvitedUser(db.Model):
index=False, index=False,
unique=False, unique=False,
nullable=False, nullable=False,
default=datetime.datetime.now) default=datetime.datetime.utcnow())
status = db.Column( status = db.Column(
db.Enum(*INVITED_USER_STATUS_TYPES, name='invited_users_status_types'), nullable=False, default='pending') db.Enum(*INVITED_USER_STATUS_TYPES, name='invited_users_status_types'), nullable=False, default='pending')
permissions = db.Column(db.String, nullable=False) permissions = db.Column(db.String, nullable=False)
@@ -338,7 +338,7 @@ class Permission(db.Model):
index=False, index=False,
unique=False, unique=False,
nullable=False, nullable=False,
default=datetime.datetime.now) default=datetime.datetime.utcnow())
__table_args__ = ( __table_args__ = (
UniqueConstraint('service_id', 'user_id', 'permission', name='uix_service_user_permission'), UniqueConstraint('service_id', 'user_id', 'permission', name='uix_service_user_permission'),

7
tests/app/conftest.py
View File

@@ -199,7 +199,8 @@ def sample_job(notify_db,
notify_db_session, notify_db_session,
service=None, service=None,
template=None, template=None,
notification_count=1): notification_count=1,
created_at=datetime.utcnow()):
if service is None: if service is None:
service = sample_service(notify_db, notify_db_session) service = sample_service(notify_db, notify_db_session)
if template is None: if template is None:
@@ -215,10 +216,12 @@ def sample_job(notify_db,
'bucket_name': bucket_name, 'bucket_name': bucket_name,
'file_name': file_name, 'file_name': file_name,
'original_file_name': 'some.csv', 'original_file_name': 'some.csv',
'notification_count': notification_count 'notification_count': notification_count,
'created_at': created_at
} }
job = Job(**data) job = Job(**data)
dao_create_job(job) dao_create_job(job)
print(job.created_at)
return job return job

9
tests/app/dao/test_jobs_dao.py
View File

@@ -1,3 +1,4 @@
from datetime import datetime
import uuid import uuid
from app.dao.jobs_dao import ( from app.dao.jobs_dao import (
@@ -67,10 +68,10 @@ def test_get_jobs_for_service(notify_db, notify_db_session, sample_template):
def test_get_jobs_for_service_in_created_at_order(notify_db, notify_db_session, sample_template): def test_get_jobs_for_service_in_created_at_order(notify_db, notify_db_session, sample_template):
from tests.app.conftest import sample_job as create_job from tests.app.conftest import sample_job as create_job
job_1 = create_job(notify_db, notify_db_session, sample_template.service, sample_template) job_1 = create_job(notify_db, notify_db_session, sample_template.service, sample_template, created_at=datetime.utcnow())
job_2 = create_job(notify_db, notify_db_session, sample_template.service, sample_template) job_2 = create_job(notify_db, notify_db_session, sample_template.service, sample_template, created_at=datetime.utcnow())
job_3 = create_job(notify_db, notify_db_session, sample_template.service, sample_template) job_3 = create_job(notify_db, notify_db_session, sample_template.service, sample_template, created_at=datetime.utcnow())
job_4 = create_job(notify_db, notify_db_session, sample_template.service, sample_template) job_4 = create_job(notify_db, notify_db_session, sample_template.service, sample_template, created_at=datetime.utcnow())
jobs = dao_get_jobs_by_service_id(sample_template.service.id) jobs = dao_get_jobs_by_service_id(sample_template.service.id)