From 9d57a11f243baf4d5622b8f4e502da1833038634 Mon Sep 17 00:00:00 2001 From: prateekj117 Date: Wed, 22 May 2019 13:13:49 +0530 Subject: [PATCH 1/3] Use SqlAlchemy Inbuild timestamp function --- app/models/user.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/models/user.py b/app/models/user.py index 7913db6a55..57c9701e3d 100644 --- a/app/models/user.py +++ b/app/models/user.py @@ -7,6 +7,7 @@ from flask_scrypt import generate_password_hash, generate_random_salt from sqlalchemy import event, desc from sqlalchemy.ext.hybrid import hybrid_property +from sqlalchemy.sql import func from sqlalchemy.orm.exc import MultipleResultsFound, NoResultFound from app.api.helpers.db import get_count @@ -77,7 +78,7 @@ class User(SoftDeletionModel): is_verified = db.Column(db.Boolean, default=False) was_registered_with_order = db.Column(db.Boolean, default=False) last_accessed_at = db.Column(db.DateTime(timezone=True)) - created_at = db.Column(db.DateTime(timezone=True), default=datetime.now(pytz.utc)) + created_at = db.Column(db.DateTime(timezone=True), default=func.now()) speaker = db.relationship('Speaker', backref="user") favourite_events = db.relationship('UserFavouriteEvent', backref="user") session = db.relationship('Session', backref="user") From e9ab2e8da6fed427628077ca70def459ad832af0 Mon Sep 17 00:00:00 2001 From: prateekj117 Date: Wed, 22 May 2019 15:08:40 +0530 Subject: [PATCH 2/3] Use SqlAlchemy Inbuild timestamp function in session models --- app/models/session.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/models/session.py b/app/models/session.py index 50e113957b..d1c7af632a 100644 --- a/app/models/session.py +++ b/app/models/session.py @@ -2,6 +2,7 @@ import pytz from sqlalchemy import event, func +from sqlalchemy.sql import func as dateandtime from app.models import db from app.models.base import SoftDeletionModel @@ -46,7 +47,7 @@ class Session(SoftDeletionModel): event_id = db.Column(db.Integer, db.ForeignKey('events.id', ondelete='CASCADE')) creator_id = db.Column(db.Integer, db.ForeignKey('users.id', ondelete='CASCADE')) state = db.Column(db.String, default="pending") - created_at = db.Column(db.DateTime(timezone=True), default=datetime.datetime.utcnow) + created_at = db.Column(db.DateTime(timezone=True), default=dateandtime.now()) submitted_at = db.Column(db.DateTime(timezone=True)) submission_modifier = db.Column(db.String) is_mail_sent = db.Column(db.Boolean, default=False) From 1c78cd87dbe49661558b6705fb2f3408578de2ef Mon Sep 17 00:00:00 2001 From: prateekj117 Date: Wed, 22 May 2019 16:14:53 +0530 Subject: [PATCH 3/3] Give proper name to sql.func package --- app/models/session.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/models/session.py b/app/models/session.py index d1c7af632a..37e1697589 100644 --- a/app/models/session.py +++ b/app/models/session.py @@ -2,7 +2,7 @@ import pytz from sqlalchemy import event, func -from sqlalchemy.sql import func as dateandtime +from sqlalchemy.sql import func as sql_func from app.models import db from app.models.base import SoftDeletionModel @@ -47,7 +47,7 @@ class Session(SoftDeletionModel): event_id = db.Column(db.Integer, db.ForeignKey('events.id', ondelete='CASCADE')) creator_id = db.Column(db.Integer, db.ForeignKey('users.id', ondelete='CASCADE')) state = db.Column(db.String, default="pending") - created_at = db.Column(db.DateTime(timezone=True), default=dateandtime.now()) + created_at = db.Column(db.DateTime(timezone=True), default=sql_func.now()) submitted_at = db.Column(db.DateTime(timezone=True)) submission_modifier = db.Column(db.String) is_mail_sent = db.Column(db.Boolean, default=False)