add date_to date_from endpoints
This commit is contained in:
@@ -1,8 +1,10 @@
|
||||
from datetime import date
|
||||
from enum import Enum
|
||||
from typing import Annotated
|
||||
|
||||
from fastapi import Depends, Query
|
||||
from pydantic import BaseModel
|
||||
from fastapi.exceptions import HTTPException
|
||||
from pydantic import BaseModel, model_validator
|
||||
|
||||
|
||||
class StatEnum(str, Enum):
|
||||
@@ -24,4 +26,18 @@ class Status(BaseModel):
|
||||
status: StatEnum | None = Query(default=None)
|
||||
|
||||
|
||||
StatusTaskDep = Annotated[Status, Depends()]
|
||||
StatusTaskDep = Annotated[Status, Depends()]
|
||||
|
||||
|
||||
class Date(BaseModel):
|
||||
date_from: date | None = Query(default=None)
|
||||
date_to: date | None = Query(default=None)
|
||||
|
||||
@model_validator(mode="after")
|
||||
def check_dates(self):
|
||||
if self.date_from and self.date_to and self.date_to < self.date_from:
|
||||
raise HTTPException(status_code=422, detail="date_to cannot be less than date_from")
|
||||
return self
|
||||
|
||||
|
||||
DateDep = Annotated[Date, Depends()]
|
||||
|
||||
@@ -3,7 +3,7 @@ from typing import Annotated
|
||||
from fastapi import APIRouter, Depends
|
||||
|
||||
from src.api.dependacies.db_dep import sessionDep
|
||||
from src.api.dependacies.task_dep import PaginationTasksDep, StatusTaskDep
|
||||
from src.api.dependacies.task_dep import DateDep, PaginationTasksDep, StatusTaskDep
|
||||
from src.api.dependacies.user_dep import ActiveUser, TaskOwnerDep
|
||||
from src.schemas.tasks import TaskADDRequest
|
||||
from src.services.tasks import TaskService
|
||||
@@ -13,7 +13,13 @@ router = APIRouter(prefix="/tasks", tags=["Tasks"])
|
||||
|
||||
|
||||
@router.get("/")
|
||||
async def get_tasks(session: sessionDep, user: ActiveUser, page: PaginationTasksDep, status: StatusTaskDep):
|
||||
async def get_tasks(
|
||||
session: sessionDep,
|
||||
user: ActiveUser,
|
||||
page: PaginationTasksDep,
|
||||
status: StatusTaskDep,
|
||||
date: DateDep,
|
||||
):
|
||||
result = await UserService(session).get_user_with_tasks(user.id)
|
||||
return result
|
||||
|
||||
|
||||
Reference in New Issue
Block a user