ruff format
This commit is contained in:
@@ -1,10 +1,19 @@
|
|||||||
from fastapi import APIRouter
|
from fastapi import APIRouter
|
||||||
|
from sqlalchemy import select
|
||||||
|
|
||||||
|
from src.api.dependacies.db_dep import sessionDep
|
||||||
|
from src.api.dependacies.user_dep import ActiveUser
|
||||||
|
from src.models.tasks import TasksORM
|
||||||
|
|
||||||
router = APIRouter(prefix="/tasks", tags=["Tasks"])
|
router = APIRouter(prefix="/tasks", tags=["Tasks"])
|
||||||
|
|
||||||
|
|
||||||
@router.get("/")
|
@router.get("/")
|
||||||
async def get_tasks(): ...
|
async def get_tasks(db: sessionDep, user: ActiveUser):
|
||||||
|
query = select(TasksORM.id, TasksORM.description).where(TasksORM.user_id == user.id)
|
||||||
|
tasks = await db.session.execute(query)
|
||||||
|
result = tasks.scalars().all()
|
||||||
|
return result
|
||||||
|
|
||||||
|
|
||||||
@router.get("/{task_id}")
|
@router.get("/{task_id}")
|
||||||
|
|||||||
@@ -6,10 +6,7 @@ from sqlalchemy.orm import DeclarativeBase, Mapped, mapped_column
|
|||||||
|
|
||||||
from src.core.settings import settings
|
from src.core.settings import settings
|
||||||
|
|
||||||
engine = create_async_engine(
|
engine = create_async_engine(settings.db.url, echo=True)
|
||||||
settings.db.url,
|
|
||||||
echo=True
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
@event.listens_for(engine.sync_engine, "connect")
|
@event.listens_for(engine.sync_engine, "connect")
|
||||||
|
|||||||
@@ -5,6 +5,7 @@ Revises: a2fdd0ec4a96
|
|||||||
Create Date: 2025-08-06 23:41:56.778423
|
Create Date: 2025-08-06 23:41:56.778423
|
||||||
|
|
||||||
"""
|
"""
|
||||||
|
|
||||||
from typing import Sequence, Union
|
from typing import Sequence, Union
|
||||||
|
|
||||||
from alembic import op
|
from alembic import op
|
||||||
@@ -12,8 +13,8 @@ import sqlalchemy as sa
|
|||||||
|
|
||||||
|
|
||||||
# revision identifiers, used by Alembic.
|
# revision identifiers, used by Alembic.
|
||||||
revision: str = '197b195208e8'
|
revision: str = "197b195208e8"
|
||||||
down_revision: Union[str, None] = 'a2fdd0ec4a96'
|
down_revision: Union[str, None] = "a2fdd0ec4a96"
|
||||||
branch_labels: Union[str, Sequence[str], None] = None
|
branch_labels: Union[str, Sequence[str], None] = None
|
||||||
depends_on: Union[str, Sequence[str], None] = None
|
depends_on: Union[str, Sequence[str], None] = None
|
||||||
|
|
||||||
@@ -21,45 +22,38 @@ depends_on: Union[str, Sequence[str], None] = None
|
|||||||
def upgrade():
|
def upgrade():
|
||||||
"""Upgrade schema."""
|
"""Upgrade schema."""
|
||||||
op.execute("PRAGMA foreign_keys=ON")
|
op.execute("PRAGMA foreign_keys=ON")
|
||||||
|
|
||||||
with op.batch_alter_table('tasks', schema=None) as batch_op:
|
with op.batch_alter_table("tasks", schema=None) as batch_op:
|
||||||
connection = op.get_bind()
|
connection = op.get_bind()
|
||||||
inspector = sa.inspect(connection)
|
inspector = sa.inspect(connection)
|
||||||
|
|
||||||
foreign_keys = inspector.get_foreign_keys('tasks')
|
foreign_keys = inspector.get_foreign_keys("tasks")
|
||||||
constraint_name = None
|
constraint_name = None
|
||||||
|
|
||||||
for fk in foreign_keys:
|
for fk in foreign_keys:
|
||||||
if 'user_id' in fk['constrained_columns']:
|
if "user_id" in fk["constrained_columns"]:
|
||||||
constraint_name = fk['name']
|
constraint_name = fk["name"]
|
||||||
break
|
break
|
||||||
|
|
||||||
if constraint_name:
|
if constraint_name:
|
||||||
try:
|
try:
|
||||||
batch_op.drop_constraint(constraint_name, type_='foreignkey')
|
batch_op.drop_constraint(constraint_name, type_="foreignkey")
|
||||||
except:
|
except:
|
||||||
pass
|
pass
|
||||||
|
|
||||||
batch_op.create_foreign_key(
|
batch_op.create_foreign_key(
|
||||||
'fk_tasks_user_id_users',
|
"fk_tasks_user_id_users", "users", ["user_id"], ["id"], ondelete="CASCADE"
|
||||||
'users',
|
|
||||||
['user_id'],
|
|
||||||
['id'],
|
|
||||||
ondelete='CASCADE'
|
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
def downgrade():
|
def downgrade():
|
||||||
"""Downgrade schema."""
|
"""Downgrade schema."""
|
||||||
with op.batch_alter_table('tasks', schema=None) as batch_op:
|
with op.batch_alter_table("tasks", schema=None) as batch_op:
|
||||||
try:
|
try:
|
||||||
batch_op.drop_constraint('fk_tasks_user_id_users', type_='foreignkey')
|
batch_op.drop_constraint("fk_tasks_user_id_users", type_="foreignkey")
|
||||||
except:
|
except:
|
||||||
pass
|
pass
|
||||||
|
|
||||||
batch_op.create_foreign_key(
|
batch_op.create_foreign_key(
|
||||||
'fk_tasks_user_id_users',
|
"fk_tasks_user_id_users", "users", ["user_id"], ["id"]
|
||||||
'users',
|
|
||||||
['user_id'],
|
|
||||||
['id']
|
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -5,6 +5,7 @@ Revises: 197b195208e8
|
|||||||
Create Date: 2025-08-06 23:54:24.308488
|
Create Date: 2025-08-06 23:54:24.308488
|
||||||
|
|
||||||
"""
|
"""
|
||||||
|
|
||||||
from typing import Sequence, Union
|
from typing import Sequence, Union
|
||||||
|
|
||||||
from alembic import op
|
from alembic import op
|
||||||
@@ -12,8 +13,8 @@ import sqlalchemy as sa
|
|||||||
|
|
||||||
|
|
||||||
# revision identifiers, used by Alembic.
|
# revision identifiers, used by Alembic.
|
||||||
revision: str = '4b0f3ea2fd26'
|
revision: str = "4b0f3ea2fd26"
|
||||||
down_revision: Union[str, None] = '197b195208e8'
|
down_revision: Union[str, None] = "197b195208e8"
|
||||||
branch_labels: Union[str, Sequence[str], None] = None
|
branch_labels: Union[str, Sequence[str], None] = None
|
||||||
depends_on: Union[str, Sequence[str], None] = None
|
depends_on: Union[str, Sequence[str], None] = None
|
||||||
|
|
||||||
@@ -21,39 +22,32 @@ depends_on: Union[str, Sequence[str], None] = None
|
|||||||
def upgrade():
|
def upgrade():
|
||||||
"""Upgrade schema."""
|
"""Upgrade schema."""
|
||||||
op.execute("PRAGMA foreign_keys=ON")
|
op.execute("PRAGMA foreign_keys=ON")
|
||||||
|
|
||||||
with op.batch_alter_table('tasks', schema=None) as batch_op:
|
with op.batch_alter_table("tasks", schema=None) as batch_op:
|
||||||
connection = op.get_bind()
|
connection = op.get_bind()
|
||||||
inspector = sa.inspect(connection)
|
inspector = sa.inspect(connection)
|
||||||
|
|
||||||
foreign_keys = inspector.get_foreign_keys('tasks')
|
foreign_keys = inspector.get_foreign_keys("tasks")
|
||||||
|
|
||||||
for fk in foreign_keys:
|
for fk in foreign_keys:
|
||||||
if 'user_id' in fk['constrained_columns']:
|
if "user_id" in fk["constrained_columns"]:
|
||||||
try:
|
try:
|
||||||
batch_op.drop_constraint(fk['name'], type_='foreignkey')
|
batch_op.drop_constraint(fk["name"], type_="foreignkey")
|
||||||
except:
|
except:
|
||||||
pass
|
pass
|
||||||
|
|
||||||
batch_op.create_foreign_key(
|
batch_op.create_foreign_key(
|
||||||
'fk_tasks_user_id_users',
|
"fk_tasks_user_id_users", "users", ["user_id"], ["id"], ondelete="CASCADE"
|
||||||
'users',
|
|
||||||
['user_id'],
|
|
||||||
['id'],
|
|
||||||
ondelete='CASCADE'
|
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
def downgrade():
|
def downgrade():
|
||||||
"""Downgrade schema."""
|
"""Downgrade schema."""
|
||||||
with op.batch_alter_table('tasks', schema=None) as batch_op:
|
with op.batch_alter_table("tasks", schema=None) as batch_op:
|
||||||
try:
|
try:
|
||||||
batch_op.drop_constraint('fk_tasks_user_id_users', type_='foreignkey')
|
batch_op.drop_constraint("fk_tasks_user_id_users", type_="foreignkey")
|
||||||
except:
|
except:
|
||||||
pass
|
pass
|
||||||
batch_op.create_foreign_key(
|
batch_op.create_foreign_key(
|
||||||
'fk_tasks_user_id_users',
|
"fk_tasks_user_id_users", "users", ["user_id"], ["id"]
|
||||||
'users',
|
|
||||||
['user_id'],
|
|
||||||
['id']
|
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -23,4 +23,6 @@ class UsersORM(Base):
|
|||||||
avatar_path: Mapped[Optional[str]] = mapped_column(String(255), nullable=True)
|
avatar_path: Mapped[Optional[str]] = mapped_column(String(255), nullable=True)
|
||||||
is_active: Mapped[bool] = mapped_column(Boolean, nullable=False, default=True)
|
is_active: Mapped[bool] = mapped_column(Boolean, nullable=False, default=True)
|
||||||
is_superuser: Mapped[bool] = mapped_column(Boolean, nullable=False, default=False)
|
is_superuser: Mapped[bool] = mapped_column(Boolean, nullable=False, default=False)
|
||||||
tasks: Mapped[list["TasksORM"]] = relationship(back_populates="user", cascade="all, delete-orphan")
|
tasks: Mapped[list["TasksORM"]] = relationship(
|
||||||
|
back_populates="user", cascade="all, delete-orphan"
|
||||||
|
)
|
||||||
|
|||||||
4
src/services/tasks.py
Normal file
4
src/services/tasks.py
Normal file
@@ -0,0 +1,4 @@
|
|||||||
|
from services.base import BaseService
|
||||||
|
|
||||||
|
|
||||||
|
class TasksService(BaseService): ...
|
||||||
Reference in New Issue
Block a user