Skip to content

Commit

Permalink
fix(backend): resolve route ambiguity for /tasks/activity endpoint (#…
Browse files Browse the repository at this point in the history
…1924)

* fix: resolve route ambiguity for /tasks/activity endpoint

* fix: re-ordering of task endpoint
  • Loading branch information
Sujanadh authored Nov 29, 2024
1 parent d61e19d commit 4cf25a9
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 22 deletions.
42 changes: 21 additions & 21 deletions src/backend/app/tasks/task_routes.py
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,27 @@ async def get_tasks_near_me(
return "Coming..."


@router.get("/activity", response_model=list[task_schemas.TaskEventCount])
async def task_activity(
project_id: int,
db: Annotated[Connection, Depends(db_conn)],
project_user: Annotated[ProjectUserDict, Depends(mapper)],
days: int = 10,
):
"""Get the number of mapped or validated tasks on each day.
Return format:
[
{
date: DD/MM/YYYY,
validated: int,
mapped: int,
}
]
"""
return await task_crud.get_project_task_activity(db, project_id, days)


@router.get("/{task_id}", response_model=task_schemas.TaskOut)
async def get_specific_task(
task_id: int,
Expand Down Expand Up @@ -84,27 +105,6 @@ async def add_new_task_event(
return await DbTaskEvent.create(db, new_event)


@router.get("/activity", response_model=list[task_schemas.TaskEventCount])
async def task_activity(
project_id: int,
db: Annotated[Connection, Depends(db_conn)],
project_user: Annotated[ProjectUserDict, Depends(mapper)],
days: int = 10,
):
"""Get the number of mapped or validated tasks on each day.
Return format:
[
{
date: DD/MM/YYYY,
validated: int,
mapped: int,
}
]
"""
return await task_crud.get_project_task_activity(db, project_id, days)


@router.get("/{task_id}/history", response_model=list[task_schemas.TaskEventOut])
async def get_task_event_history(
task_id: int,
Expand Down
2 changes: 1 addition & 1 deletion src/frontend/src/views/ProjectSubmissions.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ const ProjectSubmissions = () => {

useEffect(() => {
dispatch(
MappedVsValidatedTaskService(`${import.meta.env.VITE_API_URL}/tasks/activity?project_id=${projectId}&days=30`),
MappedVsValidatedTaskService(`${import.meta.env.VITE_API_URL}/tasks/activity/?project_id=${projectId}&days=30`),
);
}, []);

Expand Down

0 comments on commit 4cf25a9

Please sign in to comment.