From 35a431d37e35facfbcb2f3b0fdffabb42e1f7ef0 Mon Sep 17 00:00:00 2001 From: tanshu Date: Fri, 23 Apr 2021 00:58:24 +0530 Subject: [PATCH] Fix: Do not store timezone in database. I am using UTC everywhere and use of timezones messes up date comparison. --- barker/.gitignore | 1 + barker/alembic/versions/8c06ac60d125_initial_commit.py | 10 +++++----- barker/barker/models/device.py | 2 +- barker/barker/models/guest_book.py | 2 +- barker/barker/models/login_history.py | 2 +- barker/barker/models/voucher.py | 4 ++-- bookie/.gitignore | 1 + 7 files changed, 12 insertions(+), 10 deletions(-) diff --git a/barker/.gitignore b/barker/.gitignore index 7269916..25b3889 100644 --- a/barker/.gitignore +++ b/barker/.gitignore @@ -1,3 +1,4 @@ *.pyc */__pycache__/ *.egg-info/ +poetry.lock diff --git a/barker/alembic/versions/8c06ac60d125_initial_commit.py b/barker/alembic/versions/8c06ac60d125_initial_commit.py index 13685b7..2844fb7 100644 --- a/barker/alembic/versions/8c06ac60d125_initial_commit.py +++ b/barker/alembic/versions/8c06ac60d125_initial_commit.py @@ -192,7 +192,7 @@ def upgrade(): sa.Column("name", sa.Unicode(length=255), nullable=False), sa.Column("section_id", postgresql.UUID(as_uuid=True), nullable=False), sa.Column("enabled", sa.Boolean(), nullable=False), - sa.Column("creation_date", sa.DateTime(timezone=True), nullable=False), + sa.Column("creation_date", sa.DateTime(), nullable=False), sa.ForeignKeyConstraint(["section_id"], ["sections.id"], name=op.f("fk_devices_section_id_sections")), sa.PrimaryKeyConstraint("id", name=op.f("pk_devices")), sa.UniqueConstraint("name", name=op.f("uq_devices_name")), @@ -202,7 +202,7 @@ def upgrade(): sa.Column("id", postgresql.UUID(as_uuid=True), server_default=sa.text("gen_random_uuid()"), nullable=False), sa.Column("user_id", postgresql.UUID(as_uuid=True), nullable=False), sa.Column("device_id", postgresql.UUID(as_uuid=True), nullable=False), - sa.Column("date", sa.DateTime(timezone=True), nullable=False), + sa.Column("date", sa.DateTime(), nullable=False), sa.ForeignKeyConstraint(["device_id"], ["devices.id"], name=op.f("fk_login_history_device_id_devices")), sa.ForeignKeyConstraint(["user_id"], ["users.id"], name=op.f("fk_login_history_user_id_users")), sa.PrimaryKeyConstraint("id", name=op.f("pk_login_history")), @@ -229,7 +229,7 @@ def upgrade(): sa.Column("id", postgresql.UUID(as_uuid=True), server_default=sa.text("gen_random_uuid()"), nullable=False), sa.Column("customer_id", postgresql.UUID(as_uuid=True), nullable=False), sa.Column("pax", sa.Integer, nullable=False), - sa.Column("creation_date", sa.DateTime(timezone=True), nullable=False), + sa.Column("creation_date", sa.DateTime(), nullable=False), sa.ForeignKeyConstraint( ["customer_id"], ["customers.id"], @@ -369,8 +369,8 @@ def upgrade(): sa.Column("pax", sa.Integer(), nullable=False), sa.Column("bill_id", sa.Integer(), nullable=True), sa.Column("kot_id", sa.Integer(), nullable=False), - sa.Column("creation_date", sa.DateTime(timezone=True), nullable=False), - sa.Column("last_edit_date", sa.DateTime(timezone=True), nullable=False), + sa.Column("creation_date", sa.DateTime(), nullable=False), + sa.Column("last_edit_date", sa.DateTime(), nullable=False), sa.Column("food_table_id", postgresql.UUID(as_uuid=True), nullable=False), sa.Column("customer_id", postgresql.UUID(as_uuid=True), nullable=True), sa.Column("narration", sa.Unicode(length=1000), nullable=True), diff --git a/barker/barker/models/device.py b/barker/barker/models/device.py index c078dd7..61db91a 100644 --- a/barker/barker/models/device.py +++ b/barker/barker/models/device.py @@ -20,7 +20,7 @@ class Device(Base): name = Column("name", Unicode(255), unique=True, nullable=False) enabled = Column("enabled", Boolean, nullable=False) section_id = Column("section_id", UUID(as_uuid=True), ForeignKey("sections.id"), nullable=False) - creation_date = Column("creation_date", DateTime(timezone=True), nullable=False) + creation_date = Column("creation_date", DateTime(), nullable=False) section = relationship("Section", foreign_keys=section_id) login_history = relationship("LoginHistory", order_by=desc(LoginHistory.date), backref="device") diff --git a/barker/barker/models/guest_book.py b/barker/barker/models/guest_book.py index 942069d..c904eca 100644 --- a/barker/barker/models/guest_book.py +++ b/barker/barker/models/guest_book.py @@ -15,7 +15,7 @@ class GuestBook(Base): ) customer_id = Column("customer_id", UUID(as_uuid=True), ForeignKey("customers.id"), nullable=False) pax = Column("pax", Integer, nullable=False) - date = Column("creation_date", DateTime(timezone=True), nullable=False) + date = Column("creation_date", DateTime(), nullable=False) customer = relationship("Customer") diff --git a/barker/barker/models/login_history.py b/barker/barker/models/login_history.py index 9755c86..6557452 100644 --- a/barker/barker/models/login_history.py +++ b/barker/barker/models/login_history.py @@ -20,7 +20,7 @@ class LoginHistory(Base): ForeignKey("devices.id"), nullable=False, ) - date = Column("date", DateTime(timezone=True), nullable=False) + date = Column("date", DateTime(), nullable=False) def __init__(self, user_id=None, device_id=None, date=None, id_=None): self.user_id = user_id diff --git a/barker/barker/models/voucher.py b/barker/barker/models/voucher.py index 35aa3a1..8f3c315 100644 --- a/barker/barker/models/voucher.py +++ b/barker/barker/models/voucher.py @@ -28,8 +28,8 @@ class Voucher(Base): pax = Column("pax", Integer, nullable=False) bill_id = Column("bill_id", Integer) kot_id = Column("kot_id", Integer, nullable=False, unique=True) - creation_date = Column("creation_date", DateTime(timezone=True), nullable=False) - last_edit_date = Column("last_edit_date", DateTime(timezone=True), nullable=False) + creation_date = Column("creation_date", DateTime(), nullable=False) + last_edit_date = Column("last_edit_date", DateTime(), nullable=False) food_table_id = Column( "food_table_id", UUID(as_uuid=True), diff --git a/bookie/.gitignore b/bookie/.gitignore index 86d943a..2cb60d6 100644 --- a/bookie/.gitignore +++ b/bookie/.gitignore @@ -1,3 +1,4 @@ +package-lock.json # See http://help.github.com/ignore-files/ for more about ignoring files. # compiled output