From 7defcbdbd447b4e0a0b2cc147d73c6549b56ef38 Mon Sep 17 00:00:00 2001 From: AlexSserb Date: Tue, 4 Nov 2025 15:05:48 +0400 Subject: [PATCH] fix: removed celery tasks tables --- models/__init__.py | 3 +-- models/auth.py | 16 ------------- models/task.py | 58 ---------------------------------------------- 3 files changed, 1 insertion(+), 76 deletions(-) delete mode 100644 models/task.py diff --git a/models/__init__.py b/models/__init__.py index 428dff4..67a3cba 100644 --- a/models/__init__.py +++ b/models/__init__.py @@ -12,6 +12,7 @@ from .attribute import ( AttributeLabel as AttributeLabel, module_attribute as module_attribute, ) +from .auth import User as User from .base import BaseModel as BaseModel from .board import Board as Board from .deal import Deal as Deal @@ -29,7 +30,5 @@ from .module import ( # noqa: F401 ) from .project import Project as Project from .status import Status as Status, DealStatusHistory as DealStatusHistory -from .task import CeleryTask as CeleryTask, CeleryActiveTask as CeleryActiveTask -from .auth import User as User configure_mappers() diff --git a/models/auth.py b/models/auth.py index 6d598be..bb1ea56 100644 --- a/models/auth.py +++ b/models/auth.py @@ -1,22 +1,6 @@ -from typing import TYPE_CHECKING - -from sqlalchemy.orm import Mapped, relationship - from models.base import BaseModel from models.mixins import IdMixin, SoftDeleteMixin -if TYPE_CHECKING: - from models import CeleryTask, CeleryActiveTask - class User(BaseModel, IdMixin, SoftDeleteMixin): __tablename__ = "users" - - celery_tasks: Mapped["CeleryTask"] = relationship( - back_populates="user", - lazy="noload", - ) - celery_active_tasks: Mapped["CeleryActiveTask"] = relationship( - back_populates="user", - lazy="noload", - ) diff --git a/models/task.py b/models/task.py deleted file mode 100644 index 7feec54..0000000 --- a/models/task.py +++ /dev/null @@ -1,58 +0,0 @@ -from datetime import datetime, timezone -from typing import Optional, TYPE_CHECKING - -from sqlalchemy import String, DateTime, ForeignKey -from sqlalchemy.dialects.postgresql import BYTEA -from sqlalchemy.orm import Mapped, mapped_column, relationship - -from models.base import BaseModel -from models.mixins import IdMixin - -if TYPE_CHECKING: - from models.auth import User - - -class CeleryTask(BaseModel, IdMixin): - __tablename__ = "celery_taskmeta" - - task_id: Mapped[int] = mapped_column(String(155), unique=True) - status: Mapped[int] = mapped_column(String(50)) - result: Mapped[bytes] = mapped_column(BYTEA) - date_done: Mapped[datetime] = mapped_column( - DateTime(timezone=True), - default=lambda: datetime.now(timezone.utc), - ) - traceback: Mapped[str] = mapped_column() - name: Mapped[str] = mapped_column(String(155)) - args: Mapped[bytes] = mapped_column(BYTEA) - kwargs: Mapped[bytes] = mapped_column(BYTEA) - worker: Mapped[str] = mapped_column(String(155)) - retries: Mapped[int] = mapped_column() - queue: Mapped[str] = mapped_column(String(155)) - - user_id: Mapped[int] = mapped_column(ForeignKey("users.id")) - user: Mapped["User"] = relationship( - back_populates="celery_tasks", - lazy="noload", - ) - - -class CeleryActiveTask(BaseModel): - __tablename__ = "celery_taskmeta_active" - - task_id: Mapped[str] = mapped_column( - String(155), - primary_key=True, - ) - status: Mapped[str] = mapped_column(String(50)) - name: Mapped[str] = mapped_column(String(155)) - is_notification_hidden: Mapped[bool] = mapped_column( - default=False, - server_default="0", - ) - - user_id: Mapped[Optional[int]] = mapped_column(ForeignKey("users.id")) - user: Mapped[Optional["User"]] = relationship( - back_populates="celery_active_tasks", - lazy="noload", - )