diff --git a/src/api/v1/tasks.py b/src/api/v1/tasks.py index 096815c..82d8399 100644 --- a/src/api/v1/tasks.py +++ b/src/api/v1/tasks.py @@ -3,8 +3,7 @@ from typing import Annotated from fastapi import APIRouter, Depends from src.api.dependacies.db_dep import sessionDep -from src.api.dependacies.user_dep import ActiveUser, CurrentOrAdminTask, TaskOwnerDep -from src.schemas.auth import TokenData +from src.api.dependacies.user_dep import ActiveUser, TaskOwnerDep from src.schemas.tasks import TaskADDRequest from src.services.tasks import TaskService from src.services.users import UserService @@ -19,7 +18,9 @@ async def get_tasks(session: sessionDep, user: ActiveUser): @router.get("/{id}") -async def get_task_id(id: int): ... +async def get_task_id(session: sessionDep, id: int, _: TaskOwnerDep): + task = await TaskService(session).get_task(id) + return task @router.post("/") diff --git a/src/services/tasks.py b/src/services/tasks.py index bf978b0..90580b5 100644 --- a/src/services/tasks.py +++ b/src/services/tasks.py @@ -19,7 +19,8 @@ class TaskService(BaseService): return Task.model_validate(created_task_orm) async def get_task(self, task_id: int): - return await self.session.task.get_one_or_none(id=task_id) + task = await self.session.task.get_one_or_none(id=task_id) + return Task.model_validate(task) async def delete_task(self, task_id: int): await self.session.task.delete_one(id=task_id)