From 7eb1239b30c8fbd1f1a2807583121a5fe7c1d8c2 Mon Sep 17 00:00:00 2001 From: Bulat Kurbanov Date: Sun, 14 May 2023 00:43:31 +0200 Subject: [PATCH] Add ChatDonateNotification model --- src/app/models.py | 32 +++++++++++++++++++++----------- src/core/config.py | 2 +- src/main.py | 2 +- 3 files changed, 23 insertions(+), 13 deletions(-) diff --git a/src/app/models.py b/src/app/models.py index b4e5cbd..934587e 100644 --- a/src/app/models.py +++ b/src/app/models.py @@ -1,4 +1,5 @@ from datetime import datetime +from typing import cast import ormar @@ -14,22 +15,22 @@ class Language(ormar.Model): class Meta(BaseMeta): tablename = "languages" - id: int = ormar.Integer(primary_key=True) # type: ignore - label: str = ormar.String(max_length=16) # type: ignore - code: str = ormar.String(max_length=4, unique=True) # type: ignore + id: int = cast(int, ormar.Integer(primary_key=True)) + label: str = cast(str, ormar.String(max_length=16)) + code: str = cast(str, ormar.String(max_length=4, unique=True)) class User(ormar.Model): class Meta(BaseMeta): tablename = "user_settings" - id: int = ormar.Integer(primary_key=True) # type: ignore + id: int = cast(int, ormar.Integer(primary_key=True)) - user_id: int = ormar.BigInteger(unique=True) # type: ignore - last_name: str = ormar.String(max_length=64) # type: ignore - first_name: str = ormar.String(max_length=64) # type: ignore - username: str = ormar.String(max_length=32) # type: ignore - source: str = ormar.String(max_length=32) # type: ignore + user_id: int = cast(int, ormar.BigInteger(unique=True)) + last_name: str = cast(str, ormar.String(max_length=64)) + first_name: str = cast(str, ormar.String(max_length=64)) + username: str = cast(str, ormar.String(max_length=32)) + source: str = cast(str, ormar.String(max_length=32)) allowed_langs = ormar.ManyToMany(Language) @@ -38,9 +39,18 @@ class UserActivity(ormar.Model): class Meta(BaseMeta): tablename = "user_activity" - id: int = ormar.Integer(primary_key=True) # type: ignore + id: int = cast(int, ormar.Integer(primary_key=True)) user: User = ormar.ForeignKey( User, nullable=False, unique=True, related_name="last_activity" ) - updated: datetime = ormar.DateTime(timezone=False) # type: ignore + updated: datetime = cast(datetime, ormar.DateTime(timezone=False)) + + +class ChatDonateNotification(ormar.Model): + class Meta(BaseMeta): + tablename = "chat_donate_notifications" + + id: int = cast(int, ormar.BigInteger(primary_key=True)) + chat_id: int = cast(int, ormar.BigInteger(unique=True)) + sended: datetime = cast(datetime, ormar.DateTime(timezone=False)) diff --git a/src/core/config.py b/src/core/config.py index 0ea4fb8..0e39dd1 100644 --- a/src/core/config.py +++ b/src/core/config.py @@ -17,7 +17,7 @@ class EnvConfig(BaseSettings): REDIS_DB: int REDIS_PASSWORD: Optional[str] - SENTRY_SDN: str + SENTRY_DSN: str env_config = EnvConfig() diff --git a/src/main.py b/src/main.py index 5f3d007..258fd9c 100644 --- a/src/main.py +++ b/src/main.py @@ -5,6 +5,6 @@ from core.app import start_app from core.config import env_config -sentry_sdk.init(dsn=env_config.SENTRY_SDN) +sentry_sdk.init(dsn=env_config.SENTRY_DSN) app = SentryAsgiMiddleware(start_app())