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

Merge branch 'master' into primary-provider

Browse Source 
Conflicts:
	tests/app/dao/test_provider_rates_dao.py
This commit is contained in:
Martyn Inglis
2016-05-11 14:04:15 +01:00
parent 42c42bfdc9 ba874cfd43
commit 09b3313ce3
15 changed files with 61 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/models.py
View File

@@ -81,13 +81,13 @@ class Service(db.Model, Versioned):
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)
active = db.Column(db.Boolean, index=False, unique=False, nullable=False)
message_limit = db.Column(db.BigInteger, index=False, unique=False, nullable=False)
users = db.relationship(
@@ -114,13 +114,13 @@ class ApiKey(db.Model, Versioned):
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)
created_by = db.relationship('User')
created_by_id = db.Column(UUID(as_uuid=True), db.ForeignKey('users.id'), index=True, nullable=False)