From 245d3f95c72701874c99fcc2fdb00beab94169dd Mon Sep 17 00:00:00 2001 From: wate Date: Tue, 29 Sep 2026 20:28:11 -0300 Subject: [PATCH 01/62] feat(backend): add Semana challenge scoring Co-authored-by: Codex --- backend/alembic/env.py | 1 + .../1f4a9d2b7c11_add_semana_scoring.py | 80 +++++++++++++++++ backend/app/challenges/admin_routes.py | 25 ++++++ backend/app/challenges/models/challenge.py | 13 ++- .../models/challenge_participant.py | 11 ++- backend/app/challenges/routes.py | 88 ++++++++++++++++++- backend/app/challenges/schemas.py | 22 +++++ backend/app/challenges/services/challenge.py | 27 +++++- .../services/challenge_participant.py | 18 +++- backend/app/main.py | 4 + backend/app/semana/models.py | 77 ++++++++++++++++ backend/app/semana/routes.py | 73 +++++++++++++++ backend/app/semana/schemas.py | 43 +++++++++ backend/app/semana/services.py | 85 ++++++++++++++++++ 14 files changed, 558 insertions(+), 9 deletions(-) create mode 100644 backend/alembic/versions/1f4a9d2b7c11_add_semana_scoring.py create mode 100644 backend/app/semana/models.py create mode 100644 backend/app/semana/routes.py create mode 100644 backend/app/semana/schemas.py create mode 100644 backend/app/semana/services.py diff --git a/backend/alembic/env.py b/backend/alembic/env.py index 8ae1338f..3144ea7e 100644 --- a/backend/alembic/env.py +++ b/backend/alembic/env.py @@ -16,6 +16,7 @@ from app.users import models as user_models # noqa: F401 noqa from app.challenges import models as challenges_models # noqa: F401 noqa from app.users.username import models as usernames_user_models # noqa: F401 noqa +from app.semana import models as semana_models # noqa: F401 noqa # this is the Alembic Config object, which provides # access to the values within the .ini file in use. diff --git a/backend/alembic/versions/1f4a9d2b7c11_add_semana_scoring.py b/backend/alembic/versions/1f4a9d2b7c11_add_semana_scoring.py new file mode 100644 index 00000000..e62c2870 --- /dev/null +++ b/backend/alembic/versions/1f4a9d2b7c11_add_semana_scoring.py @@ -0,0 +1,80 @@ +"""add Semana participation and point ledger + +Revision ID: 1f4a9d2b7c11 +Revises: b84e1b2f6a90 +""" + +from collections.abc import Sequence + +import sqlalchemy as sa + +from alembic import op + +revision: str = "1f4a9d2b7c11" +down_revision: str | Sequence[str] | None = "b84e1b2f6a90" +branch_labels: str | Sequence[str] | None = None +depends_on: str | Sequence[str] | None = None + + +def upgrade() -> None: + op.create_table( + "semana_event", + sa.Column("id", sa.Integer(), primary_key=True), + sa.Column("nome", sa.String(255), nullable=False), + sa.Column("ano", sa.Integer(), nullable=False), + ) + op.create_table( + "semana_participants", + sa.Column("id", sa.Uuid(), nullable=False), + sa.Column("semana_id", sa.Integer(), nullable=False), + sa.Column("user_id", sa.Uuid(), nullable=False), + sa.Column("nickname", sa.String(255), nullable=False), + sa.Column("created_at", sa.DateTime(timezone=True), server_default=sa.text("now()"), nullable=False), + sa.Column("updated_at", sa.DateTime(timezone=True), server_default=sa.text("now()"), nullable=False), + sa.Column("deleted_at", sa.DateTime(timezone=True), nullable=True), + sa.ForeignKeyConstraint(["semana_id"], ["semana_event.id"], ondelete="CASCADE"), + sa.ForeignKeyConstraint(["user_id"], ["users.id"], ondelete="CASCADE"), + sa.PrimaryKeyConstraint("id"), + sa.UniqueConstraint("semana_id", "user_id"), + sa.UniqueConstraint("semana_id", "nickname"), + ) + op.create_table( + "point_events", + sa.Column("id", sa.Uuid(), nullable=False), + sa.Column("semana_participant_id", sa.Uuid(), nullable=False), + sa.Column("amount", sa.Integer(), nullable=False), + sa.Column("source_type", sa.String(32), nullable=False), + sa.Column("source_id", sa.Uuid(), nullable=True), + sa.Column("reason", sa.String(255), nullable=True), + sa.Column("created_at", sa.DateTime(timezone=True), server_default=sa.text("now()"), nullable=False), + sa.Column("updated_at", sa.DateTime(timezone=True), server_default=sa.text("now()"), nullable=False), + sa.Column("deleted_at", sa.DateTime(timezone=True), nullable=True), + sa.ForeignKeyConstraint(["semana_participant_id"], ["semana_participants.id"], ondelete="CASCADE"), + sa.PrimaryKeyConstraint("id"), + sa.UniqueConstraint("semana_participant_id", "source_type", "source_id", name="uq_point_event_source"), + ) + + op.add_column("challenges", sa.Column("prompt", sa.String(5000), server_default="", nullable=False)) + op.add_column("challenges", sa.Column("resource_urls", sa.JSON(), server_default=sa.text("'[]'"), nullable=False)) + op.add_column("challenges", sa.Column("points_value", sa.Integer(), server_default=sa.text("0"), nullable=False)) + op.add_column("challenges", sa.Column("input_answer", sa.String(255), nullable=True)) + op.add_column("challenges", sa.Column("semana_id", sa.Integer(), nullable=True)) + op.create_foreign_key("challenges_semana_id_fkey", "challenges", "semana_event", ["semana_id"], ["id"]) + op.add_column("challenge_participants", sa.Column("semana_participant_id", sa.Uuid(), nullable=True)) + op.add_column("challenge_participants", sa.Column("submission", sa.String(255), nullable=True)) + op.create_foreign_key( + "challenge_participants_semana_participant_id_fkey", + "challenge_participants", "semana_participants", ["semana_participant_id"], ["id"] + ) + + +def downgrade() -> None: + op.drop_constraint("challenge_participants_semana_participant_id_fkey", "challenge_participants", type_="foreignkey") + op.drop_column("challenge_participants", "submission") + op.drop_column("challenge_participants", "semana_participant_id") + op.drop_constraint("challenges_semana_id_fkey", "challenges", type_="foreignkey") + for column in ("semana_id", "input_answer", "points_value", "resource_urls", "prompt"): + op.drop_column("challenges", column) + op.drop_table("point_events") + op.drop_table("semana_participants") + op.drop_table("semana_event") diff --git a/backend/app/challenges/admin_routes.py b/backend/app/challenges/admin_routes.py index 2b030fee..e8e3712f 100644 --- a/backend/app/challenges/admin_routes.py +++ b/backend/app/challenges/admin_routes.py @@ -14,6 +14,7 @@ from app.challenges.services import question as question_service from app.core.database import get_session from app.core.exceptions.app_errors import BadRequestError, NotFoundError +from app.semana import services as semana_service from app.users.models import User router = APIRouter(tags=["admin", "challenges"]) @@ -36,12 +37,21 @@ async def create_challenge_endpoint( if len(data.questions) != 0 and data.scoring_type == ChallengeScoringType.MANUAL: raise BadRequestError("Manual challenges cannot have questions.") + if data.scoring_type == ChallengeScoringType.INPUT and not data.input_answer: + raise BadRequestError("Input challenges require an expected answer.") + if data.semana_id is not None and await semana_service.get_semana(session, data.semana_id) is None: + raise NotFoundError("Semana not found.") challenge = await challenge_service.create_challenge( session, title=data.title, scoring_type=data.scoring_type, finishes_at=data.finishes_at, + prompt=data.prompt, + semana_id=data.semana_id, + points_value=data.points_value, + input_answer=data.input_answer, + resource_urls=data.resource_urls, ) if data.questions: @@ -67,12 +77,18 @@ async def update_challenge_endpoint( if data.questions and challenge.scoring_type == ChallengeScoringType.MANUAL: raise BadRequestError("Manual challenges cannot have questions.") + if challenge.scoring_type == ChallengeScoringType.INPUT and data.input_answer == "": + raise BadRequestError("Input challenges require an expected answer.") await challenge_service.update_challenge( session, challenge, title=data.title, finishes_at=data.finishes_at, + prompt=data.prompt, + points_value=data.points_value, + input_answer=data.input_answer, + resource_urls=data.resource_urls, ) if data.questions is not None: await question_service.replace_challenge_questions( @@ -125,6 +141,15 @@ async def adjust_participant_score( if participant is None: raise NotFoundError("Challenge participant not found.") + if participant.semana_participant is not None: + await semana_service.add_points( + session, + participant.semana_participant, + data.amount, + source_type="manual_adjustment", + reason="Admin score adjustment", + ) + return challenge_schemas.ParticipantScoreResponse( id=participant.id, challenge_id=participant.challenge_id, diff --git a/backend/app/challenges/models/challenge.py b/backend/app/challenges/models/challenge.py index 3bfc8381..fe13ce74 100644 --- a/backend/app/challenges/models/challenge.py +++ b/backend/app/challenges/models/challenge.py @@ -4,7 +4,7 @@ from enum import StrEnum from typing import TYPE_CHECKING -from sqlalchemy import DateTime, String, text +from sqlalchemy import JSON, DateTime, ForeignKey, String, text from sqlalchemy import Enum as SQLEnum from sqlalchemy.orm import Mapped, mapped_column, relationship @@ -13,10 +13,12 @@ if TYPE_CHECKING: from app.challenges.models.question import Question + from app.semana.models import SemanaEvent class ChallengeScoringType(StrEnum): QUIZ = "quiz" + INPUT = "input" MANUAL = "manual" @@ -24,6 +26,7 @@ class Challenge(Base, UUIDPKMixin, TimestampsMixin): __tablename__ = "challenges" title: Mapped[str] = mapped_column(String(255)) + prompt: Mapped[str] = mapped_column(String(5000), default="") scoring_type: Mapped[ChallengeScoringType] = mapped_column( SQLEnum(ChallengeScoringType, native_enum=False, length=20), @@ -40,5 +43,13 @@ class Challenge(Base, UUIDPKMixin, TimestampsMixin): ) image_path: Mapped[str | None] = mapped_column(String(512), nullable=True) + resource_urls: Mapped[list[str]] = mapped_column(JSON, default=list) + points_value: Mapped[int] = mapped_column(default=0) + input_answer: Mapped[str | None] = mapped_column(String(255), nullable=True) + + semana_id: Mapped[int | None] = mapped_column( + ForeignKey("semana_event.id"), nullable=True + ) questions: Mapped[list[Question]] = relationship(back_populates="challenge") + semana: Mapped[SemanaEvent | None] = relationship(back_populates="challenges") diff --git a/backend/app/challenges/models/challenge_participant.py b/backend/app/challenges/models/challenge_participant.py index 03a594f2..60ec0aa8 100644 --- a/backend/app/challenges/models/challenge_participant.py +++ b/backend/app/challenges/models/challenge_participant.py @@ -4,7 +4,7 @@ from datetime import datetime from typing import TYPE_CHECKING -from sqlalchemy import DateTime, ForeignKey, UniqueConstraint +from sqlalchemy import DateTime, ForeignKey, String, UniqueConstraint from sqlalchemy.orm import Mapped, mapped_column, relationship from app.core.mixins import TimestampsMixin, UUIDPKMixin @@ -14,6 +14,8 @@ from .challenge import Challenge if TYPE_CHECKING: + from app.semana.models import SemanaParticipant + from .answer import Answer @@ -26,8 +28,14 @@ class ChallengeParticipant(Base, UUIDPKMixin, TimestampsMixin): ForeignKey("users.id", ondelete="CASCADE") ) challenge_id: Mapped[uuid.UUID] = mapped_column(ForeignKey("challenges.id")) + semana_participant_id: Mapped[uuid.UUID | None] = mapped_column( + ForeignKey("semana_participants.id"), nullable=True + ) user: Mapped[User] = relationship() challenge: Mapped[Challenge] = relationship() + semana_participant: Mapped[SemanaParticipant | None] = relationship( + back_populates="challenge_attempts" + ) score: Mapped[int] = mapped_column(default=0) answers: Mapped[list[Answer]] = relationship( @@ -37,6 +45,7 @@ class ChallengeParticipant(Base, UUIDPKMixin, TimestampsMixin): submitted_at: Mapped[datetime | None] = mapped_column( DateTime(timezone=True), nullable=True ) + submission: Mapped[str | None] = mapped_column(String(255), nullable=True) __table_args__ = ( UniqueConstraint( diff --git a/backend/app/challenges/routes.py b/backend/app/challenges/routes.py index b3a4ea22..7dcba66b 100644 --- a/backend/app/challenges/routes.py +++ b/backend/app/challenges/routes.py @@ -1,3 +1,4 @@ +from datetime import UTC, datetime from typing import Annotated from uuid import UUID @@ -14,6 +15,7 @@ from app.core.database import get_session from app.core.exceptions.app_errors import BadRequestError, NotFoundError from app.core.pagination import Page, PaginationParams +from app.semana import services as semana_service from app.users.models import User router = APIRouter(tags=["challenges"]) @@ -39,8 +41,18 @@ async def join_challenge( if current_participant is not None: raise BadRequestError("You are subscribed to this challenge already.") + semana_participant_id = None + if challenge.semana_id is not None: + semana = await semana_service.get_semana(session, challenge.semana_id) + if semana is None: + raise NotFoundError("Semana not found.") + semana_participant = await semana_service.get_or_create_participant( + session, semana, current_user + ) + semana_participant_id = semana_participant.id + new_participant = await participant_service.create_challenge_participant( - session, current_user.id, challenge_id + session, current_user.id, challenge_id, semana_participant_id=semana_participant_id ) await session.refresh(new_participant) @@ -55,7 +67,11 @@ async def join_challenge( user_id=result.user_id, challenge_id=result.challenge_id, name=result.user.name, - nickname=result.user.username.nickname, + nickname=( + result.semana_participant.nickname + if result.semana_participant is not None + else result.user.username.nickname + ), score=result.score, submitted_at=result.submitted_at, ) @@ -84,6 +100,57 @@ async def save_answer( ) +@router.post( + "/{challenge_id}/input", response_model=challenge_schemas.SubmissionResponse +) +async def submit_input( + session: Annotated[AsyncSession, Depends(get_session)], + challenge_id: UUID, + data: challenge_schemas.InputSubmission, + current_user: Annotated[ + User, Security(get_current_user, scopes=[Scope.PROFILE, Scope.EMAIL]) + ], +): + participant = await participant_service.get_challenge_participant( + session, current_user.id, challenge_id, for_update=True + ) + if participant is None: + raise BadRequestError("You are not subscribed to this challenge.") + + challenge = await challenge_service.get_challenge_by_id(session, challenge_id) + if challenge is None: + raise NotFoundError("Challenge not found.") + if challenge.scoring_type != ChallengeScoringType.INPUT: + raise BadRequestError("Challenge does not accept input submissions.") + challenge_service.ensure_challenge_open(challenge.finishes_at) + if participant.submitted_at is not None: + return challenge_schemas.SubmissionResponse( + submitted_at=participant.submitted_at, score=participant.score + ) + + participant.submission = data.answer + participant.submitted_at = datetime.now(UTC) + participant.score = ( + challenge.points_value + if challenge.input_answer is not None + and data.answer.strip().lower() == challenge.input_answer.strip().lower() + else 0 + ) + await session.flush() + if participant.semana_participant is not None: + await semana_service.add_points( + session, + participant.semana_participant, + participant.score, + source_type="challenge", + source_id=participant.id, + reason=challenge.title, + ) + return challenge_schemas.SubmissionResponse( + submitted_at=participant.submitted_at, score=participant.score + ) + + @router.post("/{challenge_id}/answer/all", status_code=204) async def save_many_answers( session: Annotated[AsyncSession, Depends(get_session)], @@ -154,6 +221,15 @@ async def submit_challenge( challenge_service.ensure_challenge_open(challenge.finishes_at) score = await challenge_service.process_submission(session, participant) + if participant.semana_participant is not None: + await semana_service.add_points( + session, + participant.semana_participant, + score, + source_type="challenge", + source_id=participant.id, + reason=challenge.title, + ) return challenge_schemas.SubmissionResponse( submitted_at=participant.submitted_at, score=score @@ -192,9 +268,11 @@ async def get_challenge( return challenge_schemas.ChallengeResponse( id=challenge.id, title=challenge.title, + prompt=challenge.prompt, scoring_type=challenge.scoring_type, image_path=challenge.image_path, finishes_at=challenge.finishes_at, + resource_urls=challenge.resource_urls, questions=question_responses, is_participant=participant is not None, submitted_at=participant.submitted_at if participant else None, @@ -222,7 +300,11 @@ async def get_ranking( user_id=p.user_id, score=p.score, name=p.user.name, - nickname=p.user.username.nickname if p.user.username else "", + nickname=( + p.semana_participant.nickname + if p.semana_participant is not None + else (p.user.username.nickname if p.user.username else "") + ), ) for p in participants ] diff --git a/backend/app/challenges/schemas.py b/backend/app/challenges/schemas.py index 90d66824..20f86b05 100644 --- a/backend/app/challenges/schemas.py +++ b/backend/app/challenges/schemas.py @@ -17,6 +17,10 @@ class SubmissionResponse(BaseModel): score: int +class InputSubmission(BaseModel): + answer: str + + class QuestionResponse(BaseModel): model_config = ConfigDict(from_attributes=True) @@ -62,8 +66,13 @@ class QuestionUpdate(BaseModel): class ChallengeCreate(BaseModel): title: str + prompt: str = "" scoring_type: ChallengeScoringType = ChallengeScoringType.QUIZ finishes_at: datetime | None = None + semana_id: int | None = None + points_value: int = 0 + input_answer: str | None = None + resource_urls: list[str] = Field(default_factory=list) questions: list[QuestionCreate] = Field(default_factory=list) @@ -77,8 +86,12 @@ def validate_finishes_at_timezone(cls, value: datetime | None) -> datetime | Non class ChallengeUpdate(BaseModel): title: str | None = None + prompt: str | None = None questions: list[QuestionCreate] | None = None finishes_at: datetime | None = None + points_value: int | None = None + input_answer: str | None = None + resource_urls: list[str] | None = None @field_validator("finishes_at") @classmethod @@ -131,8 +144,10 @@ class ChallengeResponse(ChallengeImageMixin): id: UUID title: str + prompt: str scoring_type: ChallengeScoringType finishes_at: datetime + resource_urls: list[str] = Field(default_factory=list) questions: list[QuestionResponse] = Field(default_factory=list) is_participant: bool = False submitted_at: datetime | None = None @@ -143,8 +158,10 @@ class ChallengePublicResponse(ChallengeImageMixin): id: UUID title: str + prompt: str scoring_type: ChallengeScoringType finishes_at: datetime + resource_urls: list[str] = Field(default_factory=list) class AdminChallengeResponse(ChallengeImageMixin): @@ -154,6 +171,11 @@ class AdminChallengeResponse(ChallengeImageMixin): id: UUID title: str + prompt: str scoring_type: ChallengeScoringType finishes_at: datetime + semana_id: int | None = None + points_value: int = 0 + input_answer: str | None = None + resource_urls: list[str] = Field(default_factory=list) questions: list[AdminQuestionResponse] = Field(default_factory=list) diff --git a/backend/app/challenges/services/challenge.py b/backend/app/challenges/services/challenge.py index 69ce7755..bd71fcf4 100644 --- a/backend/app/challenges/services/challenge.py +++ b/backend/app/challenges/services/challenge.py @@ -131,8 +131,21 @@ async def create_challenge( title: str, scoring_type: ChallengeScoringType = ChallengeScoringType.QUIZ, finishes_at: datetime | None = None, + prompt: str = "", + semana_id: int | None = None, + points_value: int = 0, + input_answer: str | None = None, + resource_urls: list[str] | None = None, ) -> Challenge: - challenge = Challenge(title=title, scoring_type=scoring_type) + challenge = Challenge( + title=title, + prompt=prompt, + scoring_type=scoring_type, + semana_id=semana_id, + points_value=points_value, + input_answer=input_answer, + resource_urls=resource_urls or [], + ) if finishes_at is not None: challenge.finishes_at = finishes_at session.add(challenge) @@ -146,11 +159,23 @@ async def update_challenge( *, title: str | None = None, finishes_at: datetime | None = None, + prompt: str | None = None, + points_value: int | None = None, + input_answer: str | None = None, + resource_urls: list[str] | None = None, ) -> Challenge: if title is not None: challenge.title = title if finishes_at is not None: challenge.finishes_at = finishes_at + if prompt is not None: + challenge.prompt = prompt + if points_value is not None: + challenge.points_value = points_value + if input_answer is not None: + challenge.input_answer = input_answer + if resource_urls is not None: + challenge.resource_urls = resource_urls await session.flush() return challenge diff --git a/backend/app/challenges/services/challenge_participant.py b/backend/app/challenges/services/challenge_participant.py index d6fd6504..4c903be2 100644 --- a/backend/app/challenges/services/challenge_participant.py +++ b/backend/app/challenges/services/challenge_participant.py @@ -17,7 +17,10 @@ async def get_challenge_ranking( ChallengeParticipant.challenge_id == challenge_id, ChallengeParticipant.deleted_at.is_(None), ) - .options(selectinload(ChallengeParticipant.user).selectinload(User.username)) + .options( + selectinload(ChallengeParticipant.user).selectinload(User.username), + selectinload(ChallengeParticipant.semana_participant), + ) .order_by(desc(ChallengeParticipant.score)) .limit(10) ) @@ -34,7 +37,10 @@ async def get_challenge_participant_by_id( ChallengeParticipant.id == participant_id, ChallengeParticipant.deleted_at.is_(None), ) - .options(selectinload(ChallengeParticipant.user).selectinload(User.username)) + .options( + selectinload(ChallengeParticipant.user).selectinload(User.username), + selectinload(ChallengeParticipant.semana_participant), + ) ) return result.scalar_one_or_none() @@ -53,7 +59,10 @@ async def get_challenge_participant( ChallengeParticipant.challenge_id == challenge_id, ChallengeParticipant.deleted_at.is_(None), ) - .options(selectinload(ChallengeParticipant.user).selectinload(User.username)) + .options( + selectinload(ChallengeParticipant.user).selectinload(User.username), + selectinload(ChallengeParticipant.semana_participant), + ) ) if for_update: @@ -88,11 +97,13 @@ async def create_challenge_participant( user_id: uuid.UUID, challenge_id: uuid.UUID, score: int = 0, + semana_participant_id: uuid.UUID | None = None, ) -> ChallengeParticipant: participant = ChallengeParticipant( user_id=user_id, challenge_id=challenge_id, score=score, + semana_participant_id=semana_participant_id, ) session.add(participant) await session.flush() @@ -124,6 +135,7 @@ async def add_challenge_participant_score( ChallengeParticipant.challenge_id == challenge_id, ChallengeParticipant.deleted_at.is_(None), ) + .options(selectinload(ChallengeParticipant.semana_participant)) .with_for_update() ) if participant is None: diff --git a/backend/app/main.py b/backend/app/main.py index 7ca67176..9dc88ad0 100644 --- a/backend/app/main.py +++ b/backend/app/main.py @@ -10,6 +10,8 @@ from app.core.exceptions.app_errors import AppError from app.core.exceptions.handlers import app_error_handler, exception_handler from app.core.health import router as health_router +from app.semana.routes import admin_router as semana_admin_router +from app.semana.routes import router as semana_router from app.users.admin_router import router as user_admin_router from app.users.routes import router as user_router @@ -36,6 +38,8 @@ async def lifespan(app: FastAPI): app.include_router(health_router, prefix="/api/v1") app.include_router(auth_router, prefix="/api/v1/auth") app.include_router(user_router, prefix="/api/v1/user") +app.include_router(semana_router, prefix="/api/v1") +app.include_router(semana_admin_router, prefix="/api/v1") app.include_router(user_admin_router, prefix="/api/v1/admin/users") app.include_router(challenge_router, prefix="/api/v1/challenge") app.include_router(challenge_admin_router, prefix="/api/v1/admin/challenge") diff --git a/backend/app/semana/models.py b/backend/app/semana/models.py new file mode 100644 index 00000000..b677bb0a --- /dev/null +++ b/backend/app/semana/models.py @@ -0,0 +1,77 @@ +from __future__ import annotations + +import uuid +from typing import TYPE_CHECKING + +from sqlalchemy import ForeignKey, Integer, String, UniqueConstraint +from sqlalchemy.orm import Mapped, mapped_column, relationship + +from app.core.mixins import TimestampsMixin, UUIDPKMixin +from app.core.models import Base + +if TYPE_CHECKING: + from app.challenges.models.challenge import Challenge + from app.challenges.models.challenge_participant import ChallengeParticipant + from app.users.models import User + + +class SemanaEvent(Base): + __tablename__ = "semana_event" + + id: Mapped[int] = mapped_column(Integer, primary_key=True) + nome: Mapped[str] = mapped_column(String(255)) + ano: Mapped[int] = mapped_column() + + challenges: Mapped[list[Challenge]] = relationship(back_populates="semana") + participants: Mapped[list[SemanaParticipant]] = relationship( + back_populates="semana", cascade="all, delete-orphan" + ) + + +class SemanaParticipant(Base, UUIDPKMixin, TimestampsMixin): + __tablename__ = "semana_participants" + + semana_id: Mapped[int] = mapped_column( + ForeignKey("semana_event.id", ondelete="CASCADE") + ) + user_id: Mapped[uuid.UUID] = mapped_column( + ForeignKey("users.id", ondelete="CASCADE") + ) + nickname: Mapped[str] = mapped_column(String(255)) + + semana: Mapped[SemanaEvent] = relationship(back_populates="participants") + user: Mapped[User] = relationship() + challenge_attempts: Mapped[list[ChallengeParticipant]] = relationship( + back_populates="semana_participant" + ) + point_events: Mapped[list[PointEvent]] = relationship( + back_populates="semana_participant", cascade="all, delete-orphan" + ) + + __table_args__ = ( + UniqueConstraint("semana_id", "user_id"), + UniqueConstraint("semana_id", "nickname"), + ) + + +class PointEvent(Base, UUIDPKMixin, TimestampsMixin): + __tablename__ = "point_events" + + semana_participant_id: Mapped[uuid.UUID] = mapped_column( + ForeignKey("semana_participants.id", ondelete="CASCADE") + ) + amount: Mapped[int] = mapped_column() + source_type: Mapped[str] = mapped_column(String(32)) + source_id: Mapped[uuid.UUID | None] = mapped_column(nullable=True) + reason: Mapped[str | None] = mapped_column(String(255), nullable=True) + + semana_participant: Mapped[SemanaParticipant] = relationship( + back_populates="point_events" + ) + + __table_args__ = ( + UniqueConstraint( + "semana_participant_id", "source_type", "source_id", + name="uq_point_event_source", + ), + ) diff --git a/backend/app/semana/routes.py b/backend/app/semana/routes.py new file mode 100644 index 00000000..70b2b627 --- /dev/null +++ b/backend/app/semana/routes.py @@ -0,0 +1,73 @@ +from typing import Annotated +from uuid import UUID + +from fastapi import APIRouter, Depends, Security +from sqlalchemy.ext.asyncio import AsyncSession + +from app.auth.dependencies import get_current_admin_user, get_current_user +from app.auth.scopes import Scope +from app.core.database import get_session +from app.core.exceptions.app_errors import NotFoundError +from app.semana import schemas, services +from app.users.models import User + +router = APIRouter(prefix="/semana", tags=["semana"]) +admin_router = APIRouter(prefix="/admin/semana", tags=["admin", "semana"]) + + +@router.get("/", response_model=list[schemas.SemanaResponse]) +async def list_semanas(session: Annotated[AsyncSession, Depends(get_session)]): + return await services.list_semanas(session) + + +@router.post( + "/{semana_id}/join", + response_model=schemas.SemanaParticipantResponse, +) +async def join_semana( + semana_id: int, + session: Annotated[AsyncSession, Depends(get_session)], + current_user: Annotated[ + User, Security(get_current_user, scopes=[Scope.PROFILE, Scope.EMAIL]) + ], +): + semana = await services.get_semana(session, semana_id) + if semana is None: + raise NotFoundError("Semana not found.") + return await services.get_or_create_participant(session, semana, current_user) + + +@router.get("/{semana_id}/ranking", response_model=list[schemas.SemanaRankingEntry]) +async def get_semana_ranking( + semana_id: int, + session: Annotated[AsyncSession, Depends(get_session)], +): + if await services.get_semana(session, semana_id) is None: + raise NotFoundError("Semana not found.") + return [ + schemas.SemanaRankingEntry(participant_id=row[0], nickname=row[1], points=row[2]) + for row in await services.list_ranking(session, semana_id) + ] + + +@admin_router.post( + "/{semana_id}/participants/{participant_id}/points", + response_model=schemas.PointEventResponse, +) +async def award_points( + semana_id: int, + participant_id: UUID, + data: schemas.PointAdjustment, + session: Annotated[AsyncSession, Depends(get_session)], + _: Annotated[User, Security(get_current_admin_user, scopes=[Scope.ADMIN])], +): + participant = await services.get_participant(session, semana_id, participant_id) + if participant is None: + raise NotFoundError("Semana participant not found.") + return await services.add_points( + session, + participant, + data.amount, + source_type="manual", + reason=data.reason, + ) diff --git a/backend/app/semana/schemas.py b/backend/app/semana/schemas.py new file mode 100644 index 00000000..544de370 --- /dev/null +++ b/backend/app/semana/schemas.py @@ -0,0 +1,43 @@ +from datetime import datetime +from uuid import UUID + +from pydantic import BaseModel, ConfigDict + + +class SemanaParticipantResponse(BaseModel): + model_config = ConfigDict(from_attributes=True) + + id: UUID + semana_id: int + user_id: UUID + nickname: str + + +class SemanaRankingEntry(BaseModel): + participant_id: UUID + nickname: str + points: int + + +class SemanaResponse(BaseModel): + model_config = ConfigDict(from_attributes=True) + + id: int + nome: str + ano: int + + +class PointEventResponse(BaseModel): + model_config = ConfigDict(from_attributes=True) + + id: UUID + amount: int + source_type: str + source_id: UUID | None + reason: str | None + created_at: datetime + + +class PointAdjustment(BaseModel): + amount: int + reason: str diff --git a/backend/app/semana/services.py b/backend/app/semana/services.py new file mode 100644 index 00000000..5dcb3630 --- /dev/null +++ b/backend/app/semana/services.py @@ -0,0 +1,85 @@ +from sqlalchemy import func, select +from sqlalchemy.ext.asyncio import AsyncSession + +from app.semana.models import PointEvent, SemanaEvent, SemanaParticipant +from app.users.models import User + + +async def get_semana(session: AsyncSession, semana_id: int) -> SemanaEvent | None: + return await session.get(SemanaEvent, semana_id) + + +async def list_semanas(session: AsyncSession) -> list[SemanaEvent]: + return list( + (await session.scalars(select(SemanaEvent).order_by(SemanaEvent.ano.desc()))).all() + ) + + +async def get_or_create_participant( + session: AsyncSession, semana: SemanaEvent, user: User +) -> SemanaParticipant: + participant = await session.scalar( + select(SemanaParticipant).where( + SemanaParticipant.semana_id == semana.id, + SemanaParticipant.user_id == user.id, + ) + ) + if participant is not None: + return participant + + nickname = user.username.nickname if user.username is not None else str(user.id)[:8] + participant = SemanaParticipant( + semana_id=semana.id, + user_id=user.id, + nickname=nickname, + ) + session.add(participant) + await session.flush() + return participant + + +async def add_points( + session: AsyncSession, + participant: SemanaParticipant, + amount: int, + *, + source_type: str, + source_id=None, + reason: str | None = None, +) -> PointEvent: + event = PointEvent( + semana_participant_id=participant.id, + amount=amount, + source_type=source_type, + source_id=source_id, + reason=reason, + ) + session.add(event) + await session.flush() + return event + + +async def list_ranking(session: AsyncSession, semana_id: int): + rows = await session.execute( + select( + SemanaParticipant.id, + SemanaParticipant.nickname, + func.coalesce(func.sum(PointEvent.amount), 0).label("points"), + ) + .outerjoin(PointEvent) + .where(SemanaParticipant.semana_id == semana_id) + .group_by(SemanaParticipant.id, SemanaParticipant.nickname) + .order_by(func.coalesce(func.sum(PointEvent.amount), 0).desc()) + ) + return rows.all() + + +async def get_participant( + session: AsyncSession, semana_id: int, participant_id +) -> SemanaParticipant | None: + return await session.scalar( + select(SemanaParticipant).where( + SemanaParticipant.id == participant_id, + SemanaParticipant.semana_id == semana_id, + ) + ) From 37968d59802e6ed8dd637d5052172801c19c7ee2 Mon Sep 17 00:00:00 2001 From: wate Date: Tue, 29 Sep 2026 20:37:59 -0300 Subject: [PATCH 02/62] refactor(users): scope usernames to Semana Co-authored-by: Codex --- .../2c6e1a4b8d90_move_usernames_to_semana.py | 80 ++++++++++ backend/app/challenges/admin_routes.py | 3 + backend/app/challenges/routes.py | 28 ++-- backend/app/challenges/schemas.py | 1 + backend/app/challenges/services/challenge.py | 10 +- .../services/challenge_participant.py | 29 ++-- backend/app/semana/models.py | 8 +- backend/app/semana/routes.py | 14 +- backend/app/semana/services.py | 17 ++- .../auth/integration/test_auth_routes.py | 57 +------ backend/app/tests/challenges/conftest.py | 42 ++++-- .../integration/test_list_and_ranking.py | 30 +++- .../users/username/unit/test_assignment.py | 139 ++++++++++-------- backend/app/users/models.py | 17 +-- backend/app/users/schemas.py | 2 +- backend/app/users/services.py | 9 -- backend/app/users/username/models.py | 6 +- backend/app/users/username/services.py | 35 +++-- 18 files changed, 316 insertions(+), 211 deletions(-) create mode 100644 backend/alembic/versions/2c6e1a4b8d90_move_usernames_to_semana.py diff --git a/backend/alembic/versions/2c6e1a4b8d90_move_usernames_to_semana.py b/backend/alembic/versions/2c6e1a4b8d90_move_usernames_to_semana.py new file mode 100644 index 00000000..bb704683 --- /dev/null +++ b/backend/alembic/versions/2c6e1a4b8d90_move_usernames_to_semana.py @@ -0,0 +1,80 @@ +"""move username ownership to Semana participants + +Revision ID: 2c6e1a4b8d90 +Revises: 1f4a9d2b7c11 +""" + +from collections.abc import Sequence + +import sqlalchemy as sa +from alembic import op + +revision: str = "2c6e1a4b8d90" +down_revision: str | Sequence[str] | None = "1f4a9d2b7c11" +branch_labels: str | Sequence[str] | None = None +depends_on: str | Sequence[str] | None = None + + +def upgrade() -> None: + op.add_column( + "semana_participants", sa.Column("username_id", sa.Uuid(), nullable=True) + ) + op.create_foreign_key( + "semana_participants_username_id_fkey", + "semana_participants", + "usernames", + ["username_id"], + ["id"], + ) + op.execute( + sa.text( + """ + UPDATE semana_participants AS participants + SET username_id = users.username_id + FROM users + WHERE participants.user_id = users.id + AND users.username_id IS NOT NULL + """ + ) + ) + op.create_unique_constraint( + "uq_semana_participant_username", + "semana_participants", + ["semana_id", "username_id"], + ) + op.drop_column("semana_participants", "nickname") + op.drop_constraint("users_username_id_key", "users", type_="unique") + op.drop_constraint("users_username_id_fkey", "users", type_="foreignkey") + op.drop_column("users", "username_id") + + +def downgrade() -> None: + op.add_column("users", sa.Column("username_id", sa.Uuid(), nullable=True)) + op.create_foreign_key( + "users_username_id_fkey", "users", "usernames", ["username_id"], ["id"] + ) + op.create_unique_constraint("users_username_id_key", "users", ["username_id"]) + op.add_column( + "semana_participants", + sa.Column("nickname", sa.String(255), nullable=True), + ) + op.execute( + sa.text( + """ + UPDATE users + SET username_id = participants.username_id + FROM semana_participants AS participants + WHERE users.id = participants.user_id + AND participants.username_id IS NOT NULL + """ + ) + ) + op.drop_constraint( + "uq_semana_participant_username", "semana_participants", type_="unique" + ) + op.drop_constraint( + "semana_participants_username_id_fkey", + "semana_participants", + type_="foreignkey", + ) + op.drop_column("semana_participants", "username_id") diff --git a/backend/app/challenges/admin_routes.py b/backend/app/challenges/admin_routes.py index e8e3712f..8636a49a 100644 --- a/backend/app/challenges/admin_routes.py +++ b/backend/app/challenges/admin_routes.py @@ -79,12 +79,15 @@ async def update_challenge_endpoint( raise BadRequestError("Manual challenges cannot have questions.") if challenge.scoring_type == ChallengeScoringType.INPUT and data.input_answer == "": raise BadRequestError("Input challenges require an expected answer.") + if data.semana_id is not None and await semana_service.get_semana(session, data.semana_id) is None: + raise NotFoundError("Semana not found.") await challenge_service.update_challenge( session, challenge, title=data.title, finishes_at=data.finishes_at, + semana_id=data.semana_id, prompt=data.prompt, points_value=data.points_value, input_answer=data.input_answer, diff --git a/backend/app/challenges/routes.py b/backend/app/challenges/routes.py index 7dcba66b..7a787ff8 100644 --- a/backend/app/challenges/routes.py +++ b/backend/app/challenges/routes.py @@ -34,6 +34,8 @@ async def join_challenge( challenge = await challenge_service.get_challenge_by_id(session, challenge_id) if challenge is None: raise NotFoundError("Challenge with given ID not found.") + if challenge.semana_id is None: + raise BadRequestError("Challenge must belong to a Semana.") current_participant = await participant_service.get_challenge_participant( session, current_user.id, challenge_id, for_update=True @@ -41,15 +43,13 @@ async def join_challenge( if current_participant is not None: raise BadRequestError("You are subscribed to this challenge already.") - semana_participant_id = None - if challenge.semana_id is not None: - semana = await semana_service.get_semana(session, challenge.semana_id) - if semana is None: - raise NotFoundError("Semana not found.") - semana_participant = await semana_service.get_or_create_participant( - session, semana, current_user - ) - semana_participant_id = semana_participant.id + semana = await semana_service.get_semana(session, challenge.semana_id) + if semana is None: + raise NotFoundError("Semana not found.") + semana_participant = await semana_service.get_or_create_participant( + session, semana, current_user + ) + semana_participant_id = semana_participant.id new_participant = await participant_service.create_challenge_participant( session, current_user.id, challenge_id, semana_participant_id=semana_participant_id @@ -59,7 +59,7 @@ async def join_challenge( result = await participant_service.get_challenge_participant_by_id( session, new_participant.id ) - if result is None or result.user.username is None: + if result is None or result.semana_participant is None: raise BadRequestError("Username assignment failed.") return challenge_schemas.ParticipantResponse( @@ -68,9 +68,9 @@ async def join_challenge( challenge_id=result.challenge_id, name=result.user.name, nickname=( - result.semana_participant.nickname + result.semana_participant.username.nickname if result.semana_participant is not None - else result.user.username.nickname + else "" ), score=result.score, submitted_at=result.submitted_at, @@ -301,9 +301,9 @@ async def get_ranking( score=p.score, name=p.user.name, nickname=( - p.semana_participant.nickname + p.semana_participant.username.nickname if p.semana_participant is not None - else (p.user.username.nickname if p.user.username else "") + else "" ), ) for p in participants diff --git a/backend/app/challenges/schemas.py b/backend/app/challenges/schemas.py index 20f86b05..bc2ecc9f 100644 --- a/backend/app/challenges/schemas.py +++ b/backend/app/challenges/schemas.py @@ -89,6 +89,7 @@ class ChallengeUpdate(BaseModel): prompt: str | None = None questions: list[QuestionCreate] | None = None finishes_at: datetime | None = None + semana_id: int | None = None points_value: int | None = None input_answer: str | None = None resource_urls: list[str] | None = None diff --git a/backend/app/challenges/services/challenge.py b/backend/app/challenges/services/challenge.py index bd71fcf4..d745fe09 100644 --- a/backend/app/challenges/services/challenge.py +++ b/backend/app/challenges/services/challenge.py @@ -1,10 +1,6 @@ import uuid from datetime import UTC, datetime -from sqlalchemy import func, select -from sqlalchemy.ext.asyncio import AsyncSession -from sqlalchemy.orm import selectinload - from app.challenges import exceptions as challenge_exceptions from app.challenges import schemas as challenge_schemas from app.challenges.models.answer import Answer @@ -13,6 +9,9 @@ from app.challenges.models.question import Question from app.core.exceptions.app_errors import NotFoundError from app.core.pagination import Page, PaginationParams +from sqlalchemy import func, select +from sqlalchemy.ext.asyncio import AsyncSession +from sqlalchemy.orm import selectinload def ensure_challenge_open(finishes_at: datetime) -> None: @@ -159,6 +158,7 @@ async def update_challenge( *, title: str | None = None, finishes_at: datetime | None = None, + semana_id: int | None = None, prompt: str | None = None, points_value: int | None = None, input_answer: str | None = None, @@ -168,6 +168,8 @@ async def update_challenge( challenge.title = title if finishes_at is not None: challenge.finishes_at = finishes_at + if semana_id is not None: + challenge.semana_id = semana_id if prompt is not None: challenge.prompt = prompt if points_value is not None: diff --git a/backend/app/challenges/services/challenge_participant.py b/backend/app/challenges/services/challenge_participant.py index 4c903be2..cc16bf3e 100644 --- a/backend/app/challenges/services/challenge_participant.py +++ b/backend/app/challenges/services/challenge_participant.py @@ -1,12 +1,11 @@ import uuid +from app.challenges.models.challenge_participant import ChallengeParticipant +from app.semana.models import SemanaParticipant from sqlalchemy import desc, select from sqlalchemy.ext.asyncio import AsyncSession from sqlalchemy.orm import selectinload -from app.challenges.models.challenge_participant import ChallengeParticipant -from app.users.models import User - async def get_challenge_ranking( session: AsyncSession, challenge_id: uuid.UUID @@ -18,8 +17,10 @@ async def get_challenge_ranking( ChallengeParticipant.deleted_at.is_(None), ) .options( - selectinload(ChallengeParticipant.user).selectinload(User.username), - selectinload(ChallengeParticipant.semana_participant), + selectinload(ChallengeParticipant.user), + selectinload(ChallengeParticipant.semana_participant).selectinload( + SemanaParticipant.username + ), ) .order_by(desc(ChallengeParticipant.score)) .limit(10) @@ -38,8 +39,10 @@ async def get_challenge_participant_by_id( ChallengeParticipant.deleted_at.is_(None), ) .options( - selectinload(ChallengeParticipant.user).selectinload(User.username), - selectinload(ChallengeParticipant.semana_participant), + selectinload(ChallengeParticipant.user), + selectinload(ChallengeParticipant.semana_participant).selectinload( + SemanaParticipant.username + ), ) ) return result.scalar_one_or_none() @@ -60,8 +63,10 @@ async def get_challenge_participant( ChallengeParticipant.deleted_at.is_(None), ) .options( - selectinload(ChallengeParticipant.user).selectinload(User.username), - selectinload(ChallengeParticipant.semana_participant), + selectinload(ChallengeParticipant.user), + selectinload(ChallengeParticipant.semana_participant).selectinload( + SemanaParticipant.username + ), ) ) @@ -135,7 +140,11 @@ async def add_challenge_participant_score( ChallengeParticipant.challenge_id == challenge_id, ChallengeParticipant.deleted_at.is_(None), ) - .options(selectinload(ChallengeParticipant.semana_participant)) + .options( + selectinload(ChallengeParticipant.semana_participant).selectinload( + SemanaParticipant.username + ) + ) .with_for_update() ) if participant is None: diff --git a/backend/app/semana/models.py b/backend/app/semana/models.py index b677bb0a..8b19eabd 100644 --- a/backend/app/semana/models.py +++ b/backend/app/semana/models.py @@ -13,6 +13,7 @@ from app.challenges.models.challenge import Challenge from app.challenges.models.challenge_participant import ChallengeParticipant from app.users.models import User + from app.users.username.models import Username class SemanaEvent(Base): @@ -37,10 +38,13 @@ class SemanaParticipant(Base, UUIDPKMixin, TimestampsMixin): user_id: Mapped[uuid.UUID] = mapped_column( ForeignKey("users.id", ondelete="CASCADE") ) - nickname: Mapped[str] = mapped_column(String(255)) + username_id: Mapped[uuid.UUID | None] = mapped_column( + ForeignKey("usernames.id"), nullable=True + ) semana: Mapped[SemanaEvent] = relationship(back_populates="participants") user: Mapped[User] = relationship() + username: Mapped[Username | None] = relationship(back_populates="participants") challenge_attempts: Mapped[list[ChallengeParticipant]] = relationship( back_populates="semana_participant" ) @@ -50,7 +54,7 @@ class SemanaParticipant(Base, UUIDPKMixin, TimestampsMixin): __table_args__ = ( UniqueConstraint("semana_id", "user_id"), - UniqueConstraint("semana_id", "nickname"), + UniqueConstraint("semana_id", "username_id"), ) diff --git a/backend/app/semana/routes.py b/backend/app/semana/routes.py index 70b2b627..6e0625fd 100644 --- a/backend/app/semana/routes.py +++ b/backend/app/semana/routes.py @@ -34,7 +34,15 @@ async def join_semana( semana = await services.get_semana(session, semana_id) if semana is None: raise NotFoundError("Semana not found.") - return await services.get_or_create_participant(session, semana, current_user) + participant = await services.get_or_create_participant( + session, semana, current_user + ) + return schemas.SemanaParticipantResponse( + id=participant.id, + semana_id=participant.semana_id, + user_id=participant.user_id, + nickname=participant.username.nickname, + ) @router.get("/{semana_id}/ranking", response_model=list[schemas.SemanaRankingEntry]) @@ -45,7 +53,9 @@ async def get_semana_ranking( if await services.get_semana(session, semana_id) is None: raise NotFoundError("Semana not found.") return [ - schemas.SemanaRankingEntry(participant_id=row[0], nickname=row[1], points=row[2]) + schemas.SemanaRankingEntry( + participant_id=row[0], nickname=row[1], points=row[2] + ) for row in await services.list_ranking(session, semana_id) ] diff --git a/backend/app/semana/services.py b/backend/app/semana/services.py index 5dcb3630..bb904683 100644 --- a/backend/app/semana/services.py +++ b/backend/app/semana/services.py @@ -1,8 +1,11 @@ from sqlalchemy import func, select from sqlalchemy.ext.asyncio import AsyncSession +from sqlalchemy.orm import selectinload from app.semana.models import PointEvent, SemanaEvent, SemanaParticipant from app.users.models import User +from app.users.username import services as username_services +from app.users.username.models import Username async def get_semana(session: AsyncSession, semana_id: int) -> SemanaEvent | None: @@ -19,22 +22,25 @@ async def get_or_create_participant( session: AsyncSession, semana: SemanaEvent, user: User ) -> SemanaParticipant: participant = await session.scalar( - select(SemanaParticipant).where( + select(SemanaParticipant) + .where( SemanaParticipant.semana_id == semana.id, SemanaParticipant.user_id == user.id, ) + .options(selectinload(SemanaParticipant.username)) ) if participant is not None: + if participant.username is None: + await username_services.assign_username(participant.id, session) return participant - nickname = user.username.nickname if user.username is not None else str(user.id)[:8] participant = SemanaParticipant( semana_id=semana.id, user_id=user.id, - nickname=nickname, ) session.add(participant) await session.flush() + await username_services.assign_username(participant.id, session) return participant @@ -63,12 +69,13 @@ async def list_ranking(session: AsyncSession, semana_id: int): rows = await session.execute( select( SemanaParticipant.id, - SemanaParticipant.nickname, + Username.nickname, func.coalesce(func.sum(PointEvent.amount), 0).label("points"), ) .outerjoin(PointEvent) + .join(Username, Username.id == SemanaParticipant.username_id) .where(SemanaParticipant.semana_id == semana_id) - .group_by(SemanaParticipant.id, SemanaParticipant.nickname) + .group_by(SemanaParticipant.id, Username.nickname) .order_by(func.coalesce(func.sum(PointEvent.amount), 0).desc()) ) return rows.all() diff --git a/backend/app/tests/auth/integration/test_auth_routes.py b/backend/app/tests/auth/integration/test_auth_routes.py index 85a6c4ff..32b0b405 100644 --- a/backend/app/tests/auth/integration/test_auth_routes.py +++ b/backend/app/tests/auth/integration/test_auth_routes.py @@ -1,8 +1,7 @@ import pytest -from httpx2 import AsyncClient - from app.auth import services as auth_services from app.auth.scopes import DEFAULT_SCOPES, Scope +from httpx2 import AsyncClient # =========================================================================== # POST /api/v1/auth/login @@ -112,40 +111,14 @@ async def test_me_returns_current_user(db_client: AsyncClient, user_factory): body = response.json() assert body["email"] == user.email assert body["name"] == "Me User" - assert body["username"]["id"] == str(user.username_id) - assert body["username"]["nickname"] + assert "username" not in body @pytest.mark.asyncio -async def test_me_returns_username_and_mother_details( - db_client: AsyncClient, user_factory, db_session +async def test_me_does_not_return_semana_username( + db_client: AsyncClient, user_factory ): - from app.users.username.models import Username, UsernameMother - user = await user_factory(email="me-username@example.com", name="Me Username") - first_mother = UsernameMother( - first_name="Ada", - last_name="Lovelace", - full_name="Ada Lovelace", - description="Mathematician", - ) - last_mother = UsernameMother( - first_name="Grace", - last_name="Hopper", - full_name="Grace Hopper", - description="Computer scientist", - ) - db_session.add_all([first_mother, last_mother]) - await db_session.flush() - username = Username( - nickname="AdaHopper", - first_mother_id=first_mother.id, - last_mother_id=last_mother.id, - ) - db_session.add(username) - await db_session.flush() - user.username_id = username.id - await db_session.flush() token = auth_services.create_access_token(user.id, [Scope.PROFILE, Scope.EMAIL]) response = await db_client.get( @@ -154,24 +127,7 @@ async def test_me_returns_username_and_mother_details( ) assert response.status_code == 200 - assert response.json()["username"] == { - "id": str(username.id), - "nickname": "AdaHopper", - "first_mother": { - "id": str(first_mother.id), - "first_name": "Ada", - "last_name": "Lovelace", - "full_name": "Ada Lovelace", - "description": "Mathematician", - }, - "last_mother": { - "id": str(last_mother.id), - "first_name": "Grace", - "last_name": "Hopper", - "full_name": "Grace Hopper", - "description": "Computer scientist", - }, - } + assert "username" not in response.json() @pytest.mark.asyncio @@ -541,9 +497,8 @@ async def test_refresh_does_not_store_plaintext_token( db_client: AsyncClient, db_session, refresh_token_factory, user_factory ): """O novo token NUNCA deve estar em claro no banco (só hash).""" - from sqlalchemy import select - from app.auth.models import RefreshToken + from sqlalchemy import select user = await user_factory(email="rot-no-plaintext@example.com") token = await refresh_token_factory(user.id) diff --git a/backend/app/tests/challenges/conftest.py b/backend/app/tests/challenges/conftest.py index 37d29a09..26341bab 100644 --- a/backend/app/tests/challenges/conftest.py +++ b/backend/app/tests/challenges/conftest.py @@ -6,14 +6,13 @@ from collections.abc import Callable import pytest -from httpx import AsyncClient -from sqlalchemy.ext.asyncio import AsyncSession - from app.auth.dependencies import get_current_admin_user, get_current_user from app.challenges.models.challenge import Challenge, ChallengeScoringType from app.challenges.models.question import Question +from app.semana.models import SemanaEvent from app.users.models import User -from app.users.username import services as username_service +from httpx import AsyncClient +from sqlalchemy.ext.asyncio import AsyncSession # --------------------------------------------------------------------------- # Factories @@ -38,29 +37,26 @@ def _make_user(*, is_admin: bool = False) -> User: @pytest.fixture -async def user(db_session: AsyncSession, username_catalog) -> User: +async def user(db_session: AsyncSession) -> User: u = _make_user() db_session.add(u) await db_session.flush() - await username_service.assign_username(u.id, db_session) return u @pytest.fixture -async def other_user(db_session: AsyncSession, username_catalog) -> User: +async def other_user(db_session: AsyncSession) -> User: u = _make_user() db_session.add(u) await db_session.flush() - await username_service.assign_username(u.id, db_session) return u @pytest.fixture -async def admin(db_session: AsyncSession, username_catalog) -> User: +async def admin(db_session: AsyncSession) -> User: u = _make_user(is_admin=True) db_session.add(u) await db_session.flush() - await username_service.assign_username(u.id, db_session) return u @@ -92,16 +88,34 @@ def _switch(user: User) -> AsyncClient: @pytest.fixture -async def challenge(db_session: AsyncSession) -> Challenge: - c = Challenge(title="Quiz Teste", scoring_type=ChallengeScoringType.QUIZ) +async def semana(db_session: AsyncSession) -> SemanaEvent: + event = SemanaEvent(nome="Semana Teste", ano=2026) + db_session.add(event) + await db_session.flush() + return event + + +@pytest.fixture +async def challenge(db_session: AsyncSession, semana: SemanaEvent) -> Challenge: + c = Challenge( + title="Quiz Teste", + scoring_type=ChallengeScoringType.QUIZ, + semana_id=semana.id, + ) db_session.add(c) await db_session.flush() return c @pytest.fixture -async def manual_challenge(db_session: AsyncSession) -> Challenge: - c = Challenge(title="Manual Teste", scoring_type=ChallengeScoringType.MANUAL) +async def manual_challenge( + db_session: AsyncSession, semana: SemanaEvent +) -> Challenge: + c = Challenge( + title="Manual Teste", + scoring_type=ChallengeScoringType.MANUAL, + semana_id=semana.id, + ) db_session.add(c) await db_session.flush() return c 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 660f2639..89ffb0d2 100644 --- a/backend/app/tests/challenges/integration/test_list_and_ranking.py +++ b/backend/app/tests/challenges/integration/test_list_and_ranking.py @@ -4,11 +4,11 @@ import uuid -from httpx import AsyncClient -from sqlalchemy.ext.asyncio import AsyncSession - from app.challenges.models.challenge import Challenge, ChallengeScoringType from app.challenges.models.challenge_participant import ChallengeParticipant +from app.semana.models import SemanaParticipant +from httpx import AsyncClient +from sqlalchemy.ext.asyncio import AsyncSession async def test_list_challenges_paginated( @@ -47,13 +47,12 @@ async def test_ranking_orders_by_score_desc( user, challenge, db_session: AsyncSession, + semana, username_catalog, ): from app.users.models import User - ranking_username = next( - username for username in username_catalog if username.id != user.username_id - ) + ranking_username = username_catalog[0] # 15 participantes com scores variados for i in range(15): @@ -67,9 +66,24 @@ async def test_ranking_orders_by_score_desc( db_session.add(u) await db_session.flush() if i == 14: - u.username_id = ranking_username.id + semana_participant = SemanaParticipant( + user_id=u.id, + semana_id=semana.id, + username_id=ranking_username.id, + ) + db_session.add(semana_participant) + await db_session.flush() + else: + semana_participant = None db_session.add( - ChallengeParticipant(user_id=u.id, challenge_id=challenge.id, score=i * 10) + ChallengeParticipant( + user_id=u.id, + challenge_id=challenge.id, + score=i * 10, + semana_participant_id=( + semana_participant.id if semana_participant is not None else None + ), + ) ) await db_session.flush() diff --git a/backend/app/tests/users/username/unit/test_assignment.py b/backend/app/tests/users/username/unit/test_assignment.py index ad874958..b44497c4 100644 --- a/backend/app/tests/users/username/unit/test_assignment.py +++ b/backend/app/tests/users/username/unit/test_assignment.py @@ -1,108 +1,127 @@ -"""Testes de `assign_username`.""" +"""Testes de `assign_username` por Semana.""" from __future__ import annotations -import pytest -from sqlalchemy.exc import IntegrityError -from sqlalchemy.ext.asyncio import AsyncSession +import uuid +import pytest from app.core.exceptions.app_errors import NotFoundError +from app.semana.models import SemanaEvent, SemanaParticipant from app.users.exceptions import NoAvailableUsername from app.users.username import services as username_service +from sqlalchemy.exc import IntegrityError +from sqlalchemy.ext.asyncio import AsyncSession + + +async def _participant(db_session, user_factory, *, semana_id, email): + user = await user_factory(email=email) + participant = SemanaParticipant(user_id=user.id, semana_id=semana_id) + db_session.add(participant) + await db_session.flush() + return participant async def test_assigns_first_available_username( db_session: AsyncSession, user_factory, username_catalog ): - user = await user_factory(email="username-first@example.com") - username = await username_service.assign_username(user.id, db_session) + semana = SemanaEvent(nome="Semana", ano=2026) + db_session.add(semana) + await db_session.flush() + participant = await _participant( + db_session, user_factory, semana_id=semana.id, email="username-first@example.com" + ) - assert username.nickname in { - catalog_username.nickname for catalog_username in username_catalog - } - assert user.username_id == username.id + username = await username_service.assign_username(participant.id, db_session) + + assert username.nickname in {item.nickname for item in username_catalog} + assert participant.username_id == username.id async def test_returns_existing_username_if_already_assigned( db_session: AsyncSession, user_factory, username_catalog ): - user = await user_factory(email="username-existing@example.com") - user.username_id = username_catalog[0].id + semana = SemanaEvent(nome="Semana", ano=2026) + db_session.add(semana) + await db_session.flush() + participant = await _participant( + db_session, + user_factory, + semana_id=semana.id, + email="username-existing@example.com", + ) + participant.username_id = username_catalog[0].id await db_session.flush() - username = await username_service.assign_username(user.id, db_session) + username = await username_service.assign_username(participant.id, db_session) assert username.id == username_catalog[0].id -async def test_username_cannot_be_assigned_to_multiple_users( - db_session: AsyncSession, username_catalog +async def test_username_cannot_be_assigned_twice_in_same_semana( + db_session: AsyncSession, user_factory, username_catalog ): - import uuid - - from app.users.models import User - - user = User( - id=uuid.uuid4(), - email="username-owner@example.com", - name="Username Owner", - password_hash="x", + semana = SemanaEvent(nome="Semana", ano=2026) + db_session.add(semana) + await db_session.flush() + first = await _participant( + db_session, user_factory, semana_id=semana.id, email="username-owner@example.com" ) - other_user = User( - id=uuid.uuid4(), - email="username-other@example.com", - name="Username Other", - password_hash="x", + other = await _participant( + db_session, user_factory, semana_id=semana.id, email="username-other@example.com" ) - db_session.add_all([user, other_user]) - await db_session.flush() - user.username_id = username_catalog[0].id + first.username_id = username_catalog[0].id await db_session.flush() with pytest.raises(IntegrityError): async with db_session.begin_nested(): - other_user.username_id = username_catalog[0].id + other.username_id = username_catalog[0].id await db_session.flush() -async def test_raises_when_no_username_available( - db_session: AsyncSession, username_catalog +async def test_same_username_can_be_used_in_different_semanas( + db_session: AsyncSession, user_factory, username_catalog ): - import uuid - - from app.users.models import User - - user = User( - id=uuid.uuid4(), - email="username-catalog-exhausted@example.com", - name="Catalog Exhausted", - password_hash="x", + first_semana = SemanaEvent(nome="Semana 1", ano=2026) + second_semana = SemanaEvent(nome="Semana 2", ano=2027) + db_session.add_all([first_semana, second_semana]) + await db_session.flush() + first = await _participant( + db_session, user_factory, semana_id=first_semana.id, email="one@example.com" ) - db_session.add(user) + second = await _participant( + db_session, user_factory, semana_id=second_semana.id, email="two@example.com" + ) + first.username_id = username_catalog[0].id + second.username_id = username_catalog[0].id + await db_session.flush() - # Assigns every catalog entry to a different user. - for i, u in enumerate(username_catalog): - dummy = User( - id=uuid.uuid4(), - email=f"dummy-{i}@t.local", - name=f"Dummy {i}", - password_hash="x", - is_verified=True, + +async def test_raises_when_no_username_available( + db_session: AsyncSession, user_factory, username_catalog +): + semana = SemanaEvent(nome="Semana", ano=2026) + db_session.add(semana) + await db_session.flush() + participants = [ + await _participant( + db_session, + user_factory, + semana_id=semana.id, + email=f"username-{i}@example.com", ) - db_session.add(dummy) - await db_session.flush() - dummy.username_id = u.id + for i in range(len(username_catalog) + 1) + ] + for participant, username in zip(participants, username_catalog): + participant.username_id = username.id await db_session.flush() with pytest.raises(NoAvailableUsername): - await username_service.assign_username(user.id, db_session) + await username_service.assign_username(participants[-1].id, db_session) -async def test_raises_when_user_does_not_exist( +async def test_raises_when_participant_does_not_exist( db_session: AsyncSession, username_catalog ): - import uuid - with pytest.raises(NotFoundError): await username_service.assign_username(uuid.uuid4(), db_session) diff --git a/backend/app/users/models.py b/backend/app/users/models.py index 7ab30cdc..56793bdd 100644 --- a/backend/app/users/models.py +++ b/backend/app/users/models.py @@ -1,17 +1,11 @@ from __future__ import annotations -import uuid -from typing import TYPE_CHECKING - -from sqlalchemy import Boolean, ForeignKey, String -from sqlalchemy.orm import Mapped, mapped_column, relationship +from sqlalchemy import Boolean, String +from sqlalchemy.orm import Mapped, mapped_column from app.core.mixins import TimestampsMixin, UUIDPKMixin from app.core.models import Base -if TYPE_CHECKING: - from app.users.username.models import Username - class User(Base, UUIDPKMixin, TimestampsMixin): """Conta de um participante da semana (login, perfil básico). @@ -39,12 +33,5 @@ class User(Base, UUIDPKMixin, TimestampsMixin): is_verified: Mapped[bool] = mapped_column( Boolean, nullable=False, default=False, server_default="false" ) - username_id: Mapped[uuid.UUID | None] = mapped_column( - ForeignKey("usernames.id"), unique=True, nullable=True - ) - username: Mapped[Username | None] = relationship( - "Username", back_populates="user", lazy="selectin" - ) - def __repr__(self) -> str: return f"" diff --git a/backend/app/users/schemas.py b/backend/app/users/schemas.py index 6e2ae037..8aa84e27 100644 --- a/backend/app/users/schemas.py +++ b/backend/app/users/schemas.py @@ -75,4 +75,4 @@ class UsernameRead(BaseModel): class UserMe(UserRead): - username: UsernameRead | None = None + pass diff --git a/backend/app/users/services.py b/backend/app/users/services.py index ae095a4f..547e6871 100644 --- a/backend/app/users/services.py +++ b/backend/app/users/services.py @@ -4,7 +4,6 @@ from sqlalchemy import func, select from sqlalchemy.ext.asyncio import AsyncSession -from sqlalchemy.orm import selectinload from app.auth.security import hash_password from app.core.pagination import Page, PaginationParams @@ -16,8 +15,6 @@ UserRead, UserUpdate, ) -from app.users.username import services as username_services -from app.users.username.models import Username # --- buscas "normais": ignoram usuários soft-deletados --- @@ -34,10 +31,6 @@ async def get_user_profile_by_id( result = await session.execute( select(User) .where(User.id == user_id, User.deleted_at.is_(None)) - .options( - selectinload(User.username).selectinload(Username.first_mother), - selectinload(User.username).selectinload(Username.last_mother), - ) .execution_options(populate_existing=True) ) return result.scalar_one_or_none() @@ -103,7 +96,6 @@ async def create_user(session: AsyncSession, user_in: UserCreate) -> User: deleted_user.is_verified = False await session.flush() - await username_services.assign_username(deleted_user.id, session) await session.refresh(deleted_user) return deleted_user @@ -116,7 +108,6 @@ async def create_user(session: AsyncSession, user_in: UserCreate) -> User: session.add(user) await session.flush() - await username_services.assign_username(user.id, session) await session.refresh(user) return user diff --git a/backend/app/users/username/models.py b/backend/app/users/username/models.py index 711fe6c6..31dd223c 100644 --- a/backend/app/users/username/models.py +++ b/backend/app/users/username/models.py @@ -10,7 +10,7 @@ from app.core.models import Base if TYPE_CHECKING: - from app.users.models import User + from app.semana.models import SemanaParticipant class UsernameMother(Base, UUIDPKMixin): @@ -36,4 +36,6 @@ class Username(Base, UUIDPKMixin): first_mother: Mapped[UsernameMother] = relationship(foreign_keys=[first_mother_id]) last_mother: Mapped[UsernameMother] = relationship(foreign_keys=[last_mother_id]) - user: Mapped[User | None] = relationship("User", back_populates="username") + participants: Mapped[list[SemanaParticipant]] = relationship( + "SemanaParticipant", back_populates="username" + ) diff --git a/backend/app/users/username/services.py b/backend/app/users/username/services.py index 6b62dff7..030c05ea 100644 --- a/backend/app/users/username/services.py +++ b/backend/app/users/username/services.py @@ -6,31 +6,38 @@ from sqlalchemy.orm import selectinload from app.core.exceptions.app_errors import NotFoundError +from app.semana.models import SemanaParticipant from app.users.exceptions import CouldNotAssignUsernameError, NoAvailableUsername -from app.users.models import User from app.users.username.models import Username MAX_RETRIES = 5 -async def assign_username(user_id: uuid.UUID, session: AsyncSession) -> Username: - user = await session.scalar( - select(User) - .where(User.id == user_id, User.deleted_at.is_(None)) - .options(selectinload(User.username)) - .execution_options(populate_existing=True) +async def assign_username( + participant_id: uuid.UUID, session: AsyncSession +) -> Username: + participant = await session.scalar( + select(SemanaParticipant) + .where( + SemanaParticipant.id == participant_id, + SemanaParticipant.deleted_at.is_(None), + ) + .options(selectinload(SemanaParticipant.username)) .with_for_update() ) - if user is None: - raise NotFoundError("User not found.") - if user.username is not None: - return user.username + if participant is None: + raise NotFoundError("Semana participant not found.") + if participant.username is not None: + return participant.username for _ in range(MAX_RETRIES): available = await session.scalar( select(Username) .where( - ~exists().where(User.username_id == Username.id), + ~exists().where( + SemanaParticipant.semana_id == participant.semana_id, + SemanaParticipant.username_id == Username.id, + ), ) .order_by(Username.id) .with_for_update(skip_locked=True) @@ -41,10 +48,10 @@ async def assign_username(user_id: uuid.UUID, session: AsyncSession) -> Username try: async with session.begin_nested(): - user.username = available + participant.username = available await session.flush() except IntegrityError: - user.username = None + participant.username = None continue return available From 41d8672af9364f9c61cf092aa5f932eedf9658dd Mon Sep 17 00:00:00 2001 From: wate Date: Tue, 29 Sep 2026 21:14:40 -0300 Subject: [PATCH 03/62] feat(frontend-auth): connect Semana auth flow Co-authored-by: Codex --- frontend/src/features/auth/README.md | 4 +- frontend/src/features/auth/api.ts | 103 ++++++++++++++++++ frontend/src/features/auth/auth-provider.tsx | 60 ++++++++++ .../features/auth/components/auth-card.tsx | 16 +-- .../features/auth/components/login-form.tsx | 3 +- .../auth/components/register-form.tsx | 5 +- frontend/src/features/auth/mock-auth.ts | 19 ---- .../profile/components/profile-page.tsx | 24 +++- 8 files changed, 201 insertions(+), 33 deletions(-) create mode 100644 frontend/src/features/auth/api.ts create mode 100644 frontend/src/features/auth/auth-provider.tsx delete mode 100644 frontend/src/features/auth/mock-auth.ts diff --git a/frontend/src/features/auth/README.md b/frontend/src/features/auth/README.md index 15995a27..0a0c334f 100644 --- a/frontend/src/features/auth/README.md +++ b/frontend/src/features/auth/README.md @@ -1,3 +1,5 @@ # Auth feature -Reserved for the new FastAPI-backed authentication and session flow. +The client uses the FastAPI auth endpoints under `/api/v1`. Access tokens stay +in memory; the backend refresh token remains an HttpOnly cookie and restores a +session when the Semana shell loads. diff --git a/frontend/src/features/auth/api.ts b/frontend/src/features/auth/api.ts new file mode 100644 index 00000000..dae6634a --- /dev/null +++ b/frontend/src/features/auth/api.ts @@ -0,0 +1,103 @@ +import type { LoginInput, RegisterInput, User } from './types' + +const API_URL = process.env.NEXT_PUBLIC_API_URL ?? 'http://localhost:8000' + +let accessToken: string | undefined + +type ApiUser = { + id: string + name: string + email: string + is_admin: boolean + is_verified: boolean + created_at: string +} + +type TokenResponse = { access_token: string } + +function mapUser(user: ApiUser): User { + return { + id: user.id, + name: user.name, + email: user.email, + isAdmin: user.is_admin, + isVerified: user.is_verified, + createdAt: user.created_at, + } +} + +async function request( + path: string, + init: RequestInit = {}, + retry = true, +): Promise { + const headers = new Headers(init.headers) + if (init.body && !headers.has('Content-Type')) + headers.set('Content-Type', 'application/json') + if (accessToken) headers.set('Authorization', `Bearer ${accessToken}`) + + const response = await fetch(`${API_URL}/api/v1${path}`, { + ...init, + headers, + credentials: 'include', + }) + + if (response.status === 401 && retry && path !== '/auth/refresh') { + try { + await refresh() + return request(path, init, false) + } catch { + accessToken = undefined + } + } + + if (!response.ok) { + const body = (await response.json().catch(() => null)) as { detail?: string } | null + throw new Error(body?.detail ?? 'Não foi possível concluir a operação.') + } + + if (response.status === 204) return undefined as T + return response.json() as Promise +} + +async function refresh() { + const token = await request('/auth/refresh', { method: 'POST' }, false) + accessToken = token.access_token +} + +export async function login(input: LoginInput): Promise { + const body = new URLSearchParams({ username: input.email, password: input.password }) + const token = await request('/auth/login', { + method: 'POST', + body, + headers: { 'Content-Type': 'application/x-www-form-urlencoded' }, + }) + accessToken = token.access_token + return getCurrentUser() +} + +export async function register(input: RegisterInput): Promise { + await request('/user/', { method: 'POST', body: JSON.stringify(input) }) +} + +export async function getCurrentUser(): Promise { + return mapUser(await request('/auth/me')) +} + +export async function restoreSession(): Promise { + try { + await refresh() + return await getCurrentUser() + } catch { + accessToken = undefined + return null + } +} + +export async function logout() { + try { + await request('/auth/logout', { method: 'POST' }, false) + } finally { + accessToken = undefined + } +} diff --git a/frontend/src/features/auth/auth-provider.tsx b/frontend/src/features/auth/auth-provider.tsx new file mode 100644 index 00000000..92737cba --- /dev/null +++ b/frontend/src/features/auth/auth-provider.tsx @@ -0,0 +1,60 @@ +'use client' + +import { + createContext, + useContext, + useEffect, + useMemo, + useState, + type ReactNode, +} from 'react' + +import { login, logout, register, restoreSession } from './api' +import type { LoginInput, RegisterInput, User } from './types' + +type AuthContextValue = { + user: User | null + loading: boolean + login: (input: LoginInput) => Promise + register: (input: RegisterInput) => Promise + logout: () => Promise +} + +const AuthContext = createContext(null) + +export function AuthProvider({ children }: { children: ReactNode }) { + const [user, setUser] = useState(null) + const [loading, setLoading] = useState(true) + + useEffect(() => { + restoreSession() + .then(setUser) + .finally(() => setLoading(false)) + }, []) + + const value = useMemo( + () => ({ + user, + loading, + async login(input) { + setUser(await login(input)) + }, + async register(input) { + await register(input) + }, + async logout() { + await logout() + setUser(null) + }, + }), + [loading, user], + ) + + return {children} +} + +export function useAuth() { + const auth = useContext(AuthContext) + if (!auth) throw new Error('useAuth must be used inside AuthProvider') + return auth +} diff --git a/frontend/src/features/auth/components/auth-card.tsx b/frontend/src/features/auth/components/auth-card.tsx index d37198ca..d7058be6 100644 --- a/frontend/src/features/auth/components/auth-card.tsx +++ b/frontend/src/features/auth/components/auth-card.tsx @@ -13,19 +13,21 @@ export function AuthCard({ footer: { text: string; label: string; href: string } }) { return ( -
-
-
-

+
+
+
+

{title}

-

{description}

+

+ {description} +

{children} -

+

{footer.text}{' '} {footer.label} diff --git a/frontend/src/features/auth/components/login-form.tsx b/frontend/src/features/auth/components/login-form.tsx index 3ae27353..260fcbe0 100644 --- a/frontend/src/features/auth/components/login-form.tsx +++ b/frontend/src/features/auth/components/login-form.tsx @@ -14,7 +14,7 @@ import { FormLabel, FormMessage, } from '@/components/ui/form' -import { login } from '@/features/auth/mock-auth' +import { useAuth } from '@/features/auth/auth-provider' import { SemanaButton } from '@/features/semana/components/semana-button' import { SemanaInput } from '@/features/semana/components/semana-input' @@ -27,6 +27,7 @@ type Values = z.infer export function LoginForm() { const router = useRouter() + const { login } = useAuth() const [error, setError] = useState() const form = useForm({ resolver: zodResolver(schema), diff --git a/frontend/src/features/auth/components/register-form.tsx b/frontend/src/features/auth/components/register-form.tsx index 6de0dcfb..cc9cf276 100644 --- a/frontend/src/features/auth/components/register-form.tsx +++ b/frontend/src/features/auth/components/register-form.tsx @@ -14,7 +14,7 @@ import { FormLabel, FormMessage, } from '@/components/ui/form' -import { register } from '@/features/auth/mock-auth' +import { useAuth } from '@/features/auth/auth-provider' import { SemanaButton } from '@/features/semana/components/semana-button' import { SemanaInput } from '@/features/semana/components/semana-input' @@ -28,6 +28,7 @@ type Values = z.infer export function RegisterForm() { const router = useRouter() + const { register } = useAuth() const [error, setError] = useState() const form = useForm({ resolver: zodResolver(schema), @@ -38,7 +39,7 @@ export function RegisterForm() { setError(undefined) try { await register(values) - router.push('/semana/perfil') + router.push('/semana/login') } catch { setError('Não foi possível criar sua conta. Tente novamente.') } diff --git a/frontend/src/features/auth/mock-auth.ts b/frontend/src/features/auth/mock-auth.ts deleted file mode 100644 index 610bfc7b..00000000 --- a/frontend/src/features/auth/mock-auth.ts +++ /dev/null @@ -1,19 +0,0 @@ -import type { LoginInput, RegisterInput, User } from './types' - -export const mockUser: User = { - id: '11111111-1111-4111-8111-111111111111', - name: 'Ada Lovelace', - email: 'ada@example.com', - isAdmin: false, - isVerified: true, - createdAt: '2026-09-01T12:00:00-03:00', -} - -export async function login(input: LoginInput): Promise { - void input - return mockUser -} - -export async function register(input: RegisterInput): Promise { - return { ...mockUser, name: input.name, email: input.email, isVerified: false } -} diff --git a/frontend/src/features/profile/components/profile-page.tsx b/frontend/src/features/profile/components/profile-page.tsx index cb97826a..4a069c56 100644 --- a/frontend/src/features/profile/components/profile-page.tsx +++ b/frontend/src/features/profile/components/profile-page.tsx @@ -1,7 +1,11 @@ +'use client' + import { CalendarCheck, CheckCircle2, Mail, ShieldCheck } from 'lucide-react' +import { useRouter } from 'next/navigation' +import { useEffect } from 'react' import { Avatar, AvatarFallback } from '@/components/ui/avatar' -import { mockUser } from '@/features/auth/mock-auth' +import { useAuth } from '@/features/auth/auth-provider' function initials(name: string) { return name @@ -13,7 +17,20 @@ function initials(name: string) { } export function ProfilePage() { - const user = mockUser + const router = useRouter() + const { user, loading } = useAuth() + + useEffect(() => { + if (!loading && !user) router.replace('/semana/login') + }, [loading, router, user]) + + if (loading || !user) { + return ( +

+ Carregando… +
+ ) + } return (
@@ -41,7 +58,8 @@ export function ProfilePage() {

-
From 62192f8fcee03de86d57b652333e8597b3e0408f Mon Sep 17 00:00:00 2001 From: wate Date: Tue, 29 Sep 2026 21:14:40 -0300 Subject: [PATCH 04/62] feat(semana-ui): refresh event branding Co-authored-by: Codex --- .../public/semana/2026/logo-horizontal.svg | 12 + frontend/src/app/semana/page.tsx | 233 ++---------------- .../semana/components/semana-button.tsx | 2 +- .../semana/components/semana-home.tsx | 17 +- .../semana/components/semana-input.tsx | 2 +- .../semana/components/semana-shell.tsx | 173 +++++++++---- 6 files changed, 171 insertions(+), 268 deletions(-) create mode 100644 frontend/public/semana/2026/logo-horizontal.svg mode change 100755 => 100644 frontend/src/app/semana/page.tsx diff --git a/frontend/public/semana/2026/logo-horizontal.svg b/frontend/public/semana/2026/logo-horizontal.svg new file mode 100644 index 00000000..24fb678e --- /dev/null +++ b/frontend/public/semana/2026/logo-horizontal.svg @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/frontend/src/app/semana/page.tsx b/frontend/src/app/semana/page.tsx old mode 100755 new mode 100644 index 30581e2b..bff79cd7 --- a/frontend/src/app/semana/page.tsx +++ b/frontend/src/app/semana/page.tsx @@ -1,224 +1,37 @@ 'use client' -import Image from 'next/image' -import { useRouter } from 'next/navigation' import { useEffect, useState } from 'react' +import { useRouter } from 'next/navigation' -import { semanaBody, semanaDisplay } from '@/features/semana/fonts' - -const dots = [ - { left: '13%', top: '34%', size: 'size-[clamp(4px,0.55vw,8px)]', delay: '0ms' }, - { left: '20%', top: '38%', size: 'size-[clamp(6px,0.9vw,13px)]', delay: '850ms' }, - { left: '44%', top: '29%', size: 'size-[clamp(3px,0.4vw,6px)]', delay: '1500ms' }, - { left: '75%', top: '28%', size: 'size-[clamp(5px,0.75vw,11px)]', delay: '400ms' }, - { left: '82%', top: '41%', size: 'size-[clamp(6px,1vw,14px)]', delay: '1900ms' }, - { left: '89%', top: '52%', size: 'size-[clamp(3px,0.45vw,7px)]', delay: '1100ms' }, - { left: '17%', top: '52%', size: 'size-[clamp(7px,1.05vw,15px)]', delay: '600ms' }, - { left: '11%', top: '61%', size: 'size-[clamp(5px,0.8vw,12px)]', delay: '2200ms' }, - { left: '80%', top: '63%', size: 'size-[clamp(6px,0.9vw,13px)]', delay: '1300ms' }, - { left: '24%', top: '68%', size: 'size-[clamp(3px,0.45vw,7px)]', delay: '200ms' }, - { left: '38%', top: '25%', size: 'size-[clamp(4px,0.6vw,9px)]', delay: '1700ms' }, - { left: '67%', top: '69%', size: 'size-[clamp(4px,0.65vw,10px)]', delay: '900ms' }, - { left: '85%', top: '34%', size: 'size-[clamp(3px,0.4vw,6px)]', delay: '2100ms' }, - { left: '31%', top: '62%', size: 'size-[clamp(5px,0.85vw,12px)]', delay: '500ms' }, - { left: '72%', top: '56%', size: 'size-[clamp(3px,0.5vw,8px)]', delay: '1600ms' }, -] - -const loadingSegments = Array.from({ length: 18 }, (_, index) => index) +import { SemanaButton } from '@/features/semana/components/semana-button' -export default function Semana() { +export default function SemanaPage() { const router = useRouter() - const [isLoading, setIsLoading] = useState(false) - const [progress, setProgress] = useState(0) + const [starting, setStarting] = useState(false) useEffect(() => { - const previousBackgroundColor = document.body.style.backgroundColor - document.body.style.backgroundColor = '#110f0f' - - return () => { - document.body.style.backgroundColor = previousBackgroundColor - } - }, []) - - useEffect(() => { - if (!isLoading) return - - const startedAt = Date.now() - const duration = 1200 - const timer = window.setInterval(() => { - const nextProgress = Math.min(100, ((Date.now() - startedAt) / duration) * 100) - setProgress(nextProgress) - - if (nextProgress === 100) { - window.clearInterval(timer) - router.push('/semana/inicio') - } - }, 50) - - return () => window.clearInterval(timer) - }, [isLoading, router]) + if (!starting) return + const timer = window.setTimeout(() => router.push('/semana/inicio'), 700) + return () => window.clearTimeout(timer) + }, [router, starting]) return ( -
-
) diff --git a/frontend/src/features/semana/components/semana-input.tsx b/frontend/src/features/semana/components/semana-input.tsx index 06e56108..7ab38949 100644 --- a/frontend/src/features/semana/components/semana-input.tsx +++ b/frontend/src/features/semana/components/semana-input.tsx @@ -9,7 +9,7 @@ export const SemanaInput = React.forwardRef< >(({ className, ...props }, ref) => ( + {children} + + ) +} + +function SemanaShellContent({ children }: { children: ReactNode }) { + const { user, loading, logout } = useAuth() + return (
-
- +
+ Semana da Computação +
+ + Semana da Computação + +
+ ))} - - - Entrar - - + {!loading && + (user ? ( + + + + ) : ( + + + Entrar + + + ))} @@ -98,30 +155,56 @@ export function SemanaShell({ children }: { children: ReactNode }) { {children}
-
-
- IME-USP -

Semana da Computação — IME-USP

-
-
- +
+

-

+ +
+

-

+ Apoio + +
+ IME-USP + Universidade de São Paulo +
+
From d2e2f46add18a5d04c5b633bb01b7d72a1e62cd2 Mon Sep 17 00:00:00 2001 From: wate Date: Tue, 29 Sep 2026 21:29:11 -0300 Subject: [PATCH 05/62] feat(semana-ui): simplify landing actions Co-authored-by: Codex --- .../semana/components/semana-home.tsx | 48 +++++++++++++------ 1 file changed, 34 insertions(+), 14 deletions(-) diff --git a/frontend/src/features/semana/components/semana-home.tsx b/frontend/src/features/semana/components/semana-home.tsx index 593c66d3..5e221867 100644 --- a/frontend/src/features/semana/components/semana-home.tsx +++ b/frontend/src/features/semana/components/semana-home.tsx @@ -1,26 +1,46 @@ import Link from 'next/link' -import { SemanaButton } from './semana-button' - export function SemanaHome() { + const links = [ + { href: '/semana/cronograma', label: 'Programação' }, + { href: '/semana/cadastro', label: 'Se inscrever' }, + ] + return (
-
-

- Próxima edição +

+

+ Semana da Computação 2026

-
-

- Semana da Computação 2026 +
+

+ Outubro

-

- Uma nova edição da Semana da Computação está em construção. Em breve, - divulgaremos as datas, a programação e as inscrições do evento. +

+ 05 à 09 +

+

+ 12h - 18h

- - Entrar - +

+ Um encontro de estudantes, pesquisadores e profissionais para celebrar a + computação no IME-USP. +

+

) From 66a2b26c1c0ffd4b7cbf38a5378d58f6d3a0e92a Mon Sep 17 00:00:00 2001 From: wate Date: Tue, 29 Sep 2026 21:36:03 -0300 Subject: [PATCH 06/62] feat(challenges): add FastAPI challenge flow Co-authored-by: Codex --- backend/app/challenges/routes.py | 1 + .../app/semana/(site)/desafios/[id]/page.tsx | 5 + frontend/src/features/auth/api.ts | 18 ++- frontend/src/features/challenges/api.ts | 37 +++++ .../challenges/components/challenge-page.tsx | 152 ++++++++++++++++++ 5 files changed, 206 insertions(+), 7 deletions(-) create mode 100644 frontend/src/app/semana/(site)/desafios/[id]/page.tsx create mode 100644 frontend/src/features/challenges/api.ts create mode 100644 frontend/src/features/challenges/components/challenge-page.tsx diff --git a/backend/app/challenges/routes.py b/backend/app/challenges/routes.py index 7a787ff8..dada2e46 100644 --- a/backend/app/challenges/routes.py +++ b/backend/app/challenges/routes.py @@ -254,6 +254,7 @@ async def get_challenge( ) = await challenge_service.get_challenge_with_context( session, challenge_id, current_user.id ) + challenge_service.ensure_challenge_open(challenge.finishes_at) question_responses = [ challenge_schemas.QuestionResponse( diff --git a/frontend/src/app/semana/(site)/desafios/[id]/page.tsx b/frontend/src/app/semana/(site)/desafios/[id]/page.tsx new file mode 100644 index 00000000..9a278422 --- /dev/null +++ b/frontend/src/app/semana/(site)/desafios/[id]/page.tsx @@ -0,0 +1,5 @@ +import { ChallengePage } from '@/features/challenges/components/challenge-page' + +export default function ChallengeRoutePage() { + return +} diff --git a/frontend/src/features/auth/api.ts b/frontend/src/features/auth/api.ts index dae6634a..36d0a0fc 100644 --- a/frontend/src/features/auth/api.ts +++ b/frontend/src/features/auth/api.ts @@ -26,7 +26,7 @@ function mapUser(user: ApiUser): User { } } -async function request( +export async function requestApi( path: string, init: RequestInit = {}, retry = true, @@ -45,7 +45,7 @@ async function request( if (response.status === 401 && retry && path !== '/auth/refresh') { try { await refresh() - return request(path, init, false) + return requestApi(path, init, false) } catch { accessToken = undefined } @@ -61,13 +61,17 @@ async function request( } async function refresh() { - const token = await request('/auth/refresh', { method: 'POST' }, false) + const token = await requestApi( + '/auth/refresh', + { method: 'POST' }, + false, + ) accessToken = token.access_token } export async function login(input: LoginInput): Promise { const body = new URLSearchParams({ username: input.email, password: input.password }) - const token = await request('/auth/login', { + const token = await requestApi('/auth/login', { method: 'POST', body, headers: { 'Content-Type': 'application/x-www-form-urlencoded' }, @@ -77,11 +81,11 @@ export async function login(input: LoginInput): Promise { } export async function register(input: RegisterInput): Promise { - await request('/user/', { method: 'POST', body: JSON.stringify(input) }) + await requestApi('/user/', { method: 'POST', body: JSON.stringify(input) }) } export async function getCurrentUser(): Promise { - return mapUser(await request('/auth/me')) + return mapUser(await requestApi('/auth/me')) } export async function restoreSession(): Promise { @@ -96,7 +100,7 @@ export async function restoreSession(): Promise { export async function logout() { try { - await request('/auth/logout', { method: 'POST' }, false) + await requestApi('/auth/logout', { method: 'POST' }, false) } finally { accessToken = undefined } diff --git a/frontend/src/features/challenges/api.ts b/frontend/src/features/challenges/api.ts new file mode 100644 index 00000000..45eb6b89 --- /dev/null +++ b/frontend/src/features/challenges/api.ts @@ -0,0 +1,37 @@ +import { requestApi } from '@/features/auth/api' + +export type Challenge = { + id: string + title: string + prompt: string + scoring_type: 'input' | 'quiz' | 'manual' + finishes_at: string + resource_urls: string[] + image_url: string | null +} + +export type ChallengeDetails = Challenge & { + questions: unknown[] + is_participant: boolean + submitted_at: string | null +} + +export function getChallenge(id: string) { + return requestApi(`/challenge/${id}`) +} + +export function joinChallenge(id: string) { + return requestApi(`/challenge/${id}/join`, { method: 'POST' }) +} + +export function submitInput(id: string, answer: string) { + return requestApi<{ submitted_at: string; score: number }>(`/challenge/${id}/input`, { + method: 'POST', + body: JSON.stringify({ answer }), + }) +} + +export function mediaUrl(path: string) { + if (path.startsWith('http')) return path + return `${process.env.NEXT_PUBLIC_API_URL ?? 'http://localhost:8000'}${path}` +} diff --git a/frontend/src/features/challenges/components/challenge-page.tsx b/frontend/src/features/challenges/components/challenge-page.tsx new file mode 100644 index 00000000..234db4a6 --- /dev/null +++ b/frontend/src/features/challenges/components/challenge-page.tsx @@ -0,0 +1,152 @@ +'use client' + +import { useParams, useRouter } from 'next/navigation' +import Image from 'next/image' +import { useEffect, useState } from 'react' + +import { useAuth } from '@/features/auth/auth-provider' +import { + getChallenge, + joinChallenge, + submitInput, + type ChallengeDetails, + mediaUrl, +} from '../api' +import { SemanaButton } from '@/features/semana/components/semana-button' +import { SemanaInput } from '@/features/semana/components/semana-input' + +export function ChallengePage() { + const params = useParams<{ id: string }>() + const router = useRouter() + const { user, loading: authLoading } = useAuth() + const [challenge, setChallenge] = useState() + const [inputAnswer, setInputAnswer] = useState('') + const [busy, setBusy] = useState(false) + const [error, setError] = useState() + const [result, setResult] = useState<{ score: number }>() + + useEffect(() => { + if (!authLoading && !user) router.replace('/semana/login') + }, [authLoading, router, user]) + + useEffect(() => { + if (!user || !params.id) return + getChallenge(params.id) + .then((data) => { + setChallenge(data) + setInputAnswer('') + }) + .catch((err: Error) => { + if (err.message.includes('challenge has ended')) { + router.replace('/semana/inicio') + return + } + setError(err.message) + }) + }, [params.id, router, user]) + + async function join() { + setBusy(true) + setError(undefined) + try { + await joinChallenge(params.id) + setChallenge(await getChallenge(params.id)) + } catch (err) { + setError(err instanceof Error ? err.message : 'Não foi possível aceitar o desafio.') + } finally { + setBusy(false) + } + } + + async function submit() { + setBusy(true) + setError(undefined) + try { + setResult(await submitInput(params.id, inputAnswer)) + setChallenge((current) => + current ? { ...current, submitted_at: new Date().toISOString() } : current, + ) + } catch (err) { + setError( + err instanceof Error ? err.message : 'Não foi possível enviar suas respostas.', + ) + } finally { + setBusy(false) + } + } + + if (authLoading || !user || (!challenge && !error)) { + return
Carregando desafio…
+ } + + if (error && !challenge) { + return
{error}
+ } + + if (!challenge) return null + + return ( +
+
+

+ {challenge.scoring_type === 'quiz' ? 'Quiz' : 'Resposta livre'} +

+

+ {challenge.title} +

+

{challenge.prompt}

+ {challenge.image_url && ( + Imagem do desafio + )} +
+ + {error &&

{error}

} + + {!challenge.is_participant ? ( +
+

Aceite este desafio para responder e pontuar.

+ + {busy ? 'Entrando…' : 'Aceitar desafio'} + +
+ ) : challenge.submitted_at || result ? ( +
+

+ Respostas enviadas +

+ {result &&

Pontuação: {result.score}

} +
+ ) : ( +
+ {challenge.scoring_type !== 'input' ? ( +

+ Este formato de desafio ainda não está disponível. +

+ ) : ( + + )} + + {busy ? 'Enviando…' : 'Enviar resposta'} + +
+ )} +
+ ) +} From 59a6e0fade86e0caaa4b377e23cb44aedb4c2cb5 Mon Sep 17 00:00:00 2001 From: wate Date: Tue, 29 Sep 2026 21:42:32 -0300 Subject: [PATCH 07/62] feat(semana-ui): add event leaderboard Co-authored-by: Codex --- .../src/app/semana/(site)/ranking/page.tsx | 5 ++ frontend/src/features/semana/api.ts | 21 ++++++ .../semana/components/ranking-page.tsx | 70 +++++++++++++++++++ .../semana/components/semana-shell.tsx | 1 + 4 files changed, 97 insertions(+) create mode 100644 frontend/src/app/semana/(site)/ranking/page.tsx create mode 100644 frontend/src/features/semana/api.ts create mode 100644 frontend/src/features/semana/components/ranking-page.tsx diff --git a/frontend/src/app/semana/(site)/ranking/page.tsx b/frontend/src/app/semana/(site)/ranking/page.tsx new file mode 100644 index 00000000..8656d0d0 --- /dev/null +++ b/frontend/src/app/semana/(site)/ranking/page.tsx @@ -0,0 +1,5 @@ +import { RankingPage } from '@/features/semana/components/ranking-page' + +export default function SemanaRankingPage() { + return +} diff --git a/frontend/src/features/semana/api.ts b/frontend/src/features/semana/api.ts new file mode 100644 index 00000000..68892912 --- /dev/null +++ b/frontend/src/features/semana/api.ts @@ -0,0 +1,21 @@ +import { requestApi } from '@/features/auth/api' + +export type SemanaEvent = { + id: number + nome: string + ano: number +} + +export type SemanaRankingEntry = { + participant_id: string + nickname: string + points: number +} + +export function listSemanas() { + return requestApi('/semana/') +} + +export function getSemanaRanking(semanaId: number) { + return requestApi(`/semana/${semanaId}/ranking`) +} diff --git a/frontend/src/features/semana/components/ranking-page.tsx b/frontend/src/features/semana/components/ranking-page.tsx new file mode 100644 index 00000000..e6ea5a4d --- /dev/null +++ b/frontend/src/features/semana/components/ranking-page.tsx @@ -0,0 +1,70 @@ +'use client' + +import { useEffect, useState } from 'react' + +import { getSemanaRanking, listSemanas, type SemanaRankingEntry } from '../api' + +export function RankingPage() { + const [eventName, setEventName] = useState() + const [ranking, setRanking] = useState([]) + const [error, setError] = useState() + + useEffect(() => { + async function loadRanking() { + try { + const events = await listSemanas() + const event = events[0] + if (!event) { + setError('Ainda não há uma Semana cadastrada.') + return + } + + setEventName(`${event.nome} ${event.ano}`) + setRanking(await getSemanaRanking(event.id)) + } catch { + setError('Não foi possível carregar o ranking.') + } + } + + loadRanking() + }, []) + + return ( +
+
+

+ {eventName ?? 'Semana da Computação'} +

+

+ Ranking +

+

Pontuação acumulada no evento.

+
+ + {error ? ( +

{error}

+ ) : ranking.length === 0 ? ( +

Ainda não há participantes pontuando.

+ ) : ( +
    + {ranking.map((entry, index) => ( +
  1. + + + {index + 1} + + {entry.nickname} + + + {entry.points} pts + +
  2. + ))} +
+ )} +
+ ) +} diff --git a/frontend/src/features/semana/components/semana-shell.tsx b/frontend/src/features/semana/components/semana-shell.tsx index 2cfd0ff7..9eecbe39 100644 --- a/frontend/src/features/semana/components/semana-shell.tsx +++ b/frontend/src/features/semana/components/semana-shell.tsx @@ -23,6 +23,7 @@ import { SemanaButton } from './semana-button' const links = [ { href: '/semana/inicio', label: 'Início' }, { href: '/semana/cronograma', label: 'Programação' }, + { href: '/semana/ranking', label: 'Ranking' }, { href: '/semana/perfil', label: 'Perfil' }, ] From 3160e7789c1445d0ad8484238d690ed14d6b3e6a Mon Sep 17 00:00:00 2001 From: wate Date: Tue, 29 Sep 2026 22:10:14 -0300 Subject: [PATCH 08/62] fix(dev): stabilize local event flows --- Caddyfile | 4 + README.md | 6 + .../1f4a9d2b7c11_add_semana_scoring.py | 103 ++++++++++++++---- backend/app/auth/routes.py | 5 +- backend/app/auth/services.py | 4 +- backend/app/main.py | 12 +- backend/app/semana/models.py | 12 +- backend/app/semana/routes.py | 9 +- .../app/tests/auth/unit/test_auth_services.py | 7 +- backend/app/users/routes.py | 3 +- backend/scripts/seed_dev.py | 76 +++++++++++++ docker-compose.dev.yml | 2 + frontend/next.config.mjs | 7 +- frontend/src/features/auth/api.ts | 4 +- frontend/src/features/auth/auth-provider.tsx | 1 + .../auth/components/register-form.tsx | 2 +- frontend/src/features/challenges/api.ts | 2 +- frontend/src/features/semana/api.ts | 2 +- 18 files changed, 219 insertions(+), 42 deletions(-) create mode 100644 backend/scripts/seed_dev.py diff --git a/Caddyfile b/Caddyfile index 0a3b0eca..f4394d72 100644 --- a/Caddyfile +++ b/Caddyfile @@ -5,6 +5,10 @@ reverse_proxy backend:8000 } + handle /media/* { + reverse_proxy backend:8000 + } + handle { reverse_proxy frontend:3000 } diff --git a/README.md b/README.md index 5cdeefc0..b3dbe95f 100644 --- a/README.md +++ b/README.md @@ -14,6 +14,12 @@ Development uses its own Compose project and database volume; it requires no `.env` file. Existing volumes from the old default development stack are not migrated automatically. +Seed the local Semana event, username catalog, and an input challenge: + +```bash +docker compose -f docker-compose.dev.yml exec backend python -m scripts.seed_dev +``` + ```bash docker compose -f docker-compose.dev.yml exec backend ruff check . docker compose -f docker-compose.dev.yml exec backend ruff format --check . diff --git a/backend/alembic/versions/1f4a9d2b7c11_add_semana_scoring.py b/backend/alembic/versions/1f4a9d2b7c11_add_semana_scoring.py index e62c2870..d7eafe09 100644 --- a/backend/alembic/versions/1f4a9d2b7c11_add_semana_scoring.py +++ b/backend/alembic/versions/1f4a9d2b7c11_add_semana_scoring.py @@ -7,7 +7,6 @@ from collections.abc import Sequence import sqlalchemy as sa - from alembic import op revision: str = "1f4a9d2b7c11" @@ -29,14 +28,28 @@ def upgrade() -> None: sa.Column("semana_id", sa.Integer(), nullable=False), sa.Column("user_id", sa.Uuid(), nullable=False), sa.Column("nickname", sa.String(255), nullable=False), - sa.Column("created_at", sa.DateTime(timezone=True), server_default=sa.text("now()"), nullable=False), - sa.Column("updated_at", sa.DateTime(timezone=True), server_default=sa.text("now()"), nullable=False), + sa.Column( + "created_at", + sa.DateTime(timezone=True), + server_default=sa.text("now()"), + nullable=False, + ), + sa.Column( + "updated_at", + sa.DateTime(timezone=True), + server_default=sa.text("now()"), + nullable=False, + ), sa.Column("deleted_at", sa.DateTime(timezone=True), nullable=True), sa.ForeignKeyConstraint(["semana_id"], ["semana_event.id"], ondelete="CASCADE"), sa.ForeignKeyConstraint(["user_id"], ["users.id"], ondelete="CASCADE"), sa.PrimaryKeyConstraint("id"), - sa.UniqueConstraint("semana_id", "user_id"), - sa.UniqueConstraint("semana_id", "nickname"), + sa.UniqueConstraint( + "semana_id", "user_id", name="uq_semana_participant_event_user" + ), + sa.UniqueConstraint( + "semana_id", "nickname", name="uq_semana_participant_event_nickname" + ), ) op.create_table( "point_events", @@ -46,34 +59,86 @@ def upgrade() -> None: sa.Column("source_type", sa.String(32), nullable=False), sa.Column("source_id", sa.Uuid(), nullable=True), sa.Column("reason", sa.String(255), nullable=True), - sa.Column("created_at", sa.DateTime(timezone=True), server_default=sa.text("now()"), nullable=False), - sa.Column("updated_at", sa.DateTime(timezone=True), server_default=sa.text("now()"), nullable=False), + sa.Column( + "created_at", + sa.DateTime(timezone=True), + server_default=sa.text("now()"), + nullable=False, + ), + sa.Column( + "updated_at", + sa.DateTime(timezone=True), + server_default=sa.text("now()"), + nullable=False, + ), sa.Column("deleted_at", sa.DateTime(timezone=True), nullable=True), - sa.ForeignKeyConstraint(["semana_participant_id"], ["semana_participants.id"], ondelete="CASCADE"), + sa.ForeignKeyConstraint( + ["semana_participant_id"], ["semana_participants.id"], ondelete="CASCADE" + ), sa.PrimaryKeyConstraint("id"), - sa.UniqueConstraint("semana_participant_id", "source_type", "source_id", name="uq_point_event_source"), + sa.UniqueConstraint( + "semana_participant_id", + "source_type", + "source_id", + name="uq_point_event_source", + ), ) - op.add_column("challenges", sa.Column("prompt", sa.String(5000), server_default="", nullable=False)) - op.add_column("challenges", sa.Column("resource_urls", sa.JSON(), server_default=sa.text("'[]'"), nullable=False)) - op.add_column("challenges", sa.Column("points_value", sa.Integer(), server_default=sa.text("0"), nullable=False)) - op.add_column("challenges", sa.Column("input_answer", sa.String(255), nullable=True)) + op.add_column( + "challenges", + sa.Column("prompt", sa.String(5000), server_default="", nullable=False), + ) + op.add_column( + "challenges", + sa.Column( + "resource_urls", sa.JSON(), server_default=sa.text("'[]'"), nullable=False + ), + ) + op.add_column( + "challenges", + sa.Column( + "points_value", sa.Integer(), server_default=sa.text("0"), nullable=False + ), + ) + op.add_column( + "challenges", sa.Column("input_answer", sa.String(255), nullable=True) + ) op.add_column("challenges", sa.Column("semana_id", sa.Integer(), nullable=True)) - op.create_foreign_key("challenges_semana_id_fkey", "challenges", "semana_event", ["semana_id"], ["id"]) - op.add_column("challenge_participants", sa.Column("semana_participant_id", sa.Uuid(), nullable=True)) - op.add_column("challenge_participants", sa.Column("submission", sa.String(255), nullable=True)) + op.create_foreign_key( + "challenges_semana_id_fkey", "challenges", "semana_event", ["semana_id"], ["id"] + ) + op.add_column( + "challenge_participants", + sa.Column("semana_participant_id", sa.Uuid(), nullable=True), + ) + op.add_column( + "challenge_participants", sa.Column("submission", sa.String(255), nullable=True) + ) op.create_foreign_key( "challenge_participants_semana_participant_id_fkey", - "challenge_participants", "semana_participants", ["semana_participant_id"], ["id"] + "challenge_participants", + "semana_participants", + ["semana_participant_id"], + ["id"], ) def downgrade() -> None: - op.drop_constraint("challenge_participants_semana_participant_id_fkey", "challenge_participants", type_="foreignkey") + op.drop_constraint( + "challenge_participants_semana_participant_id_fkey", + "challenge_participants", + type_="foreignkey", + ) op.drop_column("challenge_participants", "submission") op.drop_column("challenge_participants", "semana_participant_id") op.drop_constraint("challenges_semana_id_fkey", "challenges", type_="foreignkey") - for column in ("semana_id", "input_answer", "points_value", "resource_urls", "prompt"): + for column in ( + "semana_id", + "input_answer", + "points_value", + "resource_urls", + "prompt", + ): op.drop_column("challenges", column) op.drop_table("point_events") op.drop_table("semana_participants") diff --git a/backend/app/auth/routes.py b/backend/app/auth/routes.py index 40780368..44a984df 100644 --- a/backend/app/auth/routes.py +++ b/backend/app/auth/routes.py @@ -111,5 +111,8 @@ async def logout( await services.revoke_refresh_token(db_session, token_str) response.delete_cookie( - key="refresh_token", httponly=True, secure=True, samesite="lax" + key="refresh_token", + httponly=True, + secure=services.get_settings().app_env.value == "prod", + samesite="lax", ) diff --git a/backend/app/auth/services.py b/backend/app/auth/services.py index 87c1c284..adb3086a 100644 --- a/backend/app/auth/services.py +++ b/backend/app/auth/services.py @@ -14,7 +14,7 @@ hash_token, verify_password, ) -from app.core.config import get_settings +from app.core.config import AppEnv, get_settings from app.core.exceptions.app_errors import ForbiddenError, UnauthorizedError from app.users.models import User @@ -124,7 +124,7 @@ def build_refresh_token_cookie(refresh_token: str) -> dict: "key": "refresh_token", "value": refresh_token, "httponly": True, - "secure": True, + "secure": get_settings().app_env == AppEnv.production, "samesite": "lax", "max_age": REFRESH_EXPIRE_TIME_SECONDS, } diff --git a/backend/app/main.py b/backend/app/main.py index 9dc88ad0..7c5abf57 100644 --- a/backend/app/main.py +++ b/backend/app/main.py @@ -1,6 +1,7 @@ from contextlib import asynccontextmanager from fastapi import FastAPI +from fastapi.middleware.cors import CORSMiddleware from fastapi.staticfiles import StaticFiles from app.auth.routes import router as auth_router @@ -30,6 +31,16 @@ async def lifespan(app: FastAPI): app = FastAPI(title="SymComp API", version="0.1.0", lifespan=lifespan) +_settings = config.get_settings() + +if _settings.cors_origins: + app.add_middleware( + CORSMiddleware, + allow_origins=[str(origin).rstrip("/") for origin in _settings.cors_origins], + allow_credentials=True, + allow_methods=["*"], + allow_headers=["*"], + ) # --------------------------------------------------------------------------- # Rotas da API @@ -48,7 +59,6 @@ async def lifespan(app: FastAPI): # Arquivos estáticos (imagens de challenges) # --------------------------------------------------------------------------- -_settings = config.get_settings() app.mount( _settings.media_url_prefix, StaticFiles(directory=_settings.media_root, check_dir=False), diff --git a/backend/app/semana/models.py b/backend/app/semana/models.py index 8b19eabd..ff8615ca 100644 --- a/backend/app/semana/models.py +++ b/backend/app/semana/models.py @@ -53,8 +53,12 @@ class SemanaParticipant(Base, UUIDPKMixin, TimestampsMixin): ) __table_args__ = ( - UniqueConstraint("semana_id", "user_id"), - UniqueConstraint("semana_id", "username_id"), + UniqueConstraint( + "semana_id", "user_id", name="uq_semana_participant_event_user" + ), + UniqueConstraint( + "semana_id", "username_id", name="uq_semana_participant_username" + ), ) @@ -75,7 +79,9 @@ class PointEvent(Base, UUIDPKMixin, TimestampsMixin): __table_args__ = ( UniqueConstraint( - "semana_participant_id", "source_type", "source_id", + "semana_participant_id", + "source_type", + "source_id", name="uq_point_event_source", ), ) diff --git a/backend/app/semana/routes.py b/backend/app/semana/routes.py index 6e0625fd..96fe4a94 100644 --- a/backend/app/semana/routes.py +++ b/backend/app/semana/routes.py @@ -15,7 +15,8 @@ admin_router = APIRouter(prefix="/admin/semana", tags=["admin", "semana"]) -@router.get("/", response_model=list[schemas.SemanaResponse]) +@router.get("", response_model=list[schemas.SemanaResponse]) +@router.get("/", response_model=list[schemas.SemanaResponse], include_in_schema=False) async def list_semanas(session: Annotated[AsyncSession, Depends(get_session)]): return await services.list_semanas(session) @@ -53,9 +54,9 @@ async def get_semana_ranking( if await services.get_semana(session, semana_id) is None: raise NotFoundError("Semana not found.") return [ - schemas.SemanaRankingEntry( - participant_id=row[0], nickname=row[1], points=row[2] - ) + schemas.SemanaRankingEntry( + participant_id=row[0], nickname=row[1], points=row[2] + ) for row in await services.list_ranking(session, semana_id) ] diff --git a/backend/app/tests/auth/unit/test_auth_services.py b/backend/app/tests/auth/unit/test_auth_services.py index bdb4ca30..316a2f97 100644 --- a/backend/app/tests/auth/unit/test_auth_services.py +++ b/backend/app/tests/auth/unit/test_auth_services.py @@ -2,15 +2,14 @@ import jwt import pytest -from sqlalchemy import select -from sqlalchemy.ext.asyncio import AsyncSession - from app.auth import services as auth_services from app.auth.models import RefreshToken from app.auth.scopes import DEFAULT_SCOPES, Scope from app.auth.security import hash_token from app.core.config import Settings from app.core.exceptions.app_errors import UnauthorizedError +from sqlalchemy import select +from sqlalchemy.ext.asyncio import AsyncSession def _decode_access(token: str, settings: Settings) -> dict: @@ -374,6 +373,6 @@ def test_build_refresh_token_cookie_shape(jwt_settings: Settings): assert cookie["key"] == "refresh_token" assert cookie["value"] == "my-token" assert cookie["httponly"] is True - assert cookie["secure"] is True + assert cookie["secure"] is False assert cookie["samesite"] == "lax" assert cookie["max_age"] == jwt_settings.refresh_token_expire_days * 24 * 60 * 60 diff --git a/backend/app/users/routes.py b/backend/app/users/routes.py index d2286ea5..f5d42a9b 100644 --- a/backend/app/users/routes.py +++ b/backend/app/users/routes.py @@ -10,7 +10,8 @@ router = APIRouter(tags=["user"]) -@router.post("/", status_code=status.HTTP_201_CREATED) +@router.post("", status_code=status.HTTP_201_CREATED) +@router.post("/", status_code=status.HTTP_201_CREATED, include_in_schema=False) async def signup_with_password( db_session: Annotated[AsyncSession, Depends(get_session)], user_info: UserCreate ): diff --git a/backend/scripts/seed_dev.py b/backend/scripts/seed_dev.py new file mode 100644 index 00000000..0f0e7fac --- /dev/null +++ b/backend/scripts/seed_dev.py @@ -0,0 +1,76 @@ +"""Seed the minimum data needed to exercise the local Semana flows.""" + +import asyncio +from collections.abc import AsyncIterator +from contextlib import asynccontextmanager +from datetime import UTC, datetime, timedelta +from pathlib import Path + +from app.challenges.models.challenge import Challenge, ChallengeScoringType +from app.core.config import get_settings +from app.core.database import create_database +from app.semana.models import SemanaEvent +from app.users.username.seed import seed_from_csv_files +from sqlalchemy import select +from sqlalchemy.ext.asyncio import AsyncSession + +DATA_DIR = Path(__file__).parent / "data" + + +@asynccontextmanager +async def session_scope() -> AsyncIterator[AsyncSession]: + settings = get_settings() + engine, session_factory = create_database(settings) + try: + async with session_factory() as session: + try: + yield session + await session.commit() + except Exception: + await session.rollback() + raise + finally: + await engine.dispose() + + +async def main() -> None: + async with session_scope() as session: + await seed_from_csv_files( + session, + DATA_DIR / "mothers.csv", + DATA_DIR / "usernames.csv", + ) + + event = await session.scalar(select(SemanaEvent).where(SemanaEvent.ano == 2026)) + if event is None: + event = SemanaEvent(nome="Semana da Computação", ano=2026) + session.add(event) + await session.flush() + + challenge = await session.scalar( + select(Challenge).where( + Challenge.semana_id == event.id, + Challenge.title == "Desafio de boas-vindas", + Challenge.deleted_at.is_(None), + ) + ) + if challenge is None: + challenge = Challenge( + title="Desafio de boas-vindas", + prompt="Digite a palavra-chave apresentada na página do evento.", + scoring_type=ChallengeScoringType.INPUT, + finishes_at=datetime.now(UTC) + timedelta(days=30), + points_value=100, + input_answer="symcomp", + semana_id=event.id, + ) + session.add(challenge) + await session.flush() + + print(f"Semana: {event.id} ({event.nome} {event.ano})") + print(f"Challenge: {challenge.id} ({challenge.title})") + print("Resposta do desafio de boas-vindas: symcomp") + + +if __name__ == "__main__": + asyncio.run(main()) diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml index 1cb66751..dfa84406 100644 --- a/docker-compose.dev.yml +++ b/docker-compose.dev.yml @@ -25,7 +25,9 @@ services: DATABASE_URL: postgresql+asyncpg://postgres:postgres@postgres:5432/symcomp SECRET_KEY: local-development-only-do-not-use-in-production ISSUER: http://localhost:8000 + CORS_ORIGINS: '["http://localhost:3000"]' entrypoint: ["/bin/sh", "/app/entrypoint.sh"] + command: ["uvicorn", "app.main:app", "--host", "0.0.0.0", "--port", "8000", "--reload"] depends_on: postgres: condition: service_healthy diff --git a/frontend/next.config.mjs b/frontend/next.config.mjs index 2908f596..92bff93f 100755 --- a/frontend/next.config.mjs +++ b/frontend/next.config.mjs @@ -2,15 +2,18 @@ const nextConfig = { output: 'standalone', async rewrites() { - const backendUrl = process.env.INTERNAL_API_URL || 'http://backend:8000' + const backendUrl = process.env.INTERNAL_API_URL || 'http://localhost:8000' return [ { source: '/api/:path*', destination: `${backendUrl}/api/:path*`, }, + { + source: '/media/:path*', + destination: `${backendUrl}/media/:path*`, + }, ] }, } export default nextConfig - diff --git a/frontend/src/features/auth/api.ts b/frontend/src/features/auth/api.ts index 36d0a0fc..80ec1d35 100644 --- a/frontend/src/features/auth/api.ts +++ b/frontend/src/features/auth/api.ts @@ -1,6 +1,6 @@ import type { LoginInput, RegisterInput, User } from './types' -const API_URL = process.env.NEXT_PUBLIC_API_URL ?? 'http://localhost:8000' +const API_URL = process.env.NEXT_PUBLIC_API_URL ?? '' let accessToken: string | undefined @@ -81,7 +81,7 @@ export async function login(input: LoginInput): Promise { } export async function register(input: RegisterInput): Promise { - await requestApi('/user/', { method: 'POST', body: JSON.stringify(input) }) + await requestApi('/user', { method: 'POST', body: JSON.stringify(input) }) } export async function getCurrentUser(): Promise { diff --git a/frontend/src/features/auth/auth-provider.tsx b/frontend/src/features/auth/auth-provider.tsx index 92737cba..74b40770 100644 --- a/frontend/src/features/auth/auth-provider.tsx +++ b/frontend/src/features/auth/auth-provider.tsx @@ -41,6 +41,7 @@ export function AuthProvider({ children }: { children: ReactNode }) { }, async register(input) { await register(input) + setUser(await login(input)) }, async logout() { await logout() diff --git a/frontend/src/features/auth/components/register-form.tsx b/frontend/src/features/auth/components/register-form.tsx index cc9cf276..0e4cf00c 100644 --- a/frontend/src/features/auth/components/register-form.tsx +++ b/frontend/src/features/auth/components/register-form.tsx @@ -39,7 +39,7 @@ export function RegisterForm() { setError(undefined) try { await register(values) - router.push('/semana/login') + router.push('/semana/perfil') } catch { setError('Não foi possível criar sua conta. Tente novamente.') } diff --git a/frontend/src/features/challenges/api.ts b/frontend/src/features/challenges/api.ts index 45eb6b89..38a89f5e 100644 --- a/frontend/src/features/challenges/api.ts +++ b/frontend/src/features/challenges/api.ts @@ -33,5 +33,5 @@ export function submitInput(id: string, answer: string) { export function mediaUrl(path: string) { if (path.startsWith('http')) return path - return `${process.env.NEXT_PUBLIC_API_URL ?? 'http://localhost:8000'}${path}` + return `${process.env.NEXT_PUBLIC_API_URL ?? ''}${path}` } diff --git a/frontend/src/features/semana/api.ts b/frontend/src/features/semana/api.ts index 68892912..bd5ab718 100644 --- a/frontend/src/features/semana/api.ts +++ b/frontend/src/features/semana/api.ts @@ -13,7 +13,7 @@ export type SemanaRankingEntry = { } export function listSemanas() { - return requestApi('/semana/') + return requestApi('/semana') } export function getSemanaRanking(semanaId: number) { From 921abdd2dd04692bd66f0d23c1f0f2d20e035169 Mon Sep 17 00:00:00 2001 From: wate Date: Tue, 29 Sep 2026 22:21:26 -0300 Subject: [PATCH 09/62] feat(frontend): refine authenticated navigation --- frontend/src/app/styles/globals.css | 63 +++++++++++++++++++ frontend/src/components/ui/sheet.tsx | 4 +- .../auth/components/register-form.tsx | 12 +++- .../semana/components/ranking-page.tsx | 21 ++++++- .../semana/components/semana-home.tsx | 2 +- .../semana/components/semana-shell.tsx | 62 ++++++++++++++++-- 6 files changed, 152 insertions(+), 12 deletions(-) diff --git a/frontend/src/app/styles/globals.css b/frontend/src/app/styles/globals.css index 6a4b0dfd..03f55fa5 100755 --- a/frontend/src/app/styles/globals.css +++ b/frontend/src/app/styles/globals.css @@ -6,6 +6,69 @@ @tailwind components; @tailwind utilities; +@keyframes semana-sheet-in { + from { + opacity: 0; + transform: translateX(100%); + } + to { + opacity: 1; + transform: translateX(0); + } +} + +@keyframes semana-sheet-out { + from { + opacity: 1; + transform: translateX(0); + } + to { + opacity: 0; + transform: translateX(100%); + } +} + +@keyframes semana-sheet-overlay-in { + from { + opacity: 0; + } + to { + opacity: 1; + } +} + +@keyframes semana-sheet-overlay-out { + from { + opacity: 1; + } + to { + opacity: 0; + } +} + +.semana-sheet-content[data-state='open'] { + animation: semana-sheet-in 220ms ease-out; +} + +.semana-sheet-content[data-state='closed'] { + animation: semana-sheet-out 160ms ease-in; +} + +.semana-sheet-overlay[data-state='open'] { + animation: semana-sheet-overlay-in 180ms ease-out; +} + +.semana-sheet-overlay[data-state='closed'] { + animation: semana-sheet-overlay-out 140ms ease-in; +} + +@media (prefers-reduced-motion: reduce) { + .semana-sheet-content, + .semana-sheet-overlay { + animation-duration: 1ms !important; + } +} + /* Variáveis e estilos base */ @layer base { :root { diff --git a/frontend/src/components/ui/sheet.tsx b/frontend/src/components/ui/sheet.tsx index a42c263b..41108069 100644 --- a/frontend/src/components/ui/sheet.tsx +++ b/frontend/src/components/ui/sheet.tsx @@ -21,7 +21,7 @@ const SheetOverlay = React.forwardRef< >(({ className, ...props }, ref) => ( {children} diff --git a/frontend/src/features/auth/components/register-form.tsx b/frontend/src/features/auth/components/register-form.tsx index 0e4cf00c..d6af3f90 100644 --- a/frontend/src/features/auth/components/register-form.tsx +++ b/frontend/src/features/auth/components/register-form.tsx @@ -2,7 +2,7 @@ import { zodResolver } from '@hookform/resolvers/zod' import { useRouter } from 'next/navigation' -import { useState } from 'react' +import { useEffect, useState } from 'react' import { useForm } from 'react-hook-form' import { z } from 'zod' @@ -28,13 +28,21 @@ type Values = z.infer export function RegisterForm() { const router = useRouter() - const { register } = useAuth() + const { loading, register, user } = useAuth() const [error, setError] = useState() const form = useForm({ resolver: zodResolver(schema), defaultValues: { name: '', email: '', password: '' }, }) + useEffect(() => { + if (!loading && user) router.replace('/semana/perfil') + }, [loading, router, user]) + + if (loading || user) { + return

{user ? 'Você já está conectado.' : 'Carregando…'}

+ } + async function submit(values: Values) { setError(undefined) try { diff --git a/frontend/src/features/semana/components/ranking-page.tsx b/frontend/src/features/semana/components/ranking-page.tsx index e6ea5a4d..ad05ba04 100644 --- a/frontend/src/features/semana/components/ranking-page.tsx +++ b/frontend/src/features/semana/components/ranking-page.tsx @@ -1,15 +1,26 @@ 'use client' +import { useRouter } from 'next/navigation' import { useEffect, useState } from 'react' +import { useAuth } from '@/features/auth/auth-provider' + import { getSemanaRanking, listSemanas, type SemanaRankingEntry } from '../api' export function RankingPage() { + const router = useRouter() + const { loading: authLoading, user } = useAuth() const [eventName, setEventName] = useState() const [ranking, setRanking] = useState([]) const [error, setError] = useState() useEffect(() => { + if (authLoading) return + if (!user) { + router.replace('/semana/login') + return + } + async function loadRanking() { try { const events = await listSemanas() @@ -27,7 +38,15 @@ export function RankingPage() { } loadRanking() - }, []) + }, [authLoading, router, user]) + + if (authLoading || !user) { + return ( +
+ Carregando… +
+ ) + } return (
diff --git a/frontend/src/features/semana/components/semana-home.tsx b/frontend/src/features/semana/components/semana-home.tsx index 5e221867..cede5fe4 100644 --- a/frontend/src/features/semana/components/semana-home.tsx +++ b/frontend/src/features/semana/components/semana-home.tsx @@ -9,7 +9,7 @@ export function SemanaHome() { return (
-

+

Semana da Computação 2026

diff --git a/frontend/src/features/semana/components/semana-shell.tsx b/frontend/src/features/semana/components/semana-shell.tsx index 9eecbe39..01faf12f 100644 --- a/frontend/src/features/semana/components/semana-shell.tsx +++ b/frontend/src/features/semana/components/semana-shell.tsx @@ -1,11 +1,17 @@ 'use client' -import { Menu } from 'lucide-react' +import { Menu, UserRound } from 'lucide-react' import Image from 'next/image' import Link from 'next/link' import type { ReactNode } from 'react' import { Button } from '@/components/ui/button' +import { + DropdownMenu, + DropdownMenuContent, + DropdownMenuItem, + DropdownMenuTrigger, +} from '@/components/ui/dropdown-menu' import { AuthProvider, useAuth } from '@/features/auth/auth-provider' import { Sheet, @@ -23,8 +29,6 @@ import { SemanaButton } from './semana-button' const links = [ { href: '/semana/inicio', label: 'Início' }, { href: '/semana/cronograma', label: 'Programação' }, - { href: '/semana/ranking', label: 'Ranking' }, - { href: '/semana/perfil', label: 'Perfil' }, ] export function SemanaShell({ children }: { children: ReactNode }) { @@ -85,11 +89,35 @@ function SemanaShellContent({ children }: { children: ReactNode }) { {link.label} ))} + {user && ( + + )} {!loading && (user ? ( - + + + + + + + Perfil + + Sair + + ) : ( ))} + {user && ( + <> + + + + + + + + )} {!loading && (user ? ( From b00962b37ff6bb1b841c844c5ccd908b5f387354 Mon Sep 17 00:00:00 2001 From: wate Date: Tue, 29 Sep 2026 23:03:50 -0300 Subject: [PATCH 10/62] feat(admin): add event administration panel Co-authored-by: Codex --- backend/app/auth/services.py | 2 + backend/app/challenges/admin_routes.py | 38 +- backend/app/challenges/services/challenge.py | 32 +- backend/app/semana/routes.py | 70 +- backend/app/semana/schemas.py | 15 + backend/app/semana/services.py | 36 +- .../app/tests/auth/unit/test_auth_services.py | 22 +- backend/app/users/admin_router.py | 11 +- frontend/src/app/admin/page.tsx | 10 + frontend/src/features/admin/api.ts | 115 +++ .../features/admin/components/admin-panel.tsx | 698 ++++++++++++++++++ frontend/src/features/auth/api.ts | 19 +- .../challenges/components/challenge-page.tsx | 37 +- 13 files changed, 1074 insertions(+), 31 deletions(-) create mode 100644 frontend/src/app/admin/page.tsx create mode 100644 frontend/src/features/admin/api.ts create mode 100644 frontend/src/features/admin/components/admin-panel.tsx diff --git a/backend/app/auth/services.py b/backend/app/auth/services.py index adb3086a..6e4f1377 100644 --- a/backend/app/auth/services.py +++ b/backend/app/auth/services.py @@ -141,6 +141,8 @@ async def refresh_access_token( scopes = _narrow_scopes(old.scopes.split(" "), requested_scopes) user = await user_services.get_user_by_id(session, old.user_id) + if requested_scopes is None and user.is_admin and Scope.ADMIN not in scopes: + scopes.append(Scope.ADMIN) not_allowed = set(scopes) - get_grantable_scopes(user) if not_allowed: raise ForbiddenError(detail=f"Scopes not allowed: {sorted(not_allowed)}") diff --git a/backend/app/challenges/admin_routes.py b/backend/app/challenges/admin_routes.py index 8636a49a..b5a636bb 100644 --- a/backend/app/challenges/admin_routes.py +++ b/backend/app/challenges/admin_routes.py @@ -1,7 +1,7 @@ from typing import Annotated from uuid import UUID -from fastapi import APIRouter, Depends, File, Security, UploadFile +from fastapi import APIRouter, Depends, File, Query, Security, UploadFile from sqlalchemy.ext.asyncio import AsyncSession import app.challenges.services.image as cover_image_service @@ -14,6 +14,7 @@ from app.challenges.services import question as question_service from app.core.database import get_session from app.core.exceptions.app_errors import BadRequestError, NotFoundError +from app.core.pagination import Page, PaginationParams from app.semana import services as semana_service from app.users.models import User @@ -25,8 +26,31 @@ # ---------- Challenge ---------- +@router.get("", response_model=Page[challenge_schemas.AdminChallengeResponse]) +@router.get( + "/", + response_model=Page[challenge_schemas.AdminChallengeResponse], + include_in_schema=False, +) +async def list_challenges_admin( + session: Annotated[AsyncSession, Depends(get_session)], + _: AdminUser, + limit: int = Query(default=50, ge=1, le=100), + offset: int = Query(default=0, ge=0), +): + return await challenge_service.list_admin_challenges_paginated( + session, PaginationParams(limit=limit, offset=offset) + ) + + +@router.post( + "", response_model=challenge_schemas.AdminChallengeResponse, status_code=201 +) @router.post( - "/", response_model=challenge_schemas.AdminChallengeResponse, status_code=201 + "/", + response_model=challenge_schemas.AdminChallengeResponse, + include_in_schema=False, + status_code=201, ) async def create_challenge_endpoint( session: Annotated[AsyncSession, Depends(get_session)], @@ -39,7 +63,10 @@ async def create_challenge_endpoint( raise BadRequestError("Manual challenges cannot have questions.") if data.scoring_type == ChallengeScoringType.INPUT and not data.input_answer: raise BadRequestError("Input challenges require an expected answer.") - if data.semana_id is not None and await semana_service.get_semana(session, data.semana_id) is None: + if ( + data.semana_id is not None + and await semana_service.get_semana(session, data.semana_id) is None + ): raise NotFoundError("Semana not found.") challenge = await challenge_service.create_challenge( @@ -79,7 +106,10 @@ async def update_challenge_endpoint( raise BadRequestError("Manual challenges cannot have questions.") if challenge.scoring_type == ChallengeScoringType.INPUT and data.input_answer == "": raise BadRequestError("Input challenges require an expected answer.") - if data.semana_id is not None and await semana_service.get_semana(session, data.semana_id) is None: + if ( + data.semana_id is not None + and await semana_service.get_semana(session, data.semana_id) is None + ): raise NotFoundError("Semana not found.") await challenge_service.update_challenge( diff --git a/backend/app/challenges/services/challenge.py b/backend/app/challenges/services/challenge.py index d745fe09..9ec4c682 100644 --- a/backend/app/challenges/services/challenge.py +++ b/backend/app/challenges/services/challenge.py @@ -1,6 +1,10 @@ import uuid from datetime import UTC, datetime +from sqlalchemy import func, select +from sqlalchemy.ext.asyncio import AsyncSession +from sqlalchemy.orm import selectinload + from app.challenges import exceptions as challenge_exceptions from app.challenges import schemas as challenge_schemas from app.challenges.models.answer import Answer @@ -9,9 +13,6 @@ from app.challenges.models.question import Question from app.core.exceptions.app_errors import NotFoundError from app.core.pagination import Page, PaginationParams -from sqlalchemy import func, select -from sqlalchemy.ext.asyncio import AsyncSession -from sqlalchemy.orm import selectinload def ensure_challenge_open(finishes_at: datetime) -> None: @@ -125,6 +126,31 @@ async def list_challenges_paginated( ) +async def list_admin_challenges_paginated( + session: AsyncSession, + pagination: PaginationParams, +) -> Page[challenge_schemas.AdminChallengeResponse]: + total = await session.scalar( + select(func.count(Challenge.id)).where(Challenge.deleted_at.is_(None)) + ) + rows = ( + await session.scalars( + select(Challenge) + .where(Challenge.deleted_at.is_(None)) + .options(selectinload(Challenge.questions)) + .order_by(Challenge.created_at.desc(), Challenge.id) + .limit(pagination.limit) + .offset(pagination.offset) + ) + ).all() + return Page[challenge_schemas.AdminChallengeResponse]( + items=[challenge_schemas.AdminChallengeResponse.model_validate(c) for c in rows], + total=total or 0, + limit=pagination.limit, + offset=pagination.offset, + ) + + async def create_challenge( session: AsyncSession, title: str, diff --git a/backend/app/semana/routes.py b/backend/app/semana/routes.py index 96fe4a94..c26a67b2 100644 --- a/backend/app/semana/routes.py +++ b/backend/app/semana/routes.py @@ -7,7 +7,7 @@ from app.auth.dependencies import get_current_admin_user, get_current_user from app.auth.scopes import Scope from app.core.database import get_session -from app.core.exceptions.app_errors import NotFoundError +from app.core.exceptions.app_errors import BadRequestError, NotFoundError from app.semana import schemas, services from app.users.models import User @@ -15,6 +15,74 @@ admin_router = APIRouter(prefix="/admin/semana", tags=["admin", "semana"]) +@admin_router.get("", response_model=list[schemas.AdminSemanaResponse]) +@admin_router.get( + "/", response_model=list[schemas.AdminSemanaResponse], include_in_schema=False +) +async def list_admin_semanas( + session: Annotated[AsyncSession, Depends(get_session)], + _: Annotated[User, Security(get_current_admin_user, scopes=[Scope.ADMIN])], +): + semanas = await services.list_semanas(session, include_admin_relations=True) + return [ + schemas.AdminSemanaResponse( + id=semana.id, + nome=semana.nome, + ano=semana.ano, + challenge_count=len(semana.challenges), + participant_count=len(semana.participants), + ) + for semana in semanas + ] + + +@admin_router.post("", response_model=schemas.AdminSemanaResponse, status_code=201) +@admin_router.post( + "/", + response_model=schemas.AdminSemanaResponse, + include_in_schema=False, + status_code=201, +) +async def create_admin_semana( + data: schemas.AdminSemanaCreate, + session: Annotated[AsyncSession, Depends(get_session)], + _: Annotated[User, Security(get_current_admin_user, scopes=[Scope.ADMIN])], +): + semana = await services.create_semana(session, data.nome, data.ano) + await session.commit() + return schemas.AdminSemanaResponse.model_validate(semana) + + +@admin_router.patch("/{semana_id}", response_model=schemas.AdminSemanaResponse) +async def update_admin_semana( + semana_id: int, + data: schemas.AdminSemanaUpdate, + session: Annotated[AsyncSession, Depends(get_session)], + _: Annotated[User, Security(get_current_admin_user, scopes=[Scope.ADMIN])], +): + semana = await services.get_semana(session, semana_id) + if semana is None: + raise NotFoundError("Semana not found.") + await services.update_semana(session, semana, nome=data.nome, ano=data.ano) + await session.commit() + return schemas.AdminSemanaResponse.model_validate(semana) + + +@admin_router.delete("/{semana_id}", status_code=204) +async def delete_admin_semana( + semana_id: int, + session: Annotated[AsyncSession, Depends(get_session)], + _: Annotated[User, Security(get_current_admin_user, scopes=[Scope.ADMIN])], +): + semana = await services.get_semana(session, semana_id) + if semana is None: + raise NotFoundError("Semana not found.") + if semana.challenges or semana.participants: + raise BadRequestError("Cannot delete a Semana with challenges or participants.") + await session.delete(semana) + await session.commit() + + @router.get("", response_model=list[schemas.SemanaResponse]) @router.get("/", response_model=list[schemas.SemanaResponse], include_in_schema=False) async def list_semanas(session: Annotated[AsyncSession, Depends(get_session)]): diff --git a/backend/app/semana/schemas.py b/backend/app/semana/schemas.py index 544de370..83b17881 100644 --- a/backend/app/semana/schemas.py +++ b/backend/app/semana/schemas.py @@ -27,6 +27,21 @@ class SemanaResponse(BaseModel): ano: int +class AdminSemanaCreate(BaseModel): + nome: str + ano: int + + +class AdminSemanaUpdate(BaseModel): + nome: str | None = None + ano: int | None = None + + +class AdminSemanaResponse(SemanaResponse): + challenge_count: int = 0 + participant_count: int = 0 + + class PointEventResponse(BaseModel): model_config = ConfigDict(from_attributes=True) diff --git a/backend/app/semana/services.py b/backend/app/semana/services.py index bb904683..22eadd34 100644 --- a/backend/app/semana/services.py +++ b/backend/app/semana/services.py @@ -12,10 +12,38 @@ async def get_semana(session: AsyncSession, semana_id: int) -> SemanaEvent | Non return await session.get(SemanaEvent, semana_id) -async def list_semanas(session: AsyncSession) -> list[SemanaEvent]: - return list( - (await session.scalars(select(SemanaEvent).order_by(SemanaEvent.ano.desc()))).all() - ) +async def list_semanas( + session: AsyncSession, *, include_admin_relations: bool = False +) -> list[SemanaEvent]: + statement = select(SemanaEvent).order_by(SemanaEvent.ano.desc()) + if include_admin_relations: + statement = statement.options( + selectinload(SemanaEvent.challenges), + selectinload(SemanaEvent.participants), + ) + return list((await session.scalars(statement)).all()) + + +async def create_semana(session: AsyncSession, nome: str, ano: int) -> SemanaEvent: + semana = SemanaEvent(nome=nome, ano=ano) + session.add(semana) + await session.flush() + return semana + + +async def update_semana( + session: AsyncSession, + semana: SemanaEvent, + *, + nome: str | None = None, + ano: int | None = None, +) -> SemanaEvent: + if nome is not None: + semana.nome = nome + if ano is not None: + semana.ano = ano + await session.flush() + return semana async def get_or_create_participant( diff --git a/backend/app/tests/auth/unit/test_auth_services.py b/backend/app/tests/auth/unit/test_auth_services.py index 316a2f97..2dfec107 100644 --- a/backend/app/tests/auth/unit/test_auth_services.py +++ b/backend/app/tests/auth/unit/test_auth_services.py @@ -2,14 +2,15 @@ import jwt import pytest +from sqlalchemy import select +from sqlalchemy.ext.asyncio import AsyncSession + from app.auth import services as auth_services from app.auth.models import RefreshToken from app.auth.scopes import DEFAULT_SCOPES, Scope from app.auth.security import hash_token from app.core.config import Settings from app.core.exceptions.app_errors import UnauthorizedError -from sqlalchemy import select -from sqlalchemy.ext.asyncio import AsyncSession def _decode_access(token: str, settings: Settings) -> dict: @@ -326,6 +327,23 @@ async def test_refresh_access_token_uses_original_scopes_when_not_specified( assert set(payload["scopes"].split(" ")) == {"openid", "email"} +@pytest.mark.asyncio +async def test_refresh_access_token_adds_admin_scope_after_promotion( + db_session: AsyncSession, user_factory, jwt_settings: Settings +): + user = await user_factory(email="refresh-admin@example.com") + user.is_admin = True + await db_session.flush() + token = await auth_services.create_refresh_token( + db_session, user.id, list(DEFAULT_SCOPES) + ) + + new_access = await auth_services.refresh_access_token(db_session, token) + + payload = _decode_access(new_access.access_token, jwt_settings) + assert Scope.ADMIN in payload["scopes"].split(" ") + + # =========================================================================== # revoke_refresh_token # =========================================================================== diff --git a/backend/app/users/admin_router.py b/backend/app/users/admin_router.py index bbca33c5..a0751416 100644 --- a/backend/app/users/admin_router.py +++ b/backend/app/users/admin_router.py @@ -33,7 +33,13 @@ async def _get_user_or_404( return user -@router.post("/", response_model=UserRead, status_code=status.HTTP_201_CREATED) +@router.post("", response_model=UserRead, status_code=status.HTTP_201_CREATED) +@router.post( + "/", + response_model=UserRead, + include_in_schema=False, + status_code=status.HTTP_201_CREATED, +) async def create_user( session: Annotated[AsyncSession, Depends(get_session)], user_in: AdminUserCreate, @@ -45,7 +51,8 @@ async def create_user( return user -@router.get("/", response_model=Page[UserRead]) +@router.get("", response_model=Page[UserRead]) +@router.get("/", response_model=Page[UserRead], include_in_schema=False) async def list_users( session: Annotated[AsyncSession, Depends(get_session)], pagination: Annotated[PaginationParams, Depends()], diff --git a/frontend/src/app/admin/page.tsx b/frontend/src/app/admin/page.tsx new file mode 100644 index 00000000..5453183d --- /dev/null +++ b/frontend/src/app/admin/page.tsx @@ -0,0 +1,10 @@ +import { AuthProvider } from '@/features/auth/auth-provider' +import { AdminPanel } from '@/features/admin/components/admin-panel' + +export default function AdminPage() { + return ( + + + + ) +} diff --git a/frontend/src/features/admin/api.ts b/frontend/src/features/admin/api.ts new file mode 100644 index 00000000..a728872b --- /dev/null +++ b/frontend/src/features/admin/api.ts @@ -0,0 +1,115 @@ +import { requestApi } from '@/features/auth/api' + +export type AdminUser = { + id: string + name: string + email: string + is_admin: boolean + is_verified: boolean + created_at: string +} + +export type AdminChallenge = { + id: string + title: string + prompt: string + scoring_type: 'input' | 'quiz' | 'manual' + finishes_at: string + semana_id: number | null + points_value: number +} + +export type AdminSemana = { + id: number + nome: string + ano: number + challenge_count: number + participant_count: number +} + +type Page = { items: T[]; total: number; limit: number; offset: number } + +export function listAdminUsers() { + return requestApi>('/admin/users?limit=100') +} + +export function createAdminUser(input: { + name: string + email: string + password: string + is_admin: boolean + is_verified: boolean +}) { + return requestApi('/admin/users', { + method: 'POST', + body: JSON.stringify(input), + }) +} + +export function updateAdminUser(id: string, input: Partial) { + return requestApi(`/admin/users/${id}`, { + method: 'PATCH', + body: JSON.stringify(input), + }) +} + +export function deleteAdminUser(id: string) { + return requestApi(`/admin/users/${id}`, { method: 'DELETE' }) +} + +export function listAdminChallenges() { + return requestApi>('/admin/challenge?limit=100') +} + +export function createAdminChallenge(input: { + title: string + prompt: string + scoring_type: AdminChallenge['scoring_type'] + finishes_at: string + points_value: number + input_answer: string + semana_id?: number +}) { + return requestApi('/admin/challenge', { + method: 'POST', + body: JSON.stringify(input), + }) +} + +export function uploadAdminChallengeImage(id: string, file: File) { + const formData = new FormData() + formData.append('file', file) + return requestApi(`/admin/challenge/${id}/image`, { + method: 'PUT', + body: formData, + }) +} + +export function deleteAdminChallenge(id: string) { + return requestApi(`/admin/challenge/${id}`, { method: 'DELETE' }) +} + +export function listAdminSemanas() { + return requestApi('/admin/semana') +} + +export function createAdminSemana(input: { nome: string; ano: number }) { + return requestApi('/admin/semana', { + method: 'POST', + body: JSON.stringify(input), + }) +} + +export function updateAdminSemana( + id: number, + input: Partial>, +) { + return requestApi(`/admin/semana/${id}`, { + method: 'PATCH', + body: JSON.stringify(input), + }) +} + +export function deleteAdminSemana(id: number) { + return requestApi(`/admin/semana/${id}`, { method: 'DELETE' }) +} diff --git a/frontend/src/features/admin/components/admin-panel.tsx b/frontend/src/features/admin/components/admin-panel.tsx new file mode 100644 index 00000000..fee3bc2f --- /dev/null +++ b/frontend/src/features/admin/components/admin-panel.tsx @@ -0,0 +1,698 @@ +'use client' + +import { useEffect, useState } from 'react' +import { + CalendarDays, + Check, + CircleAlert, + LayoutDashboard, + LogOut, + Plus, + Shield, + Trash2, + Trophy, + Users, +} from 'lucide-react' +import { useRouter } from 'next/navigation' + +import { Button } from '@/components/ui/button' +import { Input } from '@/components/ui/input' +import { useAuth } from '@/features/auth/auth-provider' + +import { + createAdminChallenge, + createAdminSemana, + createAdminUser, + deleteAdminChallenge, + deleteAdminSemana, + deleteAdminUser, + listAdminChallenges, + listAdminSemanas, + listAdminUsers, + uploadAdminChallengeImage, + updateAdminSemana, + updateAdminUser, + type AdminChallenge, + type AdminSemana, + type AdminUser, +} from '../api' + +type Tab = 'overview' | 'users' | 'challenges' | 'activities' | 'points' + +const tabs: { id: Tab; label: string; icon: typeof Users }[] = [ + { id: 'overview', label: 'Visão geral', icon: LayoutDashboard }, + { id: 'users', label: 'Usuários', icon: Users }, + { id: 'challenges', label: 'Desafios', icon: Trophy }, + { id: 'activities', label: 'Semanas', icon: CalendarDays }, + { id: 'points', label: 'Pontuação', icon: Shield }, +] + +export function AdminPanel() { + const router = useRouter() + const { user, loading, logout } = useAuth() + const [tab, setTab] = useState('overview') + const [users, setUsers] = useState([]) + const [challenges, setChallenges] = useState([]) + const [semanas, setSemanas] = useState([]) + const [error, setError] = useState('') + const [refresh, setRefresh] = useState(0) + + useEffect(() => { + if (!loading && (!user || !user.isAdmin)) router.replace('/semana/login') + }, [loading, router, user]) + + useEffect(() => { + if (!user?.isAdmin) return + Promise.all([listAdminUsers(), listAdminChallenges(), listAdminSemanas()]) + .then(([userPage, challengePage, semanaList]) => { + setUsers(userPage.items) + setChallenges(challengePage.items) + setSemanas(semanaList) + }) + .catch((reason: Error) => setError(reason.message)) + }, [refresh, user]) + + if (loading || !user?.isAdmin) return null + + async function removeUser(id: string) { + if (!window.confirm('Remover este usuário?')) return + try { + await deleteAdminUser(id) + setRefresh((value) => value + 1) + } catch (reason) { + setError(reason instanceof Error ? reason.message : 'Não foi possível remover.') + } + } + + async function removeChallenge(id: string) { + if (!window.confirm('Remover este desafio?')) return + try { + await deleteAdminChallenge(id) + setRefresh((value) => value + 1) + } catch (reason) { + setError(reason instanceof Error ? reason.message : 'Não foi possível remover.') + } + } + + async function toggleAdmin(user: AdminUser) { + try { + await updateAdminUser(user.id, { is_admin: !user.is_admin }) + setRefresh((value) => value + 1) + } catch (reason) { + setError(reason instanceof Error ? reason.message : 'Não foi possível atualizar.') + } + } + + return ( +
+ + +
+
+
+

+ Painel administrativo +

+

+ {tabs.find((item) => item.id === tab)?.label} +

+
+
+

{user.name}

+

Administrador

+
+
+
+
+ {tabs.map(({ id, label }) => ( + + ))} +
+
+
+ {error && ( +
+ + {error} +
+ )} + {tab === 'overview' && ( + + )} + {tab === 'users' && ( + setRefresh((value) => value + 1)} + onDelete={removeUser} + onToggleAdmin={toggleAdmin} + /> + )} + {tab === 'challenges' && ( + setRefresh((value) => value + 1)} + onDelete={removeChallenge} + /> + )} + {tab === 'activities' && ( + setRefresh((value) => value + 1)} + /> + )} + {tab === 'points' && ( + + )} +
+
+
+ ) +} + +function Overview({ + users, + challenges, + onTab, +}: { + users: AdminUser[] + challenges: AdminChallenge[] + onTab: (tab: Tab) => void +}) { + return ( + <> +
+ + + +
+
+

Ações rápidas

+
+ + + +
+
+ + ) +} + +function Metric({ + label, + value, + icon: Icon, +}: { + label: string + value: number + icon: typeof Users +}) { + return ( +
+ +

{value}

+

{label}

+
+ ) +} + +function UsersSection({ + users, + onCreated, + onDelete, + onToggleAdmin, +}: { + users: AdminUser[] + onCreated: () => void + onDelete: (id: string) => void + onToggleAdmin: (user: AdminUser) => void +}) { + const [open, setOpen] = useState(false) + return ( +
+
+
+

Contas, permissões e verificação

+
+ +
+ {open && ( + { + setOpen(false) + onCreated() + }} + /> + )} +
+ + + + + + + + + + {users.map((item) => ( + + + + + + + ))} + +
NomeE-mailStatus +
{item.name}{item.email} + {item.is_admin ? 'Admin' : 'Usuário'} ·{' '} + {item.is_verified ? 'verificado' : 'pendente'} + +
+ + +
+
+
+
+ ) +} + +function UserForm({ onDone }: { onDone: () => void }) { + const [form, setForm] = useState({ + name: '', + email: '', + password: '', + is_admin: false, + is_verified: true, + }) + const [error, setError] = useState('') + async function submit(event: React.FormEvent) { + event.preventDefault() + try { + await createAdminUser(form) + onDone() + } catch (reason) { + setError(reason instanceof Error ? reason.message : 'Não foi possível criar.') + } + } + return ( +
+ setForm({ ...form, name: event.target.value })} + /> + setForm({ ...form, email: event.target.value })} + /> + setForm({ ...form, password: event.target.value })} + /> + + {error &&

{error}

} + +
+ ) +} + +function ChallengesSection({ + challenges, + semanas, + onCreated, + onDelete, +}: { + challenges: AdminChallenge[] + semanas: AdminSemana[] + onCreated: () => void + onDelete: (id: string) => void +}) { + const [open, setOpen] = useState(false) + return ( +
+
+

Desafios e recompensas da Semana

+ +
+ {open && ( + { + setOpen(false) + onCreated() + }} + /> + )} +
+ {challenges.map((item) => ( +
+
+
+

+ {item.scoring_type} +

+

{item.title}

+
+ +
+

+ {item.points_value} pontos · encerra em{' '} + {new Date(item.finishes_at).toLocaleDateString('pt-BR')} +

+
+ ))} +
+
+ ) +} + +function ChallengeForm({ + onDone, + semanas, +}: { + onDone: () => void + semanas: AdminSemana[] +}) { + const latestSemanaId = semanas + .slice() + .sort((a, b) => b.ano - a.ano || b.id - a.id)[0] + ?.id.toString() + const [form, setForm] = useState({ + title: '', + prompt: '', + scoring_type: 'input' as const, + finishes_at: '', + points_value: 10, + input_answer: '', + semana_id: latestSemanaId ?? '', + }) + const [image, setImage] = useState(null) + const [error, setError] = useState('') + + useEffect(() => { + if (!latestSemanaId) return + setForm((current) => ({ + ...current, + semana_id: current.semana_id || latestSemanaId, + })) + }, [latestSemanaId]) + + async function submit(event: React.FormEvent) { + event.preventDefault() + try { + const challenge = await createAdminChallenge({ + ...form, + semana_id: form.semana_id ? Number(form.semana_id) : undefined, + finishes_at: new Date(form.finishes_at).toISOString(), + }) + if (image) await uploadAdminChallengeImage(challenge.id, image) + onDone() + } catch (reason) { + setError(reason instanceof Error ? reason.message : 'Não foi possível criar.') + } + } + return ( +
+ setForm({ ...form, title: event.target.value })} + /> +
+ Resposta +
+ + setForm({ ...form, prompt: event.target.value })} + /> + setForm({ ...form, input_answer: event.target.value })} + /> + + setForm({ ...form, finishes_at: event.target.value })} + /> + + setForm({ ...form, points_value: Number(event.target.value) }) + } + /> + {error &&

{error}

} + +
+ ) +} + +function SemanasSection({ + semanas, + onChanged, +}: { + semanas: AdminSemana[] + onChanged: () => void +}) { + const [form, setForm] = useState({ nome: '', ano: new Date().getFullYear() }) + const [error, setError] = useState('') + + async function create(event: React.FormEvent) { + event.preventDefault() + try { + await createAdminSemana(form) + setForm({ nome: '', ano: new Date().getFullYear() }) + onChanged() + } catch (reason) { + setError( + reason instanceof Error ? reason.message : 'Não foi possível criar a Semana.', + ) + } + } + + async function rename(semana: AdminSemana) { + const nome = window.prompt('Nome da Semana', semana.nome) + if (!nome || nome === semana.nome) return + try { + await updateAdminSemana(semana.id, { nome }) + onChanged() + } catch (reason) { + setError( + reason instanceof Error ? reason.message : 'Não foi possível atualizar a Semana.', + ) + } + } + + async function remove(semana: AdminSemana) { + if (semana.challenge_count || semana.participant_count) { + setError('Uma Semana com desafios ou participantes não pode ser removida.') + return + } + if (!window.confirm(`Remover ${semana.nome}?`)) return + try { + await deleteAdminSemana(semana.id) + onChanged() + } catch (reason) { + setError( + reason instanceof Error ? reason.message : 'Não foi possível remover a Semana.', + ) + } + } + + return ( +
+

+ Uma Semana pode conter vários desafios; os desafios podem ser associados pelo seu + `semana_id`. +

+
+ setForm({ ...form, nome: event.target.value })} + /> + setForm({ ...form, ano: Number(event.target.value) })} + /> + +
+ {error &&

{error}

} +
+ {semanas.map((semana) => ( +
+
+
+

+ {semana.ano} +

+

{semana.nome}

+
+
+ + +
+
+

+ {semana.challenge_count} desafios · {semana.participant_count} participantes +

+
+ ))} +
+
+ ) +} + +function Unavailable({ title, text }: { title: string; text: string }) { + return ( +
+ +

{title}

+

{text}

+
+ ) +} diff --git a/frontend/src/features/auth/api.ts b/frontend/src/features/auth/api.ts index 80ec1d35..d1b22abf 100644 --- a/frontend/src/features/auth/api.ts +++ b/frontend/src/features/auth/api.ts @@ -3,6 +3,7 @@ import type { LoginInput, RegisterInput, User } from './types' const API_URL = process.env.NEXT_PUBLIC_API_URL ?? '' let accessToken: string | undefined +let refreshPromise: Promise | undefined type ApiUser = { id: string @@ -32,7 +33,7 @@ export async function requestApi( retry = true, ): Promise { const headers = new Headers(init.headers) - if (init.body && !headers.has('Content-Type')) + if (init.body && !(init.body instanceof FormData) && !headers.has('Content-Type')) headers.set('Content-Type', 'application/json') if (accessToken) headers.set('Authorization', `Bearer ${accessToken}`) @@ -61,12 +62,16 @@ export async function requestApi( } async function refresh() { - const token = await requestApi( - '/auth/refresh', - { method: 'POST' }, - false, - ) - accessToken = token.access_token + if (!refreshPromise) { + refreshPromise = requestApi('/auth/refresh', { method: 'POST' }, false) + .then((token) => { + accessToken = token.access_token + }) + .finally(() => { + refreshPromise = undefined + }) + } + return refreshPromise } export async function login(input: LoginInput): Promise { diff --git a/frontend/src/features/challenges/components/challenge-page.tsx b/frontend/src/features/challenges/components/challenge-page.tsx index 234db4a6..86f159b4 100644 --- a/frontend/src/features/challenges/components/challenge-page.tsx +++ b/frontend/src/features/challenges/components/challenge-page.tsx @@ -1,5 +1,6 @@ 'use client' +import { Download } from 'lucide-react' import { useParams, useRouter } from 'next/navigation' import Image from 'next/image' import { useEffect, useState } from 'react' @@ -75,6 +76,17 @@ export function ChallengePage() { } } + async function downloadImage() { + if (!challenge?.image_url) return + const response = await fetch(mediaUrl(challenge.image_url)) + const blob = await response.blob() + const link = document.createElement('a') + link.href = URL.createObjectURL(blob) + link.download = `${challenge.title.toLowerCase().replace(/[^a-z0-9]+/g, '-')}.jpg` + link.click() + URL.revokeObjectURL(link.href) + } + if (authLoading || !user || (!challenge && !error)) { return
Carregando desafio…
} @@ -96,14 +108,23 @@ export function ChallengePage() {

{challenge.prompt}

{challenge.image_url && ( - Imagem do desafio +
+ Imagem do desafio + +
)}
From a937cbc7f1781f0eb1c0241a9bf5ffaab576ff92 Mon Sep 17 00:00:00 2001 From: wate Date: Wed, 30 Sep 2026 07:26:45 -0300 Subject: [PATCH 11/62] refactor(semana): generate nicknames on demand Co-authored-by: Codex --- README.md | 2 +- backend/alembic/env.py | 1 - ...5c6d7e8f_add_on_demand_semana_nicknames.py | 84 +++++++ backend/app/challenges/routes.py | 17 +- .../services/challenge_participant.py | 22 +- backend/app/semana/models.py | 9 +- backend/app/semana/nicknames.py | 42 ++++ backend/app/semana/routes.py | 2 +- backend/app/semana/services.py | 22 +- backend/app/tests/challenges/conftest.py | 9 +- .../integration/test_list_and_ranking.py | 12 +- .../integration/test_manual_challenges.py | 1 - .../integration/test_quiz_lifecycle.py | 16 +- .../integration/test_soft_delete_leaks.py | 2 - backend/app/tests/conftest.py | 36 +-- .../tests/users/unit/test_user_services.py | 22 +- .../users/username/unit/test_assignment.py | 127 ----------- .../tests/users/username/unit/test_seed.py | 208 ------------------ backend/app/users/exceptions.py | 20 -- backend/app/users/schemas.py | 19 -- backend/app/users/services.py | 4 +- backend/app/users/username/__init__.py | 1 - backend/app/users/username/models.py | 41 ---- backend/app/users/username/seed.py | 120 ---------- backend/app/users/username/services.py | 59 ----- backend/scripts/data/mothers.csv | 30 --- backend/scripts/seed_dev.py | 15 +- backend/scripts/seed_usernames.py | 44 ---- 28 files changed, 183 insertions(+), 804 deletions(-) create mode 100644 backend/alembic/versions/3a4b5c6d7e8f_add_on_demand_semana_nicknames.py create mode 100644 backend/app/semana/nicknames.py delete mode 100644 backend/app/tests/users/username/unit/test_assignment.py delete mode 100644 backend/app/tests/users/username/unit/test_seed.py delete mode 100644 backend/app/users/username/__init__.py delete mode 100644 backend/app/users/username/models.py delete mode 100644 backend/app/users/username/seed.py delete mode 100644 backend/app/users/username/services.py delete mode 100755 backend/scripts/data/mothers.csv delete mode 100755 backend/scripts/seed_usernames.py diff --git a/README.md b/README.md index b3dbe95f..6b596095 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,7 @@ Development uses its own Compose project and database volume; it requires no `.env` file. Existing volumes from the old default development stack are not migrated automatically. -Seed the local Semana event, username catalog, and an input challenge: +Seed the local Semana event and an input challenge: ```bash docker compose -f docker-compose.dev.yml exec backend python -m scripts.seed_dev diff --git a/backend/alembic/env.py b/backend/alembic/env.py index 3144ea7e..7eb07d88 100644 --- a/backend/alembic/env.py +++ b/backend/alembic/env.py @@ -15,7 +15,6 @@ from app.auth import models as auth_models # noqa: F401 noqa from app.users import models as user_models # noqa: F401 noqa from app.challenges import models as challenges_models # noqa: F401 noqa -from app.users.username import models as usernames_user_models # noqa: F401 noqa from app.semana import models as semana_models # noqa: F401 noqa # this is the Alembic Config object, which provides diff --git a/backend/alembic/versions/3a4b5c6d7e8f_add_on_demand_semana_nicknames.py b/backend/alembic/versions/3a4b5c6d7e8f_add_on_demand_semana_nicknames.py new file mode 100644 index 00000000..7700e8da --- /dev/null +++ b/backend/alembic/versions/3a4b5c6d7e8f_add_on_demand_semana_nicknames.py @@ -0,0 +1,84 @@ +"""Store generated nicknames on Semana participants. + +Revision ID: 3a4b5c6d7e8f +Revises: 2c6e1a4b8d90 +""" + +from collections.abc import Sequence + +import sqlalchemy as sa + +from alembic import op + +revision: str = "3a4b5c6d7e8f" +down_revision: str | Sequence[str] | None = "2c6e1a4b8d90" +branch_labels: str | Sequence[str] | None = None +depends_on: str | Sequence[str] | None = None + + +def upgrade() -> None: + op.add_column( + "semana_participants", + sa.Column("nickname", sa.String(length=255), nullable=True), + ) + op.execute( + sa.text( + """ + UPDATE semana_participants AS participants + SET nickname = usernames.nickname + FROM usernames + WHERE participants.username_id = usernames.id + AND participants.nickname IS NULL + """ + ) + ) + op.execute( + sa.text( + """ + WITH numbered AS ( + SELECT + id, + 'Participante' || LPAD( + ROW_NUMBER() OVER ( + PARTITION BY semana_id ORDER BY id + )::text, + 4, + '0' + ) AS generated_nickname + FROM semana_participants + WHERE nickname IS NULL + ) + UPDATE semana_participants AS participants + SET nickname = numbered.generated_nickname + FROM numbered + WHERE participants.id = numbered.id + """ + ) + ) + op.create_unique_constraint( + "uq_semana_participant_nickname", + "semana_participants", + ["semana_id", "nickname"], + ) + op.drop_constraint( + "uq_semana_participant_username", + "semana_participants", + type_="unique", + ) + op.drop_constraint( + "semana_participants_username_id_fkey", + "semana_participants", + type_="foreignkey", + ) + op.drop_column("semana_participants", "username_id") + op.drop_table("usernames") + op.drop_table("username_mothers") + + +def downgrade() -> None: + op.drop_constraint( + "uq_semana_participant_nickname", + "semana_participants", + type_="unique", + ) + op.drop_column("semana_participants", "nickname") diff --git a/backend/app/challenges/routes.py b/backend/app/challenges/routes.py index dada2e46..7fe02e22 100644 --- a/backend/app/challenges/routes.py +++ b/backend/app/challenges/routes.py @@ -52,7 +52,10 @@ async def join_challenge( semana_participant_id = semana_participant.id new_participant = await participant_service.create_challenge_participant( - session, current_user.id, challenge_id, semana_participant_id=semana_participant_id + session, + current_user.id, + challenge_id, + semana_participant_id=semana_participant_id, ) await session.refresh(new_participant) @@ -60,7 +63,7 @@ async def join_challenge( session, new_participant.id ) if result is None or result.semana_participant is None: - raise BadRequestError("Username assignment failed.") + raise BadRequestError("Nickname assignment failed.") return challenge_schemas.ParticipantResponse( id=result.id, @@ -68,9 +71,7 @@ async def join_challenge( challenge_id=result.challenge_id, name=result.user.name, nickname=( - result.semana_participant.username.nickname - if result.semana_participant is not None - else "" + result.semana_participant.nickname if result.semana_participant else "" ), score=result.score, submitted_at=result.submitted_at, @@ -301,11 +302,7 @@ async def get_ranking( user_id=p.user_id, score=p.score, name=p.user.name, - nickname=( - p.semana_participant.username.nickname - if p.semana_participant is not None - else "" - ), + nickname=(p.semana_participant.nickname if p.semana_participant else ""), ) for p in participants ] diff --git a/backend/app/challenges/services/challenge_participant.py b/backend/app/challenges/services/challenge_participant.py index cc16bf3e..aca8023a 100644 --- a/backend/app/challenges/services/challenge_participant.py +++ b/backend/app/challenges/services/challenge_participant.py @@ -1,11 +1,11 @@ import uuid -from app.challenges.models.challenge_participant import ChallengeParticipant -from app.semana.models import SemanaParticipant from sqlalchemy import desc, select from sqlalchemy.ext.asyncio import AsyncSession from sqlalchemy.orm import selectinload +from app.challenges.models.challenge_participant import ChallengeParticipant + async def get_challenge_ranking( session: AsyncSession, challenge_id: uuid.UUID @@ -18,9 +18,7 @@ async def get_challenge_ranking( ) .options( selectinload(ChallengeParticipant.user), - selectinload(ChallengeParticipant.semana_participant).selectinload( - SemanaParticipant.username - ), + selectinload(ChallengeParticipant.semana_participant), ) .order_by(desc(ChallengeParticipant.score)) .limit(10) @@ -40,9 +38,7 @@ async def get_challenge_participant_by_id( ) .options( selectinload(ChallengeParticipant.user), - selectinload(ChallengeParticipant.semana_participant).selectinload( - SemanaParticipant.username - ), + selectinload(ChallengeParticipant.semana_participant), ) ) return result.scalar_one_or_none() @@ -64,9 +60,7 @@ async def get_challenge_participant( ) .options( selectinload(ChallengeParticipant.user), - selectinload(ChallengeParticipant.semana_participant).selectinload( - SemanaParticipant.username - ), + selectinload(ChallengeParticipant.semana_participant), ) ) @@ -140,11 +134,7 @@ async def add_challenge_participant_score( ChallengeParticipant.challenge_id == challenge_id, ChallengeParticipant.deleted_at.is_(None), ) - .options( - selectinload(ChallengeParticipant.semana_participant).selectinload( - SemanaParticipant.username - ) - ) + .options(selectinload(ChallengeParticipant.semana_participant)) .with_for_update() ) if participant is None: diff --git a/backend/app/semana/models.py b/backend/app/semana/models.py index ff8615ca..4545218b 100644 --- a/backend/app/semana/models.py +++ b/backend/app/semana/models.py @@ -13,7 +13,6 @@ from app.challenges.models.challenge import Challenge from app.challenges.models.challenge_participant import ChallengeParticipant from app.users.models import User - from app.users.username.models import Username class SemanaEvent(Base): @@ -38,13 +37,9 @@ class SemanaParticipant(Base, UUIDPKMixin, TimestampsMixin): user_id: Mapped[uuid.UUID] = mapped_column( ForeignKey("users.id", ondelete="CASCADE") ) - username_id: Mapped[uuid.UUID | None] = mapped_column( - ForeignKey("usernames.id"), nullable=True - ) - + nickname: Mapped[str | None] = mapped_column(String(255), nullable=True) semana: Mapped[SemanaEvent] = relationship(back_populates="participants") user: Mapped[User] = relationship() - username: Mapped[Username | None] = relationship(back_populates="participants") challenge_attempts: Mapped[list[ChallengeParticipant]] = relationship( back_populates="semana_participant" ) @@ -57,7 +52,7 @@ class SemanaParticipant(Base, UUIDPKMixin, TimestampsMixin): "semana_id", "user_id", name="uq_semana_participant_event_user" ), UniqueConstraint( - "semana_id", "username_id", name="uq_semana_participant_username" + "semana_id", "nickname", name="uq_semana_participant_nickname" ), ) diff --git a/backend/app/semana/nicknames.py b/backend/app/semana/nicknames.py new file mode 100644 index 00000000..0737c68b --- /dev/null +++ b/backend/app/semana/nicknames.py @@ -0,0 +1,42 @@ +import csv +import secrets +from functools import lru_cache +from pathlib import Path + +from sqlalchemy import exists, select +from sqlalchemy.ext.asyncio import AsyncSession + +from app.semana.models import SemanaParticipant + +NICKNAME_FILE = Path(__file__).parents[2] / "scripts" / "data" / "usernames.csv" +MAX_GENERATION_ATTEMPTS = 20 + + +@lru_cache(maxsize=1) +def nickname_bases() -> tuple[str, ...]: + with NICKNAME_FILE.open(encoding="utf-8", newline="") as file: + bases = tuple( + row["nickname"].strip() + for row in csv.DictReader(file) + if row.get("nickname", "").strip() + ) + if not bases: + raise RuntimeError(f"No nickname bases found in {NICKNAME_FILE}") + return bases + + +async def generate_nickname(session: AsyncSession, semana_id: int) -> str: + for _ in range(MAX_GENERATION_ATTEMPTS): + candidate = f"{secrets.choice(nickname_bases())}{secrets.randbelow(10000):04d}" + taken = await session.scalar( + select( + exists().where( + SemanaParticipant.semana_id == semana_id, + SemanaParticipant.nickname == candidate, + ) + ) + ) + if not taken: + return candidate + + raise RuntimeError("Could not generate a unique Semana nickname.") diff --git a/backend/app/semana/routes.py b/backend/app/semana/routes.py index c26a67b2..803f949b 100644 --- a/backend/app/semana/routes.py +++ b/backend/app/semana/routes.py @@ -110,7 +110,7 @@ async def join_semana( id=participant.id, semana_id=participant.semana_id, user_id=participant.user_id, - nickname=participant.username.nickname, + nickname=participant.nickname, ) diff --git a/backend/app/semana/services.py b/backend/app/semana/services.py index 22eadd34..c5300d4b 100644 --- a/backend/app/semana/services.py +++ b/backend/app/semana/services.py @@ -3,9 +3,8 @@ from sqlalchemy.orm import selectinload from app.semana.models import PointEvent, SemanaEvent, SemanaParticipant +from app.semana.nicknames import generate_nickname from app.users.models import User -from app.users.username import services as username_services -from app.users.username.models import Username async def get_semana(session: AsyncSession, semana_id: int) -> SemanaEvent | None: @@ -50,25 +49,24 @@ async def get_or_create_participant( session: AsyncSession, semana: SemanaEvent, user: User ) -> SemanaParticipant: participant = await session.scalar( - select(SemanaParticipant) - .where( + select(SemanaParticipant).where( SemanaParticipant.semana_id == semana.id, SemanaParticipant.user_id == user.id, ) - .options(selectinload(SemanaParticipant.username)) ) if participant is not None: - if participant.username is None: - await username_services.assign_username(participant.id, session) + if participant.nickname is None: + participant.nickname = await generate_nickname(session, semana.id) + await session.flush() return participant participant = SemanaParticipant( semana_id=semana.id, user_id=user.id, + nickname=await generate_nickname(session, semana.id), ) session.add(participant) await session.flush() - await username_services.assign_username(participant.id, session) return participant @@ -97,13 +95,15 @@ async def list_ranking(session: AsyncSession, semana_id: int): rows = await session.execute( select( SemanaParticipant.id, - Username.nickname, + SemanaParticipant.nickname, func.coalesce(func.sum(PointEvent.amount), 0).label("points"), ) .outerjoin(PointEvent) - .join(Username, Username.id == SemanaParticipant.username_id) .where(SemanaParticipant.semana_id == semana_id) - .group_by(SemanaParticipant.id, Username.nickname) + .group_by( + SemanaParticipant.id, + SemanaParticipant.nickname, + ) .order_by(func.coalesce(func.sum(PointEvent.amount), 0).desc()) ) return rows.all() diff --git a/backend/app/tests/challenges/conftest.py b/backend/app/tests/challenges/conftest.py index 26341bab..74b753b2 100644 --- a/backend/app/tests/challenges/conftest.py +++ b/backend/app/tests/challenges/conftest.py @@ -6,13 +6,14 @@ from collections.abc import Callable import pytest +from httpx import AsyncClient +from sqlalchemy.ext.asyncio import AsyncSession + from app.auth.dependencies import get_current_admin_user, get_current_user from app.challenges.models.challenge import Challenge, ChallengeScoringType from app.challenges.models.question import Question from app.semana.models import SemanaEvent from app.users.models import User -from httpx import AsyncClient -from sqlalchemy.ext.asyncio import AsyncSession # --------------------------------------------------------------------------- # Factories @@ -108,9 +109,7 @@ async def challenge(db_session: AsyncSession, semana: SemanaEvent) -> Challenge: @pytest.fixture -async def manual_challenge( - db_session: AsyncSession, semana: SemanaEvent -) -> Challenge: +async def manual_challenge(db_session: AsyncSession, semana: SemanaEvent) -> Challenge: c = Challenge( title="Manual Teste", scoring_type=ChallengeScoringType.MANUAL, 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 89ffb0d2..82be4148 100644 --- a/backend/app/tests/challenges/integration/test_list_and_ranking.py +++ b/backend/app/tests/challenges/integration/test_list_and_ranking.py @@ -4,11 +4,12 @@ import uuid +from httpx import AsyncClient +from sqlalchemy.ext.asyncio import AsyncSession + from app.challenges.models.challenge import Challenge, ChallengeScoringType from app.challenges.models.challenge_participant import ChallengeParticipant from app.semana.models import SemanaParticipant -from httpx import AsyncClient -from sqlalchemy.ext.asyncio import AsyncSession async def test_list_challenges_paginated( @@ -48,11 +49,10 @@ async def test_ranking_orders_by_score_desc( challenge, db_session: AsyncSession, semana, - username_catalog, ): from app.users.models import User - ranking_username = username_catalog[0] + ranking_nickname = "AdaLovelace4821" # 15 participantes com scores variados for i in range(15): @@ -69,7 +69,7 @@ async def test_ranking_orders_by_score_desc( semana_participant = SemanaParticipant( user_id=u.id, semana_id=semana.id, - username_id=ranking_username.id, + nickname=ranking_nickname, ) db_session.add(semana_participant) await db_session.flush() @@ -95,4 +95,4 @@ async def test_ranking_orders_by_score_desc( scores = [p["score"] for p in ranking] assert scores == sorted(scores, reverse=True) assert scores[0] == 140 - assert ranking[0]["nickname"] == ranking_username.nickname + assert ranking[0]["nickname"] == ranking_nickname diff --git a/backend/app/tests/challenges/integration/test_manual_challenges.py b/backend/app/tests/challenges/integration/test_manual_challenges.py index 808a8ca9..4288fe50 100644 --- a/backend/app/tests/challenges/integration/test_manual_challenges.py +++ b/backend/app/tests/challenges/integration/test_manual_challenges.py @@ -10,7 +10,6 @@ async def test_manual_challenge_cannot_be_submitted( as_user, user, manual_challenge, - username_catalog, ): c = as_user(user) r = await c.post(f"api/v1/challenge/{manual_challenge.id}/join") diff --git a/backend/app/tests/challenges/integration/test_quiz_lifecycle.py b/backend/app/tests/challenges/integration/test_quiz_lifecycle.py index 99de8396..e3f549d9 100644 --- a/backend/app/tests/challenges/integration/test_quiz_lifecycle.py +++ b/backend/app/tests/challenges/integration/test_quiz_lifecycle.py @@ -2,6 +2,7 @@ from __future__ import annotations +import re from datetime import UTC, datetime, timedelta from httpx import AsyncClient @@ -13,7 +14,6 @@ async def test_full_quiz_lifecycle( user, challenge, questions, - username_catalog, ): c = as_user(user) @@ -90,13 +90,12 @@ async def test_answering_without_joining_returns_400( assert r.status_code == 400 -async def test_username_is_reused_across_challenge_joins( +async def test_nickname_is_reused_across_challenge_joins( client: AsyncClient, as_user, user, challenge, manual_challenge, - username_catalog, ): c = as_user(user) @@ -105,9 +104,8 @@ async def test_username_is_reused_across_challenge_joins( assert first_join.status_code == 200, first_join.text assert second_join.status_code == 200, second_join.text - assert first_join.json()["nickname"] in { - username.nickname for username in username_catalog - } + assert len(first_join.json()["nickname"]) > 0 + assert re.fullmatch(r"[A-Za-z]+\d{4}", first_join.json()["nickname"]) assert second_join.json()["nickname"] == first_join.json()["nickname"] @@ -125,7 +123,6 @@ async def test_submitting_question_from_other_challenge_returns_404( user, challenge, manual_challenge, - username_catalog, db_session, ): from app.challenges.models.question import Question @@ -147,7 +144,7 @@ async def test_submitting_question_from_other_challenge_returns_404( async def test_bulk_save_answers( - client: AsyncClient, as_user, user, challenge, questions, username_catalog + client: AsyncClient, as_user, user, challenge, questions ): c = as_user(user) await c.post(f"api/v1/challenge/{challenge.id}/join") @@ -169,7 +166,6 @@ async def test_expired_challenge_rejects_single_and_bulk_answers( user, challenge, questions, - username_catalog, db_session, ): c = as_user(user) @@ -200,7 +196,6 @@ async def test_expired_challenge_rejects_new_submission( as_user, user, challenge, - username_catalog, db_session, ): c = as_user(user) @@ -222,7 +217,6 @@ async def test_existing_submission_remains_idempotent_after_deadline( as_user, user, challenge, - username_catalog, db_session, ): c = as_user(user) diff --git a/backend/app/tests/challenges/integration/test_soft_delete_leaks.py b/backend/app/tests/challenges/integration/test_soft_delete_leaks.py index e31bee00..7ba50741 100644 --- a/backend/app/tests/challenges/integration/test_soft_delete_leaks.py +++ b/backend/app/tests/challenges/integration/test_soft_delete_leaks.py @@ -17,7 +17,6 @@ async def test_deleted_answer_does_not_appear_in_get_challenge( user, challenge, questions, - username_catalog, db_session: AsyncSession, ): c = as_user(user) @@ -55,7 +54,6 @@ async def test_deleted_answer_not_counted_on_submit( user, challenge, questions, - username_catalog, db_session: AsyncSession, ): c = as_user(user) diff --git a/backend/app/tests/conftest.py b/backend/app/tests/conftest.py index 96970791..187b621a 100644 --- a/backend/app/tests/conftest.py +++ b/backend/app/tests/conftest.py @@ -1,4 +1,3 @@ -import uuid from datetime import UTC, datetime from shutil import rmtree @@ -12,7 +11,6 @@ from app.main import app from app.users import services as user_services from app.users.schemas import UserCreate -from app.users.username.models import Username, UsernameMother @pytest.fixture @@ -72,7 +70,7 @@ def override_get_settings(): @pytest.fixture -def user_factory(db_session: AsyncSession, username_catalog): +def user_factory(db_session: AsyncSession): async def _make( email: str = "factory-user@example.com", name: str = "Factory User", @@ -100,38 +98,6 @@ async def _make( return _make -def _make_username_mother() -> UsernameMother: - return UsernameMother( - first_name="Maria", - last_name="Silva", - full_name=f"Maria Silva {uuid.uuid4().hex[:6]}", - description="Mãe de teste", - ) - - -def _make_username( - first_mother: UsernameMother, last_mother: UsernameMother -) -> Username: - return Username( - nickname=f"nick-{uuid.uuid4().hex[:10]}", - first_mother_id=first_mother.id, - last_mother_id=last_mother.id, - ) - - -@pytest.fixture -async def username_catalog(db_session: AsyncSession) -> list[Username]: - first_mother = _make_username_mother() - last_mother = _make_username_mother() - db_session.add_all([first_mother, last_mother]) - await db_session.flush() - - usernames = [_make_username(first_mother, last_mother) for _ in range(5)] - db_session.add_all(usernames) - await db_session.flush() - return usernames - - @pytest.fixture(autouse=True) def cleanup_generated_challenge_images(): settings = get_settings() diff --git a/backend/app/tests/users/unit/test_user_services.py b/backend/app/tests/users/unit/test_user_services.py index 1f811b50..52b92220 100644 --- a/backend/app/tests/users/unit/test_user_services.py +++ b/backend/app/tests/users/unit/test_user_services.py @@ -51,7 +51,7 @@ def test_verify_password_is_case_sensitive(): @pytest.mark.asyncio -async def test_create_user_service(db_session: AsyncSession, username_catalog): +async def test_create_user_service(db_session: AsyncSession): user_in = UserCreate( email="service_test@example.com", name="Service User", password="password123" ) @@ -63,7 +63,7 @@ async def test_create_user_service(db_session: AsyncSession, username_catalog): @pytest.mark.asyncio -async def test_get_user_by_id(db_session: AsyncSession, username_catalog): +async def test_get_user_by_id(db_session: AsyncSession): user_in = UserCreate( email="get_id@example.com", name="Get By ID", password="password123" ) @@ -75,7 +75,7 @@ async def test_get_user_by_id(db_session: AsyncSession, username_catalog): @pytest.mark.asyncio -async def test_get_user_by_email(db_session: AsyncSession, username_catalog): +async def test_get_user_by_email(db_session: AsyncSession): user_in = UserCreate( email="get_email@example.com", name="Get By Email", password="password123" ) @@ -89,7 +89,7 @@ async def test_get_user_by_email(db_session: AsyncSession, username_catalog): @pytest.mark.asyncio -async def test_update_user_service(db_session: AsyncSession, username_catalog): +async def test_update_user_service(db_session: AsyncSession): user_in = UserCreate( email="update@example.com", name="Old Name", password="password123" ) @@ -102,7 +102,7 @@ async def test_update_user_service(db_session: AsyncSession, username_catalog): @pytest.mark.asyncio -async def test_soft_delete_user_service(db_session: AsyncSession, username_catalog): +async def test_soft_delete_user_service(db_session: AsyncSession): user_in = UserCreate( email="delete@example.com", name="Delete Me", password="password123" ) @@ -115,9 +115,7 @@ async def test_soft_delete_user_service(db_session: AsyncSession, username_catal @pytest.mark.asyncio -async def test_create_user_with_existing_active_email_raises( - db_session: AsyncSession, username_catalog -): +async def test_create_user_with_existing_active_email_raises(db_session: AsyncSession): user_in = UserCreate( email="duplicate@example.com", name="First", password="password123" ) @@ -131,9 +129,7 @@ async def test_create_user_with_existing_active_email_raises( @pytest.mark.asyncio -async def test_delete_already_deleted_user_raises( - db_session: AsyncSession, username_catalog -): +async def test_delete_already_deleted_user_raises(db_session: AsyncSession): user_in = UserCreate( email="double_delete@example.com", name="Delete Twice", password="password123" ) @@ -146,9 +142,7 @@ async def test_delete_already_deleted_user_raises( @pytest.mark.asyncio -async def test_create_user_reactivates_soft_deleted_account( - db_session: AsyncSession, username_catalog -): +async def test_create_user_reactivates_soft_deleted_account(db_session: AsyncSession): # Cria, soft-deleta e depois recria com o mesmo e-mail: deve reativar a # conta antiga (mesmo id) em vez de criar um registro novo. user_in = UserCreate( diff --git a/backend/app/tests/users/username/unit/test_assignment.py b/backend/app/tests/users/username/unit/test_assignment.py deleted file mode 100644 index b44497c4..00000000 --- a/backend/app/tests/users/username/unit/test_assignment.py +++ /dev/null @@ -1,127 +0,0 @@ -"""Testes de `assign_username` por Semana.""" - -from __future__ import annotations - -import uuid - -import pytest -from app.core.exceptions.app_errors import NotFoundError -from app.semana.models import SemanaEvent, SemanaParticipant -from app.users.exceptions import NoAvailableUsername -from app.users.username import services as username_service -from sqlalchemy.exc import IntegrityError -from sqlalchemy.ext.asyncio import AsyncSession - - -async def _participant(db_session, user_factory, *, semana_id, email): - user = await user_factory(email=email) - participant = SemanaParticipant(user_id=user.id, semana_id=semana_id) - db_session.add(participant) - await db_session.flush() - return participant - - -async def test_assigns_first_available_username( - db_session: AsyncSession, user_factory, username_catalog -): - semana = SemanaEvent(nome="Semana", ano=2026) - db_session.add(semana) - await db_session.flush() - participant = await _participant( - db_session, user_factory, semana_id=semana.id, email="username-first@example.com" - ) - - username = await username_service.assign_username(participant.id, db_session) - - assert username.nickname in {item.nickname for item in username_catalog} - assert participant.username_id == username.id - - -async def test_returns_existing_username_if_already_assigned( - db_session: AsyncSession, user_factory, username_catalog -): - semana = SemanaEvent(nome="Semana", ano=2026) - db_session.add(semana) - await db_session.flush() - participant = await _participant( - db_session, - user_factory, - semana_id=semana.id, - email="username-existing@example.com", - ) - participant.username_id = username_catalog[0].id - await db_session.flush() - - username = await username_service.assign_username(participant.id, db_session) - - assert username.id == username_catalog[0].id - - -async def test_username_cannot_be_assigned_twice_in_same_semana( - db_session: AsyncSession, user_factory, username_catalog -): - semana = SemanaEvent(nome="Semana", ano=2026) - db_session.add(semana) - await db_session.flush() - first = await _participant( - db_session, user_factory, semana_id=semana.id, email="username-owner@example.com" - ) - other = await _participant( - db_session, user_factory, semana_id=semana.id, email="username-other@example.com" - ) - first.username_id = username_catalog[0].id - await db_session.flush() - - with pytest.raises(IntegrityError): - async with db_session.begin_nested(): - other.username_id = username_catalog[0].id - await db_session.flush() - - -async def test_same_username_can_be_used_in_different_semanas( - db_session: AsyncSession, user_factory, username_catalog -): - first_semana = SemanaEvent(nome="Semana 1", ano=2026) - second_semana = SemanaEvent(nome="Semana 2", ano=2027) - db_session.add_all([first_semana, second_semana]) - await db_session.flush() - first = await _participant( - db_session, user_factory, semana_id=first_semana.id, email="one@example.com" - ) - second = await _participant( - db_session, user_factory, semana_id=second_semana.id, email="two@example.com" - ) - first.username_id = username_catalog[0].id - second.username_id = username_catalog[0].id - - await db_session.flush() - - -async def test_raises_when_no_username_available( - db_session: AsyncSession, user_factory, username_catalog -): - semana = SemanaEvent(nome="Semana", ano=2026) - db_session.add(semana) - await db_session.flush() - participants = [ - await _participant( - db_session, - user_factory, - semana_id=semana.id, - email=f"username-{i}@example.com", - ) - for i in range(len(username_catalog) + 1) - ] - for participant, username in zip(participants, username_catalog): - participant.username_id = username.id - await db_session.flush() - - with pytest.raises(NoAvailableUsername): - await username_service.assign_username(participants[-1].id, db_session) - - -async def test_raises_when_participant_does_not_exist( - db_session: AsyncSession, username_catalog -): - with pytest.raises(NotFoundError): - await username_service.assign_username(uuid.uuid4(), db_session) diff --git a/backend/app/tests/users/username/unit/test_seed.py b/backend/app/tests/users/username/unit/test_seed.py deleted file mode 100644 index b208c8fe..00000000 --- a/backend/app/tests/users/username/unit/test_seed.py +++ /dev/null @@ -1,208 +0,0 @@ -"""Testes do seed do catálogo de usernames.""" - -from __future__ import annotations - -import pytest -from sqlalchemy import func, select -from sqlalchemy.ext.asyncio import AsyncSession - -from app.users.username.models import Username, UsernameMother -from app.users.username.seed import ( - read_csv, - seed_from_csv_files, - seed_from_rows, -) - -# --------------------------------------------------------------------------- -# Dados base -# --------------------------------------------------------------------------- - - -MOTHERS = [ - {"first_name": "Maria", "last_name": "Silva", "description": "professora"}, - {"first_name": "Ana", "last_name": "Souza", "description": "astronauta"}, -] - -USERNAMES = [ - { - "nickname": "MariSilva", - "first_mome_full_name": "Maria Silva", - "last_mome_full_name": "Ana Souza", - }, - { - "nickname": "AnaSouza", - "first_mome_full_name": "Ana Souza", - "last_mome_full_name": "Maria Silva", - }, -] - - -async def _count(session: AsyncSession, model) -> int: - return await session.scalar(select(func.count()).select_from(model)) or 0 - - -# --------------------------------------------------------------------------- -# seed_from_rows -# --------------------------------------------------------------------------- - - -async def test_seed_inserts_all_rows(db_session): - n_mothers, n_usernames = await seed_from_rows(db_session, MOTHERS, USERNAMES) - - assert n_mothers == 2 - assert n_usernames == 2 - assert await _count(db_session, UsernameMother) == 2 - assert await _count(db_session, Username) == 2 - - -async def test_seed_is_idempotent(db_session): - first = await seed_from_rows(db_session, MOTHERS, USERNAMES) - second = await seed_from_rows(db_session, MOTHERS, USERNAMES) - - assert first == (2, 2) - assert second == (0, 0) # nada novo na segunda rodada - assert await _count(db_session, UsernameMother) == 2 - assert await _count(db_session, Username) == 2 - - -async def test_seed_partially_idempotent(db_session): - """Rodar com um catálogo parcialmente novo só insere o que falta.""" - await seed_from_rows(db_session, MOTHERS, USERNAMES) - - extended_mothers = MOTHERS + [ - {"first_name": "Joana", "last_name": "Lima", "description": "x"} - ] - extended_usernames = USERNAMES + [ - { - "nickname": "JoanaLima", - "first_mome_full_name": "Joana Lima", - "last_mome_full_name": "Maria Silva", - } - ] - - n_mothers, n_usernames = await seed_from_rows( - db_session, extended_mothers, extended_usernames - ) - - assert n_mothers == 1 - assert n_usernames == 1 - assert await _count(db_session, UsernameMother) == 3 - assert await _count(db_session, Username) == 3 - - -async def test_seed_raises_on_missing_mother(db_session): - """Falha ANTES de qualquer INSERT — nada é gravado.""" - bad_usernames = [ - { - "nickname": "X", - "first_mome_full_name": "Ninguém Silva", - "last_mome_full_name": "Maria Silva", - } - ] - - with pytest.raises(RuntimeError, match="mothers inexistentes"): - await seed_from_rows(db_session, MOTHERS, bad_usernames) - - assert await _count(db_session, UsernameMother) == 0 - assert await _count(db_session, Username) == 0 - - -async def test_seed_handles_empty_input(db_session): - """CSV vazio não deve estourar (insert com [] quebra no SQLAlchemy).""" - result = await seed_from_rows(db_session, [], []) - assert result == (0, 0) - assert await _count(db_session, UsernameMother) == 0 - assert await _count(db_session, Username) == 0 - - -async def test_seed_with_mothers_but_no_usernames(db_session): - result = await seed_from_rows(db_session, MOTHERS, []) - assert result == (2, 0) - assert await _count(db_session, UsernameMother) == 2 - assert await _count(db_session, Username) == 0 - - -async def test_seed_strips_whitespace(db_session): - mothers = [ - {"first_name": " Maria ", "last_name": " Silva ", "description": " x "} - ] - usernames = [ - { - "nickname": " nick ", - "first_mome_full_name": " Maria Silva ", - "last_mome_full_name": " Maria Silva ", - } - ] - - await seed_from_rows(db_session, mothers, usernames) - - m = await db_session.scalar(select(UsernameMother)) - assert m.first_name == "Maria" - assert m.last_name == "Silva" - assert m.full_name == "Maria Silva" - - u = await db_session.scalar(select(Username)) - assert u.nickname == "nick" - - -async def test_seed_dedupes_repeated_mothers(db_session): - """Mother duplicada no CSV só é inserida uma vez.""" - duplicated = MOTHERS + [MOTHERS[0]] # Maria Silva aparece 2x - - n_mothers, _ = await seed_from_rows(db_session, duplicated, USERNAMES) - - assert n_mothers == 2 - assert await _count(db_session, UsernameMother) == 2 - - -# --------------------------------------------------------------------------- -# read_csv / seed_from_csv_files -# --------------------------------------------------------------------------- - - -def test_read_csv(tmp_path): - path = tmp_path / "x.csv" - path.write_text("a,b\n1,2\n3,4\n", encoding="utf-8") - - assert read_csv(path) == [{"a": "1", "b": "2"}, {"a": "3", "b": "4"}] - - -async def test_seed_from_csv_files_end_to_end(db_session, tmp_path): - mothers_csv = tmp_path / "mothers.csv" - mothers_csv.write_text( - "first_name,last_name,description\nMaria,Silva,prof\nAna,Souza,astro\n", - encoding="utf-8", - ) - usernames_csv = tmp_path / "usernames.csv" - usernames_csv.write_text( - "nickname,first_mome_full_name,last_mome_full_name\n" - "MariSilva,Maria Silva,Ana Souza\n", - encoding="utf-8", - ) - - n_mothers, n_usernames = await seed_from_csv_files( - db_session, mothers_csv, usernames_csv - ) - - assert (n_mothers, n_usernames) == (2, 1) - - -async def test_seed_from_csv_files_fails_on_inconsistent_csv(db_session, tmp_path): - """CSV de usernames referencia mother que não existe no CSV de mothers.""" - mothers_csv = tmp_path / "mothers.csv" - mothers_csv.write_text( - "first_name,last_name,description\nMaria,Silva,prof\n", - encoding="utf-8", - ) - usernames_csv = tmp_path / "usernames.csv" - usernames_csv.write_text( - "nickname,first_mome_full_name,last_mome_full_name\nX,Joana Lima,Maria Silva\n", - encoding="utf-8", - ) - - with pytest.raises(RuntimeError, match="mothers inexistentes"): - await seed_from_csv_files(db_session, mothers_csv, usernames_csv) - - # Nada foi inserido - assert await _count(db_session, UsernameMother) == 0 - assert await _count(db_session, Username) == 0 diff --git a/backend/app/users/exceptions.py b/backend/app/users/exceptions.py index ed278958..566a1ad7 100644 --- a/backend/app/users/exceptions.py +++ b/backend/app/users/exceptions.py @@ -21,23 +21,3 @@ def __init__(self, email, headers: dict[str, str] | None = None): detail=f"User with email {email!r} already exists.", headers=headers, ) - - -class NoAvailableUsername(AppError): - def __init__(self) -> None: - super().__init__( - status_code=409, - type="no_available_username", - title="No available username", - detail="No usernames available for the user.", - ) - - -class CouldNotAssignUsernameError(AppError): - def __init__(self) -> None: - super().__init__( - status_code=500, - type="could_not_assign_username", - title="Could not assign username", - detail="Could not assign a username. Try again later.", - ) diff --git a/backend/app/users/schemas.py b/backend/app/users/schemas.py index 8aa84e27..44d2a355 100644 --- a/backend/app/users/schemas.py +++ b/backend/app/users/schemas.py @@ -55,24 +55,5 @@ class UserRead(UserBase): deleted_at: datetime | None = None -class UsernameMotherRead(BaseModel): - model_config = ConfigDict(from_attributes=True) - - id: uuid.UUID - first_name: str - last_name: str - full_name: str - description: str - - -class UsernameRead(BaseModel): - model_config = ConfigDict(from_attributes=True) - - id: uuid.UUID - nickname: str - first_mother: UsernameMotherRead - last_mother: UsernameMotherRead - - class UserMe(UserRead): pass diff --git a/backend/app/users/services.py b/backend/app/users/services.py index 547e6871..fce2733e 100644 --- a/backend/app/users/services.py +++ b/backend/app/users/services.py @@ -116,8 +116,8 @@ async def create_user(session: AsyncSession, user_in: UserCreate) -> User: async def admin_create_user(session: AsyncSession, user_in: AdminUserCreate) -> User: """Cria um usuário como admin, podendo definir `is_admin` e `is_verified`. - Reaproveita `create_user` (mesmas regras de e-mail duplicado, reativação de - conta deletada e atribuição de username) e aplica os privilégios em seguida. + Reaproveita `create_user` (mesmas regras de e-mail duplicado e reativação de + conta deletada) e aplica os privilégios em seguida. Não faz commit. """ diff --git a/backend/app/users/username/__init__.py b/backend/app/users/username/__init__.py deleted file mode 100644 index be123a4b..00000000 --- a/backend/app/users/username/__init__.py +++ /dev/null @@ -1 +0,0 @@ -"""User-owned username catalog and assignment logic.""" diff --git a/backend/app/users/username/models.py b/backend/app/users/username/models.py deleted file mode 100644 index 31dd223c..00000000 --- a/backend/app/users/username/models.py +++ /dev/null @@ -1,41 +0,0 @@ -from __future__ import annotations - -import uuid -from typing import TYPE_CHECKING - -from sqlalchemy import ForeignKey, String, Text -from sqlalchemy.orm import Mapped, mapped_column, relationship - -from app.core.mixins import UUIDPKMixin -from app.core.models import Base - -if TYPE_CHECKING: - from app.semana.models import SemanaParticipant - - -class UsernameMother(Base, UUIDPKMixin): - __tablename__ = "username_mothers" - - first_name: Mapped[str] = mapped_column(String(100), nullable=False) - last_name: Mapped[str] = mapped_column(String(100), nullable=False) - full_name: Mapped[str] = mapped_column(String(201), nullable=False, unique=True) - description: Mapped[str] = mapped_column(Text, nullable=False) - - -class Username(Base, UUIDPKMixin): - __tablename__ = "usernames" - - nickname: Mapped[str] = mapped_column(String(255), nullable=False, unique=True) - - first_mother_id: Mapped[uuid.UUID] = mapped_column( - ForeignKey("username_mothers.id"), nullable=False - ) - last_mother_id: Mapped[uuid.UUID] = mapped_column( - ForeignKey("username_mothers.id"), nullable=False - ) - - first_mother: Mapped[UsernameMother] = relationship(foreign_keys=[first_mother_id]) - last_mother: Mapped[UsernameMother] = relationship(foreign_keys=[last_mother_id]) - participants: Mapped[list[SemanaParticipant]] = relationship( - "SemanaParticipant", back_populates="username" - ) diff --git a/backend/app/users/username/seed.py b/backend/app/users/username/seed.py deleted file mode 100644 index ffcddd11..00000000 --- a/backend/app/users/username/seed.py +++ /dev/null @@ -1,120 +0,0 @@ -"""Seed the username catalog from CSV files or tabular data.""" - -from __future__ import annotations - -import csv -from pathlib import Path -from uuid import UUID, uuid4 - -from sqlalchemy import select -from sqlalchemy.dialects.postgresql import insert -from sqlalchemy.ext.asyncio import AsyncSession - -from app.users.username.models import Username, UsernameMother - - -def read_csv(path: Path) -> list[dict]: - with path.open(encoding="utf-8") as file: - return list(csv.DictReader(file)) - - -def _mother_full_name(row: dict) -> str: - return f"{row['first_name'].strip()} {row['last_name'].strip()}" - - -def _to_mother_values(row: dict) -> dict: - first = row["first_name"].strip() - last = row["last_name"].strip() - return { - "id": uuid4(), - "first_name": first, - "last_name": last, - "full_name": f"{first} {last}", - "description": row["description"].strip(), - } - - -def _to_username_values(row: dict, mother_ids: dict[str, UUID]) -> dict: - return { - "id": uuid4(), - "nickname": row["nickname"].strip(), - "first_mother_id": mother_ids[row["first_mome_full_name"].strip()], - "last_mother_id": mother_ids[row["last_mome_full_name"].strip()], - } - - -def _validate_refs(username_rows: list[dict], mother_names: set[str]) -> None: - missing: list[tuple[str, str, str]] = [] - for row in username_rows: - first = row["first_mome_full_name"].strip() - last = row["last_mome_full_name"].strip() - if first not in mother_names or last not in mother_names: - missing.append((row["nickname"].strip(), first, last)) - - if missing: - raise RuntimeError( - f"{len(missing)} usernames referenciam mothers inexistentes. " - f"Exemplos: {missing[:5]}" - ) - - -async def _insert_mothers( - session: AsyncSession, mother_rows: list[dict] -) -> tuple[dict[str, UUID], int]: - if not mother_rows: - return {}, 0 - - statement = ( - insert(UsernameMother) - .values([_to_mother_values(row) for row in mother_rows]) - .on_conflict_do_nothing(index_elements=["full_name"]) - .returning(UsernameMother.id) - ) - result = await session.execute(statement) - inserted_count = len(result.scalars().all()) - mothers = await session.scalars(select(UsernameMother)) - mother_ids = {mother.full_name: mother.id for mother in mothers} - return mother_ids, inserted_count - - -async def _insert_usernames( - session: AsyncSession, - username_rows: list[dict], - mother_ids: dict[str, UUID], -) -> int: - if not username_rows: - return 0 - - statement = ( - insert(Username) - .values([_to_username_values(row, mother_ids) for row in username_rows]) - .on_conflict_do_nothing(index_elements=["nickname"]) - .returning(Username.id) - ) - result = await session.execute(statement) - return len(result.scalars().all()) - - -async def seed_from_rows( - session: AsyncSession, - mother_rows: list[dict], - username_rows: list[dict], -) -> tuple[int, int]: - async with session.begin_nested(): - mother_names = {_mother_full_name(row) for row in mother_rows} - _validate_refs(username_rows, mother_names) - mother_ids, inserted_mothers = await _insert_mothers(session, mother_rows) - inserted_usernames = await _insert_usernames(session, username_rows, mother_ids) - return inserted_mothers, inserted_usernames - - -async def seed_from_csv_files( - session: AsyncSession, - mothers_path: Path, - usernames_path: Path, -) -> tuple[int, int]: - return await seed_from_rows( - session, - read_csv(mothers_path), - read_csv(usernames_path), - ) diff --git a/backend/app/users/username/services.py b/backend/app/users/username/services.py deleted file mode 100644 index 030c05ea..00000000 --- a/backend/app/users/username/services.py +++ /dev/null @@ -1,59 +0,0 @@ -import uuid - -from sqlalchemy import exists, select -from sqlalchemy.exc import IntegrityError -from sqlalchemy.ext.asyncio import AsyncSession -from sqlalchemy.orm import selectinload - -from app.core.exceptions.app_errors import NotFoundError -from app.semana.models import SemanaParticipant -from app.users.exceptions import CouldNotAssignUsernameError, NoAvailableUsername -from app.users.username.models import Username - -MAX_RETRIES = 5 - - -async def assign_username( - participant_id: uuid.UUID, session: AsyncSession -) -> Username: - participant = await session.scalar( - select(SemanaParticipant) - .where( - SemanaParticipant.id == participant_id, - SemanaParticipant.deleted_at.is_(None), - ) - .options(selectinload(SemanaParticipant.username)) - .with_for_update() - ) - if participant is None: - raise NotFoundError("Semana participant not found.") - if participant.username is not None: - return participant.username - - for _ in range(MAX_RETRIES): - available = await session.scalar( - select(Username) - .where( - ~exists().where( - SemanaParticipant.semana_id == participant.semana_id, - SemanaParticipant.username_id == Username.id, - ), - ) - .order_by(Username.id) - .with_for_update(skip_locked=True) - .limit(1) - ) - if available is None: - raise NoAvailableUsername() - - try: - async with session.begin_nested(): - participant.username = available - await session.flush() - except IntegrityError: - participant.username = None - continue - - return available - - raise CouldNotAssignUsernameError() diff --git a/backend/scripts/data/mothers.csv b/backend/scripts/data/mothers.csv deleted file mode 100755 index 5775d128..00000000 --- a/backend/scripts/data/mothers.csv +++ /dev/null @@ -1,30 +0,0 @@ -first_name,last_name,description -Ana Cristina,Viera de Melo,"Professora titular no IME-USP, atua em Engenharia de Software, Métodos Formais e Linguagens de Programação. Suas pesquisas incluem automação de regras para programação orientada a objetos e validação de transformações de programas orientados a objetos utilizando o Alloy Analyzer. Contribui para o desenvolvimento de ambientes formais de desenvolvimento de programas." -Cristina,Fernandes,"Professora associada no IME-USP, com doutorado pelo Georgia Institute of Technology. Suas pesquisas envolvem Algoritmos, Otimização Combinatória e Teoria dos Grafos. É membro do grupo de pesquisa em Ciência da Computação Teórica, Combinatória e Otimização Combinatória." -Kelly,Braghetto,"Professora assistente no IME-USP, especializada em Bancos de Dados, Gerenciamento de Fluxo de Trabalho e Métodos Formais. Suas pesquisas incluem modelagem formal e análise de fluxos de trabalho, avaliação de desempenho e integração de dados. Contribui para o desenvolvimento de plataformas de cidades inteligentes escaláveis." -Leliane,Nunes de Barros,"Professora livre-docente no IME-USP, com foco em Inteligência Artificial e Planejamento Automatizado. Suas pesquisas incluem Processos de Decisão de Markov Sensíveis ao Risco e planejamento simbólico para políticas fortemente cíclicas. Contribui para o desenvolvimento de políticas ótimas em processos de decisão com restrições de custo." -Nami,Kobayashi,"Professora aposentada do IME-USP, especializada em Linguagens Formais e Autômatos. Suas pesquisas abordam relações racionais, expressões regulares e funções subsequenciais. Contribuiu significativamente para o ensino e desenvolvimento de teorias formais na computação." -Nina Sumiko,Tomita Hirata,"Professora livre-docente no IME-USP, com doutorado em Ciência da Computação pela USP. Sua pesquisa concentra-se em aprendizado de máquina, reconhecimento de padrões e processamento de imagens, com aplicações em áreas como análise de imagens médicas, reconhecimento de escrita manual e segmentação de documentos." -Renata,Wassermann,"Professora associada no IME-USP, com doutorado pela Universidade de Amsterdã. Suas pesquisas envolvem Inteligência Artificial, Lógica e Representação de Conhecimento. É membro do grupo de pesquisa em Lógica, Inteligência Artificial e Métodos Formais (LIAMF) e pesquisadora no Centro de Inteligência Artificial (C4AI)." -Yoshiko,Wakabayashi,"Professora titular no IME-USP, com doutorado pela Universidade de Augsburg. Suas pesquisas incluem otimização combinatória, teoria dos grafos, algoritmos e combinatória poliedral. Foi premiada com a Ordem Nacional do Mérito Científico e eleita membro da Academia Brasileira de Ciências." -Ada,Lovelace,"Matemática e escritora britânica, considerada a primeira programadora de computadores. Trabalhou com Charles Babbage no projeto da máquina analítica e escreveu notas que descreviam um algoritmo para calcular números de Bernoulli, sendo reconhecida como a primeira pessoa a conceber um algoritmo destinado a ser processado por uma máquina." -Grace,Hopper,"Almirante da Marinha dos EUA e cientista da computação, desenvolveu o primeiro compilador para um computador eletrônico e foi pioneira na criação da linguagem COBOL. Popularizou o termo 'debugging' no contexto de programação." -Radia,Perlman,"Conhecida como a 'mãe da internet', desenvolveu o algoritmo Spanning Tree Protocol (STP), fundamental para a operação das redes Ethernet modernas, permitindo a comunicação eficiente entre dispositivos em redes locais." -Frances,Allen,"Pioneira na otimização de compiladores, desenvolveu técnicas que melhoraram a eficiência dos programas de computador. Foi a primeira mulher a receber o Prêmio Turing, considerado o 'Nobel da computação'." -Barbara,Liskov,"Cientista da computação, desenvolveu o princípio da substituição de Liskov. O ""L"" de SOLID se refere a ela. Liderou o projeto do Argus, um dos primeiros sistemas a implementar transações distribuídas e recuperação automática." -Marissa,Mayer,"Primeira engenheira de software do Google, contribuiu para o desenvolvimento da interface de usuário do Google Search. Posteriormente, foi CEO do Yahoo, liderando a empresa em um período de transformação digital." -Dorothy,Vaughan,"Matemática e programadora da NASA, foi uma das primeiras mulheres afro-americanas a trabalhar como programadora em computadores eletrônicos. Foi pioneira na programação em COBOL." -Sister Mary Kenneth,Keller,Primeira mulher a obter um doutorado em ciência da computação nos Estados Unidos. Contribuiu para a introdução da computação no ensino superior e foi defensora do uso de computadores na educação. -Annie,Easley,"Matemática e cientista da computação, trabalhou na NASA desenvolvendo software para foguetes e sistemas de controle de voo. Foi uma das primeiras mulheres afro-americanas a trabalhar como cientista na NASA." -Margaret,Hamilton,"Engenheira de software na missão Apollo da NASA, desenvolveu o software de controle de voo que foi crucial para o sucesso das missões lunares. Ela é creditada por ter cunhado o termo 'engenharia de software'." -Lynn,Conway,"Cientista da computação, trabalhou no desenvolvimento de computadores eletrônicos e hardware. Foi pioneira na arquitetura de computadores e na programação de sistemas operacionais." -Daphne,Koller,"Cientista da computação israelense-americana, professora na Universidade de Stanford e cofundadora do Coursera, plataforma de educação online. Suas pesquisas incluem aprendizado de máquina, modelos gráficos probabilísticos e suas aplicações em biomedicina. Fundadora e CEO da insitro, empresa que utiliza aprendizado de máquina para descoberta de medicamentos." -Timnit,Gebru,"Pesquisadora em inteligência artificial, ética algorítmica e mineração de dados. Cofundadora do Black in AI, uma iniciativa que promove a inclusão de profissionais negros na área de IA. Fundadora do Distributed Artificial Intelligence Research Institute (DAIR), focado em desenvolver IA ética e acessível. Sua pesquisa destaca os vieses e impactos ambientais de modelos de linguagem em larga escala, defendendo uma abordagem mais equitativa e transparente no desenvolvimento de IA." -Chieko,Asakawa,"Pesquisadora no campo da acessibilidade digital, desenvolveu tecnologias inovadoras como o IBM Home Page Reader, um sistema de navegação na web por voz para deficientes visuais. Seu trabalho contínuo explora como a inteligência artificial pode aumentar a independência de pessoas com deficiências, promovendo uma sociedade mais inclusiva." -Mary Jane,Irwin,"Especialista em arquitetura de computadores, com foco em sistemas embarcados e computação móvel. Sua pesquisa aborda o design de sistemas computacionais com consciência de energia e confiabilidade, além de explorar tecnologias emergentes em sistemas computacionais." -Anita,Borg,"Pioneira na promoção da participação feminina em tecnologia, cofundadora da Grace Hopper Celebration, a maior conferência de mulheres na computação. Fundadora do Instituted for Women and Technology, que mais tarde se tornou o Anita Borg Institute, dedicado a apoiar mulheres na tecnologia." -Reshma,Saujani,"Fundadora do Girls Who Code, uma organização sem fins lucrativos que visa fechar a lacuna de gênero na tecnologia, oferecendo educação em ciência da computação para meninas. Seu trabalho tem sido fundamental para aumentar a participação feminina na área de tecnologia." -Jennifer,Klawe,"Presidente do Harvey Mudd College, com contribuições significativas em matemática e ciência da computação. Seu trabalho inclui análise funcional, matemática discreta, ciência da computação teórica e interação humano-computador. É defensora da inclusão de mulheres e minorias sub-representadas em STEM." -Shafi,Goldwasser,"Premiada com o Prêmio Turing em 2012 por suas contribuições fundamentais à criptografia. Desenvolveu os fundamentos teóricos da criptografia moderna, incluindo provas interativas de conhecimento zero e criptografia probabilística, com aplicações em segurança e privacidade." -Fei-Fei,Li,"Pesquisadora em inteligência artificial, conhecida por seu trabalho no desenvolvimento do ImageNet, um banco de dados visual que impulsionou o avanço do aprendizado profundo. Cofundadora do AI4ALL, uma iniciativa para aumentar a diversidade na IA. Atualmente, lidera a World Labs, focada em inteligência artificial espacial." -Mary,Sieckenius,"Pesquisadora em ciência da computação, com foco em áreas como aprendizado de máquina, processamento de linguagem natural e ética em IA. Seu trabalho contribui para o desenvolvimento de tecnologias de IA mais justas e acessíveis." diff --git a/backend/scripts/seed_dev.py b/backend/scripts/seed_dev.py index 0f0e7fac..4ad42c33 100644 --- a/backend/scripts/seed_dev.py +++ b/backend/scripts/seed_dev.py @@ -4,17 +4,14 @@ from collections.abc import AsyncIterator from contextlib import asynccontextmanager from datetime import UTC, datetime, timedelta -from pathlib import Path + +from sqlalchemy import select +from sqlalchemy.ext.asyncio import AsyncSession from app.challenges.models.challenge import Challenge, ChallengeScoringType from app.core.config import get_settings from app.core.database import create_database from app.semana.models import SemanaEvent -from app.users.username.seed import seed_from_csv_files -from sqlalchemy import select -from sqlalchemy.ext.asyncio import AsyncSession - -DATA_DIR = Path(__file__).parent / "data" @asynccontextmanager @@ -35,12 +32,6 @@ async def session_scope() -> AsyncIterator[AsyncSession]: async def main() -> None: async with session_scope() as session: - await seed_from_csv_files( - session, - DATA_DIR / "mothers.csv", - DATA_DIR / "usernames.csv", - ) - event = await session.scalar(select(SemanaEvent).where(SemanaEvent.ano == 2026)) if event is None: event = SemanaEvent(nome="Semana da Computação", ano=2026) diff --git a/backend/scripts/seed_usernames.py b/backend/scripts/seed_usernames.py deleted file mode 100755 index 37318ad1..00000000 --- a/backend/scripts/seed_usernames.py +++ /dev/null @@ -1,44 +0,0 @@ -#!/usr/bin/env python3 - -import asyncio -from collections.abc import AsyncIterator -from contextlib import asynccontextmanager -from pathlib import Path - -from sqlalchemy.ext.asyncio import AsyncSession - -from app.core.config import get_settings -from app.core.database import create_database -from app.users.username.seed import seed_from_csv_files - -DATA_DIR = Path(__file__).parent / "data" - - -@asynccontextmanager -async def _session_scope() -> AsyncIterator[AsyncSession]: - settings = get_settings() - engine, session_factory = create_database(settings) - try: - async with session_factory() as session: - try: - yield session - await session.commit() - except Exception: - await session.rollback() - raise - finally: - await engine.dispose() - - -async def main() -> None: - async with _session_scope() as session: - n_mothers, n_usernames = await seed_from_csv_files( - session, - DATA_DIR / "mothers.csv", - DATA_DIR / "usernames.csv", - ) - print(f"Seed concluído: {n_mothers} mothers, {n_usernames} usernames.") - - -if __name__ == "__main__": - asyncio.run(main()) From 139c3bdcc086f171d22fdce6d8fc3e23fecf97c5 Mon Sep 17 00:00:00 2001 From: wate Date: Wed, 30 Sep 2026 07:54:42 -0300 Subject: [PATCH 12/62] feat(atividades): add semana attendance registration Co-authored-by: Codex --- backend/alembic/env.py | 1 + ...9b1c3d_create_activities_and_attendance.py | 98 ++++++++++++ backend/app/atividade/models.py | 112 +++++++------- backend/app/atividade/presenca.py | 26 +--- backend/app/atividade/routes.py | 115 ++++++++++++++ backend/app/atividade/schemas.py | 59 ++++++++ backend/app/atividade/services.py | 141 ++++++++++++++++++ backend/app/auth/dependencies.py | 32 ++++ backend/app/challenges/models/challenge.py | 4 +- backend/app/main.py | 6 + backend/app/semana/models.py | 11 +- backend/app/semana/routes.py | 4 +- backend/app/semana/services.py | 24 +-- frontend/src/features/admin/api.ts | 8 +- frontend/src/features/semana/api.ts | 6 +- 15 files changed, 541 insertions(+), 106 deletions(-) create mode 100644 backend/alembic/versions/4e2f7a9b1c3d_create_activities_and_attendance.py create mode 100644 backend/app/atividade/routes.py create mode 100644 backend/app/atividade/schemas.py create mode 100644 backend/app/atividade/services.py diff --git a/backend/alembic/env.py b/backend/alembic/env.py index 7eb07d88..c6342024 100644 --- a/backend/alembic/env.py +++ b/backend/alembic/env.py @@ -16,6 +16,7 @@ from app.users import models as user_models # noqa: F401 noqa from app.challenges import models as challenges_models # noqa: F401 noqa from app.semana import models as semana_models # noqa: F401 noqa +from app.atividade import models as atividade_models # noqa: F401 noqa # this is the Alembic Config object, which provides # access to the values within the .ini file in use. diff --git a/backend/alembic/versions/4e2f7a9b1c3d_create_activities_and_attendance.py b/backend/alembic/versions/4e2f7a9b1c3d_create_activities_and_attendance.py new file mode 100644 index 00000000..19eb1b20 --- /dev/null +++ b/backend/alembic/versions/4e2f7a9b1c3d_create_activities_and_attendance.py @@ -0,0 +1,98 @@ +"""create activities and attendance""" + +from collections.abc import Sequence + +import sqlalchemy as sa + +from alembic import op + +revision: str = "4e2f7a9b1c3d" +down_revision: str | Sequence[str] | None = "1f4a9d2b7c11" +branch_labels: str | Sequence[str] | None = None +depends_on: str | Sequence[str] | None = None + + +def upgrade() -> None: + op.create_table( + "atividades", + sa.Column("id", sa.Uuid(), nullable=False), + sa.Column("semana_id", sa.Integer(), nullable=False), + sa.Column("tipo", sa.String(length=20), nullable=False), + sa.Column("titulo", sa.String(length=255), nullable=False), + sa.Column("status", sa.String(length=20), nullable=False), + sa.Column("comeca_as", sa.DateTime(timezone=True), nullable=False), + sa.Column("termina_as", sa.DateTime(timezone=True), nullable=False), + sa.Column("codigo", sa.String(length=4), nullable=False), + sa.Column("pontos", sa.Integer(), server_default="0", nullable=False), + sa.Column("horas", sa.Integer(), server_default="1", nullable=False), + sa.Column( + "created_at", + sa.DateTime(timezone=True), + server_default=sa.text("now()"), + nullable=False, + ), + sa.Column( + "updated_at", + sa.DateTime(timezone=True), + server_default=sa.text("now()"), + nullable=False, + ), + sa.Column("deleted_at", sa.DateTime(timezone=True), nullable=True), + sa.ForeignKeyConstraint(["semana_id"], ["semana_event.id"], ondelete="CASCADE"), + sa.PrimaryKeyConstraint("id"), + sa.UniqueConstraint("semana_id", "codigo", name="uq_atividade_semana_codigo"), + ) + op.create_index( + "ix_atividades_semana_id", "atividades", ["semana_id"], unique=False + ) + op.create_index( + "ix_atividade_semana_schedule", + "atividades", + ["semana_id", "comeca_as"], + unique=False, + ) + + op.create_table( + "presencas", + sa.Column("id", sa.Uuid(), nullable=False), + sa.Column("atividade_id", sa.Uuid(), nullable=False), + sa.Column("user_id", sa.Uuid(), nullable=True), + sa.Column("nome", sa.String(length=255), nullable=False), + sa.Column("email", sa.String(length=255), nullable=False), + sa.Column("horas", sa.Integer(), nullable=False), + sa.Column( + "created_at", + sa.DateTime(timezone=True), + server_default=sa.text("now()"), + nullable=False, + ), + sa.Column( + "updated_at", + sa.DateTime(timezone=True), + server_default=sa.text("now()"), + nullable=False, + ), + sa.Column("deleted_at", sa.DateTime(timezone=True), nullable=True), + sa.ForeignKeyConstraint( + ["atividade_id"], ["atividades.id"], ondelete="CASCADE" + ), + sa.ForeignKeyConstraint(["user_id"], ["users.id"], ondelete="SET NULL"), + sa.PrimaryKeyConstraint("id"), + sa.UniqueConstraint( + "atividade_id", "user_id", name="uq_presenca_atividade_user" + ), + sa.UniqueConstraint( + "atividade_id", "email", name="uq_presenca_atividade_email" + ), + ) + op.create_index( + "ix_presencas_atividade_id", "presencas", ["atividade_id"], unique=False + ) + op.create_index("ix_presencas_user_id", "presencas", ["user_id"], unique=False) + + +def downgrade() -> None: + op.drop_table("presencas") + op.drop_index("ix_atividade_semana_schedule", table_name="atividades") + op.drop_index("ix_atividades_semana_id", table_name="atividades") + op.drop_table("atividades") diff --git a/backend/app/atividade/models.py b/backend/app/atividade/models.py index cb693236..4ed7d487 100644 --- a/backend/app/atividade/models.py +++ b/backend/app/atividade/models.py @@ -1,83 +1,81 @@ -from datetime import UTC, datetime -from enum import Enum -from uuid import UUID, uuid4 +from __future__ import annotations -import jwt -from core.models import Base -from presenca import Presenca -from sqlalchemy import DateTime, ForeignKey, LargeBinary, String, UUIDType -from sqlalchemy.orm import Mapped, SQLEnum, mapped_column, relationship +import uuid +from datetime import datetime +from enum import StrEnum +from typing import TYPE_CHECKING -from app.core.config import settings +from sqlalchemy import DateTime, ForeignKey, Index, Integer, String, UniqueConstraint +from sqlalchemy.orm import Mapped, mapped_column, relationship +from app.core.mixins import TimestampsMixin, UUIDPKMixin +from app.core.models import Base -class StatusAtividade(str, Enum): +if TYPE_CHECKING: + from app.semana.models import Semana + from app.users.models import User + + +class StatusAtividade(StrEnum): PROVISORIA = "provisoria" CONFIRMADA = "confirmada" -class TipoAtividade(str, Enum): +class TipoAtividade(StrEnum): PALESTRA = "palestra" + WORKSHOP = "workshop" ENCERRAMENTO = "encerramento" CONVERSA = "conversa" COFFEE_BREAK = "coffee_break" -class SemanaEvent(Base): - __tablename__ = "semana_event" - - id: Mapped[int] = mapped_column(primary_key=True) - nome: Mapped[str] = mapped_column(String(255)) - ano: Mapped[int] = mapped_column() - atividades: Mapped[list["Atividade"]] = relationship(back_populates="semana") - +class Atividade(Base, UUIDPKMixin, TimestampsMixin): + __tablename__ = "atividades" -class Atividade(Base): - __tablename__ = "atividade" - - id: Mapped[int] = mapped_column(primary_key=True) - semana_event_id: Mapped[int] = mapped_column(ForeignKey("semana_event.id")) - - tipo: Mapped[TipoAtividade] = mapped_column(SQLEnum(TipoAtividade)) - titulo: Mapped[str] = mapped_column(String(255), default="") + semana_id: Mapped[int] = mapped_column( + ForeignKey("semana_event.id", ondelete="CASCADE"), index=True + ) + tipo: Mapped[TipoAtividade] = mapped_column(nullable=False) + titulo: Mapped[str] = mapped_column(String(255), default="", nullable=False) status: Mapped[StatusAtividade] = mapped_column( - SQLEnum(StatusAtividade), default=StatusAtividade.PROVISORIA + default=StatusAtividade.PROVISORIA, nullable=False ) - comeca_as: Mapped[datetime] = mapped_column(DateTime, unique=True) - termina_as: Mapped[datetime] = mapped_column(DateTime, unique=True) - qr_code: Mapped[bytes | None] = mapped_column(LargeBinary, nullable=True) - uid: Mapped[UUID] = mapped_column(UUIDType, default=uuid4, unique=True) - token: Mapped[str | None] = mapped_column(String(512), default="", nullable=True) - - semana_id: Mapped[int] = mapped_column(ForeignKey("semana_event.id")) - semana: Mapped["SemanaEvent"] = mapped_column(ForeignKey("semana_event")) + comeca_as: Mapped[datetime] = mapped_column(DateTime(timezone=True), nullable=False) + termina_as: Mapped[datetime] = mapped_column( + DateTime(timezone=True), nullable=False + ) + codigo: Mapped[str] = mapped_column(String(4), nullable=False) + pontos: Mapped[int] = mapped_column(Integer, default=0, nullable=False) + horas: Mapped[int] = mapped_column(Integer, default=1, nullable=False) - registro_presenca: Mapped[list["Presenca"]] = relationship( + semana: Mapped[Semana] = relationship(back_populates="atividades") + presencas: Mapped[list[Presenca]] = relationship( back_populates="atividade", cascade="all, delete-orphan" ) - def _generate_signed_token(self) -> str: - payload = { - "uid": str(self.uid), - "type": "qr_presence", - "iat": int(datetime.now(UTC).timestamp()), - } - - token = jwt.encode( - payload, settings.secret_key.get_secret_value(), algorithm="HS256" - ) + __table_args__ = ( + UniqueConstraint("semana_id", "codigo", name="uq_atividade_semana_codigo"), + Index("ix_atividade_semana_schedule", "semana_id", "comeca_as"), + ) - self.token = token - return token - def generate_qr_data(self) -> str: - return self._generate_signed_token() +class Presenca(Base, UUIDPKMixin, TimestampsMixin): + __tablename__ = "presencas" - def generate_qr_code(self): - pass + atividade_id: Mapped[uuid.UUID] = mapped_column( + ForeignKey("atividades.id", ondelete="CASCADE"), index=True + ) + user_id: Mapped[uuid.UUID | None] = mapped_column( + ForeignKey("users.id", ondelete="SET NULL"), nullable=True, index=True + ) + nome: Mapped[str] = mapped_column(String(255), nullable=False) + email: Mapped[str] = mapped_column(String(255), nullable=False) + horas: Mapped[int] = mapped_column(Integer, nullable=False) - def save(self): - pass + atividade: Mapped[Atividade] = relationship(back_populates="presencas") + user: Mapped[User | None] = relationship() - def __str__(self): - return f"{self.titulo} - {self.comeca_as.strftime('%d/%m/%Y %H:%M')}" + __table_args__ = ( + UniqueConstraint("atividade_id", "user_id", name="uq_presenca_atividade_user"), + UniqueConstraint("atividade_id", "email", name="uq_presenca_atividade_email"), + ) diff --git a/backend/app/atividade/presenca.py b/backend/app/atividade/presenca.py index a84b78cf..7098c10f 100644 --- a/backend/app/atividade/presenca.py +++ b/backend/app/atividade/presenca.py @@ -1,25 +1,3 @@ -from core.models import Base -from models import Atividade -from sqlalchemy import DateTime, ForeignKey, String, func -from sqlalchemy.orm import Mapped, mapped_column, relationship +from app.atividade.models import Presenca - -class Presenca(Base): - __tablename__ = "presenca" - - id: Mapped[int] = mapped_column(primary_key=True) - nome: Mapped[str] = mapped_column(String(255), default="") - email: Mapped[str] = mapped_column(String(255), default="") - - atividade_id: Mapped[int] = mapped_column( - ForeignKey("atividade.id"), nullable=False - ) - atividade: Mapped["Atividade"] = relationship(back_populates="registros_presenca") - horario_registro: Mapped[DateTime] = mapped_column( - DateTime(timezone=True), server_default=func.now() - ) - horas: Mapped[int] = mapped_column(default=1) - compartilhar_email: Mapped[bool] = mapped_column(default=False) - - def __str__(self): - return f"{self.nome} ({self.email}) - {self.atividade.titulo}" +__all__ = ["Presenca"] diff --git a/backend/app/atividade/routes.py b/backend/app/atividade/routes.py new file mode 100644 index 00000000..79be0573 --- /dev/null +++ b/backend/app/atividade/routes.py @@ -0,0 +1,115 @@ +from typing import Annotated +from uuid import UUID + +from fastapi import APIRouter, Depends, Path, Security +from sqlalchemy.ext.asyncio import AsyncSession + +from app.atividade import schemas, services +from app.auth.dependencies import get_current_admin_user, get_optional_current_user +from app.auth.scopes import Scope +from app.core.database import get_session +from app.core.exceptions.app_errors import NotFoundError +from app.semana.services import get_semana +from app.users.models import User + +router = APIRouter(prefix="/semanas/{semana_id}/atividades", tags=["atividade"]) +attendance_router = APIRouter( + prefix="/semanas/{semana_id}/atividades", tags=["atividade"] +) +admin_router = APIRouter( + prefix="/admin/semanas/{semana_id}/atividades", tags=["admin", "atividade"] +) + + +async def _require_semana(session: AsyncSession, semana_id: int): + semana = await get_semana(session, semana_id) + if semana is None: + raise NotFoundError("Semana not found.") + return semana + + +@router.get("", response_model=list[schemas.AtividadeResponse]) +@router.get( + "/", response_model=list[schemas.AtividadeResponse], include_in_schema=False +) +async def list_atividades( + semana_id: int, session: Annotated[AsyncSession, Depends(get_session)] +): + await _require_semana(session, semana_id) + return await services.list_atividades(session, semana_id) + + +@admin_router.get("", response_model=list[schemas.AtividadeResponse]) +@admin_router.get( + "/", response_model=list[schemas.AtividadeResponse], include_in_schema=False +) +async def list_admin_atividades( + semana_id: int, + session: Annotated[AsyncSession, Depends(get_session)], + _: Annotated[User, Security(get_current_admin_user, scopes=[Scope.ADMIN])], +): + await _require_semana(session, semana_id) + return await services.list_atividades(session, semana_id) + + +@admin_router.post("", response_model=schemas.AtividadeResponse, status_code=201) +async def create_admin_atividade( + semana_id: int, + data: schemas.AtividadeCreate, + session: Annotated[AsyncSession, Depends(get_session)], + _: Annotated[User, Security(get_current_admin_user, scopes=[Scope.ADMIN])], +): + semana = await _require_semana(session, semana_id) + return await services.create_atividade(session, semana, **data.model_dump()) + + +@admin_router.patch("/{atividade_id}", response_model=schemas.AtividadeResponse) +async def update_admin_atividade( + semana_id: int, + atividade_id: UUID, + data: schemas.AtividadeUpdate, + session: Annotated[AsyncSession, Depends(get_session)], + _: Annotated[User, Security(get_current_admin_user, scopes=[Scope.ADMIN])], +): + atividade = await services.get_atividade(session, semana_id, atividade_id) + if atividade is None: + raise NotFoundError("Activity not found.") + return await services.update_atividade(session, atividade, data.model_dump()) + + +@admin_router.delete("/{atividade_id}", status_code=204) +async def delete_admin_atividade( + semana_id: int, + atividade_id: UUID, + session: Annotated[AsyncSession, Depends(get_session)], + _: Annotated[User, Security(get_current_admin_user, scopes=[Scope.ADMIN])], +): + atividade = await services.get_atividade(session, semana_id, atividade_id) + if atividade is None: + raise NotFoundError("Activity not found.") + await session.delete(atividade) + + +@attendance_router.post( + "/registrar/{codigo}", + response_model=schemas.PresencaResponse, +) +async def register_atividade_presence( + semana_id: int, + codigo: Annotated[str, Path(pattern=r"^\d{4}$")], + data: schemas.PresencaRequest, + session: Annotated[AsyncSession, Depends(get_session)], + user: Annotated[User | None, Depends(get_optional_current_user)], +): + await _require_semana(session, semana_id) + atividade = await services.get_atividade_by_codigo(session, semana_id, codigo) + if atividade is None: + raise NotFoundError("Activity not found.") + presence, points = await services.register_presence( + session, atividade, user, data.nome, data.email + ) + return schemas.PresencaResponse( + atividade_id=presence.atividade_id, + pontos_adicionados=points, + horas=presence.horas, + ) diff --git a/backend/app/atividade/schemas.py b/backend/app/atividade/schemas.py new file mode 100644 index 00000000..39822419 --- /dev/null +++ b/backend/app/atividade/schemas.py @@ -0,0 +1,59 @@ +from datetime import datetime +from uuid import UUID + +from pydantic import BaseModel, ConfigDict, EmailStr, Field, model_validator + +from app.atividade.models import StatusAtividade, TipoAtividade + + +class AtividadeCreate(BaseModel): + tipo: TipoAtividade + titulo: str = "" + comeca_as: datetime + termina_as: datetime + status: StatusAtividade = StatusAtividade.PROVISORIA + pontos: int = Field(default=0, ge=0) + horas: int = Field(default=1, ge=1) + + @model_validator(mode="after") + def validate_schedule(self): + if self.termina_as <= self.comeca_as: + raise ValueError("termina_as must be after comeca_as") + return self + + +class AtividadeUpdate(BaseModel): + tipo: TipoAtividade | None = None + titulo: str | None = None + comeca_as: datetime | None = None + termina_as: datetime | None = None + status: StatusAtividade | None = None + pontos: int | None = Field(default=None, ge=0) + horas: int | None = Field(default=None, ge=1) + + +class AtividadeResponse(BaseModel): + model_config = ConfigDict(from_attributes=True) + + id: UUID + semana_id: int + tipo: TipoAtividade + titulo: str + status: StatusAtividade + comeca_as: datetime + termina_as: datetime + codigo: str + pontos: int + horas: int + + +class PresencaRequest(BaseModel): + nome: str | None = Field(default=None, min_length=1, max_length=255) + email: EmailStr | None = None + + +class PresencaResponse(BaseModel): + atividade_id: UUID + registrada: bool = True + pontos_adicionados: int + horas: int diff --git a/backend/app/atividade/services.py b/backend/app/atividade/services.py new file mode 100644 index 00000000..ac6c558e --- /dev/null +++ b/backend/app/atividade/services.py @@ -0,0 +1,141 @@ +import secrets +from datetime import UTC, datetime, timedelta +from uuid import UUID + +from sqlalchemy import select +from sqlalchemy.ext.asyncio import AsyncSession + +from app.atividade.models import Atividade, Presenca, StatusAtividade +from app.core.exceptions.app_errors import BadRequestError +from app.semana.models import Semana +from app.semana.services import add_points, get_or_create_participant +from app.users.models import User + + +async def list_atividades(session: AsyncSession, semana_id: int) -> list[Atividade]: + result = await session.scalars( + select(Atividade) + .where(Atividade.semana_id == semana_id) + .order_by(Atividade.comeca_as) + ) + return list(result.all()) + + +async def get_atividade( + session: AsyncSession, semana_id: int, atividade_id: UUID +) -> Atividade | None: + return await session.scalar( + select(Atividade).where( + Atividade.id == atividade_id, Atividade.semana_id == semana_id + ) + ) + + +async def get_atividade_by_codigo( + session: AsyncSession, semana_id: int, codigo: str +) -> Atividade | None: + return await session.scalar( + select(Atividade).where( + Atividade.semana_id == semana_id, Atividade.codigo == codigo + ) + ) + + +def _new_codigo() -> str: + return f"{secrets.randbelow(10_000):04d}" + + +async def _unique_codigo(session: AsyncSession, semana_id: int) -> str: + for _ in range(10_000): + codigo = _new_codigo() + exists = await session.scalar( + select(Atividade.id).where( + Atividade.semana_id == semana_id, Atividade.codigo == codigo + ) + ) + if exists is None: + return codigo + raise BadRequestError("No activity code is available for this Semana.") + + +async def create_atividade( + session: AsyncSession, semana: Semana, **fields +) -> Atividade: + atividade = Atividade( + semana_id=semana.id, + codigo=await _unique_codigo(session, semana.id), + **fields, + ) + session.add(atividade) + await session.flush() + return atividade + + +async def update_atividade( + session: AsyncSession, atividade: Atividade, fields: dict +) -> Atividade: + values = {key: value for key, value in fields.items() if value is not None} + starts = values.get("comeca_as", atividade.comeca_as) + ends = values.get("termina_as", atividade.termina_as) + if ends <= starts: + raise BadRequestError("termina_as must be after comeca_as") + for key, value in values.items(): + setattr(atividade, key, value) + await session.flush() + return atividade + + +async def register_presence( + session: AsyncSession, + atividade: Atividade, + user: User | None, + nome: str | None, + email: str | None, +) -> tuple[Presenca, int]: + now = datetime.now(UTC) + if atividade.status != StatusAtividade.CONFIRMADA: + raise BadRequestError("Activity is not confirmed.") + if now < atividade.comeca_as or now > atividade.termina_as + timedelta(minutes=30): + raise BadRequestError("Attendance window is closed.") + + if user is not None: + nome, email = user.name, user.email + elif not nome or not email: + raise BadRequestError("nome and email are required for visitors.") + + email = email.strip().lower() + existing = await session.scalar( + select(Presenca).where( + Presenca.atividade_id == atividade.id, + Presenca.email == email, + ) + ) + if existing is not None: + return existing, 0 + + presence = Presenca( + atividade_id=atividade.id, + user_id=user.id if user else None, + nome=nome.strip(), + email=email, + horas=atividade.horas, + ) + session.add(presence) + await session.flush() + + points = 0 + if user is not None: + participant = await get_or_create_participant( + session, await session.get(Semana, atividade.semana_id), user + ) + if atividade.pontos: + await add_points( + session, + participant, + atividade.pontos, + source_type="atividade", + source_id=atividade.id, + reason=atividade.titulo or "Atividade", + ) + points = atividade.pontos + return presence, points diff --git a/backend/app/auth/dependencies.py b/backend/app/auth/dependencies.py index ef82b4b2..0b841b77 100644 --- a/backend/app/auth/dependencies.py +++ b/backend/app/auth/dependencies.py @@ -18,6 +18,38 @@ oauth2_scheme = OAuth2PasswordBearer( tokenUrl="api/v1/auth/login", scopes=SCOPE_DESCRIPTIONS ) +optional_oauth2_scheme = OAuth2PasswordBearer( + tokenUrl="api/v1/auth/login", scopes=SCOPE_DESCRIPTIONS, auto_error=False +) + + +async def get_optional_current_user( + db_session: Annotated[AsyncSession, Depends(get_session)], + token: Annotated[str | None, Depends(optional_oauth2_scheme)], + settings: Annotated[Settings, Depends(get_settings)], +) -> User | None: + if token is None: + return None + try: + payload = jwt.decode( + token, + settings.secret_key.get_secret_value(), + algorithms=[settings.token_algorithm], + ) + user_id = payload.get("sub") + scopes = payload.get("scopes") + token_data = TokenData( + user_id=user_id, + scopes=scopes.split(" ") if isinstance(scopes, str) else [], + ) + if token_data.user_id is None or not token_data.scopes: + raise UnauthorizedError(detail="Could not validate credentials") + user = await get_user_by_id(db_session, token_data.user_id) + except (InvalidTokenError, ValidationError): + raise UnauthorizedError(detail="Could not validate credentials") + if user is None or user.deleted_at is not None: + raise UnauthorizedError(detail="Inexistent or inactive user") + return user async def get_current_user_including_deleted( diff --git a/backend/app/challenges/models/challenge.py b/backend/app/challenges/models/challenge.py index fe13ce74..d1b667e9 100644 --- a/backend/app/challenges/models/challenge.py +++ b/backend/app/challenges/models/challenge.py @@ -13,7 +13,7 @@ if TYPE_CHECKING: from app.challenges.models.question import Question - from app.semana.models import SemanaEvent + from app.semana.models import Semana class ChallengeScoringType(StrEnum): @@ -52,4 +52,4 @@ class Challenge(Base, UUIDPKMixin, TimestampsMixin): ) questions: Mapped[list[Question]] = relationship(back_populates="challenge") - semana: Mapped[SemanaEvent | None] = relationship(back_populates="challenges") + semana: Mapped[Semana | None] = relationship(back_populates="challenges") diff --git a/backend/app/main.py b/backend/app/main.py index 7c5abf57..d2b2a1e9 100644 --- a/backend/app/main.py +++ b/backend/app/main.py @@ -4,6 +4,9 @@ from fastapi.middleware.cors import CORSMiddleware from fastapi.staticfiles import StaticFiles +from app.atividade.routes import admin_router as atividade_admin_router +from app.atividade.routes import attendance_router as atividade_attendance_router +from app.atividade.routes import router as atividade_router from app.auth.routes import router as auth_router from app.challenges.admin_routes import router as challenge_admin_router from app.challenges.routes import router as challenge_router @@ -51,6 +54,9 @@ async def lifespan(app: FastAPI): app.include_router(user_router, prefix="/api/v1/user") app.include_router(semana_router, prefix="/api/v1") app.include_router(semana_admin_router, prefix="/api/v1") +app.include_router(atividade_router, prefix="/api/v1") +app.include_router(atividade_admin_router, prefix="/api/v1") +app.include_router(atividade_attendance_router, prefix="/api/v1") app.include_router(user_admin_router, prefix="/api/v1/admin/users") app.include_router(challenge_router, prefix="/api/v1/challenge") app.include_router(challenge_admin_router, prefix="/api/v1/admin/challenge") diff --git a/backend/app/semana/models.py b/backend/app/semana/models.py index 4545218b..f24bba60 100644 --- a/backend/app/semana/models.py +++ b/backend/app/semana/models.py @@ -10,12 +10,13 @@ from app.core.models import Base if TYPE_CHECKING: + from app.atividade.models import Atividade from app.challenges.models.challenge import Challenge from app.challenges.models.challenge_participant import ChallengeParticipant from app.users.models import User -class SemanaEvent(Base): +class Semana(Base): __tablename__ = "semana_event" id: Mapped[int] = mapped_column(Integer, primary_key=True) @@ -23,6 +24,9 @@ class SemanaEvent(Base): ano: Mapped[int] = mapped_column() challenges: Mapped[list[Challenge]] = relationship(back_populates="semana") + atividades: Mapped[list[Atividade]] = relationship( + back_populates="semana", cascade="all, delete-orphan" + ) participants: Mapped[list[SemanaParticipant]] = relationship( back_populates="semana", cascade="all, delete-orphan" ) @@ -38,7 +42,7 @@ class SemanaParticipant(Base, UUIDPKMixin, TimestampsMixin): ForeignKey("users.id", ondelete="CASCADE") ) nickname: Mapped[str | None] = mapped_column(String(255), nullable=True) - semana: Mapped[SemanaEvent] = relationship(back_populates="participants") + semana: Mapped[Semana] = relationship(back_populates="participants") user: Mapped[User] = relationship() challenge_attempts: Mapped[list[ChallengeParticipant]] = relationship( back_populates="semana_participant" @@ -57,6 +61,9 @@ class SemanaParticipant(Base, UUIDPKMixin, TimestampsMixin): ) +SemanaEvent = Semana + + class PointEvent(Base, UUIDPKMixin, TimestampsMixin): __tablename__ = "point_events" diff --git a/backend/app/semana/routes.py b/backend/app/semana/routes.py index 803f949b..e970c474 100644 --- a/backend/app/semana/routes.py +++ b/backend/app/semana/routes.py @@ -11,8 +11,8 @@ from app.semana import schemas, services from app.users.models import User -router = APIRouter(prefix="/semana", tags=["semana"]) -admin_router = APIRouter(prefix="/admin/semana", tags=["admin", "semana"]) +router = APIRouter(prefix="/semanas", tags=["semana"]) +admin_router = APIRouter(prefix="/admin/semanas", tags=["admin", "semana"]) @admin_router.get("", response_model=list[schemas.AdminSemanaResponse]) diff --git a/backend/app/semana/services.py b/backend/app/semana/services.py index c5300d4b..44d7e70f 100644 --- a/backend/app/semana/services.py +++ b/backend/app/semana/services.py @@ -2,29 +2,29 @@ from sqlalchemy.ext.asyncio import AsyncSession from sqlalchemy.orm import selectinload -from app.semana.models import PointEvent, SemanaEvent, SemanaParticipant +from app.semana.models import PointEvent, Semana, SemanaParticipant from app.semana.nicknames import generate_nickname from app.users.models import User -async def get_semana(session: AsyncSession, semana_id: int) -> SemanaEvent | None: - return await session.get(SemanaEvent, semana_id) +async def get_semana(session: AsyncSession, semana_id: int) -> Semana | None: + return await session.get(Semana, semana_id) async def list_semanas( session: AsyncSession, *, include_admin_relations: bool = False -) -> list[SemanaEvent]: - statement = select(SemanaEvent).order_by(SemanaEvent.ano.desc()) +) -> list[Semana]: + statement = select(Semana).order_by(Semana.ano.desc()) if include_admin_relations: statement = statement.options( - selectinload(SemanaEvent.challenges), - selectinload(SemanaEvent.participants), + selectinload(Semana.challenges), + selectinload(Semana.participants), ) return list((await session.scalars(statement)).all()) -async def create_semana(session: AsyncSession, nome: str, ano: int) -> SemanaEvent: - semana = SemanaEvent(nome=nome, ano=ano) +async def create_semana(session: AsyncSession, nome: str, ano: int) -> Semana: + semana = Semana(nome=nome, ano=ano) session.add(semana) await session.flush() return semana @@ -32,11 +32,11 @@ async def create_semana(session: AsyncSession, nome: str, ano: int) -> SemanaEve async def update_semana( session: AsyncSession, - semana: SemanaEvent, + semana: Semana, *, nome: str | None = None, ano: int | None = None, -) -> SemanaEvent: +) -> Semana: if nome is not None: semana.nome = nome if ano is not None: @@ -46,7 +46,7 @@ async def update_semana( async def get_or_create_participant( - session: AsyncSession, semana: SemanaEvent, user: User + session: AsyncSession, semana: Semana, user: User ) -> SemanaParticipant: participant = await session.scalar( select(SemanaParticipant).where( diff --git a/frontend/src/features/admin/api.ts b/frontend/src/features/admin/api.ts index a728872b..ff0fc7fa 100644 --- a/frontend/src/features/admin/api.ts +++ b/frontend/src/features/admin/api.ts @@ -90,11 +90,11 @@ export function deleteAdminChallenge(id: string) { } export function listAdminSemanas() { - return requestApi('/admin/semana') + return requestApi('/admin/semanas') } export function createAdminSemana(input: { nome: string; ano: number }) { - return requestApi('/admin/semana', { + return requestApi('/admin/semanas', { method: 'POST', body: JSON.stringify(input), }) @@ -104,12 +104,12 @@ export function updateAdminSemana( id: number, input: Partial>, ) { - return requestApi(`/admin/semana/${id}`, { + return requestApi(`/admin/semanas/${id}`, { method: 'PATCH', body: JSON.stringify(input), }) } export function deleteAdminSemana(id: number) { - return requestApi(`/admin/semana/${id}`, { method: 'DELETE' }) + return requestApi(`/admin/semanas/${id}`, { method: 'DELETE' }) } diff --git a/frontend/src/features/semana/api.ts b/frontend/src/features/semana/api.ts index bd5ab718..46f13e55 100644 --- a/frontend/src/features/semana/api.ts +++ b/frontend/src/features/semana/api.ts @@ -1,6 +1,6 @@ import { requestApi } from '@/features/auth/api' -export type SemanaEvent = { +export type Semana = { id: number nome: string ano: number @@ -13,9 +13,9 @@ export type SemanaRankingEntry = { } export function listSemanas() { - return requestApi('/semana') + return requestApi('/semanas') } export function getSemanaRanking(semanaId: number) { - return requestApi(`/semana/${semanaId}/ranking`) + return requestApi(`/semanas/${semanaId}/ranking`) } From 39f3a2481d513d8094a87b986cf4c827392865e8 Mon Sep 17 00:00:00 2001 From: wate Date: Wed, 30 Sep 2026 08:31:17 -0300 Subject: [PATCH 13/62] feat(admin): manage semana activities Co-authored-by: Codex --- .../1f4a9d2b7c11_add_semana_scoring.py | 145 ------ .../2c6e1a4b8d90_move_usernames_to_semana.py | 80 --- ...5c6d7e8f_add_on_demand_semana_nicknames.py | 84 ---- ...9b1c3d_create_activities_and_attendance.py | 98 ---- .../versions/508a25128b6c_initial_schema.py | 461 ++++++++++++++++++ .../597d02678cf0_challenges_cover_image.py | 35 -- ...5537158e76e_create_refresh_tokens_table.py | 48 -- .../7b14a96d2c83_add_challenge_finishes_at.py | 35 -- ..._align_timestamps_to_timezone_awareness.py | 102 ---- .../b84e1b2f6a90_user_owned_usernames.py | 97 ---- .../c8389c55b075_challenges_tables.py | 210 -------- .../d01c0010d74b_create_users_table.py | 53 -- ...4ca2ff096e_add_scopes_to_refresh_tokens.py | 35 -- backend/app/atividade/routes.py | 15 + backend/app/atividade/services.py | 14 +- .../src/app/semana/(site)/presenca/page.tsx | 5 + frontend/src/features/admin/api.ts | 40 ++ .../features/admin/components/admin-panel.tsx | 250 ++++++++++ .../attendance/components/attendance-page.tsx | 148 ++++++ frontend/src/features/semana/api.ts | 16 + .../semana/components/semana-shell.tsx | 1 + 21 files changed, 948 insertions(+), 1024 deletions(-) delete mode 100644 backend/alembic/versions/1f4a9d2b7c11_add_semana_scoring.py delete mode 100644 backend/alembic/versions/2c6e1a4b8d90_move_usernames_to_semana.py delete mode 100644 backend/alembic/versions/3a4b5c6d7e8f_add_on_demand_semana_nicknames.py delete mode 100644 backend/alembic/versions/4e2f7a9b1c3d_create_activities_and_attendance.py create mode 100644 backend/alembic/versions/508a25128b6c_initial_schema.py delete mode 100644 backend/alembic/versions/597d02678cf0_challenges_cover_image.py delete mode 100644 backend/alembic/versions/75537158e76e_create_refresh_tokens_table.py delete mode 100644 backend/alembic/versions/7b14a96d2c83_add_challenge_finishes_at.py delete mode 100644 backend/alembic/versions/91cc57573789_align_timestamps_to_timezone_awareness.py delete mode 100644 backend/alembic/versions/b84e1b2f6a90_user_owned_usernames.py delete mode 100644 backend/alembic/versions/c8389c55b075_challenges_tables.py delete mode 100644 backend/alembic/versions/d01c0010d74b_create_users_table.py delete mode 100644 backend/alembic/versions/dd4ca2ff096e_add_scopes_to_refresh_tokens.py create mode 100644 frontend/src/app/semana/(site)/presenca/page.tsx create mode 100644 frontend/src/features/attendance/components/attendance-page.tsx diff --git a/backend/alembic/versions/1f4a9d2b7c11_add_semana_scoring.py b/backend/alembic/versions/1f4a9d2b7c11_add_semana_scoring.py deleted file mode 100644 index d7eafe09..00000000 --- a/backend/alembic/versions/1f4a9d2b7c11_add_semana_scoring.py +++ /dev/null @@ -1,145 +0,0 @@ -"""add Semana participation and point ledger - -Revision ID: 1f4a9d2b7c11 -Revises: b84e1b2f6a90 -""" - -from collections.abc import Sequence - -import sqlalchemy as sa -from alembic import op - -revision: str = "1f4a9d2b7c11" -down_revision: str | Sequence[str] | None = "b84e1b2f6a90" -branch_labels: str | Sequence[str] | None = None -depends_on: str | Sequence[str] | None = None - - -def upgrade() -> None: - op.create_table( - "semana_event", - sa.Column("id", sa.Integer(), primary_key=True), - sa.Column("nome", sa.String(255), nullable=False), - sa.Column("ano", sa.Integer(), nullable=False), - ) - op.create_table( - "semana_participants", - sa.Column("id", sa.Uuid(), nullable=False), - sa.Column("semana_id", sa.Integer(), nullable=False), - sa.Column("user_id", sa.Uuid(), nullable=False), - sa.Column("nickname", sa.String(255), nullable=False), - sa.Column( - "created_at", - sa.DateTime(timezone=True), - server_default=sa.text("now()"), - nullable=False, - ), - sa.Column( - "updated_at", - sa.DateTime(timezone=True), - server_default=sa.text("now()"), - nullable=False, - ), - sa.Column("deleted_at", sa.DateTime(timezone=True), nullable=True), - sa.ForeignKeyConstraint(["semana_id"], ["semana_event.id"], ondelete="CASCADE"), - sa.ForeignKeyConstraint(["user_id"], ["users.id"], ondelete="CASCADE"), - sa.PrimaryKeyConstraint("id"), - sa.UniqueConstraint( - "semana_id", "user_id", name="uq_semana_participant_event_user" - ), - sa.UniqueConstraint( - "semana_id", "nickname", name="uq_semana_participant_event_nickname" - ), - ) - op.create_table( - "point_events", - sa.Column("id", sa.Uuid(), nullable=False), - sa.Column("semana_participant_id", sa.Uuid(), nullable=False), - sa.Column("amount", sa.Integer(), nullable=False), - sa.Column("source_type", sa.String(32), nullable=False), - sa.Column("source_id", sa.Uuid(), nullable=True), - sa.Column("reason", sa.String(255), nullable=True), - sa.Column( - "created_at", - sa.DateTime(timezone=True), - server_default=sa.text("now()"), - nullable=False, - ), - sa.Column( - "updated_at", - sa.DateTime(timezone=True), - server_default=sa.text("now()"), - nullable=False, - ), - sa.Column("deleted_at", sa.DateTime(timezone=True), nullable=True), - sa.ForeignKeyConstraint( - ["semana_participant_id"], ["semana_participants.id"], ondelete="CASCADE" - ), - sa.PrimaryKeyConstraint("id"), - sa.UniqueConstraint( - "semana_participant_id", - "source_type", - "source_id", - name="uq_point_event_source", - ), - ) - - op.add_column( - "challenges", - sa.Column("prompt", sa.String(5000), server_default="", nullable=False), - ) - op.add_column( - "challenges", - sa.Column( - "resource_urls", sa.JSON(), server_default=sa.text("'[]'"), nullable=False - ), - ) - op.add_column( - "challenges", - sa.Column( - "points_value", sa.Integer(), server_default=sa.text("0"), nullable=False - ), - ) - op.add_column( - "challenges", sa.Column("input_answer", sa.String(255), nullable=True) - ) - op.add_column("challenges", sa.Column("semana_id", sa.Integer(), nullable=True)) - op.create_foreign_key( - "challenges_semana_id_fkey", "challenges", "semana_event", ["semana_id"], ["id"] - ) - op.add_column( - "challenge_participants", - sa.Column("semana_participant_id", sa.Uuid(), nullable=True), - ) - op.add_column( - "challenge_participants", sa.Column("submission", sa.String(255), nullable=True) - ) - op.create_foreign_key( - "challenge_participants_semana_participant_id_fkey", - "challenge_participants", - "semana_participants", - ["semana_participant_id"], - ["id"], - ) - - -def downgrade() -> None: - op.drop_constraint( - "challenge_participants_semana_participant_id_fkey", - "challenge_participants", - type_="foreignkey", - ) - op.drop_column("challenge_participants", "submission") - op.drop_column("challenge_participants", "semana_participant_id") - op.drop_constraint("challenges_semana_id_fkey", "challenges", type_="foreignkey") - for column in ( - "semana_id", - "input_answer", - "points_value", - "resource_urls", - "prompt", - ): - op.drop_column("challenges", column) - op.drop_table("point_events") - op.drop_table("semana_participants") - op.drop_table("semana_event") diff --git a/backend/alembic/versions/2c6e1a4b8d90_move_usernames_to_semana.py b/backend/alembic/versions/2c6e1a4b8d90_move_usernames_to_semana.py deleted file mode 100644 index bb704683..00000000 --- a/backend/alembic/versions/2c6e1a4b8d90_move_usernames_to_semana.py +++ /dev/null @@ -1,80 +0,0 @@ -"""move username ownership to Semana participants - -Revision ID: 2c6e1a4b8d90 -Revises: 1f4a9d2b7c11 -""" - -from collections.abc import Sequence - -import sqlalchemy as sa -from alembic import op - -revision: str = "2c6e1a4b8d90" -down_revision: str | Sequence[str] | None = "1f4a9d2b7c11" -branch_labels: str | Sequence[str] | None = None -depends_on: str | Sequence[str] | None = None - - -def upgrade() -> None: - op.add_column( - "semana_participants", sa.Column("username_id", sa.Uuid(), nullable=True) - ) - op.create_foreign_key( - "semana_participants_username_id_fkey", - "semana_participants", - "usernames", - ["username_id"], - ["id"], - ) - op.execute( - sa.text( - """ - UPDATE semana_participants AS participants - SET username_id = users.username_id - FROM users - WHERE participants.user_id = users.id - AND users.username_id IS NOT NULL - """ - ) - ) - op.create_unique_constraint( - "uq_semana_participant_username", - "semana_participants", - ["semana_id", "username_id"], - ) - op.drop_column("semana_participants", "nickname") - op.drop_constraint("users_username_id_key", "users", type_="unique") - op.drop_constraint("users_username_id_fkey", "users", type_="foreignkey") - op.drop_column("users", "username_id") - - -def downgrade() -> None: - op.add_column("users", sa.Column("username_id", sa.Uuid(), nullable=True)) - op.create_foreign_key( - "users_username_id_fkey", "users", "usernames", ["username_id"], ["id"] - ) - op.create_unique_constraint("users_username_id_key", "users", ["username_id"]) - op.add_column( - "semana_participants", - sa.Column("nickname", sa.String(255), nullable=True), - ) - op.execute( - sa.text( - """ - UPDATE users - SET username_id = participants.username_id - FROM semana_participants AS participants - WHERE users.id = participants.user_id - AND participants.username_id IS NOT NULL - """ - ) - ) - op.drop_constraint( - "uq_semana_participant_username", "semana_participants", type_="unique" - ) - op.drop_constraint( - "semana_participants_username_id_fkey", - "semana_participants", - type_="foreignkey", - ) - op.drop_column("semana_participants", "username_id") diff --git a/backend/alembic/versions/3a4b5c6d7e8f_add_on_demand_semana_nicknames.py b/backend/alembic/versions/3a4b5c6d7e8f_add_on_demand_semana_nicknames.py deleted file mode 100644 index 7700e8da..00000000 --- a/backend/alembic/versions/3a4b5c6d7e8f_add_on_demand_semana_nicknames.py +++ /dev/null @@ -1,84 +0,0 @@ -"""Store generated nicknames on Semana participants. - -Revision ID: 3a4b5c6d7e8f -Revises: 2c6e1a4b8d90 -""" - -from collections.abc import Sequence - -import sqlalchemy as sa - -from alembic import op - -revision: str = "3a4b5c6d7e8f" -down_revision: str | Sequence[str] | None = "2c6e1a4b8d90" -branch_labels: str | Sequence[str] | None = None -depends_on: str | Sequence[str] | None = None - - -def upgrade() -> None: - op.add_column( - "semana_participants", - sa.Column("nickname", sa.String(length=255), nullable=True), - ) - op.execute( - sa.text( - """ - UPDATE semana_participants AS participants - SET nickname = usernames.nickname - FROM usernames - WHERE participants.username_id = usernames.id - AND participants.nickname IS NULL - """ - ) - ) - op.execute( - sa.text( - """ - WITH numbered AS ( - SELECT - id, - 'Participante' || LPAD( - ROW_NUMBER() OVER ( - PARTITION BY semana_id ORDER BY id - )::text, - 4, - '0' - ) AS generated_nickname - FROM semana_participants - WHERE nickname IS NULL - ) - UPDATE semana_participants AS participants - SET nickname = numbered.generated_nickname - FROM numbered - WHERE participants.id = numbered.id - """ - ) - ) - op.create_unique_constraint( - "uq_semana_participant_nickname", - "semana_participants", - ["semana_id", "nickname"], - ) - op.drop_constraint( - "uq_semana_participant_username", - "semana_participants", - type_="unique", - ) - op.drop_constraint( - "semana_participants_username_id_fkey", - "semana_participants", - type_="foreignkey", - ) - op.drop_column("semana_participants", "username_id") - op.drop_table("usernames") - op.drop_table("username_mothers") - - -def downgrade() -> None: - op.drop_constraint( - "uq_semana_participant_nickname", - "semana_participants", - type_="unique", - ) - op.drop_column("semana_participants", "nickname") diff --git a/backend/alembic/versions/4e2f7a9b1c3d_create_activities_and_attendance.py b/backend/alembic/versions/4e2f7a9b1c3d_create_activities_and_attendance.py deleted file mode 100644 index 19eb1b20..00000000 --- a/backend/alembic/versions/4e2f7a9b1c3d_create_activities_and_attendance.py +++ /dev/null @@ -1,98 +0,0 @@ -"""create activities and attendance""" - -from collections.abc import Sequence - -import sqlalchemy as sa - -from alembic import op - -revision: str = "4e2f7a9b1c3d" -down_revision: str | Sequence[str] | None = "1f4a9d2b7c11" -branch_labels: str | Sequence[str] | None = None -depends_on: str | Sequence[str] | None = None - - -def upgrade() -> None: - op.create_table( - "atividades", - sa.Column("id", sa.Uuid(), nullable=False), - sa.Column("semana_id", sa.Integer(), nullable=False), - sa.Column("tipo", sa.String(length=20), nullable=False), - sa.Column("titulo", sa.String(length=255), nullable=False), - sa.Column("status", sa.String(length=20), nullable=False), - sa.Column("comeca_as", sa.DateTime(timezone=True), nullable=False), - sa.Column("termina_as", sa.DateTime(timezone=True), nullable=False), - sa.Column("codigo", sa.String(length=4), nullable=False), - sa.Column("pontos", sa.Integer(), server_default="0", nullable=False), - sa.Column("horas", sa.Integer(), server_default="1", nullable=False), - sa.Column( - "created_at", - sa.DateTime(timezone=True), - server_default=sa.text("now()"), - nullable=False, - ), - sa.Column( - "updated_at", - sa.DateTime(timezone=True), - server_default=sa.text("now()"), - nullable=False, - ), - sa.Column("deleted_at", sa.DateTime(timezone=True), nullable=True), - sa.ForeignKeyConstraint(["semana_id"], ["semana_event.id"], ondelete="CASCADE"), - sa.PrimaryKeyConstraint("id"), - sa.UniqueConstraint("semana_id", "codigo", name="uq_atividade_semana_codigo"), - ) - op.create_index( - "ix_atividades_semana_id", "atividades", ["semana_id"], unique=False - ) - op.create_index( - "ix_atividade_semana_schedule", - "atividades", - ["semana_id", "comeca_as"], - unique=False, - ) - - op.create_table( - "presencas", - sa.Column("id", sa.Uuid(), nullable=False), - sa.Column("atividade_id", sa.Uuid(), nullable=False), - sa.Column("user_id", sa.Uuid(), nullable=True), - sa.Column("nome", sa.String(length=255), nullable=False), - sa.Column("email", sa.String(length=255), nullable=False), - sa.Column("horas", sa.Integer(), nullable=False), - sa.Column( - "created_at", - sa.DateTime(timezone=True), - server_default=sa.text("now()"), - nullable=False, - ), - sa.Column( - "updated_at", - sa.DateTime(timezone=True), - server_default=sa.text("now()"), - nullable=False, - ), - sa.Column("deleted_at", sa.DateTime(timezone=True), nullable=True), - sa.ForeignKeyConstraint( - ["atividade_id"], ["atividades.id"], ondelete="CASCADE" - ), - sa.ForeignKeyConstraint(["user_id"], ["users.id"], ondelete="SET NULL"), - sa.PrimaryKeyConstraint("id"), - sa.UniqueConstraint( - "atividade_id", "user_id", name="uq_presenca_atividade_user" - ), - sa.UniqueConstraint( - "atividade_id", "email", name="uq_presenca_atividade_email" - ), - ) - op.create_index( - "ix_presencas_atividade_id", "presencas", ["atividade_id"], unique=False - ) - op.create_index("ix_presencas_user_id", "presencas", ["user_id"], unique=False) - - -def downgrade() -> None: - op.drop_table("presencas") - op.drop_index("ix_atividade_semana_schedule", table_name="atividades") - op.drop_index("ix_atividades_semana_id", table_name="atividades") - op.drop_table("atividades") diff --git a/backend/alembic/versions/508a25128b6c_initial_schema.py b/backend/alembic/versions/508a25128b6c_initial_schema.py new file mode 100644 index 00000000..b9b8de64 --- /dev/null +++ b/backend/alembic/versions/508a25128b6c_initial_schema.py @@ -0,0 +1,461 @@ +"""initial schema + +Revision ID: 508a25128b6c +Revises: +Create Date: 2026-09-30 08:10:30.465341 + +""" + +from collections.abc import Sequence + +import sqlalchemy as sa + +from alembic import op + +# revision identifiers, used by Alembic. +revision: str = "508a25128b6c" +down_revision: str | Sequence[str] | None = None +branch_labels: str | Sequence[str] | None = None +depends_on: str | Sequence[str] | None = None + + +def upgrade() -> None: + """Upgrade schema.""" + # ### commands auto generated by Alembic - please adjust! ### + op.create_table( + "semana_event", + sa.Column("id", sa.Integer(), nullable=False), + sa.Column("nome", sa.String(length=255), nullable=False), + sa.Column("ano", sa.Integer(), nullable=False), + sa.PrimaryKeyConstraint("id", name=op.f("semana_event_pkey")), + ) + op.create_table( + "users", + sa.Column("id", sa.Uuid(), nullable=False), + sa.Column("email", sa.String(length=255), nullable=False), + sa.Column("name", sa.String(length=255), nullable=False), + sa.Column("password_hash", sa.String(length=255), nullable=True), + sa.Column("is_admin", sa.Boolean(), server_default="false", nullable=False), + sa.Column("is_verified", sa.Boolean(), server_default="false", nullable=False), + sa.Column( + "created_at", + sa.DateTime(timezone=True), + server_default=sa.text("now()"), + nullable=False, + ), + sa.Column( + "updated_at", + sa.DateTime(timezone=True), + server_default=sa.text("now()"), + nullable=False, + ), + sa.Column("deleted_at", sa.DateTime(timezone=True), nullable=True), + sa.PrimaryKeyConstraint("id", name=op.f("users_pkey")), + ) + op.create_index(op.f("users_deleted_at_idx"), "users", ["deleted_at"], unique=False) + op.create_index(op.f("users_email_idx"), "users", ["email"], unique=True) + op.create_table( + "atividades", + sa.Column("id", sa.Uuid(), nullable=False), + sa.Column("semana_id", sa.Integer(), nullable=False), + sa.Column( + "tipo", + sa.Enum( + "PALESTRA", + "WORKSHOP", + "ENCERRAMENTO", + "CONVERSA", + "COFFEE_BREAK", + name="tipoatividade", + ), + nullable=False, + ), + sa.Column("titulo", sa.String(length=255), nullable=False), + sa.Column( + "status", + sa.Enum("PROVISORIA", "CONFIRMADA", name="statusatividade"), + nullable=False, + ), + sa.Column("comeca_as", sa.DateTime(timezone=True), nullable=False), + sa.Column("termina_as", sa.DateTime(timezone=True), nullable=False), + sa.Column("codigo", sa.String(length=4), nullable=False), + sa.Column("pontos", sa.Integer(), nullable=False), + sa.Column("horas", sa.Integer(), nullable=False), + sa.Column( + "created_at", + sa.DateTime(timezone=True), + server_default=sa.text("now()"), + nullable=False, + ), + sa.Column( + "updated_at", + sa.DateTime(timezone=True), + server_default=sa.text("now()"), + nullable=False, + ), + sa.Column("deleted_at", sa.DateTime(timezone=True), nullable=True), + sa.ForeignKeyConstraint( + ["semana_id"], + ["semana_event.id"], + name=op.f("atividades_semana_id_fkey"), + ondelete="CASCADE", + ), + sa.PrimaryKeyConstraint("id", name=op.f("atividades_pkey")), + sa.UniqueConstraint("semana_id", "codigo", name="uq_atividade_semana_codigo"), + ) + op.create_index( + op.f("atividades_deleted_at_idx"), "atividades", ["deleted_at"], unique=False + ) + op.create_index( + op.f("atividades_semana_id_idx"), "atividades", ["semana_id"], unique=False + ) + op.create_index( + "ix_atividade_semana_schedule", + "atividades", + ["semana_id", "comeca_as"], + unique=False, + ) + op.create_table( + "challenges", + sa.Column("id", sa.Uuid(), nullable=False), + sa.Column("title", sa.String(length=255), nullable=False), + sa.Column("prompt", sa.String(length=5000), nullable=False), + sa.Column( + "scoring_type", + sa.Enum( + "QUIZ", + "INPUT", + "MANUAL", + name="challengescoringtype", + native_enum=False, + length=20, + ), + nullable=False, + ), + sa.Column("image_path", sa.String(length=512), nullable=True), + sa.Column("resource_urls", sa.JSON(), nullable=False), + sa.Column("points_value", sa.Integer(), nullable=False), + sa.Column("input_answer", sa.String(length=255), nullable=True), + sa.Column("semana_id", sa.Integer(), nullable=True), + sa.Column( + "finishes_at", + sa.DateTime(timezone=True), + server_default=sa.text("now() + interval '1 day'"), + nullable=False, + ), + sa.Column( + "created_at", + sa.DateTime(timezone=True), + server_default=sa.text("now()"), + nullable=False, + ), + sa.Column( + "updated_at", + sa.DateTime(timezone=True), + server_default=sa.text("now()"), + nullable=False, + ), + sa.Column("deleted_at", sa.DateTime(timezone=True), nullable=True), + sa.ForeignKeyConstraint( + ["semana_id"], ["semana_event.id"], name=op.f("challenges_semana_id_fkey") + ), + sa.PrimaryKeyConstraint("id", name=op.f("challenges_pkey")), + ) + op.create_index( + op.f("challenges_deleted_at_idx"), "challenges", ["deleted_at"], unique=False + ) + op.create_table( + "refresh_tokens", + sa.Column("id", sa.Uuid(), nullable=False), + sa.Column("user_id", sa.Uuid(), nullable=False), + sa.Column("token_hash", sa.String(length=64), nullable=False), + sa.Column("scopes", sa.String(length=255), nullable=False), + sa.Column( + "created_at", + sa.DateTime(timezone=True), + server_default=sa.text("now()"), + nullable=False, + ), + sa.Column("expires_at", sa.DateTime(timezone=True), nullable=False), + sa.Column("revoked_at", sa.DateTime(timezone=True), nullable=True), + sa.ForeignKeyConstraint( + ["user_id"], ["users.id"], name=op.f("refresh_tokens_user_id_fkey") + ), + sa.PrimaryKeyConstraint("id", name=op.f("refresh_tokens_pkey")), + sa.UniqueConstraint("token_hash", name=op.f("refresh_tokens_token_hash_key")), + ) + op.create_table( + "semana_participants", + sa.Column("id", sa.Uuid(), nullable=False), + sa.Column("semana_id", sa.Integer(), nullable=False), + sa.Column("user_id", sa.Uuid(), nullable=False), + sa.Column("nickname", sa.String(length=255), nullable=True), + sa.Column( + "created_at", + sa.DateTime(timezone=True), + server_default=sa.text("now()"), + nullable=False, + ), + sa.Column( + "updated_at", + sa.DateTime(timezone=True), + server_default=sa.text("now()"), + nullable=False, + ), + sa.Column("deleted_at", sa.DateTime(timezone=True), nullable=True), + sa.ForeignKeyConstraint( + ["semana_id"], + ["semana_event.id"], + name=op.f("semana_participants_semana_id_fkey"), + ondelete="CASCADE", + ), + sa.ForeignKeyConstraint( + ["user_id"], + ["users.id"], + name=op.f("semana_participants_user_id_fkey"), + ondelete="CASCADE", + ), + sa.PrimaryKeyConstraint("id", name=op.f("semana_participants_pkey")), + sa.UniqueConstraint( + "semana_id", "nickname", name="uq_semana_participant_nickname" + ), + sa.UniqueConstraint( + "semana_id", "user_id", name="uq_semana_participant_event_user" + ), + ) + op.create_index( + op.f("semana_participants_deleted_at_idx"), + "semana_participants", + ["deleted_at"], + unique=False, + ) + op.create_table( + "challenge_participants", + sa.Column("id", sa.Uuid(), nullable=False), + sa.Column("user_id", sa.Uuid(), nullable=False), + sa.Column("challenge_id", sa.Uuid(), nullable=False), + sa.Column("semana_participant_id", sa.Uuid(), nullable=True), + sa.Column("score", sa.Integer(), nullable=False), + sa.Column("submitted_at", sa.DateTime(timezone=True), nullable=True), + sa.Column("submission", sa.String(length=255), nullable=True), + sa.Column( + "created_at", + sa.DateTime(timezone=True), + server_default=sa.text("now()"), + nullable=False, + ), + sa.Column( + "updated_at", + sa.DateTime(timezone=True), + server_default=sa.text("now()"), + nullable=False, + ), + sa.Column("deleted_at", sa.DateTime(timezone=True), nullable=True), + sa.ForeignKeyConstraint( + ["challenge_id"], + ["challenges.id"], + name=op.f("challenge_participants_challenge_id_fkey"), + ), + sa.ForeignKeyConstraint( + ["semana_participant_id"], + ["semana_participants.id"], + name=op.f("challenge_participants_semana_participant_id_fkey"), + ), + sa.ForeignKeyConstraint( + ["user_id"], + ["users.id"], + name=op.f("challenge_participants_user_id_fkey"), + ondelete="CASCADE", + ), + sa.PrimaryKeyConstraint("id", name=op.f("challenge_participants_pkey")), + sa.UniqueConstraint( + "user_id", "challenge_id", name="uq_participant_user_challenge" + ), + ) + op.create_index( + op.f("challenge_participants_deleted_at_idx"), + "challenge_participants", + ["deleted_at"], + unique=False, + ) + op.create_table( + "point_events", + sa.Column("id", sa.Uuid(), nullable=False), + sa.Column("semana_participant_id", sa.Uuid(), nullable=False), + sa.Column("amount", sa.Integer(), nullable=False), + sa.Column("source_type", sa.String(length=32), nullable=False), + sa.Column("source_id", sa.Uuid(), nullable=True), + sa.Column("reason", sa.String(length=255), nullable=True), + sa.Column( + "created_at", + sa.DateTime(timezone=True), + server_default=sa.text("now()"), + nullable=False, + ), + sa.Column( + "updated_at", + sa.DateTime(timezone=True), + server_default=sa.text("now()"), + nullable=False, + ), + sa.Column("deleted_at", sa.DateTime(timezone=True), nullable=True), + sa.ForeignKeyConstraint( + ["semana_participant_id"], + ["semana_participants.id"], + name=op.f("point_events_semana_participant_id_fkey"), + ondelete="CASCADE", + ), + sa.PrimaryKeyConstraint("id", name=op.f("point_events_pkey")), + sa.UniqueConstraint( + "semana_participant_id", + "source_type", + "source_id", + name="uq_point_event_source", + ), + ) + op.create_index( + op.f("point_events_deleted_at_idx"), + "point_events", + ["deleted_at"], + unique=False, + ) + op.create_table( + "presencas", + sa.Column("id", sa.Uuid(), nullable=False), + sa.Column("atividade_id", sa.Uuid(), nullable=False), + sa.Column("user_id", sa.Uuid(), nullable=True), + sa.Column("nome", sa.String(length=255), nullable=False), + sa.Column("email", sa.String(length=255), nullable=False), + sa.Column("horas", sa.Integer(), nullable=False), + sa.Column( + "created_at", + sa.DateTime(timezone=True), + server_default=sa.text("now()"), + nullable=False, + ), + sa.Column( + "updated_at", + sa.DateTime(timezone=True), + server_default=sa.text("now()"), + nullable=False, + ), + sa.Column("deleted_at", sa.DateTime(timezone=True), nullable=True), + sa.ForeignKeyConstraint( + ["atividade_id"], + ["atividades.id"], + name=op.f("presencas_atividade_id_fkey"), + ondelete="CASCADE", + ), + sa.ForeignKeyConstraint( + ["user_id"], + ["users.id"], + name=op.f("presencas_user_id_fkey"), + ondelete="SET NULL", + ), + sa.PrimaryKeyConstraint("id", name=op.f("presencas_pkey")), + sa.UniqueConstraint( + "atividade_id", "email", name="uq_presenca_atividade_email" + ), + sa.UniqueConstraint( + "atividade_id", "user_id", name="uq_presenca_atividade_user" + ), + ) + op.create_index( + op.f("presencas_atividade_id_idx"), "presencas", ["atividade_id"], unique=False + ) + op.create_index( + op.f("presencas_deleted_at_idx"), "presencas", ["deleted_at"], unique=False + ) + op.create_index( + op.f("presencas_user_id_idx"), "presencas", ["user_id"], unique=False + ) + op.create_table( + "questions", + sa.Column("id", sa.Uuid(), nullable=False), + sa.Column("prompt", sa.String(length=5000), nullable=False), + sa.Column("answer", sa.String(length=255), nullable=False), + sa.Column("points_value", sa.Integer(), nullable=False), + sa.Column("challenge_id", sa.Uuid(), nullable=False), + sa.ForeignKeyConstraint( + ["challenge_id"], + ["challenges.id"], + name=op.f("questions_challenge_id_fkey"), + ), + sa.PrimaryKeyConstraint("id", name=op.f("questions_pkey")), + ) + op.create_table( + "answers", + sa.Column("id", sa.Uuid(), nullable=False), + sa.Column("participant_id", sa.Uuid(), nullable=False), + sa.Column("question_id", sa.Uuid(), nullable=False), + sa.Column("content", sa.String(length=255), nullable=False), + sa.Column("is_correct", sa.Boolean(), nullable=False), + sa.Column( + "created_at", + sa.DateTime(timezone=True), + server_default=sa.text("now()"), + nullable=False, + ), + sa.Column( + "updated_at", + sa.DateTime(timezone=True), + server_default=sa.text("now()"), + nullable=False, + ), + sa.Column("deleted_at", sa.DateTime(timezone=True), nullable=True), + sa.ForeignKeyConstraint( + ["participant_id"], + ["challenge_participants.id"], + name=op.f("answers_participant_id_fkey"), + ondelete="CASCADE", + ), + sa.ForeignKeyConstraint( + ["question_id"], + ["questions.id"], + name=op.f("answers_question_id_fkey"), + ondelete="CASCADE", + ), + sa.PrimaryKeyConstraint("id", name=op.f("answers_pkey")), + sa.UniqueConstraint( + "participant_id", "question_id", name="uq_participant_question" + ), + ) + op.create_index( + op.f("answers_deleted_at_idx"), "answers", ["deleted_at"], unique=False + ) + # ### end Alembic commands ### + + +def downgrade() -> None: + """Downgrade schema.""" + # ### commands auto generated by Alembic - please adjust! ### + op.drop_index(op.f("answers_deleted_at_idx"), table_name="answers") + op.drop_table("answers") + op.drop_table("questions") + op.drop_index(op.f("presencas_user_id_idx"), table_name="presencas") + op.drop_index(op.f("presencas_deleted_at_idx"), table_name="presencas") + op.drop_index(op.f("presencas_atividade_id_idx"), table_name="presencas") + op.drop_table("presencas") + op.drop_index(op.f("point_events_deleted_at_idx"), table_name="point_events") + op.drop_table("point_events") + op.drop_index( + op.f("challenge_participants_deleted_at_idx"), + table_name="challenge_participants", + ) + op.drop_table("challenge_participants") + op.drop_index( + op.f("semana_participants_deleted_at_idx"), table_name="semana_participants" + ) + op.drop_table("semana_participants") + op.drop_table("refresh_tokens") + op.drop_index(op.f("challenges_deleted_at_idx"), table_name="challenges") + op.drop_table("challenges") + op.drop_index("ix_atividade_semana_schedule", table_name="atividades") + op.drop_index(op.f("atividades_semana_id_idx"), table_name="atividades") + op.drop_index(op.f("atividades_deleted_at_idx"), table_name="atividades") + op.drop_table("atividades") + op.drop_index(op.f("users_email_idx"), table_name="users") + op.drop_index(op.f("users_deleted_at_idx"), table_name="users") + op.drop_table("users") + op.drop_table("semana_event") + # ### end Alembic commands ### diff --git a/backend/alembic/versions/597d02678cf0_challenges_cover_image.py b/backend/alembic/versions/597d02678cf0_challenges_cover_image.py deleted file mode 100644 index 5802d7f8..00000000 --- a/backend/alembic/versions/597d02678cf0_challenges_cover_image.py +++ /dev/null @@ -1,35 +0,0 @@ -"""challenges cover image - -Revision ID: 597d02678cf0 -Revises: 7b14a96d2c83 -Create Date: 2026-09-27 21:30:55.360689 - -""" - -from collections.abc import Sequence - -import sqlalchemy as sa - -from alembic import op - -# revision identifiers, used by Alembic. -revision: str = "597d02678cf0" -down_revision: str | Sequence[str] | None = "7b14a96d2c83" -branch_labels: str | Sequence[str] | None = None -depends_on: str | Sequence[str] | None = None - - -def upgrade() -> None: - """Upgrade schema.""" - # ### commands auto generated by Alembic - please adjust! ### - op.add_column( - "challenges", sa.Column("image_path", sa.String(length=512), nullable=True) - ) - # ### end Alembic commands ### - - -def downgrade() -> None: - """Downgrade schema.""" - # ### commands auto generated by Alembic - please adjust! ### - op.drop_column("challenges", "image_path") - # ### end Alembic commands ### diff --git a/backend/alembic/versions/75537158e76e_create_refresh_tokens_table.py b/backend/alembic/versions/75537158e76e_create_refresh_tokens_table.py deleted file mode 100644 index b591f3bf..00000000 --- a/backend/alembic/versions/75537158e76e_create_refresh_tokens_table.py +++ /dev/null @@ -1,48 +0,0 @@ -"""create_refresh_tokens_table - -Revision ID: 75537158e76e -Revises: d01c0010d74b -Create Date: 2026-09-10 02:47:45.422092 - -""" - -from collections.abc import Sequence - -import sqlalchemy as sa - -from alembic import op - -# revision identifiers, used by Alembic. -revision: str = "75537158e76e" -down_revision: str | Sequence[str] | None = "d01c0010d74b" -branch_labels: str | Sequence[str] | None = None -depends_on: str | Sequence[str] | None = None - - -def upgrade() -> None: - """Upgrade schema.""" - # ### commands auto generated by Alembic - please adjust! ### - op.create_table( - "refresh_tokens", - sa.Column("id", sa.Uuid(), nullable=False), - sa.Column("user_id", sa.Uuid(), nullable=False), - sa.Column("token_hash", sa.String(length=64), nullable=False), - sa.Column( - "created_at", sa.DateTime(), server_default=sa.text("now()"), nullable=False - ), - sa.Column("expires_at", sa.DateTime(timezone=True), nullable=False), - sa.Column("revoked_at", sa.DateTime(timezone=True), nullable=True), - sa.ForeignKeyConstraint( - ["user_id"], ["users.id"], name=op.f("refresh_tokens_user_id_fkey") - ), - sa.PrimaryKeyConstraint("id", name=op.f("refresh_tokens_pkey")), - sa.UniqueConstraint("token_hash", name=op.f("refresh_tokens_token_hash_key")), - ) - # ### end Alembic commands ### - - -def downgrade() -> None: - """Downgrade schema.""" - # ### commands auto generated by Alembic - please adjust! ### - op.drop_table("refresh_tokens") - # ### end Alembic commands ### diff --git a/backend/alembic/versions/7b14a96d2c83_add_challenge_finishes_at.py b/backend/alembic/versions/7b14a96d2c83_add_challenge_finishes_at.py deleted file mode 100644 index 68939ae3..00000000 --- a/backend/alembic/versions/7b14a96d2c83_add_challenge_finishes_at.py +++ /dev/null @@ -1,35 +0,0 @@ -"""add challenge finish deadline - -Revision ID: 7b14a96d2c83 -Revises: c8389c55b075 -Create Date: 2026-09-27 00:00:00.000000 - -""" - -from collections.abc import Sequence - -import sqlalchemy as sa - -from alembic import op - -# revision identifiers, used by Alembic. -revision: str = "7b14a96d2c83" -down_revision: str | Sequence[str] | None = "c8389c55b075" -branch_labels: str | Sequence[str] | None = None -depends_on: str | Sequence[str] | None = None - - -def upgrade() -> None: - op.add_column( - "challenges", - sa.Column( - "finishes_at", - sa.DateTime(timezone=True), - server_default=sa.text("now() + interval '1 day'"), - nullable=False, - ), - ) - - -def downgrade() -> None: - op.drop_column("challenges", "finishes_at") diff --git a/backend/alembic/versions/91cc57573789_align_timestamps_to_timezone_awareness.py b/backend/alembic/versions/91cc57573789_align_timestamps_to_timezone_awareness.py deleted file mode 100644 index a4d6878c..00000000 --- a/backend/alembic/versions/91cc57573789_align_timestamps_to_timezone_awareness.py +++ /dev/null @@ -1,102 +0,0 @@ -"""align_timestamps_to_timezone_awareness - -Revision ID: 91cc57573789 -Revises: 75537158e76e -Create Date: 2026-09-10 04:40:10.591315 - -""" - -from collections.abc import Sequence - -import sqlalchemy as sa -from sqlalchemy.dialects import postgresql - -from alembic import op - -# revision identifiers, used by Alembic. -revision: str = "91cc57573789" -down_revision: str | Sequence[str] | None = "75537158e76e" -branch_labels: str | Sequence[str] | None = None -depends_on: str | Sequence[str] | None = None - - -def upgrade() -> None: - """Upgrade schema.""" - # ### commands auto generated by Alembic - please adjust! ### - op.alter_column( - "refresh_tokens", - "created_at", - existing_type=postgresql.TIMESTAMP(), - type_=sa.DateTime(timezone=True), - existing_nullable=False, - existing_server_default=sa.text("now()"), - postgresql_using="created_at AT TIME ZONE 'UTC'", - ) - op.alter_column( - "users", - "created_at", - existing_type=postgresql.TIMESTAMP(), - type_=sa.DateTime(timezone=True), - existing_nullable=False, - existing_server_default=sa.text("now()"), - postgresql_using="created_at AT TIME ZONE 'UTC'", - ) - op.alter_column( - "users", - "updated_at", - existing_type=postgresql.TIMESTAMP(), - type_=sa.DateTime(timezone=True), - existing_nullable=False, - existing_server_default=sa.text("now()"), - postgresql_using="created_at AT TIME ZONE 'UTC'", - ) - op.alter_column( - "users", - "deleted_at", - existing_type=postgresql.TIMESTAMP(), - type_=sa.DateTime(timezone=True), - existing_nullable=True, - postgresql_using="created_at AT TIME ZONE 'UTC'", - ) - # ### end Alembic commands ### - - -def downgrade() -> None: - """Downgrade schema.""" - # ### commands auto generated by Alembic - please adjust! ### - op.alter_column( - "users", - "deleted_at", - existing_type=sa.DateTime(timezone=True), - type_=postgresql.TIMESTAMP(), - existing_nullable=True, - postgresql_using="created_at AT TIME ZONE 'UTC'", - ) - op.alter_column( - "users", - "updated_at", - existing_type=sa.DateTime(timezone=True), - type_=postgresql.TIMESTAMP(), - existing_nullable=False, - existing_server_default=sa.text("now()"), - postgresql_using="created_at AT TIME ZONE 'UTC'", - ) - op.alter_column( - "users", - "created_at", - existing_type=sa.DateTime(timezone=True), - type_=postgresql.TIMESTAMP(), - existing_nullable=False, - existing_server_default=sa.text("now()"), - postgresql_using="created_at AT TIME ZONE 'UTC'", - ) - op.alter_column( - "refresh_tokens", - "created_at", - existing_type=sa.DateTime(timezone=True), - type_=postgresql.TIMESTAMP(), - existing_nullable=False, - existing_server_default=sa.text("now()"), - postgresql_using="created_at AT TIME ZONE 'UTC'", - ) - # ### end Alembic commands ### diff --git a/backend/alembic/versions/b84e1b2f6a90_user_owned_usernames.py b/backend/alembic/versions/b84e1b2f6a90_user_owned_usernames.py deleted file mode 100644 index b4edf37b..00000000 --- a/backend/alembic/versions/b84e1b2f6a90_user_owned_usernames.py +++ /dev/null @@ -1,97 +0,0 @@ -"""move username assignment from participants to users - -Revision ID: b84e1b2f6a90 -Revises: 597d02678cf0 -Create Date: 2026-09-27 23:10:00.000000 - -""" - -from collections.abc import Sequence - -import sqlalchemy as sa - -from alembic import op - -# revision identifiers, used by Alembic. -revision: str = "b84e1b2f6a90" -down_revision: str | Sequence[str] | None = "597d02678cf0" -branch_labels: str | Sequence[str] | None = None -depends_on: str | Sequence[str] | None = None - - -def upgrade() -> None: - op.add_column("users", sa.Column("username_id", sa.Uuid(), nullable=True)) - op.create_foreign_key( - "users_username_id_fkey", "users", "usernames", ["username_id"], ["id"] - ) - op.create_unique_constraint("users_username_id_key", "users", ["username_id"]) - - op.execute( - sa.text( - """ - WITH ranked_assignments AS ( - SELECT - user_id, - username_id, - row_number() OVER ( - PARTITION BY user_id ORDER BY created_at, id - ) AS user_rank, - row_number() OVER ( - PARTITION BY username_id ORDER BY created_at, id - ) AS username_rank - FROM challenge_participants - WHERE username_id IS NOT NULL - ) - UPDATE users - SET username_id = ranked_assignments.username_id - FROM ranked_assignments - WHERE users.id = ranked_assignments.user_id - AND ranked_assignments.user_rank = 1 - AND ranked_assignments.username_rank = 1 - """ - ) - ) - - op.drop_constraint( - "uq_participant_username_challenge", - "challenge_participants", - type_="unique", - ) - op.drop_constraint( - "challenge_participants_username_id_fkey", - "challenge_participants", - type_="foreignkey", - ) - op.drop_column("challenge_participants", "username_id") - - -def downgrade() -> None: - op.add_column( - "challenge_participants", - sa.Column("username_id", sa.Uuid(), nullable=True), - ) - op.create_foreign_key( - "challenge_participants_username_id_fkey", - "challenge_participants", - "usernames", - ["username_id"], - ["id"], - ) - op.create_unique_constraint( - "uq_participant_username_challenge", - "challenge_participants", - ["challenge_id", "username_id"], - ) - op.execute( - sa.text( - """ - UPDATE challenge_participants - SET username_id = users.username_id - FROM users - WHERE challenge_participants.user_id = users.id - """ - ) - ) - op.drop_constraint("users_username_id_key", "users", type_="unique") - op.drop_constraint("users_username_id_fkey", "users", type_="foreignkey") - op.drop_column("users", "username_id") diff --git a/backend/alembic/versions/c8389c55b075_challenges_tables.py b/backend/alembic/versions/c8389c55b075_challenges_tables.py deleted file mode 100644 index 7ae692d1..00000000 --- a/backend/alembic/versions/c8389c55b075_challenges_tables.py +++ /dev/null @@ -1,210 +0,0 @@ -"""challenges tables - -Revision ID: c8389c55b075 -Revises: dd4ca2ff096e -Create Date: 2026-09-27 00:27:26.225175 - -""" - -from collections.abc import Sequence - -import sqlalchemy as sa - -from alembic import op - -# revision identifiers, used by Alembic. -revision: str = "c8389c55b075" -down_revision: str | Sequence[str] | None = "dd4ca2ff096e" -branch_labels: str | Sequence[str] | None = None -depends_on: str | Sequence[str] | None = None - - -def upgrade() -> None: - """Upgrade schema.""" - # ### commands auto generated by Alembic - please adjust! ### - op.create_table( - "challenges", - sa.Column("id", sa.Uuid(), nullable=False), - sa.Column("title", sa.String(length=255), nullable=False), - sa.Column( - "scoring_type", - sa.Enum( - "QUIZ", - "MANUAL", - name="challengescoringtype", - native_enum=False, - length=20, - ), - nullable=False, - ), - sa.Column( - "created_at", - sa.DateTime(timezone=True), - server_default=sa.text("now()"), - nullable=False, - ), - sa.Column( - "updated_at", - sa.DateTime(timezone=True), - server_default=sa.text("now()"), - nullable=False, - ), - sa.Column("deleted_at", sa.DateTime(timezone=True), nullable=True), - sa.PrimaryKeyConstraint("id", name=op.f("challenges_pkey")), - ) - op.create_index( - op.f("challenges_deleted_at_idx"), "challenges", ["deleted_at"], unique=False - ) - op.create_table( - "username_mothers", - sa.Column("id", sa.Uuid(), nullable=False), - sa.Column("first_name", sa.String(length=100), nullable=False), - sa.Column("last_name", sa.String(length=100), nullable=False), - sa.Column("full_name", sa.String(length=201), nullable=False), - sa.Column("description", sa.Text(), nullable=False), - sa.PrimaryKeyConstraint("id", name=op.f("username_mothers_pkey")), - sa.UniqueConstraint("full_name", name=op.f("username_mothers_full_name_key")), - ) - op.create_table( - "questions", - sa.Column("id", sa.Uuid(), nullable=False), - sa.Column("prompt", sa.String(length=5000), nullable=False), - sa.Column("answer", sa.String(length=255), nullable=False), - sa.Column("points_value", sa.Integer(), nullable=False), - sa.Column("challenge_id", sa.Uuid(), nullable=False), - sa.ForeignKeyConstraint( - ["challenge_id"], - ["challenges.id"], - name=op.f("questions_challenge_id_fkey"), - ), - sa.PrimaryKeyConstraint("id", name=op.f("questions_pkey")), - ) - op.create_table( - "usernames", - sa.Column("id", sa.Uuid(), nullable=False), - sa.Column("nickname", sa.String(length=255), nullable=False), - sa.Column("first_mother_id", sa.Uuid(), nullable=False), - sa.Column("last_mother_id", sa.Uuid(), nullable=False), - sa.ForeignKeyConstraint( - ["first_mother_id"], - ["username_mothers.id"], - name=op.f("usernames_first_mother_id_fkey"), - ), - sa.ForeignKeyConstraint( - ["last_mother_id"], - ["username_mothers.id"], - name=op.f("usernames_last_mother_id_fkey"), - ), - sa.PrimaryKeyConstraint("id", name=op.f("usernames_pkey")), - sa.UniqueConstraint("nickname", name=op.f("usernames_nickname_key")), - ) - op.create_table( - "challenge_participants", - sa.Column("id", sa.Uuid(), nullable=False), - sa.Column("user_id", sa.Uuid(), nullable=False), - sa.Column("challenge_id", sa.Uuid(), nullable=False), - sa.Column("username_id", sa.Uuid(), nullable=True), - sa.Column("score", sa.Integer(), nullable=False), - sa.Column("submitted_at", sa.DateTime(timezone=True), nullable=True), - sa.Column( - "created_at", - sa.DateTime(timezone=True), - server_default=sa.text("now()"), - nullable=False, - ), - sa.Column( - "updated_at", - sa.DateTime(timezone=True), - server_default=sa.text("now()"), - nullable=False, - ), - sa.Column("deleted_at", sa.DateTime(timezone=True), nullable=True), - sa.ForeignKeyConstraint( - ["challenge_id"], - ["challenges.id"], - name=op.f("challenge_participants_challenge_id_fkey"), - ), - sa.ForeignKeyConstraint( - ["user_id"], - ["users.id"], - name=op.f("challenge_participants_user_id_fkey"), - ondelete="CASCADE", - ), - sa.ForeignKeyConstraint( - ["username_id"], - ["usernames.id"], - name=op.f("challenge_participants_username_id_fkey"), - ), - sa.PrimaryKeyConstraint("id", name=op.f("challenge_participants_pkey")), - sa.UniqueConstraint( - "challenge_id", "username_id", name="uq_participant_username_challenge" - ), - sa.UniqueConstraint( - "user_id", "challenge_id", name="uq_participant_user_challenge" - ), - ) - op.create_index( - op.f("challenge_participants_deleted_at_idx"), - "challenge_participants", - ["deleted_at"], - unique=False, - ) - op.create_table( - "answers", - sa.Column("id", sa.Uuid(), nullable=False), - sa.Column("participant_id", sa.Uuid(), nullable=False), - sa.Column("question_id", sa.Uuid(), nullable=False), - sa.Column("content", sa.String(length=255), nullable=False), - sa.Column("is_correct", sa.Boolean(), nullable=False), - sa.Column( - "created_at", - sa.DateTime(timezone=True), - server_default=sa.text("now()"), - nullable=False, - ), - sa.Column( - "updated_at", - sa.DateTime(timezone=True), - server_default=sa.text("now()"), - nullable=False, - ), - sa.Column("deleted_at", sa.DateTime(timezone=True), nullable=True), - sa.ForeignKeyConstraint( - ["participant_id"], - ["challenge_participants.id"], - name=op.f("answers_participant_id_fkey"), - ondelete="CASCADE", - ), - sa.ForeignKeyConstraint( - ["question_id"], - ["questions.id"], - name=op.f("answers_question_id_fkey"), - ondelete="CASCADE", - ), - sa.PrimaryKeyConstraint("id", name=op.f("answers_pkey")), - sa.UniqueConstraint( - "participant_id", "question_id", name="uq_participant_question" - ), - ) - op.create_index( - op.f("answers_deleted_at_idx"), "answers", ["deleted_at"], unique=False - ) - # ### end Alembic commands ### - - -def downgrade() -> None: - """Downgrade schema.""" - # ### commands auto generated by Alembic - please adjust! ### - op.drop_index(op.f("answers_deleted_at_idx"), table_name="answers") - op.drop_table("answers") - op.drop_index( - op.f("challenge_participants_deleted_at_idx"), - table_name="challenge_participants", - ) - op.drop_table("challenge_participants") - op.drop_table("usernames") - op.drop_table("questions") - op.drop_table("username_mothers") - op.drop_index(op.f("challenges_deleted_at_idx"), table_name="challenges") - op.drop_table("challenges") - # ### end Alembic commands ### diff --git a/backend/alembic/versions/d01c0010d74b_create_users_table.py b/backend/alembic/versions/d01c0010d74b_create_users_table.py deleted file mode 100644 index b82900e0..00000000 --- a/backend/alembic/versions/d01c0010d74b_create_users_table.py +++ /dev/null @@ -1,53 +0,0 @@ -"""create users table - -Revision ID: d01c0010d74b -Revises: -Create Date: 2026-09-02 18:39:01.652422 - -""" - -from collections.abc import Sequence - -import sqlalchemy as sa - -from alembic import op - -# revision identifiers, used by Alembic. -revision: str = "d01c0010d74b" -down_revision: str | Sequence[str] | None = None -branch_labels: str | Sequence[str] | None = None -depends_on: str | Sequence[str] | None = None - - -def upgrade() -> None: - """Upgrade schema.""" - # ### commands auto generated by Alembic - please adjust! ### - op.create_table( - "users", - sa.Column("id", sa.Uuid(), nullable=False), - sa.Column("email", sa.String(length=255), nullable=False), - sa.Column("name", sa.String(length=255), nullable=False), - sa.Column("password_hash", sa.String(length=255), nullable=True), - sa.Column("is_admin", sa.Boolean(), server_default="false", nullable=False), - sa.Column("is_verified", sa.Boolean(), server_default="false", nullable=False), - sa.Column( - "created_at", sa.DateTime(), server_default=sa.text("now()"), nullable=False - ), - sa.Column( - "updated_at", sa.DateTime(), server_default=sa.text("now()"), nullable=False - ), - sa.Column("deleted_at", sa.DateTime(), nullable=True), - sa.PrimaryKeyConstraint("id", name=op.f("users_pkey")), - ) - op.create_index(op.f("users_deleted_at_idx"), "users", ["deleted_at"], unique=False) - op.create_index(op.f("users_email_idx"), "users", ["email"], unique=True) - # ### end Alembic commands ### - - -def downgrade() -> None: - """Downgrade schema.""" - # ### commands auto generated by Alembic - please adjust! ### - op.drop_index(op.f("users_email_idx"), table_name="users") - op.drop_index(op.f("users_deleted_at_idx"), table_name="users") - op.drop_table("users") - # ### end Alembic commands ### diff --git a/backend/alembic/versions/dd4ca2ff096e_add_scopes_to_refresh_tokens.py b/backend/alembic/versions/dd4ca2ff096e_add_scopes_to_refresh_tokens.py deleted file mode 100644 index 2976b532..00000000 --- a/backend/alembic/versions/dd4ca2ff096e_add_scopes_to_refresh_tokens.py +++ /dev/null @@ -1,35 +0,0 @@ -"""add scopes to refresh_tokens - -Revision ID: dd4ca2ff096e -Revises: 91cc57573789 -Create Date: 2026-09-11 00:05:46.857827 - -""" - -from collections.abc import Sequence - -import sqlalchemy as sa - -from alembic import op - -# revision identifiers, used by Alembic. -revision: str = "dd4ca2ff096e" -down_revision: str | Sequence[str] | None = "91cc57573789" -branch_labels: str | Sequence[str] | None = None -depends_on: str | Sequence[str] | None = None - - -def upgrade() -> None: - """Upgrade schema.""" - # ### commands auto generated by Alembic - please adjust! ### - op.add_column( - "refresh_tokens", sa.Column("scopes", sa.String(length=255), nullable=False) - ) - # ### end Alembic commands ### - - -def downgrade() -> None: - """Downgrade schema.""" - # ### commands auto generated by Alembic - please adjust! ### - op.drop_column("refresh_tokens", "scopes") - # ### end Alembic commands ### diff --git a/backend/app/atividade/routes.py b/backend/app/atividade/routes.py index 79be0573..6d70daec 100644 --- a/backend/app/atividade/routes.py +++ b/backend/app/atividade/routes.py @@ -90,6 +90,21 @@ async def delete_admin_atividade( await session.delete(atividade) +@admin_router.post( + "/{atividade_id}/regenerar-codigo", response_model=schemas.AtividadeResponse +) +async def regenerate_admin_atividade_code( + semana_id: int, + atividade_id: UUID, + session: Annotated[AsyncSession, Depends(get_session)], + _: Annotated[User, Security(get_current_admin_user, scopes=[Scope.ADMIN])], +): + atividade = await services.get_atividade(session, semana_id, atividade_id) + if atividade is None: + raise NotFoundError("Activity not found.") + return await services.regenerate_codigo(session, atividade) + + @attendance_router.post( "/registrar/{codigo}", response_model=schemas.PresencaResponse, diff --git a/backend/app/atividade/services.py b/backend/app/atividade/services.py index ac6c558e..440648c3 100644 --- a/backend/app/atividade/services.py +++ b/backend/app/atividade/services.py @@ -45,12 +45,16 @@ def _new_codigo() -> str: return f"{secrets.randbelow(10_000):04d}" -async def _unique_codigo(session: AsyncSession, semana_id: int) -> str: +async def _unique_codigo( + session: AsyncSession, semana_id: int, exclude_id: UUID | None = None +) -> str: for _ in range(10_000): codigo = _new_codigo() exists = await session.scalar( select(Atividade.id).where( - Atividade.semana_id == semana_id, Atividade.codigo == codigo + Atividade.semana_id == semana_id, + Atividade.codigo == codigo, + Atividade.id != exclude_id if exclude_id else True, ) ) if exists is None: @@ -71,6 +75,12 @@ async def create_atividade( return atividade +async def regenerate_codigo(session: AsyncSession, atividade: Atividade) -> Atividade: + atividade.codigo = await _unique_codigo(session, atividade.semana_id, atividade.id) + await session.flush() + return atividade + + async def update_atividade( session: AsyncSession, atividade: Atividade, fields: dict ) -> Atividade: diff --git a/frontend/src/app/semana/(site)/presenca/page.tsx b/frontend/src/app/semana/(site)/presenca/page.tsx new file mode 100644 index 00000000..e5bc95b7 --- /dev/null +++ b/frontend/src/app/semana/(site)/presenca/page.tsx @@ -0,0 +1,5 @@ +import { AttendancePage } from '@/features/attendance/components/attendance-page' + +export default function AttendanceRoute() { + return +} diff --git a/frontend/src/features/admin/api.ts b/frontend/src/features/admin/api.ts index ff0fc7fa..9810b0b6 100644 --- a/frontend/src/features/admin/api.ts +++ b/frontend/src/features/admin/api.ts @@ -27,6 +27,19 @@ export type AdminSemana = { participant_count: number } +export type AdminAtividade = { + id: string + semana_id: number + tipo: 'palestra' | 'workshop' | 'encerramento' | 'conversa' | 'coffee_break' + titulo: string + status: 'provisoria' | 'confirmada' + comeca_as: string + termina_as: string + codigo: string + pontos: number + horas: number +} + type Page = { items: T[]; total: number; limit: number; offset: number } export function listAdminUsers() { @@ -113,3 +126,30 @@ export function updateAdminSemana( export function deleteAdminSemana(id: number) { return requestApi(`/admin/semanas/${id}`, { method: 'DELETE' }) } + +export function listAdminAtividades(semanaId: number) { + return requestApi(`/admin/semanas/${semanaId}/atividades`) +} + +export function createAdminAtividade( + semanaId: number, + input: Omit, +) { + return requestApi(`/admin/semanas/${semanaId}/atividades`, { + method: 'POST', + body: JSON.stringify(input), + }) +} + +export function deleteAdminAtividade(semanaId: number, id: string) { + return requestApi(`/admin/semanas/${semanaId}/atividades/${id}`, { + method: 'DELETE', + }) +} + +export function regenerateAdminAtividadeCode(semanaId: number, id: string) { + return requestApi( + `/admin/semanas/${semanaId}/atividades/${id}/regenerar-codigo`, + { method: 'POST' }, + ) +} diff --git a/frontend/src/features/admin/components/admin-panel.tsx b/frontend/src/features/admin/components/admin-panel.tsx index fee3bc2f..8a8e5934 100644 --- a/frontend/src/features/admin/components/admin-panel.tsx +++ b/frontend/src/features/admin/components/admin-panel.tsx @@ -20,18 +20,23 @@ import { Input } from '@/components/ui/input' import { useAuth } from '@/features/auth/auth-provider' import { + createAdminAtividade, createAdminChallenge, createAdminSemana, createAdminUser, + deleteAdminAtividade, deleteAdminChallenge, deleteAdminSemana, deleteAdminUser, + listAdminAtividades, listAdminChallenges, listAdminSemanas, listAdminUsers, uploadAdminChallengeImage, + regenerateAdminAtividadeCode, updateAdminSemana, updateAdminUser, + type AdminAtividade, type AdminChallenge, type AdminSemana, type AdminUser, @@ -54,6 +59,7 @@ export function AdminPanel() { const [users, setUsers] = useState([]) const [challenges, setChallenges] = useState([]) const [semanas, setSemanas] = useState([]) + const [atividades, setAtividades] = useState>({}) const [error, setError] = useState('') const [refresh, setRefresh] = useState(0) @@ -68,6 +74,14 @@ export function AdminPanel() { setUsers(userPage.items) setChallenges(challengePage.items) setSemanas(semanaList) + return Promise.all( + semanaList.map( + async (semana) => [semana.id, await listAdminAtividades(semana.id)] as const, + ), + ) + }) + .then((activityLists) => { + if (activityLists) setAtividades(Object.fromEntries(activityLists)) }) .catch((reason: Error) => setError(reason.message)) }, [refresh, user]) @@ -189,7 +203,9 @@ export function AdminPanel() { )} {tab === 'activities' && ( setRefresh((value) => value + 1)} onChanged={() => setRefresh((value) => value + 1)} /> )} @@ -570,14 +586,19 @@ function ChallengeForm({ } function SemanasSection({ + atividades, semanas, + onActivityChanged, onChanged, }: { + atividades: Record semanas: AdminSemana[] + onActivityChanged: () => void onChanged: () => void }) { const [form, setForm] = useState({ nome: '', ano: new Date().getFullYear() }) const [error, setError] = useState('') + const [openActivityForm, setOpenActivityForm] = useState() async function create(event: React.FormEvent) { event.preventDefault() @@ -680,6 +701,59 @@ function SemanasSection({

{semana.challenge_count} desafios · {semana.participant_count} participantes

+
+
+

Atividades

+ +
+ {openActivityForm === semana.id && ( + { + setOpenActivityForm(undefined) + onActivityChanged() + }} + semanaId={semana.id} + /> + )} +
+ {(atividades[semana.id] ?? []).map((atividade) => ( + setError(message)} + onDelete={async () => { + if ( + !window.confirm( + `Remover ${atividade.titulo || 'esta atividade'}?`, + ) + ) + return + try { + await deleteAdminAtividade(semana.id, atividade.id) + onActivityChanged() + } catch (reason) { + setError( + reason instanceof Error + ? reason.message + : 'Não foi possível remover a atividade.', + ) + } + }} + semanaId={semana.id} + /> + ))} + {!atividades[semana.id]?.length && ( +

Nenhuma atividade cadastrada.

+ )} +
+
))}
@@ -687,6 +761,182 @@ function SemanasSection({ ) } +function ActivityForm({ semanaId, onDone }: { semanaId: number; onDone: () => void }) { + const [form, setForm] = useState({ + tipo: 'palestra' as AdminAtividade['tipo'], + titulo: '', + comeca_as: '', + termina_as: '', + status: 'provisoria' as AdminAtividade['status'], + pontos: 0, + horas: 1, + }) + const [error, setError] = useState('') + + async function submit(event: React.FormEvent) { + event.preventDefault() + setError('') + try { + await createAdminAtividade(semanaId, { + ...form, + comeca_as: new Date(form.comeca_as).toISOString(), + termina_as: new Date(form.termina_as).toISOString(), + }) + onDone() + } catch (reason) { + setError( + reason instanceof Error ? reason.message : 'Não foi possível criar a atividade.', + ) + } + } + + return ( +
+ setForm({ ...form, titulo: event.target.value })} + /> + + + + + + + {error &&

{error}

} + +
+ ) +} + +function ActivityCard({ + atividade, + semanaId, + onChanged, + onError, + onDelete, +}: { + atividade: AdminAtividade + semanaId: number + onChanged: () => void + onError: (message: string) => void + onDelete: () => void +}) { + async function regenerate() { + if (!window.confirm('O código anterior deixará de funcionar. Continuar?')) return + try { + await regenerateAdminAtividadeCode(semanaId, atividade.id) + onChanged() + } catch (reason) { + onError( + reason instanceof Error ? reason.message : 'Não foi possível regenerar o código.', + ) + } + } + + return ( +
+
+
+

+ {atividade.tipo} · {atividade.status} +

+

{atividade.titulo || 'Sem título'}

+

+ {new Date(atividade.comeca_as).toLocaleString('pt-BR')} · {atividade.horas}h ·{' '} + {atividade.pontos} pontos +

+
+ +
+
+
+

+ Código presença +

+

+ {atividade.codigo} +

+
+ +
+
+ ) +} + function Unavailable({ title, text }: { title: string; text: string }) { return (
diff --git a/frontend/src/features/attendance/components/attendance-page.tsx b/frontend/src/features/attendance/components/attendance-page.tsx new file mode 100644 index 00000000..1b806b58 --- /dev/null +++ b/frontend/src/features/attendance/components/attendance-page.tsx @@ -0,0 +1,148 @@ +'use client' + +import { useEffect, useState, type FormEvent } from 'react' + +import { useAuth } from '@/features/auth/auth-provider' +import { registerAttendance, listSemanas, type Semana } from '@/features/semana/api' +import { SemanaButton } from '@/features/semana/components/semana-button' +import { SemanaInput } from '@/features/semana/components/semana-input' + +export function AttendancePage() { + const { user, loading: authLoading } = useAuth() + const [semana, setSemana] = useState() + const [loading, setLoading] = useState(true) + const [code, setCode] = useState('') + const [name, setName] = useState('') + const [email, setEmail] = useState('') + const [message, setMessage] = useState() + const [error, setError] = useState() + + useEffect(() => { + listSemanas() + .then((semanas) => { + // Temporary fallback: replace with backend-provided active/current Semana + // before future editions coexist, or a future edition may win here. + const latest = [...semanas].sort((a, b) => b.ano - a.ano)[0] + if (!latest) throw new Error('Nenhuma Semana disponível.') + setSemana(latest) + }) + .catch((cause: unknown) => { + setError( + cause instanceof Error ? cause.message : 'Não foi possível carregar a Semana.', + ) + }) + .finally(() => setLoading(false)) + }, []) + + async function submit(event: FormEvent) { + event.preventDefault() + setMessage(undefined) + setError(undefined) + + if (!semana || !/^\d{4}$/.test(code)) { + setError('Digite o código de 4 dígitos.') + return + } + + try { + const result = await registerAttendance( + semana.id, + code, + user ? {} : { nome: name, email }, + ) + setMessage( + result.pontos_adicionados > 0 + ? `Presença registrada. +${result.pontos_adicionados} pontos.` + : 'Presença registrada.', + ) + setCode('') + } catch (cause: unknown) { + setError( + cause instanceof Error ? cause.message : 'Não foi possível registrar presença.', + ) + } + } + + const pageLoading = authLoading || loading + + return ( +
+
+
+

+ Presença +

+

+ Digite o código mostrado na atividade. +

+
+ +
+ + + {!authLoading && !user && ( +
+ + +
+ )} + + {error && ( +

+ {error} +

+ )} + {message && ( +

+ {message} +

+ )} + + + {pageLoading ? 'Carregando…' : 'Registrar presença'} + +
+ + {semana && ( +

+ Semana {semana.ano} +

+ )} +
+
+ ) +} diff --git a/frontend/src/features/semana/api.ts b/frontend/src/features/semana/api.ts index 46f13e55..907a81ea 100644 --- a/frontend/src/features/semana/api.ts +++ b/frontend/src/features/semana/api.ts @@ -19,3 +19,19 @@ export function listSemanas() { export function getSemanaRanking(semanaId: number) { return requestApi(`/semanas/${semanaId}/ranking`) } + +export function registerAttendance( + semanaId: number, + codigo: string, + input: { nome?: string; email?: string }, +) { + return requestApi<{ + atividade_id: string + registrada: boolean + pontos_adicionados: number + horas: number + }>(`/semanas/${semanaId}/atividades/registrar/${codigo}`, { + method: 'POST', + body: JSON.stringify(input), + }) +} diff --git a/frontend/src/features/semana/components/semana-shell.tsx b/frontend/src/features/semana/components/semana-shell.tsx index 01faf12f..7d5291f1 100644 --- a/frontend/src/features/semana/components/semana-shell.tsx +++ b/frontend/src/features/semana/components/semana-shell.tsx @@ -29,6 +29,7 @@ import { SemanaButton } from './semana-button' const links = [ { href: '/semana/inicio', label: 'Início' }, { href: '/semana/cronograma', label: 'Programação' }, + { href: '/semana/presenca', label: 'Presença' }, ] export function SemanaShell({ children }: { children: ReactNode }) { From c63a5bf5d939e050e8b855ae66ae6d6e424432e7 Mon Sep 17 00:00:00 2001 From: wate Date: Wed, 30 Sep 2026 08:33:35 -0300 Subject: [PATCH 14/62] feat(admin): record activity attendance manually Co-authored-by: Codex --- backend/app/atividade/routes.py | 52 +++++++++++++ backend/app/atividade/schemas.py | 16 ++++ backend/app/atividade/services.py | 69 ++++++++++++++++- frontend/src/features/admin/api.ts | 37 +++++++++ .../features/admin/components/admin-panel.tsx | 75 +++++++++++++++++++ 5 files changed, 248 insertions(+), 1 deletion(-) diff --git a/backend/app/atividade/routes.py b/backend/app/atividade/routes.py index 6d70daec..1e91a97b 100644 --- a/backend/app/atividade/routes.py +++ b/backend/app/atividade/routes.py @@ -5,6 +5,7 @@ from sqlalchemy.ext.asyncio import AsyncSession from app.atividade import schemas, services +from app.atividade.models import Presenca from app.auth.dependencies import get_current_admin_user, get_optional_current_user from app.auth.scopes import Scope from app.core.database import get_session @@ -105,6 +106,57 @@ async def regenerate_admin_atividade_code( return await services.regenerate_codigo(session, atividade) +@admin_router.get( + "/{atividade_id}/presencas", + response_model=list[schemas.AdminPresencaResponse], +) +async def list_admin_presencas( + semana_id: int, + atividade_id: UUID, + session: Annotated[AsyncSession, Depends(get_session)], + _: Annotated[User, Security(get_current_admin_user, scopes=[Scope.ADMIN])], +): + if await services.get_atividade(session, semana_id, atividade_id) is None: + raise NotFoundError("Activity not found.") + return await services.list_presencas(session, atividade_id) + + +@admin_router.post( + "/{atividade_id}/presencas", + response_model=schemas.AdminPresencaResponse, + status_code=201, +) +async def create_admin_presenca( + semana_id: int, + atividade_id: UUID, + data: schemas.AdminPresencaCreate, + session: Annotated[AsyncSession, Depends(get_session)], + _: Annotated[User, Security(get_current_admin_user, scopes=[Scope.ADMIN])], +): + atividade = await services.get_atividade(session, semana_id, atividade_id) + if atividade is None: + raise NotFoundError("Activity not found.") + return await services.register_manual_presence( + session, atividade, data.nome, str(data.email) + ) + + +@admin_router.delete("/{atividade_id}/presencas/{presenca_id}", status_code=204) +async def delete_admin_presenca( + semana_id: int, + atividade_id: UUID, + presenca_id: UUID, + session: Annotated[AsyncSession, Depends(get_session)], + _: Annotated[User, Security(get_current_admin_user, scopes=[Scope.ADMIN])], +): + if await services.get_atividade(session, semana_id, atividade_id) is None: + raise NotFoundError("Activity not found.") + presence = await session.get(Presenca, presenca_id) + if presence is None or presence.atividade_id != atividade_id: + raise NotFoundError("Attendance not found.") + await services.delete_presence(session, presence) + + @attendance_router.post( "/registrar/{codigo}", response_model=schemas.PresencaResponse, diff --git a/backend/app/atividade/schemas.py b/backend/app/atividade/schemas.py index 39822419..e429ea6b 100644 --- a/backend/app/atividade/schemas.py +++ b/backend/app/atividade/schemas.py @@ -57,3 +57,19 @@ class PresencaResponse(BaseModel): registrada: bool = True pontos_adicionados: int horas: int + + +class AdminPresencaCreate(BaseModel): + nome: str = Field(min_length=1, max_length=255) + email: EmailStr + + +class AdminPresencaResponse(BaseModel): + model_config = ConfigDict(from_attributes=True) + + id: UUID + atividade_id: UUID + user_id: UUID | None + nome: str + email: EmailStr + horas: int diff --git a/backend/app/atividade/services.py b/backend/app/atividade/services.py index 440648c3..d34f9043 100644 --- a/backend/app/atividade/services.py +++ b/backend/app/atividade/services.py @@ -7,9 +7,10 @@ from app.atividade.models import Atividade, Presenca, StatusAtividade from app.core.exceptions.app_errors import BadRequestError -from app.semana.models import Semana +from app.semana.models import PointEvent, Semana, SemanaParticipant from app.semana.services import add_points, get_or_create_participant from app.users.models import User +from app.users.services import get_user_by_email async def list_atividades(session: AsyncSession, semana_id: int) -> list[Atividade]: @@ -81,6 +82,72 @@ async def regenerate_codigo(session: AsyncSession, atividade: Atividade) -> Ativ return atividade +async def list_presencas(session: AsyncSession, atividade_id: UUID) -> list[Presenca]: + result = await session.scalars( + select(Presenca) + .where(Presenca.atividade_id == atividade_id) + .order_by(Presenca.created_at.desc()) + ) + return list(result.all()) + + +async def register_manual_presence( + session: AsyncSession, atividade: Atividade, nome: str, email: str +) -> Presenca: + email = email.strip().lower() + existing = await session.scalar( + select(Presenca).where( + Presenca.atividade_id == atividade.id, Presenca.email == email + ) + ) + if existing is not None: + return existing + + user = await get_user_by_email(session, email) + presence = Presenca( + atividade_id=atividade.id, + user_id=user.id if user else None, + nome=nome.strip(), + email=email, + horas=atividade.horas, + ) + session.add(presence) + await session.flush() + + if user is not None and atividade.pontos: + participant = await get_or_create_participant( + session, await session.get(Semana, atividade.semana_id), user + ) + await add_points( + session, + participant, + atividade.pontos, + source_type="atividade", + source_id=atividade.id, + reason=atividade.titulo or "Atividade", + ) + return presence + + +async def delete_presence(session: AsyncSession, presence: Presenca) -> None: + if presence.user_id is not None: + point_event = await session.scalar( + select(PointEvent).where( + PointEvent.semana_participant_id.in_( + select(SemanaParticipant.id).where( + SemanaParticipant.user_id == presence.user_id, + SemanaParticipant.semana_id == presence.atividade.semana_id, + ) + ), + PointEvent.source_type == "atividade", + PointEvent.source_id == presence.atividade_id, + ) + ) + if point_event is not None: + await session.delete(point_event) + await session.delete(presence) + + async def update_atividade( session: AsyncSession, atividade: Atividade, fields: dict ) -> Atividade: diff --git a/frontend/src/features/admin/api.ts b/frontend/src/features/admin/api.ts index 9810b0b6..3340ab2a 100644 --- a/frontend/src/features/admin/api.ts +++ b/frontend/src/features/admin/api.ts @@ -40,6 +40,15 @@ export type AdminAtividade = { horas: number } +export type AdminPresenca = { + id: string + atividade_id: string + user_id: string | null + nome: string + email: string + horas: number +} + type Page = { items: T[]; total: number; limit: number; offset: number } export function listAdminUsers() { @@ -153,3 +162,31 @@ export function regenerateAdminAtividadeCode(semanaId: number, id: string) { { method: 'POST' }, ) } + +export function listAdminPresencas(semanaId: number, atividadeId: string) { + return requestApi( + `/admin/semanas/${semanaId}/atividades/${atividadeId}/presencas`, + ) +} + +export function createAdminPresenca( + semanaId: number, + atividadeId: string, + input: { nome: string; email: string }, +) { + return requestApi( + `/admin/semanas/${semanaId}/atividades/${atividadeId}/presencas`, + { method: 'POST', body: JSON.stringify(input) }, + ) +} + +export function deleteAdminPresenca( + semanaId: number, + atividadeId: string, + presencaId: string, +) { + return requestApi( + `/admin/semanas/${semanaId}/atividades/${atividadeId}/presencas/${presencaId}`, + { method: 'DELETE' }, + ) +} diff --git a/frontend/src/features/admin/components/admin-panel.tsx b/frontend/src/features/admin/components/admin-panel.tsx index 8a8e5934..cc206c5b 100644 --- a/frontend/src/features/admin/components/admin-panel.tsx +++ b/frontend/src/features/admin/components/admin-panel.tsx @@ -22,6 +22,7 @@ import { useAuth } from '@/features/auth/auth-provider' import { createAdminAtividade, createAdminChallenge, + createAdminPresenca, createAdminSemana, createAdminUser, deleteAdminAtividade, @@ -933,10 +934,84 @@ function ActivityCard({ Regenerar código
+ ) } +function ManualPresenceForm({ + semanaId, + atividadeId, + onDone, +}: { + semanaId: number + atividadeId: string + onDone: () => void +}) { + const [open, setOpen] = useState(false) + const [form, setForm] = useState({ nome: '', email: '' }) + const [error, setError] = useState('') + + async function submit(event: React.FormEvent) { + event.preventDefault() + setError('') + try { + await createAdminPresenca(semanaId, atividadeId, form) + setForm({ nome: '', email: '' }) + setOpen(false) + onDone() + } catch (reason) { + setError(reason instanceof Error ? reason.message : 'Não foi possível registrar.') + } + } + + if (!open) { + return ( + + ) + } + + return ( +
+

Presença manual

+ setForm({ ...form, nome: event.target.value })} + /> + setForm({ ...form, email: event.target.value })} + /> + {error &&

{error}

} +
+ + +
+
+ ) +} + function Unavailable({ title, text }: { title: string; text: string }) { return (
From 5f69db44f7bfe9d354b0d77914a94c94257bdb44 Mon Sep 17 00:00:00 2001 From: wate Date: Wed, 30 Sep 2026 08:38:18 -0300 Subject: [PATCH 15/62] fix(admin): derive attendance name from account Co-authored-by: Codex --- backend/app/atividade/schemas.py | 2 +- backend/app/atividade/services.py | 6 +++++- frontend/src/features/admin/api.ts | 2 +- frontend/src/features/admin/components/admin-panel.tsx | 4 +++- 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/backend/app/atividade/schemas.py b/backend/app/atividade/schemas.py index e429ea6b..d69342d7 100644 --- a/backend/app/atividade/schemas.py +++ b/backend/app/atividade/schemas.py @@ -60,7 +60,7 @@ class PresencaResponse(BaseModel): class AdminPresencaCreate(BaseModel): - nome: str = Field(min_length=1, max_length=255) + nome: str | None = Field(default=None, min_length=1, max_length=255) email: EmailStr diff --git a/backend/app/atividade/services.py b/backend/app/atividade/services.py index d34f9043..feffd355 100644 --- a/backend/app/atividade/services.py +++ b/backend/app/atividade/services.py @@ -92,7 +92,7 @@ async def list_presencas(session: AsyncSession, atividade_id: UUID) -> list[Pres async def register_manual_presence( - session: AsyncSession, atividade: Atividade, nome: str, email: str + session: AsyncSession, atividade: Atividade, nome: str | None, email: str ) -> Presenca: email = email.strip().lower() existing = await session.scalar( @@ -104,6 +104,10 @@ async def register_manual_presence( return existing user = await get_user_by_email(session, email) + if user is not None: + nome = user.name + elif not nome: + raise BadRequestError("nome is required for visitors.") presence = Presenca( atividade_id=atividade.id, user_id=user.id if user else None, diff --git a/frontend/src/features/admin/api.ts b/frontend/src/features/admin/api.ts index 3340ab2a..58a8a5fa 100644 --- a/frontend/src/features/admin/api.ts +++ b/frontend/src/features/admin/api.ts @@ -172,7 +172,7 @@ export function listAdminPresencas(semanaId: number, atividadeId: string) { export function createAdminPresenca( semanaId: number, atividadeId: string, - input: { nome: string; email: string }, + input: { nome?: string; email: string }, ) { return requestApi( `/admin/semanas/${semanaId}/atividades/${atividadeId}/presencas`, diff --git a/frontend/src/features/admin/components/admin-panel.tsx b/frontend/src/features/admin/components/admin-panel.tsx index cc206c5b..b4c1d9de 100644 --- a/frontend/src/features/admin/components/admin-panel.tsx +++ b/frontend/src/features/admin/components/admin-panel.tsx @@ -990,10 +990,12 @@ function ManualPresenceForm({

Presença manual

setForm({ ...form, nome: event.target.value })} /> +

+ Para usuário cadastrado, e-mail basta. Visitante precisa de nome. +

Date: Wed, 30 Sep 2026 08:45:47 -0300 Subject: [PATCH 16/62] feat(admin): add activity attendance view Co-authored-by: Codex --- .../features/admin/components/admin-panel.tsx | 183 +++++++++++++++++- 1 file changed, 180 insertions(+), 3 deletions(-) diff --git a/frontend/src/features/admin/components/admin-panel.tsx b/frontend/src/features/admin/components/admin-panel.tsx index b4c1d9de..241d3c1b 100644 --- a/frontend/src/features/admin/components/admin-panel.tsx +++ b/frontend/src/features/admin/components/admin-panel.tsx @@ -31,25 +31,29 @@ import { deleteAdminUser, listAdminAtividades, listAdminChallenges, + listAdminPresencas, listAdminSemanas, listAdminUsers, uploadAdminChallengeImage, regenerateAdminAtividadeCode, + deleteAdminPresenca, updateAdminSemana, updateAdminUser, type AdminAtividade, type AdminChallenge, + type AdminPresenca, type AdminSemana, type AdminUser, } from '../api' -type Tab = 'overview' | 'users' | 'challenges' | 'activities' | 'points' +type Tab = 'overview' | 'users' | 'challenges' | 'semanas' | 'activities' | 'points' const tabs: { id: Tab; label: string; icon: typeof Users }[] = [ { id: 'overview', label: 'Visão geral', icon: LayoutDashboard }, { id: 'users', label: 'Usuários', icon: Users }, { id: 'challenges', label: 'Desafios', icon: Trophy }, - { id: 'activities', label: 'Semanas', icon: CalendarDays }, + { id: 'semanas', label: 'Semanas', icon: CalendarDays }, + { id: 'activities', label: 'Atividades', icon: CalendarDays }, { id: 'points', label: 'Pontuação', icon: Shield }, ] @@ -202,7 +206,7 @@ export function AdminPanel() { onDelete={removeChallenge} /> )} - {tab === 'activities' && ( + {tab === 'semanas' && ( setRefresh((value) => value + 1)} /> )} + {tab === 'activities' && ( + + )} {tab === 'points' && ( + semanas: AdminSemana[] +}) { + const allActivities = semanas.flatMap((semana) => + (atividades[semana.id] ?? []).map((atividade) => ({ atividade, semana })), + ) + const [selectedId, setSelectedId] = useState() + const [presencas, setPresencas] = useState([]) + const [loading, setLoading] = useState(false) + const [error, setError] = useState('') + const [refresh, setRefresh] = useState(0) + const selected = allActivities.find(({ atividade }) => atividade.id === selectedId) + const selectedSemanaId = selected?.semana.id + + useEffect(() => { + if (!selectedId || selectedSemanaId === undefined) { + setPresencas([]) + return + } + setLoading(true) + listAdminPresencas(selectedSemanaId, selectedId) + .then(setPresencas) + .catch((reason: Error) => setError(reason.message)) + .finally(() => setLoading(false)) + }, [refresh, selectedId, selectedSemanaId]) + + async function removePresence(presenca: AdminPresenca) { + if (!selected || !window.confirm(`Remover presença de ${presenca.nome}?`)) return + try { + await deleteAdminPresenca(selected.semana.id, selected.atividade.id, presenca.id) + setRefresh((value) => value + 1) + } catch (reason) { + setError(reason instanceof Error ? reason.message : 'Não foi possível remover.') + } + } + + return ( +
+

+ Todas atividades cadastradas. Selecione uma para administrar código e presenças. +

+ {error &&

{error}

} +
+
+ {allActivities.map(({ atividade, semana }) => ( + + ))} + {!allActivities.length && ( +

+ Nenhuma atividade cadastrada. +

+ )} +
+ + {selected ? ( +
+

+ {selected.semana.nome} · {selected.semana.ano} +

+

+ {selected.atividade.titulo || 'Sem título'} +

+ setRefresh((value) => value + 1)} + onError={setError} + semanaId={selected.semana.id} + /> +
+

Presenças ({presencas.length})

+ {loading && Carregando…} +
+
+ {presencas.map((presenca) => ( +
+
+

{presenca.nome}

+

+ {presenca.email} · {presenca.horas}h +

+
+ +
+ ))} + {!presencas.length && !loading && ( +

Nenhuma presença registrada.

+ )} +
+ setRefresh((value) => value + 1)} + semanaId={selected.semana.id} + /> +
+ ) : ( +
+ Selecione uma atividade. +
+ )} +
+
+ ) +} + +function ActivityCodeAction({ + atividade, + semanaId, + onChanged, + onError, +}: { + atividade: AdminAtividade + semanaId: number + onChanged: () => void + onError: (message: string) => void +}) { + const [code, setCode] = useState(atividade.codigo) + + async function regenerate() { + if (!window.confirm('O código anterior deixará de funcionar. Continuar?')) return + try { + const updated = await regenerateAdminAtividadeCode(semanaId, atividade.id) + setCode(updated.codigo) + onChanged() + } catch (reason) { + onError( + reason instanceof Error ? reason.message : 'Não foi possível regenerar o código.', + ) + } + } + + return ( +
+
+

Código

+

{code}

+
+ +
+ ) +} + function ActivityForm({ semanaId, onDone }: { semanaId: number; onDone: () => void }) { const [form, setForm] = useState({ tipo: 'palestra' as AdminAtividade['tipo'], From 7a0e73d6d3021c063ddad60222a2619e6601ccbf Mon Sep 17 00:00:00 2001 From: wate Date: Wed, 30 Sep 2026 08:57:43 -0300 Subject: [PATCH 17/62] feat(profile): show attendance participation Co-authored-by: Codex --- backend/app/semana/routes.py | 10 ++ backend/app/semana/schemas.py | 14 +++ backend/app/semana/services.py | 58 ++++++++++++ .../profile/components/profile-page.tsx | 94 +++++++++++++++---- frontend/src/features/semana/api.ts | 16 ++++ 5 files changed, 176 insertions(+), 16 deletions(-) diff --git a/backend/app/semana/routes.py b/backend/app/semana/routes.py index e970c474..78d05c66 100644 --- a/backend/app/semana/routes.py +++ b/backend/app/semana/routes.py @@ -89,6 +89,16 @@ async def list_semanas(session: Annotated[AsyncSession, Depends(get_session)]): return await services.list_semanas(session) +@router.get("/participacao", response_model=schemas.ParticipationResponse) +async def get_my_participation( + session: Annotated[AsyncSession, Depends(get_session)], + current_user: Annotated[ + User, Security(get_current_user, scopes=[Scope.PROFILE, Scope.EMAIL]) + ], +): + return await services.get_user_participation(session, current_user.id) + + @router.post( "/{semana_id}/join", response_model=schemas.SemanaParticipantResponse, diff --git a/backend/app/semana/schemas.py b/backend/app/semana/schemas.py index 83b17881..be7873c7 100644 --- a/backend/app/semana/schemas.py +++ b/backend/app/semana/schemas.py @@ -56,3 +56,17 @@ class PointEventResponse(BaseModel): class PointAdjustment(BaseModel): amount: int reason: str + + +class ParticipationWeek(BaseModel): + semana_id: int + nome: str + ano: int + pontos: int + horas: int + + +class ParticipationResponse(BaseModel): + pontos: int + horas: int + semanas: list[ParticipationWeek] diff --git a/backend/app/semana/services.py b/backend/app/semana/services.py index 44d7e70f..ccbf30d1 100644 --- a/backend/app/semana/services.py +++ b/backend/app/semana/services.py @@ -2,6 +2,7 @@ from sqlalchemy.ext.asyncio import AsyncSession from sqlalchemy.orm import selectinload +from app.atividade.models import Atividade, Presenca from app.semana.models import PointEvent, Semana, SemanaParticipant from app.semana.nicknames import generate_nickname from app.users.models import User @@ -109,6 +110,63 @@ async def list_ranking(session: AsyncSession, semana_id: int): return rows.all() +async def get_user_participation(session: AsyncSession, user_id): + points_rows = await session.execute( + select( + Semana.id, + Semana.nome, + Semana.ano, + func.coalesce(func.sum(PointEvent.amount), 0).label("pontos"), + ) + .join(SemanaParticipant, SemanaParticipant.semana_id == Semana.id) + .outerjoin(PointEvent, PointEvent.semana_participant_id == SemanaParticipant.id) + .where( + SemanaParticipant.user_id == user_id, + SemanaParticipant.deleted_at.is_(None), + PointEvent.deleted_at.is_(None) | (PointEvent.id.is_(None)), + ) + .group_by(Semana.id, Semana.nome, Semana.ano) + ) + hours_rows = await session.execute( + select( + Atividade.semana_id, + func.coalesce(func.sum(Presenca.horas), 0).label("horas"), + ) + .join(Presenca, Presenca.atividade_id == Atividade.id) + .where( + Presenca.user_id == user_id, + Presenca.deleted_at.is_(None), + Atividade.deleted_at.is_(None), + ) + .group_by(Atividade.semana_id) + ) + points = {row.id: row for row in points_rows} + hours = {row.semana_id: row.horas for row in hours_rows} + semana_ids = set(points) | set(hours) + weeks = [] + for semana_id in semana_ids: + point_row = points.get(semana_id) + weeks.append( + { + "semana_id": semana_id, + "nome": point_row.nome + if point_row + else (await get_semana(session, semana_id)).nome, + "ano": point_row.ano + if point_row + else (await get_semana(session, semana_id)).ano, + "pontos": int(point_row.pontos) if point_row else 0, + "horas": int(hours.get(semana_id, 0)), + } + ) + weeks.sort(key=lambda week: week["ano"], reverse=True) + return { + "pontos": sum(week["pontos"] for week in weeks), + "horas": sum(week["horas"] for week in weeks), + "semanas": weeks, + } + + async def get_participant( session: AsyncSession, semana_id: int, participant_id ) -> SemanaParticipant | None: diff --git a/frontend/src/features/profile/components/profile-page.tsx b/frontend/src/features/profile/components/profile-page.tsx index 4a069c56..cfa7d866 100644 --- a/frontend/src/features/profile/components/profile-page.tsx +++ b/frontend/src/features/profile/components/profile-page.tsx @@ -1,11 +1,12 @@ 'use client' -import { CalendarCheck, CheckCircle2, Mail, ShieldCheck } from 'lucide-react' +import { CalendarCheck, CheckCircle2, Clock3, Mail, Trophy } from 'lucide-react' import { useRouter } from 'next/navigation' -import { useEffect } from 'react' +import { useEffect, useState } from 'react' import { Avatar, AvatarFallback } from '@/components/ui/avatar' import { useAuth } from '@/features/auth/auth-provider' +import { getMyParticipation, type Participation } from '@/features/semana/api' function initials(name: string) { return name @@ -19,11 +20,20 @@ function initials(name: string) { export function ProfilePage() { const router = useRouter() const { user, loading } = useAuth() + const [participation, setParticipation] = useState() + const [participationError, setParticipationError] = useState('') useEffect(() => { if (!loading && !user) router.replace('/semana/login') }, [loading, router, user]) + useEffect(() => { + if (!user) return + getMyParticipation() + .then(setParticipation) + .catch((reason: Error) => setParticipationError(reason.message)) + }, [user]) + if (loading || !user) { return (
@@ -64,24 +74,76 @@ export function ProfilePage() {
-
-
-
-
+
+
) } + +function ParticipationMetric({ + icon: Icon, + label, + value, +}: { + icon: typeof Trophy + label: string + value: number +}) { + return ( +
+
+ ) +} diff --git a/frontend/src/features/semana/api.ts b/frontend/src/features/semana/api.ts index 907a81ea..14068c4b 100644 --- a/frontend/src/features/semana/api.ts +++ b/frontend/src/features/semana/api.ts @@ -12,6 +12,18 @@ export type SemanaRankingEntry = { points: number } +export type Participation = { + pontos: number + horas: number + semanas: { + semana_id: number + nome: string + ano: number + pontos: number + horas: number + }[] +} + export function listSemanas() { return requestApi('/semanas') } @@ -20,6 +32,10 @@ export function getSemanaRanking(semanaId: number) { return requestApi(`/semanas/${semanaId}/ranking`) } +export function getMyParticipation() { + return requestApi('/semanas/participacao') +} + export function registerAttendance( semanaId: number, codigo: string, From 50565ffd17f9831bf01c8089dcc8a276071562ec Mon Sep 17 00:00:00 2001 From: wate Date: Wed, 30 Sep 2026 09:30:43 -0300 Subject: [PATCH 18/62] feat(schedule): connect activities to cronograma Co-authored-by: Codex --- ...d7a2c4b6e_add_activity_schedule_details.py | 37 +++ backend/app/atividade/image.py | 26 ++ backend/app/atividade/models.py | 16 +- backend/app/atividade/routes.py | 36 ++- backend/app/atividade/schemas.py | 12 + backend/app/atividade/services.py | 13 +- frontend/src/features/admin/api.ts | 29 +++ .../features/admin/components/admin-panel.tsx | 227 ++++++++++++++++-- frontend/src/features/schedule/api.ts | 55 +++++ .../schedule/components/activity-card.tsx | 82 ++++++- .../schedule/components/schedule-page.tsx | 32 ++- .../features/schedule/data/mock-schedule.ts | 57 ----- frontend/src/features/schedule/types.ts | 2 + 13 files changed, 525 insertions(+), 99 deletions(-) create mode 100644 backend/alembic/versions/9f1d7a2c4b6e_add_activity_schedule_details.py create mode 100644 backend/app/atividade/image.py create mode 100644 frontend/src/features/schedule/api.ts delete mode 100644 frontend/src/features/schedule/data/mock-schedule.ts diff --git a/backend/alembic/versions/9f1d7a2c4b6e_add_activity_schedule_details.py b/backend/alembic/versions/9f1d7a2c4b6e_add_activity_schedule_details.py new file mode 100644 index 00000000..16b8f576 --- /dev/null +++ b/backend/alembic/versions/9f1d7a2c4b6e_add_activity_schedule_details.py @@ -0,0 +1,37 @@ +"""add activity schedule details + +Revision ID: 9f1d7a2c4b6e +Revises: 508a25128b6c +""" + +from collections.abc import Sequence + +import sqlalchemy as sa + +from alembic import op + + +revision: str = "9f1d7a2c4b6e" +down_revision: str | Sequence[str] | None = "508a25128b6c" +branch_labels: str | Sequence[str] | None = None +depends_on: str | Sequence[str] | None = None + + +def upgrade() -> None: + op.add_column("atividades", sa.Column("descricao", sa.String(length=5000))) + op.add_column("atividades", sa.Column("local", sa.String(length=255))) + op.add_column( + "atividades", + sa.Column( + "palestrantes", sa.JSON(), nullable=False, server_default=sa.text("'[]'") + ), + ) + op.add_column("atividades", sa.Column("link_live", sa.String(length=500))) + op.alter_column("atividades", "palestrantes", server_default=None) + + +def downgrade() -> None: + op.drop_column("atividades", "link_live") + op.drop_column("atividades", "palestrantes") + op.drop_column("atividades", "local") + op.drop_column("atividades", "descricao") diff --git a/backend/app/atividade/image.py b/backend/app/atividade/image.py new file mode 100644 index 00000000..aa0d8e0e --- /dev/null +++ b/backend/app/atividade/image.py @@ -0,0 +1,26 @@ +from fastapi import UploadFile + +from app.core.exceptions.app_errors import BadRequestError +from app.core.storage import save_bytes + +ALLOWED_IMAGE_TYPES = { + "image/jpeg": "jpg", + "image/png": "png", + "image/webp": "webp", +} +MAX_IMAGE_BYTES = 5 * 1024 * 1024 + + +async def save_palestrante_photo(file: UploadFile) -> str: + extension = ALLOWED_IMAGE_TYPES.get(file.content_type or "") + if extension is None: + raise BadRequestError( + f"Unsupported image type: {file.content_type}. " + f"Allowed: {sorted(ALLOWED_IMAGE_TYPES)}" + ) + + contents = await file.read(MAX_IMAGE_BYTES + 1) + if len(contents) > MAX_IMAGE_BYTES: + raise BadRequestError(f"Image too large (max {MAX_IMAGE_BYTES} bytes).") + + return f"/media/{await save_bytes(contents, subdir='palestrantes', extension=extension)}" diff --git a/backend/app/atividade/models.py b/backend/app/atividade/models.py index 4ed7d487..286dedcb 100644 --- a/backend/app/atividade/models.py +++ b/backend/app/atividade/models.py @@ -5,7 +5,15 @@ from enum import StrEnum from typing import TYPE_CHECKING -from sqlalchemy import DateTime, ForeignKey, Index, Integer, String, UniqueConstraint +from sqlalchemy import ( + JSON, + DateTime, + ForeignKey, + Index, + Integer, + String, + UniqueConstraint, +) from sqlalchemy.orm import Mapped, mapped_column, relationship from app.core.mixins import TimestampsMixin, UUIDPKMixin @@ -37,6 +45,12 @@ class Atividade(Base, UUIDPKMixin, TimestampsMixin): ) tipo: Mapped[TipoAtividade] = mapped_column(nullable=False) titulo: Mapped[str] = mapped_column(String(255), default="", nullable=False) + descricao: Mapped[str | None] = mapped_column(String(5000), nullable=True) + local: Mapped[str | None] = mapped_column(String(255), nullable=True) + palestrantes: Mapped[list[dict[str, str]]] = mapped_column( + JSON, default=list, nullable=False + ) + link_live: Mapped[str | None] = mapped_column(String(500), nullable=True) status: Mapped[StatusAtividade] = mapped_column( default=StatusAtividade.PROVISORIA, nullable=False ) diff --git a/backend/app/atividade/routes.py b/backend/app/atividade/routes.py index 1e91a97b..087287f6 100644 --- a/backend/app/atividade/routes.py +++ b/backend/app/atividade/routes.py @@ -1,10 +1,11 @@ from typing import Annotated from uuid import UUID -from fastapi import APIRouter, Depends, Path, Security +from fastapi import APIRouter, Depends, File, Path, Security, UploadFile from sqlalchemy.ext.asyncio import AsyncSession from app.atividade import schemas, services +from app.atividade.image import save_palestrante_photo from app.atividade.models import Presenca from app.auth.dependencies import get_current_admin_user, get_optional_current_user from app.auth.scopes import Scope @@ -37,7 +38,7 @@ async def list_atividades( semana_id: int, session: Annotated[AsyncSession, Depends(get_session)] ): await _require_semana(session, semana_id) - return await services.list_atividades(session, semana_id) + return await services.list_atividades(session, semana_id, confirmed_only=True) @admin_router.get("", response_model=list[schemas.AtividadeResponse]) @@ -75,7 +76,36 @@ async def update_admin_atividade( atividade = await services.get_atividade(session, semana_id, atividade_id) if atividade is None: raise NotFoundError("Activity not found.") - return await services.update_atividade(session, atividade, data.model_dump()) + return await services.update_atividade( + session, atividade, data.model_dump(exclude_unset=True) + ) + + +@admin_router.put( + "/{atividade_id}/palestrantes/{palestrante_index}/foto", + response_model=schemas.AtividadeResponse, +) +async def upload_palestrante_photo( + semana_id: int, + atividade_id: UUID, + palestrante_index: int, + file: Annotated[UploadFile, File()], + session: Annotated[AsyncSession, Depends(get_session)], + _: Annotated[User, Security(get_current_admin_user, scopes=[Scope.ADMIN])], +): + atividade = await services.get_atividade(session, semana_id, atividade_id) + if atividade is None: + raise NotFoundError("Activity not found.") + if not 0 <= palestrante_index < len(atividade.palestrantes): + raise NotFoundError("Speaker not found.") + + photo_url = await save_palestrante_photo(file) + speakers = [speaker.copy() for speaker in atividade.palestrantes] + speakers[palestrante_index]["foto"] = photo_url + atividade.palestrantes = speakers + await session.commit() + await session.refresh(atividade) + return atividade @admin_router.delete("/{atividade_id}", status_code=204) diff --git a/backend/app/atividade/schemas.py b/backend/app/atividade/schemas.py index d69342d7..5e660b31 100644 --- a/backend/app/atividade/schemas.py +++ b/backend/app/atividade/schemas.py @@ -9,6 +9,10 @@ class AtividadeCreate(BaseModel): tipo: TipoAtividade titulo: str = "" + descricao: str | None = None + local: str | None = None + palestrantes: list[dict[str, str]] = Field(default_factory=list) + link_live: str | None = None comeca_as: datetime termina_as: datetime status: StatusAtividade = StatusAtividade.PROVISORIA @@ -25,6 +29,10 @@ def validate_schedule(self): class AtividadeUpdate(BaseModel): tipo: TipoAtividade | None = None titulo: str | None = None + descricao: str | None = None + local: str | None = None + palestrantes: list[dict[str, str]] | None = None + link_live: str | None = None comeca_as: datetime | None = None termina_as: datetime | None = None status: StatusAtividade | None = None @@ -39,6 +47,10 @@ class AtividadeResponse(BaseModel): semana_id: int tipo: TipoAtividade titulo: str + descricao: str | None + local: str | None + palestrantes: list[dict[str, str]] + link_live: str | None status: StatusAtividade comeca_as: datetime termina_as: datetime diff --git a/backend/app/atividade/services.py b/backend/app/atividade/services.py index feffd355..ee814267 100644 --- a/backend/app/atividade/services.py +++ b/backend/app/atividade/services.py @@ -13,11 +13,14 @@ from app.users.services import get_user_by_email -async def list_atividades(session: AsyncSession, semana_id: int) -> list[Atividade]: +async def list_atividades( + session: AsyncSession, semana_id: int, confirmed_only: bool = False +) -> list[Atividade]: + filters = [Atividade.semana_id == semana_id] + if confirmed_only: + filters.append(Atividade.status == StatusAtividade.CONFIRMADA) result = await session.scalars( - select(Atividade) - .where(Atividade.semana_id == semana_id) - .order_by(Atividade.comeca_as) + select(Atividade).where(*filters).order_by(Atividade.comeca_as) ) return list(result.all()) @@ -155,7 +158,7 @@ async def delete_presence(session: AsyncSession, presence: Presenca) -> None: async def update_atividade( session: AsyncSession, atividade: Atividade, fields: dict ) -> Atividade: - values = {key: value for key, value in fields.items() if value is not None} + values = fields starts = values.get("comeca_as", atividade.comeca_as) ends = values.get("termina_as", atividade.termina_as) if ends <= starts: diff --git a/frontend/src/features/admin/api.ts b/frontend/src/features/admin/api.ts index 58a8a5fa..2bdb8770 100644 --- a/frontend/src/features/admin/api.ts +++ b/frontend/src/features/admin/api.ts @@ -32,6 +32,10 @@ export type AdminAtividade = { semana_id: number tipo: 'palestra' | 'workshop' | 'encerramento' | 'conversa' | 'coffee_break' titulo: string + descricao: string | null + local: string | null + palestrantes: { nome: string; sobre?: string; foto?: string }[] + link_live: string | null status: 'provisoria' | 'confirmada' comeca_as: string termina_as: string @@ -150,6 +154,17 @@ export function createAdminAtividade( }) } +export function updateAdminAtividade( + semanaId: number, + id: string, + input: Omit, +) { + return requestApi(`/admin/semanas/${semanaId}/atividades/${id}`, { + method: 'PATCH', + body: JSON.stringify(input), + }) +} + export function deleteAdminAtividade(semanaId: number, id: string) { return requestApi(`/admin/semanas/${semanaId}/atividades/${id}`, { method: 'DELETE', @@ -163,6 +178,20 @@ export function regenerateAdminAtividadeCode(semanaId: number, id: string) { ) } +export function uploadAdminPalestrantePhoto( + semanaId: number, + atividadeId: string, + palestranteIndex: number, + file: File, +) { + const formData = new FormData() + formData.append('file', file) + return requestApi( + `/admin/semanas/${semanaId}/atividades/${atividadeId}/palestrantes/${palestranteIndex}/foto`, + { method: 'PUT', body: formData }, + ) +} + export function listAdminPresencas(semanaId: number, atividadeId: string) { return requestApi( `/admin/semanas/${semanaId}/atividades/${atividadeId}/presencas`, diff --git a/frontend/src/features/admin/components/admin-panel.tsx b/frontend/src/features/admin/components/admin-panel.tsx index 241d3c1b..8ebd3489 100644 --- a/frontend/src/features/admin/components/admin-panel.tsx +++ b/frontend/src/features/admin/components/admin-panel.tsx @@ -35,10 +35,12 @@ import { listAdminSemanas, listAdminUsers, uploadAdminChallengeImage, + uploadAdminPalestrantePhoto, regenerateAdminAtividadeCode, deleteAdminPresenca, updateAdminSemana, updateAdminUser, + updateAdminAtividade, type AdminAtividade, type AdminChallenge, type AdminPresenca, @@ -939,27 +941,98 @@ function ActivityCodeAction({ ) } -function ActivityForm({ semanaId, onDone }: { semanaId: number; onDone: () => void }) { - const [form, setForm] = useState({ - tipo: 'palestra' as AdminAtividade['tipo'], - titulo: '', - comeca_as: '', - termina_as: '', - status: 'provisoria' as AdminAtividade['status'], - pontos: 0, - horas: 1, - }) +type ActivityFormSpeaker = { + nome: string + sobre: string + foto: File | null + fotoUrl?: string +} + +type ActivityFormState = { + tipo: AdminAtividade['tipo'] + titulo: string + descricao: string + local: string + palestrantes: ActivityFormSpeaker[] + link_live: string + comeca_as: string + termina_as: string + status: AdminAtividade['status'] + pontos: number + horas: number +} + +function localDateTime(value: string) { + const date = new Date(value) + const pad = (part: number) => String(part).padStart(2, '0') + return `${date.getFullYear()}-${pad(date.getMonth() + 1)}-${pad(date.getDate())}T${pad(date.getHours())}:${pad(date.getMinutes())}` +} + +function activityFormState(atividade?: AdminAtividade): ActivityFormState { + return { + tipo: atividade?.tipo ?? 'palestra', + titulo: atividade?.titulo ?? '', + descricao: atividade?.descricao ?? '', + local: atividade?.local ?? '', + palestrantes: atividade?.palestrantes.length + ? atividade.palestrantes.map((speaker) => ({ + nome: speaker.nome, + sobre: speaker.sobre ?? '', + foto: null, + fotoUrl: speaker.foto, + })) + : [{ nome: '', sobre: '', foto: null }], + link_live: atividade?.link_live ?? '', + comeca_as: atividade ? localDateTime(atividade.comeca_as) : '', + termina_as: atividade ? localDateTime(atividade.termina_as) : '', + status: atividade?.status ?? 'provisoria', + pontos: atividade?.pontos ?? 0, + horas: atividade?.horas ?? 1, + } +} + +function ActivityForm({ + semanaId, + atividade, + onDone, +}: { + semanaId: number + atividade?: AdminAtividade + onDone: () => void +}) { + const [form, setForm] = useState(() => activityFormState(atividade)) const [error, setError] = useState('') async function submit(event: React.FormEvent) { event.preventDefault() setError('') try { - await createAdminAtividade(semanaId, { - ...form, + const speakers = form.palestrantes.filter((speaker) => speaker.nome.trim()) + const input = { + tipo: form.tipo, + titulo: form.titulo, + descricao: form.descricao || null, + local: form.local || null, + palestrantes: speakers.map(({ nome, sobre, fotoUrl }) => ({ + nome, + sobre, + ...(fotoUrl ? { foto: fotoUrl } : {}), + })), + link_live: form.link_live || null, + status: form.status, + pontos: form.pontos, + horas: form.horas, comeca_as: new Date(form.comeca_as).toISOString(), termina_as: new Date(form.termina_as).toISOString(), - }) + } + const 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) + } + } onDone() } catch (reason) { setError( @@ -980,6 +1053,94 @@ function ActivityForm({ semanaId, onDone }: { semanaId: number; onDone: () => vo value={form.titulo} onChange={(event) => setForm({ ...form, titulo: event.target.value })} /> +