From b88b0499b921871d6e85d0c0a0003ff9219f304e Mon Sep 17 00:00:00 2001
From: Martyn Inglis <martyn.inglis@digital.cabinet-office.gov.uk>
Date: Mon, 14 Mar 2016 16:31:57 +0000
Subject: [PATCH] Order jobs on dashboard page

---
 app/models.py                  | 14 +++++++-------
 tests/app/conftest.py          |  7 +++++--
 tests/app/dao/test_jobs_dao.py |  9 +++++----
 3 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/app/models.py b/app/models.py
index 8184a08ba..0f28d2452 100644
--- a/app/models.py
+++ b/app/models.py
@@ -150,7 +150,7 @@ class Template(db.Model):
         index=False,
         unique=False,
         nullable=True,
-        onupdate=datetime.datetime.now)
+        onupdate=datetime.datetime.utcnow())
     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 = db.relationship('Service', backref=db.backref('templates', lazy='dynamic'))
@@ -176,13 +176,13 @@ class Job(db.Model):
         index=False,
         unique=False,
         nullable=False,
-        default=datetime.datetime.now)
+        default=datetime.datetime.utcnow())
     updated_at = db.Column(
         db.DateTime,
         index=False,
         unique=False,
         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')
     notification_count = db.Column(db.Integer, nullable=False)
     notifications_sent = db.Column(db.Integer, nullable=False, default=0)
@@ -217,7 +217,7 @@ class VerifyCode(db.Model):
         index=False,
         unique=False,
         nullable=False,
-        default=datetime.datetime.now)
+        default=datetime.datetime.utcnow())
 
     @property
     def code(self):
@@ -262,7 +262,7 @@ class Notification(db.Model):
         index=False,
         unique=False,
         nullable=True,
-        onupdate=datetime.datetime.now)
+        onupdate=datetime.datetime.utcnow())
     status = db.Column(
         db.Enum(*NOTIFICATION_STATUS_TYPES, name='notification_status_types'), nullable=False, default='sent')
     reference = db.Column(db.String, nullable=True, index=True)
@@ -286,7 +286,7 @@ class InvitedUser(db.Model):
         index=False,
         unique=False,
         nullable=False,
-        default=datetime.datetime.now)
+        default=datetime.datetime.utcnow())
     status = db.Column(
         db.Enum(*INVITED_USER_STATUS_TYPES, name='invited_users_status_types'), nullable=False, default='pending')
     permissions = db.Column(db.String, nullable=False)
@@ -338,7 +338,7 @@ class Permission(db.Model):
         index=False,
         unique=False,
         nullable=False,
-        default=datetime.datetime.now)
+        default=datetime.datetime.utcnow())
 
     __table_args__ = (
         UniqueConstraint('service_id', 'user_id', 'permission', name='uix_service_user_permission'),
diff --git a/tests/app/conftest.py b/tests/app/conftest.py
index 37dc69d41..e954d6cb0 100644
--- a/tests/app/conftest.py
+++ b/tests/app/conftest.py
@@ -199,7 +199,8 @@ def sample_job(notify_db,
                notify_db_session,
                service=None,
                template=None,
-               notification_count=1):
+               notification_count=1,
+               created_at=datetime.utcnow()):
     if service is None:
         service = sample_service(notify_db, notify_db_session)
     if template is None:
@@ -215,10 +216,12 @@ def sample_job(notify_db,
         'bucket_name': bucket_name,
         'file_name': file_name,
         'original_file_name': 'some.csv',
-        'notification_count': notification_count
+        'notification_count': notification_count,
+        'created_at': created_at
     }
     job = Job(**data)
     dao_create_job(job)
+    print(job.created_at)
     return job
 
 
diff --git a/tests/app/dao/test_jobs_dao.py b/tests/app/dao/test_jobs_dao.py
index 2c1d64f03..36f6f36e4 100644
--- a/tests/app/dao/test_jobs_dao.py
+++ b/tests/app/dao/test_jobs_dao.py
@@ -1,3 +1,4 @@
+from datetime import datetime
 import uuid
 
 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):
     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_2 = 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)
-    job_4 = 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, created_at=datetime.utcnow())
+    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, created_at=datetime.utcnow())
 
     jobs = dao_get_jobs_by_service_id(sample_template.service.id)