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

Pass the utcnow function, rather than the result of executing the function.

Browse Source
This commit is contained in:
Rebecca Law
2016-03-15 09:32:43 +00:00
parent c2b2ce3878
commit 2caea40212
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
app/models.py
View File

@@ -144,13 +144,13 @@ class Template(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.utcnow()) 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.utcnow()) 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.utcnow()) 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.utcnow()) 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.utcnow()) 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.utcnow()) 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.utcnow()) 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'),