Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
32 changes: 32 additions & 0 deletions backend/alembic/versions/b81f3c2a6d40_add_challenge_starts_at.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
"""add challenge start time

Revision ID: b81f3c2a6d40
Revises: 4f21ac9d7b30
"""

from collections.abc import Sequence

import sqlalchemy as sa

from alembic import op

revision: str = "b81f3c2a6d40"
down_revision: str | Sequence[str] | None = "4f21ac9d7b30"
branch_labels: str | Sequence[str] | None = None
depends_on: str | Sequence[str] | None = None


def upgrade() -> None:
op.add_column(
"challenges",
sa.Column(
"starts_at",
sa.DateTime(timezone=True),
server_default=sa.text("now()"),
nullable=False,
),
)


def downgrade() -> None:
op.drop_column("challenges", "starts_at")
2 changes: 2 additions & 0 deletions backend/app/challenges/admin_routes.py
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@ async def create_challenge_endpoint(
title=data.title,
description=data.description,
scoring_type=data.scoring_type,
starts_at=data.starts_at,
finishes_at=data.finishes_at,
semana_id=data.semana_id,
points_value=data.points_value,
Expand Down Expand Up @@ -126,6 +127,7 @@ async def update_challenge_endpoint(
title=data.title,
description=data.description,
scoring_type=data.scoring_type,
starts_at=data.starts_at,
finishes_at=data.finishes_at,
semana_id=data.semana_id,
points_value=data.points_value,
Expand Down
10 changes: 10 additions & 0 deletions backend/app/challenges/exceptions.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,3 +21,13 @@ def __init__(self) -> None:
title="Challenge closed",
detail="This challenge has ended and no longer accepts answers or submissions.",
)


class ChallengeNotStartedError(AppError):
def __init__(self) -> None:
super().__init__(
status_code=409,
type="challenge_not_started",
title="Challenge not started",
detail="This challenge has not started yet.",
)
6 changes: 6 additions & 0 deletions backend/app/challenges/models/challenge.py
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,12 @@ class Challenge(Base, UUIDPKMixin, TimestampsMixin):
default=ChallengeScoringType.QUIZ,
nullable=False,
)
starts_at: Mapped[datetime] = mapped_column(
DateTime(timezone=True),
default=lambda: datetime.now(UTC),
server_default=text("now()"),
nullable=False,
)

finishes_at: Mapped[datetime] = mapped_column(
DateTime(timezone=True),
Expand Down
8 changes: 8 additions & 0 deletions backend/app/challenges/routes.py
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ async def join_challenge(
raise NotFoundError("Challenge with given ID not found.")
if challenge.semana_id is None:
raise BadRequestError("Challenge must belong to a Semana.")
challenge_service.ensure_challenge_started(challenge.starts_at)

current_participant = await participant_service.get_challenge_participant(
session, current_user.id, challenge_id, for_update=True
Expand Down Expand Up @@ -125,6 +126,7 @@ async def submit_input(
raise NotFoundError("Challenge not found.")
if challenge.scoring_type != ChallengeScoringType.INPUT:
raise BadRequestError("Challenge does not accept input submissions.")
challenge_service.ensure_challenge_started(challenge.starts_at)
if participant.submitted_at is not None:
return challenge_schemas.SubmissionResponse(
submitted_at=participant.submitted_at, score=participant.score
Expand Down Expand Up @@ -219,6 +221,7 @@ async def submit_challenge(
raise NotFoundError("Challenge not found")
if challenge.scoring_type != ChallengeScoringType.QUIZ:
raise BadRequestError("Manual challenges cannot be submitted by participants.")
challenge_service.ensure_challenge_started(challenge.starts_at)

# idempotência: se o usuário já submeteu antes, retorna o valor anterior
if participant.submitted_at is not None:
Expand Down Expand Up @@ -281,6 +284,7 @@ async def get_challenge(
description=challenge.description,
prompt=challenge.input.prompt if challenge.input is not None else "",
scoring_type=challenge.scoring_type,
starts_at=challenge.starts_at,
image_path=challenge.image_path,
finishes_at=challenge.finishes_at,
resource_urls=challenge.resource_urls,
Expand All @@ -302,6 +306,10 @@ async def get_ranking(
Obtém o ranking (Top 10) de um challenge
"""

challenge = await challenge_service.get_challenge_by_id(session, challenge_id)
if challenge is None or challenge.starts_at > datetime.now(UTC):
raise NotFoundError("Challenge not found.")

participants = await participant_service.get_challenge_ranking(
session, challenge_id
)
Expand Down
19 changes: 19 additions & 0 deletions backend/app/challenges/schemas.py
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@ class ChallengeCreate(BaseModel):
description: str = ""
prompt: str | None = None
scoring_type: ChallengeScoringType = ChallengeScoringType.QUIZ
starts_at: datetime | None = None
finishes_at: datetime | None = None
semana_id: int | None = None
points_value: int = 0
Expand All @@ -101,13 +102,21 @@ def validate_finishes_at_timezone(cls, value: datetime | None) -> datetime | Non
raise ValueError("finishes_at must include a timezone.")
return value

@field_validator("starts_at")
@classmethod
def validate_starts_at_timezone(cls, value: datetime | None) -> datetime | None:
if value is not None and value.utcoffset() is None:
raise ValueError("starts_at must include a timezone.")
return value


class ChallengeUpdate(BaseModel):
title: str | None = None
description: str | None = None
scoring_type: ChallengeScoringType | None = None
prompt: str | None = None
questions: list[QuestionCreate] | None = None
starts_at: datetime | None = None
finishes_at: datetime | None = None
semana_id: int | None = None
points_value: int | None = None
Expand All @@ -121,6 +130,13 @@ def validate_finishes_at_timezone(cls, value: datetime | None) -> datetime | Non
raise ValueError("finishes_at must include a timezone.")
return value

@field_validator("starts_at")
@classmethod
def validate_starts_at_timezone(cls, value: datetime | None) -> datetime | None:
if value is not None and value.utcoffset() is None:
raise ValueError("starts_at must include a timezone.")
return value


class RankingEntry(BaseModel):
model_config = ConfigDict(from_attributes=True)
Expand Down Expand Up @@ -180,6 +196,7 @@ class ChallengeResponse(ChallengeImageMixin):
description: str
prompt: str
scoring_type: ChallengeScoringType
starts_at: datetime
finishes_at: datetime
resource_urls: list[str] = Field(default_factory=list)
questions: list[QuestionResponse] = Field(default_factory=list)
Expand All @@ -196,6 +213,7 @@ class ChallengePublicResponse(ChallengeImageMixin):
description: str
prompt: str
scoring_type: ChallengeScoringType
starts_at: datetime
finishes_at: datetime
resource_urls: list[str] = Field(default_factory=list)

Expand All @@ -210,6 +228,7 @@ class AdminChallengeResponse(ChallengeImageMixin):
description: str
prompt: str
scoring_type: ChallengeScoringType
starts_at: datetime
finishes_at: datetime
semana_id: int | None = None
points_value: int = 0
Expand Down
5 changes: 3 additions & 2 deletions backend/app/challenges/services/answer.py
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ async def upsert_answer(
) -> Answer:

result = await session.execute(
select(Question, Challenge.finishes_at)
select(Question, Challenge.starts_at, Challenge.finishes_at)
.join(Challenge, Challenge.id == Question.challenge_id)
.join(ChallengeParticipant, ChallengeParticipant.challenge_id == Challenge.id)
.where(
Expand All @@ -62,7 +62,8 @@ async def upsert_answer(
if question_and_deadline is None:
raise NotFoundError("Could not find question with given ID.")

question, finishes_at = question_and_deadline
question, starts_at, finishes_at = question_and_deadline
challenge_service.ensure_challenge_started(starts_at)
challenge_service.ensure_challenge_open(finishes_at)

is_correct = content.strip().lower() == question.answer.strip().lower()
Expand Down
20 changes: 17 additions & 3 deletions backend/app/challenges/services/challenge.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,11 @@ def ensure_challenge_open(finishes_at: datetime) -> None:
raise challenge_exceptions.ChallengeClosedError()


def ensure_challenge_started(starts_at: datetime) -> None:
if starts_at > datetime.now(UTC):
raise challenge_exceptions.ChallengeNotStartedError()


async def get_challenge_with_context(
session: AsyncSession,
challenge_id: uuid.UUID,
Expand All @@ -34,6 +39,7 @@ async def get_challenge_with_context(
select(Challenge)
.where(Challenge.id == challenge_id)
.where(Challenge.deleted_at.is_(None))
.where(Challenge.starts_at <= datetime.now(UTC))
.options(selectinload(Challenge.questions), selectinload(Challenge.input))
)

Expand Down Expand Up @@ -112,14 +118,16 @@ async def list_challenges_paginated(
session: AsyncSession,
pagination: PaginationParams,
) -> Page[challenge_schemas.ChallengePublicResponse]: # ← tipo correto
total = await session.scalar(
select(func.count(Challenge.id)).where(Challenge.deleted_at.is_(None))
conditions = (
Challenge.deleted_at.is_(None),
Challenge.starts_at <= datetime.now(UTC),
)
total = await session.scalar(select(func.count(Challenge.id)).where(*conditions))

rows = (
await session.scalars(
select(Challenge)
.where(Challenge.deleted_at.is_(None))
.where(*conditions)
.options(selectinload(Challenge.input))
.order_by(Challenge.created_at.desc(), Challenge.id)
.limit(pagination.limit)
Expand Down Expand Up @@ -169,6 +177,7 @@ async def create_challenge(
title: str,
description: str = "",
scoring_type: ChallengeScoringType = ChallengeScoringType.QUIZ,
starts_at: datetime | None = None,
finishes_at: datetime | None = None,
semana_id: int | None = None,
points_value: int = 0,
Expand All @@ -184,6 +193,8 @@ async def create_challenge(
)
if finishes_at is not None:
challenge.finishes_at = finishes_at
if starts_at is not None:
challenge.starts_at = starts_at
session.add(challenge)
await session.flush()
return challenge
Expand All @@ -196,6 +207,7 @@ async def update_challenge(
title: str | None = None,
description: str | None = None,
scoring_type: ChallengeScoringType | None = None,
starts_at: datetime | None = None,
finishes_at: datetime | None = None,
semana_id: int | None = None,
points_value: int | None = None,
Expand All @@ -211,6 +223,8 @@ async def update_challenge(
challenge.points_value = points_value
if finishes_at is not None:
challenge.finishes_at = finishes_at
if starts_at is not None:
challenge.starts_at = starts_at
if semana_id is not None:
challenge.semana_id = semana_id
if resource_urls is not None:
Expand Down
32 changes: 32 additions & 0 deletions backend/app/tests/challenges/integration/test_admin_routes.py
Original file line number Diff line number Diff line change
Expand Up @@ -34,13 +34,45 @@ async def test_admin_can_create_challenge(client: AsyncClient, as_user, admin):
assert body["title"] == "Novo"
assert body["description"] == "Descrição inicial"
assert body["scoring_type"] == "quiz"
default_start = datetime.fromisoformat(body["starts_at"])
assert default_start.tzinfo is not None
assert timedelta(seconds=-1) <= default_start - datetime.now(UTC)
assert default_start - datetime.now(UTC) <= timedelta(seconds=1)
default_deadline = datetime.fromisoformat(body["finishes_at"])
assert default_deadline.tzinfo is not None
assert timedelta(hours=23, minutes=59) <= default_deadline - datetime.now(UTC)
assert default_deadline - datetime.now(UTC) <= timedelta(days=1, minutes=1)
assert body["questions"] == []


async def test_admin_can_set_challenge_start(client: AsyncClient, as_user, admin):
c = as_user(admin)
starts_at = datetime.now(UTC) + timedelta(days=2)
created = await c.post(
"/api/v1/admin/challenge/",
json={"title": "Início agendado", "starts_at": starts_at.isoformat()},
)

assert created.status_code == 201, created.text
challenge_id = created.json()["id"]
assert datetime.fromisoformat(created.json()["starts_at"]) == starts_at

updated_starts_at = starts_at + timedelta(days=1)
updated = await c.patch(
f"/api/v1/admin/challenge/{challenge_id}",
json={"starts_at": updated_starts_at.isoformat()},
)

assert updated.status_code == 200, updated.text
assert datetime.fromisoformat(updated.json()["starts_at"]) == updated_starts_at

admin_detail = await c.get(f"/api/v1/admin/challenge/{challenge_id}")
assert admin_detail.status_code == 200
admin_list = await c.get("/api/v1/admin/challenge", params={"limit": 100})
assert admin_list.status_code == 200
assert challenge_id in {item["id"] for item in admin_list.json()["items"]}


async def test_admin_can_create_challenge_with_questions(
client: AsyncClient, as_user, admin
):
Expand Down
31 changes: 31 additions & 0 deletions backend/app/tests/challenges/integration/test_list_and_ranking.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
from __future__ import annotations

import uuid
from datetime import UTC, datetime, timedelta

from httpx import AsyncClient
from sqlalchemy.ext.asyncio import AsyncSession
Expand All @@ -17,10 +18,26 @@ async def test_list_challenges_paginated(
):
for i in range(5):
db_session.add(Challenge(title=f"C{i}", scoring_type=ChallengeScoringType.QUIZ))
future_challenge = Challenge(
title="Future challenge",
scoring_type=ChallengeScoringType.QUIZ,
starts_at=datetime.now(UTC) + timedelta(days=1),
)
db_session.add(future_challenge)
await db_session.flush()

c = as_user(user)

anonymous_list = await client.get(
"/api/v1/challenge", params={"limit": 100, "offset": 0}
)
assert anonymous_list.status_code == 200
assert anonymous_list.json()["total"] == 5
assert all(
item["id"] != str(future_challenge.id)
for item in anonymous_list.json()["items"]
)

r = await c.get("api/v1/challenge", params={"limit": 2, "offset": 0})
assert r.status_code == 200
body = r.json()
Expand All @@ -33,6 +50,20 @@ async def test_list_challenges_paginated(
assert len(r.json()["items"]) == 1


async def test_future_challenge_is_hidden_from_public_detail_and_ranking(
client: AsyncClient, as_user, user, challenge, db_session: AsyncSession
):
challenge.starts_at = datetime.now(UTC) + timedelta(days=1)
await db_session.flush()

c = as_user(user)
detail = await c.get(f"/api/v1/challenge/{challenge.id}")
ranking = await c.get(f"/api/v1/challenge/{challenge.id}/ranking")

assert detail.status_code == 404
assert ranking.status_code == 404


async def test_list_rejects_bad_pagination(client: AsyncClient, as_user, user):
c = as_user(user)
r = await c.get("api/v1/challenge/", params={"limit": 0})
Expand Down
Loading
Loading