This commit is contained in:
MrLening 2025-03-29 18:18:14 +03:00
parent 76c716cea6
commit ba42f28bcc

View File

@ -1,10 +1,13 @@
import datetime
from typing import Optional from typing import Optional
from pathlib import Path
import datetime
import sys
from sqlalchemy.future import select
from sqlalchemy.ext.asyncio import AsyncSession from sqlalchemy.ext.asyncio import AsyncSession
from sqlalchemy import exc as sqlalchemy_exc
from sqlalchemy.types import TIMESTAMP
from sqlalchemy.orm import declarative_base from sqlalchemy.orm import declarative_base
from sqlalchemy.future import select
from sqlalchemy import ( from sqlalchemy import (
func, func,
Column, Column,
@ -13,10 +16,11 @@ from sqlalchemy import (
String, String,
Boolean, Boolean,
) )
from sqlalchemy import exc as sqlalchemy_exc
from app.core.sessions import get_session
from loguru import logger sys.path.append(str(Path(__file__).resolve().parent.parent))
from core.sessions import get_session
from loader import custom_logger
Base = declarative_base() Base = declarative_base()
@ -38,7 +42,7 @@ class BaseDBModel(Base):
class BaseCreatedUpdatedAtModel: class BaseCreatedUpdatedAtModel:
created_at = Column(DateTime, default=datetime.datetime.now(datetime.timezone.utc)) created_at = Column(type_=TIMESTAMP(timezone=True), default=datetime.datetime.now(datetime.timezone.utc))
updated_at = Column( updated_at = Column(
DateTime, DateTime,
default=func.now(), default=func.now(),
@ -76,7 +80,7 @@ class User(BaseDBModel, BaseCreatedUpdatedAtModel):
await session.commit() await session.commit()
return new_user return new_user
except sqlalchemy_exc.SQLAlchemyError as err: except sqlalchemy_exc.SQLAlchemyError as err:
logger.warning(err) custom_logger.warning(err)
await session.rollback() await session.rollback()
finally: finally:
await session.close() await session.close()
@ -94,7 +98,7 @@ class User(BaseDBModel, BaseCreatedUpdatedAtModel):
) )
return user return user
except sqlalchemy_exc.SQLAlchemyError as err: except sqlalchemy_exc.SQLAlchemyError as err:
logger.warning(err) custom_logger.warning(err)
finally: finally:
await session.close() await session.close()
@ -111,6 +115,6 @@ class User(BaseDBModel, BaseCreatedUpdatedAtModel):
) )
return user return user
except sqlalchemy_exc.SQLAlchemyError as err: except sqlalchemy_exc.SQLAlchemyError as err:
logger.warning(err) custom_logger.warning(err)
finally: finally:
await session.close() await session.close()