Skip to content

return "204 No Content" when the last exercise in a competition has a… #13

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
fwoerister merged 1 commit into from
Oct 17, 2025
Merged

return "204 No Content" when the last exercise in a competition has a… #13

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 7 additions & 11 deletions app/api/v1/exercise.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import datetime

import sqlalchemy as sa
from fastapi import APIRouter, HTTPException, status
from fastapi import APIRouter, HTTPException, status, Response
from fastapi.params import Depends
from sqlalchemy import select
from sqlalchemy.ext.asyncio import AsyncSession
Expand All @@ -20,7 +20,7 @@
@router.get("/current",
response_model=ExerciseRead,
status_code=status.HTTP_200_OK)
async def get_current_exercise(tan_code: str, session: AsyncSession = Depends(get_session)) -> ExerciseRead:
async def get_current_exercise(tan_code: str, session: AsyncSession = Depends(get_session)) -> ExerciseRead | Response:
statement = select(Tan).where(Tan.code == tan_code)
result = await session.execute(statement)
tan = result.scalars().first()
Expand All @@ -38,25 +38,21 @@ async def get_current_exercise(tan_code: str, session: AsyncSession = Depends(ge
exercise = result.scalars().first()

if not exercise:
subquery = (
select(ExerciseProgress.exercise_id)
.where(ExerciseProgress.tan_code.like(tan_code))
)

stmt = (
select(Exercise)
.join(ExerciseProgress, ExerciseProgress.exercise_id == Exercise.id)
.where(sa.and_(
ExerciseProgress.tan_code.like(tan_code)),
~Exercise.next_exercise_id.in_(subquery),
Exercise.id.in_(subquery)
)
.where(ExerciseProgress.tan_code.like(tan_code))
.order_by(ExerciseProgress.end_time.desc())
)

result = await session.execute(stmt)
last_exercise = result.scalars().first()

if last_exercise:
if last_exercise.next_exercise_id is None:
return Response(status_code=status.HTTP_204_NO_CONTENT)

ep = ExerciseProgress(
tan_code=tan_code,
exercise_id=last_exercise.next_exercise_id,
Expand Down