diff --git a/backend/alembic/versions/b81f3c2a6d40_add_challenge_starts_at.py b/backend/alembic/versions/b81f3c2a6d40_add_challenge_starts_at.py new file mode 100644 index 00000000..06c18cd5 --- /dev/null +++ b/backend/alembic/versions/b81f3c2a6d40_add_challenge_starts_at.py @@ -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") diff --git a/backend/app/challenges/admin_routes.py b/backend/app/challenges/admin_routes.py index f9d0d546..5e26ebc6 100644 --- a/backend/app/challenges/admin_routes.py +++ b/backend/app/challenges/admin_routes.py @@ -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, @@ -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, diff --git a/backend/app/challenges/exceptions.py b/backend/app/challenges/exceptions.py index 7a8fae73..84e790f4 100644 --- a/backend/app/challenges/exceptions.py +++ b/backend/app/challenges/exceptions.py @@ -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.", + ) diff --git a/backend/app/challenges/models/challenge.py b/backend/app/challenges/models/challenge.py index 91e7dd4f..7f2dc5fe 100644 --- a/backend/app/challenges/models/challenge.py +++ b/backend/app/challenges/models/challenge.py @@ -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), diff --git a/backend/app/challenges/routes.py b/backend/app/challenges/routes.py index 1bb7d053..fedd9926 100644 --- a/backend/app/challenges/routes.py +++ b/backend/app/challenges/routes.py @@ -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 @@ -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 @@ -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: @@ -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, @@ -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 ) diff --git a/backend/app/challenges/schemas.py b/backend/app/challenges/schemas.py index 44741764..7d6b9569 100644 --- a/backend/app/challenges/schemas.py +++ b/backend/app/challenges/schemas.py @@ -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 @@ -101,6 +102,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 ChallengeUpdate(BaseModel): title: str | None = None @@ -108,6 +116,7 @@ class ChallengeUpdate(BaseModel): 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 @@ -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) @@ -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) @@ -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) @@ -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 diff --git a/backend/app/challenges/services/answer.py b/backend/app/challenges/services/answer.py index 5d02fe05..7b984f89 100644 --- a/backend/app/challenges/services/answer.py +++ b/backend/app/challenges/services/answer.py @@ -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( @@ -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() diff --git a/backend/app/challenges/services/challenge.py b/backend/app/challenges/services/challenge.py index 4f436089..9c01fcca 100644 --- a/backend/app/challenges/services/challenge.py +++ b/backend/app/challenges/services/challenge.py @@ -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, @@ -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)) ) @@ -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) @@ -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, @@ -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 @@ -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, @@ -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: diff --git a/backend/app/tests/challenges/integration/test_admin_routes.py b/backend/app/tests/challenges/integration/test_admin_routes.py index 0cd844a3..5a0820e6 100644 --- a/backend/app/tests/challenges/integration/test_admin_routes.py +++ b/backend/app/tests/challenges/integration/test_admin_routes.py @@ -34,6 +34,10 @@ 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) @@ -41,6 +45,34 @@ async def test_admin_can_create_challenge(client: AsyncClient, as_user, admin): 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 ): diff --git a/backend/app/tests/challenges/integration/test_list_and_ranking.py b/backend/app/tests/challenges/integration/test_list_and_ranking.py index 2b20e493..fbdde713 100644 --- a/backend/app/tests/challenges/integration/test_list_and_ranking.py +++ b/backend/app/tests/challenges/integration/test_list_and_ranking.py @@ -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 @@ -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() @@ -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}) diff --git a/backend/app/tests/challenges/integration/test_quiz_lifecycle.py b/backend/app/tests/challenges/integration/test_quiz_lifecycle.py index 9636e983..b01897ff 100644 --- a/backend/app/tests/challenges/integration/test_quiz_lifecycle.py +++ b/backend/app/tests/challenges/integration/test_quiz_lifecycle.py @@ -249,6 +249,53 @@ async def test_quiz_submission_is_rejected_after_challenge_expires( assert response.status_code == 409 +async def test_future_quiz_rejects_join_answer_and_submission( + client: AsyncClient, + as_user, + user, + challenge, + questions, + db_session, +): + challenge.starts_at = datetime.now(UTC) + timedelta(days=1) + participant = ChallengeParticipant(user_id=user.id, challenge_id=challenge.id) + db_session.add(participant) + await db_session.flush() + + c = as_user(user) + joined = await c.post(f"api/v1/challenge/{challenge.id}/join") + answer = await c.post( + f"api/v1/challenge/{challenge.id}/answer", + json={"question_id": str(questions[0].id), "answer": "4"}, + ) + answers = await c.post( + f"api/v1/challenge/{challenge.id}/answer/all", + json=[{"question_id": str(questions[0].id), "answer": "4"}], + ) + submission = await c.post(f"api/v1/challenge/{challenge.id}/submit") + + assert joined.status_code == 409 + assert answer.status_code == 409 + assert answers.status_code == 409 + assert submission.status_code == 409 + + +async def test_future_input_rejects_submission( + client: AsyncClient, as_user, user, challenge, db_session +): + challenge.starts_at = datetime.now(UTC) + timedelta(days=1) + challenge.scoring_type = ChallengeScoringType.INPUT + challenge.input = Input(prompt="Answer?", input_answer="correct") + db_session.add(ChallengeParticipant(user_id=user.id, challenge_id=challenge.id)) + await db_session.flush() + + response = await as_user(user).post( + f"api/v1/challenge/{challenge.id}/input", json={"answer": "correct"} + ) + + assert response.status_code == 409 + + async def test_answering_without_joining_returns_400( client: AsyncClient, as_user, user, challenge, questions ): diff --git a/backend/app/tests/conftest.py b/backend/app/tests/conftest.py index 2b7ec3f5..3b6df366 100644 --- a/backend/app/tests/conftest.py +++ b/backend/app/tests/conftest.py @@ -8,6 +8,7 @@ from app.core.config import Settings, get_settings from app.core.database import get_session +from app.core.rate_limit import RateLimitMiddleware from app.main import app from app.users import services as user_services from app.users.schemas import UserCreate @@ -25,6 +26,20 @@ def jwt_settings(test_settings: Settings) -> Settings: return test_settings +@pytest.fixture(autouse=True) +def reset_rate_limit_state(): + middleware = app.middleware_stack + if middleware is None: + middleware = app.build_middleware_stack() + app.middleware_stack = middleware + + while middleware is not None: + if isinstance(middleware, RateLimitMiddleware): + middleware.requests.clear() + break + middleware = getattr(middleware, "app", None) + + @pytest_asyncio.fixture async def db_session(test_settings: Settings): engine = create_async_engine(str(test_settings.database_url)) diff --git a/frontend/src/features/admin/api.ts b/frontend/src/features/admin/api.ts index 68af84c8..19e50b6b 100644 --- a/frontend/src/features/admin/api.ts +++ b/frontend/src/features/admin/api.ts @@ -16,6 +16,7 @@ export type AdminChallenge = { prompt: string input_answer?: string | null scoring_type: 'input' | 'quiz' | 'manual' + starts_at: string finishes_at: string semana_id: number | null points_value: number @@ -26,6 +27,7 @@ type AdminChallengeInput = { title: string description?: string scoring_type: AdminChallenge['scoring_type'] + starts_at: string finishes_at: string points_value?: number prompt?: string @@ -110,7 +112,9 @@ export function deleteAdminUser(id: string) { } export function listAdminChallenges() { - return requestApi>('/admin/challenge?limit=100') + return requestApi>('/admin/challenge?limit=100', { + cache: 'no-store', + }) } export function listAdminChallengeParticipants( @@ -192,7 +196,9 @@ export function deleteAdminSemana(id: number) { } export function listAdminAtividades(semanaId: number) { - return requestApi(`/admin/semanas/${semanaId}/atividades`) + return requestApi(`/admin/semanas/${semanaId}/atividades`, { + cache: 'no-store', + }) } export function createAdminAtividade( diff --git a/frontend/src/features/admin/components/activities-section.tsx b/frontend/src/features/admin/components/activities-section.tsx index 8f8177c6..990d108b 100644 --- a/frontend/src/features/admin/components/activities-section.tsx +++ b/frontend/src/features/admin/components/activities-section.tsx @@ -19,11 +19,11 @@ import { ActivityForm } from './activity-form' export function ActivitiesSection({ atividades, semanas, - onActivityChanged, + onActivitySaved, }: { atividades: Record semanas: AdminSemana[] - onActivityChanged: () => void + onActivitySaved: (atividade: AdminAtividade) => void }) { const allActivities = semanas.flatMap((semana) => (atividades[semana.id] ?? []).map((atividade) => ({ atividade, semana })), @@ -138,10 +138,9 @@ export function ActivitiesSection({ {editing && ( { + onDone={(atividade) => { setEditing(false) - onActivityChanged() - setRefresh((value) => value + 1) + onActivitySaved(atividade) }} semanaId={selected.semana.id} /> diff --git a/frontend/src/features/admin/components/activity-form.tsx b/frontend/src/features/admin/components/activity-form.tsx index eaf4327d..74e376cc 100644 --- a/frontend/src/features/admin/components/activity-form.tsx +++ b/frontend/src/features/admin/components/activity-form.tsx @@ -70,7 +70,7 @@ export function ActivityForm({ }: { semanaId: number atividade?: AdminAtividade - onDone: () => void + onDone: (atividade: AdminAtividade) => void }) { const [form, setForm] = useState(() => activityFormState(atividade)) const [error, setError] = useState('') @@ -97,15 +97,20 @@ export function ActivityForm({ comeca_as: new Date(form.comeca_as).toISOString(), termina_as: new Date(form.termina_as).toISOString(), } - const saved = atividade + let saved = atividade ? await updateAdminAtividade(semanaId, atividade.id, input) : await createAdminAtividade(semanaId, input) for (const [index, speaker] of speakers.entries()) { if (speaker.foto) { - await uploadAdminPalestrantePhoto(semanaId, saved.id, index, speaker.foto) + saved = await uploadAdminPalestrantePhoto( + semanaId, + saved.id, + index, + speaker.foto, + ) } } - onDone() + onDone(saved) } catch (reason) { setError( reason instanceof Error ? reason.message : 'Não foi possível criar a atividade.', diff --git a/frontend/src/features/admin/components/activity-presence.tsx b/frontend/src/features/admin/components/activity-presence.tsx index 7e508bcf..f606a4c5 100644 --- a/frontend/src/features/admin/components/activity-presence.tsx +++ b/frontend/src/features/admin/components/activity-presence.tsx @@ -61,12 +61,14 @@ export function ActivityCodeAction({ export function ActivityCard({ atividade, semanaId, + onActivitySaved, onChanged, onError, onDelete, }: { atividade: AdminAtividade semanaId: number + onActivitySaved: (atividade: AdminAtividade) => void onChanged: () => void onError: (message: string) => void onDelete: () => void @@ -108,9 +110,9 @@ export function ActivityCard({ {editing && ( { + onDone={(savedActivity) => { setEditing(false) - onChanged() + onActivitySaved(savedActivity) }} semanaId={semanaId} /> diff --git a/frontend/src/features/admin/components/admin-panel.tsx b/frontend/src/features/admin/components/admin-panel.tsx index c2945ff1..3718ffe6 100644 --- a/frontend/src/features/admin/components/admin-panel.tsx +++ b/frontend/src/features/admin/components/admin-panel.tsx @@ -1,6 +1,6 @@ 'use client' -import { useEffect, useState } from 'react' +import { useEffect, useRef, useState } from 'react' import { CalendarDays, CircleAlert, @@ -56,6 +56,8 @@ export function AdminPanel() { const [atividades, setAtividades] = useState>({}) const [error, setError] = useState('') const [refresh, setRefresh] = useState(0) + const deletedChallengeIds = useRef(new Set()) + const activityLoadId = useRef(0) useEffect(() => { if (!loading && (!user || !user.isAdmin)) router.replace('/semana') @@ -63,10 +65,17 @@ export function AdminPanel() { useEffect(() => { if (!user?.isAdmin) return + let active = true + const requestId = ++activityLoadId.current Promise.all([listAdminUsers(), listAdminChallenges(), listAdminSemanas()]) .then(([userPage, challengePage, semanaList]) => { + if (!active) return setUsers(userPage.items) - setChallenges(challengePage.items) + setChallenges( + challengePage.items.filter( + (challenge) => !deletedChallengeIds.current.has(challenge.id), + ), + ) setSemanas(semanaList) return Promise.all( semanaList.map( @@ -75,13 +84,45 @@ export function AdminPanel() { ) }) .then((activityLists) => { - if (activityLists) setAtividades(Object.fromEntries(activityLists)) + if (active && requestId === activityLoadId.current && activityLists) { + setAtividades(Object.fromEntries(activityLists)) + } }) - .catch((reason: Error) => setError(reason.message)) + .catch((reason: Error) => { + if (active) setError(reason.message) + }) + + return () => { + active = false + } }, [refresh, user]) if (loading || !user?.isAdmin) return null + function saveActivity(atividade: AdminAtividade) { + activityLoadId.current += 1 + setAtividades((current) => { + const currentWeek = current[atividade.semana_id] ?? [] + const exists = currentWeek.some((item) => item.id === atividade.id) + return { + ...current, + [atividade.semana_id]: exists + ? currentWeek.map((item) => (item.id === atividade.id ? atividade : item)) + : [atividade, ...currentWeek], + } + }) + } + + function removeActivity(semanaId: number, atividadeId: string) { + activityLoadId.current += 1 + setAtividades((current) => ({ + ...current, + [semanaId]: (current[semanaId] ?? []).filter( + (atividade) => atividade.id !== atividadeId, + ), + })) + } + async function removeUser(id: string) { if (!window.confirm('Remover este usuário?')) return try { @@ -96,7 +137,21 @@ export function AdminPanel() { if (!window.confirm('Remover este desafio?')) return try { await deleteAdminChallenge(id) - setRefresh((value) => value + 1) + deletedChallengeIds.current.add(id) + const removedChallenge = challenges.find((challenge) => challenge.id === id) + setChallenges((current) => current.filter((item) => item.id !== id)) + if ( + removedChallenge?.semana_id !== null && + removedChallenge?.semana_id !== undefined + ) { + setSemanas((current) => + current.map((semana) => + semana.id === removedChallenge.semana_id + ? { ...semana, challenge_count: Math.max(0, semana.challenge_count - 1) } + : semana, + ), + ) + } } catch (reason) { setError(reason instanceof Error ? reason.message : 'Não foi possível remover.') } @@ -209,6 +264,8 @@ export function AdminPanel() { setRefresh((value) => value + 1)} onChanged={() => setRefresh((value) => value + 1)} /> @@ -217,7 +274,7 @@ export function AdminPanel() { setRefresh((value) => value + 1)} + onActivitySaved={saveActivity} /> )} {tab === 'points' && } diff --git a/frontend/src/features/admin/components/challenges-section.tsx b/frontend/src/features/admin/components/challenges-section.tsx index 40dca538..af88ffc5 100644 --- a/frontend/src/features/admin/components/challenges-section.tsx +++ b/frontend/src/features/admin/components/challenges-section.tsx @@ -1,6 +1,6 @@ 'use client' -import { useEffect, useState } from 'react' +import { useEffect, useRef, useState } from 'react' import { Check, Pencil, Plus, Trash2 } from 'lucide-react' import { Button } from '@/components/ui/button' @@ -86,8 +86,11 @@ export function ChallengesSection({

- {item.points_value} pontos · encerra em{' '} - {new Date(item.finishes_at).toLocaleDateString('pt-BR')} + {item.scoring_type === 'manual' + ? 'Pontuação manual · ' + : `${item.points_value} pontos · `} + começa em {new Date(item.starts_at).toLocaleDateString('pt-BR')} · encerra + em {new Date(item.finishes_at).toLocaleDateString('pt-BR')}

))} @@ -114,6 +117,9 @@ function ChallengeForm({ description: challenge?.description ?? '', prompt: challenge?.prompt ?? '', scoring_type: challenge?.scoring_type ?? ('quiz' as const), + starts_at: challenge + ? toDateTimeLocal(challenge.starts_at) + : toDateTimeLocal(new Date().toISOString()), finishes_at: challenge ? toDateTimeLocal(challenge.finishes_at) : '', points_value: challenge?.points_value ?? 10, input_answer: challenge?.input_answer ?? '', @@ -124,6 +130,8 @@ function ChallengeForm({ })) const [image, setImage] = useState(null) const [error, setError] = useState('') + const [submitting, setSubmitting] = useState(false) + const submitLocked = useRef(false) useEffect(() => { if (!latestSemanaId) return @@ -135,11 +143,16 @@ function ChallengeForm({ async function submit(event: React.FormEvent) { event.preventDefault() + if (submitLocked.current) return + submitLocked.current = true + setSubmitting(true) + setError('') try { const challengeInput = { title: form.title, description: form.description, scoring_type: form.scoring_type, + starts_at: new Date(form.starts_at).toISOString(), finishes_at: new Date(form.finishes_at).toISOString(), semana_id: form.semana_id ? Number(form.semana_id) : undefined, } @@ -164,6 +177,9 @@ function ChallengeForm({ onDone(savedChallenge) } catch (reason) { setError(reason instanceof Error ? reason.message : 'Não foi possível criar.') + } finally { + submitLocked.current = false + setSubmitting(false) } } @@ -304,33 +320,52 @@ function ChallengeForm({ )} - setForm({ ...form, finishes_at: event.target.value })} - /> - {form.scoring_type !== 'manual' && ( + + + {form.scoring_type !== 'manual' && ( + )} {error &&

{error}

} - ) diff --git a/frontend/src/features/admin/components/semanas-section.tsx b/frontend/src/features/admin/components/semanas-section.tsx index 310513ed..39416035 100644 --- a/frontend/src/features/admin/components/semanas-section.tsx +++ b/frontend/src/features/admin/components/semanas-section.tsx @@ -21,11 +21,15 @@ import { ActivityCard } from './activity-presence' export function SemanasSection({ atividades, semanas, + onActivitySaved, + onActivityDeleted, onActivityChanged, onChanged, }: { atividades: Record semanas: AdminSemana[] + onActivitySaved: (atividade: AdminAtividade) => void + onActivityDeleted: (semanaId: number, atividadeId: string) => void onActivityChanged: () => void onChanged: () => void }) { @@ -147,9 +151,9 @@ export function SemanasSection({ {openActivityForm === semana.id && ( { + onDone={(atividade) => { setOpenActivityForm(undefined) - onActivityChanged() + onActivitySaved(atividade) }} semanaId={semana.id} /> @@ -159,6 +163,7 @@ export function SemanasSection({ { @@ -170,7 +175,7 @@ export function SemanasSection({ return try { await deleteAdminAtividade(semana.id, atividade.id) - onActivityChanged() + onActivityDeleted(semana.id, atividade.id) } catch (reason) { setError( reason instanceof Error diff --git a/frontend/src/features/challenges/api.ts b/frontend/src/features/challenges/api.ts index d0309601..40c82ec0 100644 --- a/frontend/src/features/challenges/api.ts +++ b/frontend/src/features/challenges/api.ts @@ -6,6 +6,7 @@ export type Challenge = { description: string prompt: string scoring_type: 'input' | 'quiz' | 'manual' + starts_at: string finishes_at: string resource_urls: string[] image_url: string | null diff --git a/frontend/src/features/challenges/components/challenge-page.tsx b/frontend/src/features/challenges/components/challenge-page.tsx index 19261de8..69828ff4 100644 --- a/frontend/src/features/challenges/components/challenge-page.tsx +++ b/frontend/src/features/challenges/components/challenge-page.tsx @@ -159,10 +159,8 @@ export function ChallengePage() {

{challenge.title}

- {challenge.description && ( -

{challenge.description}

- )} -

{challenge.prompt}

+ {challenge.description &&

{challenge.description}

} +

{challenge.prompt}

{challenge.image_url && (