From f48fef3c60ffff00d6b8acf33df07a04462a40ec Mon Sep 17 00:00:00 2001 From: george haff Date: Wed, 7 Jun 2023 10:03:06 -0400 Subject: [PATCH 1/2] fix defaults for user columns --- src/server/admin/models.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/server/admin/models.py b/src/server/admin/models.py index 3755a517b..a9853e0d4 100644 --- a/src/server/admin/models.py +++ b/src/server/admin/models.py @@ -19,6 +19,8 @@ Column("role_id", ForeignKey("user_role.id")), ) +def _default_date_now(): + return dtime.strftime(dtime.now(), "%Y-%m-%d")) class User(Base): __tablename__ = "api_user" @@ -26,8 +28,8 @@ class User(Base): roles = relationship("UserRole", secondary=association_table) api_key = Column(String(50), unique=True, nullable=False) email = Column(String(320), unique=True, nullable=False) - created = Column(Date, default=dtime.strftime(dtime.now(), "%Y-%m-%d")) - last_time_used = Column(Date, default=dtime.strftime(dtime.now(), "%Y-%m-%d")) + created = Column(Date, default=_default_date_now) + last_time_used = Column(Date, default=_default_date_now) def __init__(self, api_key: str, email: str = None) -> None: self.api_key = api_key From f171fad68adf5e646e9497d7c3ed969bc9bb48c4 Mon Sep 17 00:00:00 2001 From: george haff Date: Wed, 7 Jun 2023 18:07:06 -0400 Subject: [PATCH 2/2] oops parenthesis --- src/server/admin/models.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/server/admin/models.py b/src/server/admin/models.py index a9853e0d4..62cbc186d 100644 --- a/src/server/admin/models.py +++ b/src/server/admin/models.py @@ -20,7 +20,7 @@ ) def _default_date_now(): - return dtime.strftime(dtime.now(), "%Y-%m-%d")) + return dtime.strftime(dtime.now(), "%Y-%m-%d") class User(Base): __tablename__ = "api_user"