Compare commits

..

2 Commits

Author SHA1 Message Date
1af9a7b4d9 fix bug :)
Some checks failed
continuous-integration/drone/push Build is failing
update Worker table doc
2025-09-26 16:23:05 +03:00
de9c0e6724 clear database_engine imports 2025-09-26 16:21:41 +03:00
2 changed files with 7 additions and 12 deletions

View File

@@ -1,14 +1,8 @@
import os import os
import asyncpg from sqlalchemy.ext.asyncio import async_sessionmaker, create_async_engine
from sqlalchemy.ext.asyncio import async_sessionmaker, create_async_engine, session
import dotenv
# connection = psycopg2.connect(*(os.getenv(key) for key in ["DATABASE", "DB_HOST", "DB_USER", "DB_PASSWORD"]))
# connection.autocommit = True
dotenv.load_dotenv(".env")
DATABASE_URL = (f"postgresql+asyncpg://{os.getenv('DB_USER')}:{os.getenv('DB_PASSWORD')}@" DATABASE_URL = (f"postgresql+asyncpg://{os.getenv('DB_USER')}:{os.getenv('DB_PASSWORD')}@"
f"{os.getenv('DB_HOST')}/{os.getenv('DATABASE')}") f"{os.getenv('DB_HOST')}/{os.getenv('DATABASE')}")
print(DATABASE_URL)
engine = create_async_engine(DATABASE_URL, echo=True) engine = create_async_engine(DATABASE_URL, echo=True)
async_session_ = async_sessionmaker(bind=engine, expire_on_commit=False) async_session_ = async_sessionmaker(bind=engine, expire_on_commit=False)

View File

@@ -13,10 +13,11 @@ class Base(DeclarativeBase):
class Worker(Base): class Worker(Base):
""" """
id SERIAL PRIMARY KEY, id SERIAL PRIMARY KEY,
telegram_id INTEGER UNIQUE NOT NULL, telegram_id BIGINT UNIQUE NOT NULL,
name VARCHAR NOT NULL, name VARCHAR NOT NULL,
email VARCHAR(50), email VARCHAR(50),
phone_number VARCHAR(20) NOT NULL, phone_number VARCHAR(20),
job_title job_title default 'Сборщик',
created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP, created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
updated_at TIMESTAMP updated_at TIMESTAMP
""" """
@@ -27,7 +28,7 @@ class Worker(Base):
name = Column(String, nullable=False) name = Column(String, nullable=False)
email = Column(String, nullable=True) email = Column(String, nullable=True)
phone_number = Column(String, default=None) phone_number = Column(String, default=None)
job_title = Column(job_title, default='Сборщик'), job_title = Column(job_title, default='Сборщик')
created_at = Column(Date, server_default=func.now()) created_at = Column(Date, server_default=func.now())
updated_at = Column(Date, onupdate=func.now()) updated_at = Column(Date, onupdate=func.now())