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() {
- Conta verificada
+
+ {user.isVerified ? 'Conta verificada' : 'Verificação pendente'}
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 (
-
-
- {dots.map((dot) => (
-
- ))}
+
+
+
+ Semana da Computação 2026
+
+
+ Em breve
+
+
+ Estamos preparando uma nova edição do evento. Conheça a página inicial para
+ acompanhar as novidades.
+
+
setStarting(true)}>
+ {starting ? 'Carregando…' : 'Começar'}
+
-
-
-
-
-
-
- SYMCOMP
-
-
- Apresenta
-
-
-
-
-
-
- {/* Previous CSS-drawn button retained for reference:
-
setIsLoading(true)}
- type="button"
- >
-
- Começar
-
- */}
- {isLoading ? (
-
-
- CARREGANDO...
-
-
-
- {loadingSegments.map((segment) => (
-
- ))}
-
-
-
- ) : (
-
setIsLoading(true)}
- type="button"
- >
-
-
- )}
-
-
-
-
)
}
diff --git a/frontend/src/features/semana/components/semana-button.tsx b/frontend/src/features/semana/components/semana-button.tsx
index 1248c1ee..9d48700b 100644
--- a/frontend/src/features/semana/components/semana-button.tsx
+++ b/frontend/src/features/semana/components/semana-button.tsx
@@ -5,7 +5,7 @@ export function SemanaButton({ className, ...props }: ButtonProps) {
return (
- Semana da Computação
+ Semana da Computação 2026
- Uma nova experiência da SymComp está em construção. Datas, programação e
- inscrições serão divulgadas em breve.
+ 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.
-
-
- Ver programação
-
-
- Criar conta
-
-
+
+ Entrar
+
)
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 (
-
-
-
- Dados da conta
-
- O perfil básico já está preparado para receber os dados do endpoint de usuário
- atual.
-
-
-
+
+
Participação no evento
-
- Presenças, certificados e pontuação aparecerão aqui quando esses recursos
- estiverem disponíveis.
-
+ {participationError ? (
+
+ {participationError}
+
+ ) : participation ? (
+ <>
+
+
+ {participation.semanas.map((semana) => (
+
+
+
+ {semana.nome} ({semana.ano})
+
+
+ {semana.pontos} pts · {semana.horas}h
+
+
+
+ ))}
+ {!participation.semanas.length && (
+
+ Nenhuma participação registrada.
+
+ )}
+
+ >
+ ) : (
+
+ Carregando participação…
+
+ )}
)
}
+
+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 })}
/>
+
-
-
-
+
+ setEditing((value) => !value)}
+ size="sm"
+ type="button"
+ variant="outline"
+ >
+ {editing ? 'Cancelar' : 'Editar'}
+
+
+
+
+
+ {editing && (
+ {
+ setEditing(false)
+ onChanged()
+ }}
+ semanaId={semanaId}
+ />
+ )}
diff --git a/frontend/src/features/schedule/api.ts b/frontend/src/features/schedule/api.ts
new file mode 100644
index 00000000..a6783f66
--- /dev/null
+++ b/frontend/src/features/schedule/api.ts
@@ -0,0 +1,55 @@
+import { requestApi } from '@/features/auth/api'
+import type { Semana } from '@/features/semana/api'
+
+import type { Activity } from './types'
+
+type ApiActivity = {
+ id: string
+ tipo: 'palestra' | 'workshop' | 'encerramento' | 'conversa' | 'coffee_break'
+ titulo: string
+ descricao: string | null
+ local: string | null
+ palestrantes: { nome: string; sobre?: string; foto?: string }[]
+ comeca_as: string
+ termina_as: string
+ link_live: string | null
+}
+
+export function listScheduleWeeks() {
+ return requestApi('/semanas')
+}
+
+export function listScheduleActivities(semanaId: number) {
+ return requestApi(`/semanas/${semanaId}/atividades`)
+}
+
+function mediaUrl(path: string) {
+ if (path.startsWith('http')) return path
+ return `${process.env.NEXT_PUBLIC_API_URL ?? ''}${path}`
+}
+
+export function mapActivity(activity: ApiActivity) {
+ const typeByActivity: Record = {
+ palestra: 'talk',
+ workshop: 'talk',
+ encerramento: 'closing',
+ conversa: 'conversation',
+ coffee_break: 'coffee_break',
+ }
+
+ return {
+ uid: activity.id,
+ type: typeByActivity[activity.tipo],
+ title: activity.titulo,
+ description: activity.descricao ?? undefined,
+ speakers: activity.palestrantes.map((speaker) => ({
+ name: speaker.nome,
+ bio: speaker.sobre,
+ photo: speaker.foto ? mediaUrl(speaker.foto) : undefined,
+ })),
+ startsAt: activity.comeca_as,
+ endsAt: activity.termina_as,
+ location: activity.local ?? undefined,
+ liveUrl: activity.link_live ?? undefined,
+ } as const
+}
diff --git a/frontend/src/features/schedule/components/activity-card.tsx b/frontend/src/features/schedule/components/activity-card.tsx
index a11e763b..687b25cc 100644
--- a/frontend/src/features/schedule/components/activity-card.tsx
+++ b/frontend/src/features/schedule/components/activity-card.tsx
@@ -6,9 +6,18 @@ import {
MessageCircle,
Presentation,
Users,
+ Youtube,
} from 'lucide-react'
import { SemanaButton } from '@/features/semana/components/semana-button'
+import {
+ Dialog,
+ DialogContent,
+ DialogDescription,
+ DialogHeader,
+ DialogTitle,
+ DialogTrigger,
+} from '@/components/ui/dialog'
import { googleCalendarUrl } from '../calendar'
import type { Activity, ActivityType } from '../types'
@@ -69,15 +78,72 @@ export function ActivityCard({ activity }: { activity: Activity }) {
{activity.description}
)}
-
-
- Adicionar à
- agenda
+ {activity.liveUrl && (
+
+ Assistir transmissão
-
+ )}
+
+
+
+ Adicionar à
+ agenda
+
+
+ {(activity.description ||
+ activity.speakers.some((speaker) => speaker.bio || speaker.photo)) && (
+
+
+
+ Saber mais
+
+
+
+
+ {activity.title}
+
+ {activity.speakers.map((speaker) => speaker.name).join(', ')}
+
+
+ {activity.description && (
+ {activity.description}
+ )}
+
+ {activity.speakers.map(
+ (speaker) =>
+ (speaker.bio || speaker.photo) && (
+
+ {speaker.photo && (
+
+ )}
+
+
{speaker.name}
+ {speaker.bio && (
+
+ {speaker.bio}
+
+ )}
+
+
+ ),
+ )}
+
+
+
+ )}
+
diff --git a/frontend/src/features/schedule/components/schedule-page.tsx b/frontend/src/features/schedule/components/schedule-page.tsx
index c83f585b..67b9b545 100644
--- a/frontend/src/features/schedule/components/schedule-page.tsx
+++ b/frontend/src/features/schedule/components/schedule-page.tsx
@@ -1,4 +1,11 @@
-import { mockSchedule } from '../data/mock-schedule'
+'use client'
+
+import { useEffect, useState } from 'react'
+
+import { SEMANA_YEAR } from '@/features/semana/config'
+
+import { listScheduleActivities, listScheduleWeeks, mapActivity } from '../api'
+import type { Activity } from '../types'
import { ActivityCard } from './activity-card'
const dayFormatter = new Intl.DateTimeFormat('pt-BR', {
@@ -13,7 +20,23 @@ const weekdayFormatter = new Intl.DateTimeFormat('pt-BR', {
})
export function SchedulePage() {
- const days = Map.groupBy(mockSchedule, (activity) => activity.startsAt.slice(0, 10))
+ const [activities, setActivities] = useState([])
+ const [loading, setLoading] = useState(true)
+ const [error, setError] = useState('')
+
+ useEffect(() => {
+ listScheduleWeeks()
+ .then((weeks) => {
+ const week = weeks.find((item) => item.ano === SEMANA_YEAR)
+ if (!week) throw new Error('Semana da Computação 2026 não encontrada.')
+ return listScheduleActivities(week.id)
+ })
+ .then((items) => setActivities(items.map(mapActivity)))
+ .catch((reason: Error) => setError(reason.message))
+ .finally(() => setLoading(false))
+ }, [])
+
+ const days = Map.groupBy(activities, (activity) => activity.startsAt.slice(0, 10))
return (
@@ -25,10 +48,13 @@ export function SchedulePage() {
Programação
- Uma prévia da programação. Horários e participantes ainda podem mudar.
+ Confira palestras, conversas e atividades da Semana da Computação.
+ {loading && Carregando programação…
}
+ {error && {error}
}
+ {!loading && !error && !activities.length && Programação em breve.
}
{[...days.entries()].map(([date, activities]) => {
const day = new Date(`${date}T12:00:00-03:00`)
diff --git a/frontend/src/features/schedule/data/mock-schedule.ts b/frontend/src/features/schedule/data/mock-schedule.ts
deleted file mode 100644
index c800dd05..00000000
--- a/frontend/src/features/schedule/data/mock-schedule.ts
+++ /dev/null
@@ -1,57 +0,0 @@
-import type { Activity } from '../types'
-
-export const mockSchedule: Activity[] = [
- {
- uid: 'programacao-01',
- type: 'talk',
- title: 'Construindo tecnologia com impacto',
- description:
- 'Uma conversa sobre escolhas técnicas, colaboração e os caminhos entre a universidade e o mercado.',
- speakers: [
- { name: 'Marina Silva', bio: 'Engenheira de software e ex-aluna do IME-USP.' },
- ],
- startsAt: '2026-10-19T13:00:00-03:00',
- endsAt: '2026-10-19T14:00:00-03:00',
- location: 'Auditório Jacy Monteiro',
- },
- {
- uid: 'programacao-02',
- type: 'coffee_break',
- title: 'Coffee break',
- speakers: [],
- startsAt: '2026-10-19T14:00:00-03:00',
- endsAt: '2026-10-19T14:30:00-03:00',
- location: 'Saguão do Bloco B',
- },
- {
- uid: 'programacao-03',
- type: 'conversation',
- title: 'Pesquisa em computação: por onde começar?',
- description:
- 'Pesquisadores compartilham experiências de iniciação científica, pós-graduação e carreira acadêmica.',
- speakers: [{ name: 'Rafael Costa' }, { name: 'Ana Pereira' }],
- startsAt: '2026-10-19T14:30:00-03:00',
- endsAt: '2026-10-19T15:30:00-03:00',
- location: 'Auditório Jacy Monteiro',
- },
- {
- uid: 'programacao-04',
- type: 'talk',
- title: 'Inteligência artificial além do hype',
- description:
- 'Fundamentos, limitações e decisões responsáveis ao colocar modelos de IA em produção.',
- speakers: [{ name: 'Beatriz Almeida' }],
- startsAt: '2026-10-20T13:00:00-03:00',
- endsAt: '2026-10-20T14:00:00-03:00',
- location: 'Auditório Jacy Monteiro',
- },
- {
- uid: 'programacao-05',
- type: 'closing',
- title: 'Encerramento e próximos passos',
- speakers: [{ name: 'Equipe SymComp' }],
- startsAt: '2026-10-20T17:00:00-03:00',
- endsAt: '2026-10-20T17:30:00-03:00',
- location: 'Auditório Jacy Monteiro',
- },
-]
diff --git a/frontend/src/features/schedule/types.ts b/frontend/src/features/schedule/types.ts
index ec060458..f89bc63a 100644
--- a/frontend/src/features/schedule/types.ts
+++ b/frontend/src/features/schedule/types.ts
@@ -3,6 +3,7 @@ export type ActivityType = 'talk' | 'conversation' | 'closing' | 'coffee_break'
export type Speaker = {
name: string
bio?: string
+ photo?: string
}
export type Activity = {
@@ -14,4 +15,5 @@ export type Activity = {
startsAt: string
endsAt: string
location?: string
+ liveUrl?: string
}
From 3d137543ddad1e0f3e5214fbdbfd0de936313acb Mon Sep 17 00:00:00 2001
From: Sara Abe
Date: Wed, 30 Sep 2026 15:10:09 -0300
Subject: [PATCH 19/62] feat(semana): add about us page
Add the public /semana/sobre-nos route with the SymComp, Semana and
projects content from the 2025 site. Use the hamburger menu at every
screen size so the extra link no longer overlaps the centered logo.
Co-Authored-By: Claude Opus 5.5
---
.../src/app/semana/(site)/sobre-nos/page.tsx | 13 ++
frontend/src/app/sitemap.ts | 6 +
.../features/semana/components/about-page.tsx | 117 ++++++++++++++++++
.../semana/components/semana-shell.tsx | 66 +---------
4 files changed, 140 insertions(+), 62 deletions(-)
create mode 100644 frontend/src/app/semana/(site)/sobre-nos/page.tsx
create mode 100644 frontend/src/features/semana/components/about-page.tsx
diff --git a/frontend/src/app/semana/(site)/sobre-nos/page.tsx b/frontend/src/app/semana/(site)/sobre-nos/page.tsx
new file mode 100644
index 00000000..0dccd8c8
--- /dev/null
+++ b/frontend/src/app/semana/(site)/sobre-nos/page.tsx
@@ -0,0 +1,13 @@
+import type { Metadata } from 'next'
+
+import { AboutPage } from '@/features/semana/components/about-page'
+
+export const metadata: Metadata = {
+ title: 'Sobre nós | Semana da Computação',
+ description:
+ 'Conheça a SymComp, grupo de extensão do IME USP que organiza a Semana da Computação e o ByteCafé.',
+}
+
+export default function SobreNosPage() {
+ return
+}
diff --git a/frontend/src/app/sitemap.ts b/frontend/src/app/sitemap.ts
index 8cf0a8ac..b6e267e7 100755
--- a/frontend/src/app/sitemap.ts
+++ b/frontend/src/app/sitemap.ts
@@ -14,5 +14,11 @@ export default function sitemap(): MetadataRoute.Sitemap {
changeFrequency: 'weekly',
priority: 1,
},
+ {
+ url: 'https://symcomp.ime.usp.br/semana/sobre-nos',
+ lastModified: new Date(),
+ changeFrequency: 'monthly',
+ priority: 0.7,
+ },
]
}
diff --git a/frontend/src/features/semana/components/about-page.tsx b/frontend/src/features/semana/components/about-page.tsx
new file mode 100644
index 00000000..4b9aff9d
--- /dev/null
+++ b/frontend/src/features/semana/components/about-page.tsx
@@ -0,0 +1,117 @@
+import Image from 'next/image'
+import Link from 'next/link'
+
+const projects = [
+ {
+ label: 'Semana da Computação',
+ href: '/semana',
+ imageUrl: '/logo/sc.png',
+ imageWidth: 1080,
+ imageHeight: 1080,
+ description:
+ 'Anualmente reunimos alunos da graduação e visitantes para participar de uma semana de palestras, competições, brindes, networking e coffee breaks.',
+ },
+ {
+ label: 'ByteCafé',
+ href: '/bytecafe',
+ imageUrl: '/logo/bc.png',
+ imageWidth: 477,
+ imageHeight: 592,
+ description:
+ 'Duas vezes por semestre convidamos alunos do Ensino Médio para conhecer a USP e o curso de Ciência da Computação.',
+ },
+]
+
+const sectionTitle =
+ 'mb-5 border-b-[6px] border-[hsl(var(--semana-contrast))] pb-3 font-[family-name:var(--font-semana-display)] text-2xl font-bold uppercase'
+
+export function AboutPage() {
+ return (
+
+
+
+ Semana da Computação
+
+
+ Sobre nós
+
+
+ Organizando eventos sobre computação, aproximando a comunidade interna e externa
+ do curso de Bacharelado em Ciência da Computação da USP Butantã.
+
+
+
+
+
+
+ Quem somos
+
+
+ A SymComp, Simpósio da Computação, é um grupo de extensão originado em 2023 a
+ partir da comissão responsável pela Semana da Computação do Instituto de
+ Matemática e Estatística da Universidade de São Paulo (IME USP). O grupo
+ surgiu com o propósito de fortalecer a presença do curso de Ciência da
+ Computação não apenas dentro da comunidade uspiana, mas também na comunidade
+ externa, promovendo eventos e atividades relacionadas a essa ciência tão
+ essencial e relevante na atualidade.
+
+
+
+
+
+ A Semana da Computação
+
+
+
+ A Semana da Computação do IME USP é um dos maiores eventos estudantis de
+ tecnologia e inovação do Brasil. Organizada por alunos do Instituto de
+ Matemática e Estatística da Universidade de São Paulo, reúne palestras,
+ workshops, minicursos e painéis sobre ciência da computação, inteligência
+ artificial, segurança da informação, desenvolvimento de software, design de
+ sistemas e carreira em tecnologia.
+
+
+ O evento conecta estudantes, pesquisadores e profissionais da área,
+ promovendo troca de conhecimento, networking e contato direto com as
+ tendências mais atuais do mercado.
+
+
+
+
+
+
+ Nossos projetos
+
+
+ {projects.map((project) => (
+
+
+
+
+
+ {project.label}
+
+ {project.description}
+
+ Conhecer
+
+
+ ))}
+
+
+
+
+ )
+}
diff --git a/frontend/src/features/semana/components/semana-shell.tsx b/frontend/src/features/semana/components/semana-shell.tsx
index 7d5291f1..173caa6b 100644
--- a/frontend/src/features/semana/components/semana-shell.tsx
+++ b/frontend/src/features/semana/components/semana-shell.tsx
@@ -1,17 +1,11 @@
'use client'
-import { Menu, UserRound } from 'lucide-react'
+import { Menu } 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,
@@ -30,6 +24,7 @@ const links = [
{ href: '/semana/inicio', label: 'Início' },
{ href: '/semana/cronograma', label: 'Programação' },
{ href: '/semana/presenca', label: 'Presença' },
+ { href: '/semana/sobre-nos', label: 'Sobre nós' },
]
export function SemanaShell({ children }: { children: ReactNode }) {
@@ -76,64 +71,11 @@ function SemanaShellContent({ children }: { children: ReactNode }) {
-
- {links.map((link) => (
-
- {link.label}
-
- ))}
- {user && (
-
- Ranking
-
- )}
- {!loading &&
- (user ? (
-
-
-
-
-
-
-
-
- Perfil
-
- Sair
-
-
- ) : (
-
- Entrar
-
- ))}
-
-
@@ -146,7 +88,7 @@ function SemanaShellContent({ children }: { children: ReactNode }) {
Semana da Computação
-
+
{links.map((link) => (
Date: Wed, 30 Sep 2026 16:04:25 -0300
Subject: [PATCH 20/62] fix(schedule): define the Semana edition year
The schedule page imports SEMANA_YEAR from the Semana config, but the
constant was never added, which breaks the TypeScript check and build.
Co-Authored-By: Claude Opus 5.5
---
frontend/src/features/semana/config.ts | 3 +++
1 file changed, 3 insertions(+)
diff --git a/frontend/src/features/semana/config.ts b/frontend/src/features/semana/config.ts
index 3aee4ba1..144d306c 100644
--- a/frontend/src/features/semana/config.ts
+++ b/frontend/src/features/semana/config.ts
@@ -1,2 +1,5 @@
// Set to false when the complete event website is ready to be published.
export const SEMANA_PREVIEW_MODE = true
+
+// Edition shown by pages that load event data from the API.
+export const SEMANA_YEAR = 2026
From 12041cb06db0d75cc0d46f700f3e11e88d51bac1 Mon Sep 17 00:00:00 2001
From: Sara Abe
Date: Wed, 30 Sep 2026 16:04:25 -0300
Subject: [PATCH 21/62] feat(semana): rewrite about page for 2026
Replace the 2025 content with the SymComp presentation for the 16th
edition: edition logo, group description, social links and a call to
join the group. External links open in a new tab, and the page keeps the
Semana layout title.
The Facebook and join links are placeholders until the official URLs
are provided.
Co-Authored-By: Claude Opus 5.5
---
.../src/app/semana/(site)/sobre-nos/page.tsx | 3 +-
.../features/semana/components/about-page.tsx | 150 +++++++-----------
2 files changed, 56 insertions(+), 97 deletions(-)
diff --git a/frontend/src/app/semana/(site)/sobre-nos/page.tsx b/frontend/src/app/semana/(site)/sobre-nos/page.tsx
index 0dccd8c8..1e1d12c5 100644
--- a/frontend/src/app/semana/(site)/sobre-nos/page.tsx
+++ b/frontend/src/app/semana/(site)/sobre-nos/page.tsx
@@ -3,9 +3,8 @@ import type { Metadata } from 'next'
import { AboutPage } from '@/features/semana/components/about-page'
export const metadata: Metadata = {
- title: 'Sobre nós | Semana da Computação',
description:
- 'Conheça a SymComp, grupo de extensão do IME USP que organiza a Semana da Computação e o ByteCafé.',
+ 'A SymComp é um grupo de extensão do IME USP formado por alunos da graduação que dissemina a computação dentro e fora da universidade.',
}
export default function SobreNosPage() {
diff --git a/frontend/src/features/semana/components/about-page.tsx b/frontend/src/features/semana/components/about-page.tsx
index 4b9aff9d..9e6035f7 100644
--- a/frontend/src/features/semana/components/about-page.tsx
+++ b/frontend/src/features/semana/components/about-page.tsx
@@ -1,116 +1,76 @@
import Image from 'next/image'
-import Link from 'next/link'
+import { BsFacebook, BsInstagram, BsLinkedin } from 'react-icons/bs'
-const projects = [
+import { SemanaButton } from './semana-button'
+
+// TODO: substituir pelas URLs oficiais do Facebook e do formulário de entrada.
+const FACEBOOK_URL = '#'
+const JOIN_URL = '#'
+
+const socialLinks = [
{
- label: 'Semana da Computação',
- href: '/semana',
- imageUrl: '/logo/sc.png',
- imageWidth: 1080,
- imageHeight: 1080,
- description:
- 'Anualmente reunimos alunos da graduação e visitantes para participar de uma semana de palestras, competições, brindes, networking e coffee breaks.',
+ label: 'Instagram da SymComp',
+ href: 'https://www.instagram.com/symcomp.imeusp/',
+ icon: BsInstagram,
},
{
- label: 'ByteCafé',
- href: '/bytecafe',
- imageUrl: '/logo/bc.png',
- imageWidth: 477,
- imageHeight: 592,
- description:
- 'Duas vezes por semestre convidamos alunos do Ensino Médio para conhecer a USP e o curso de Ciência da Computação.',
+ label: 'LinkedIn da SymComp',
+ href: 'https://www.linkedin.com/company/symcompimeusp',
+ icon: BsLinkedin,
},
+ { label: 'Facebook da SymComp', href: FACEBOOK_URL, icon: BsFacebook },
]
-const sectionTitle =
- 'mb-5 border-b-[6px] border-[hsl(var(--semana-contrast))] pb-3 font-[family-name:var(--font-semana-display)] text-2xl font-bold uppercase'
-
export function AboutPage() {
return (
-
-
- Semana da Computação
-
+
- Sobre nós
+ Quem somos?
-
- Organizando eventos sobre computação, aproximando a comunidade interna e externa
- do curso de Bacharelado em Ciência da Computação da USP Butantã.
+
+ Conheça o grupo de extensão SymComp, responsável pela 16ª Semana da Computação.
-
-
-
-
- Quem somos
-
-
- A SymComp, Simpósio da Computação, é um grupo de extensão originado em 2023 a
- partir da comissão responsável pela Semana da Computação do Instituto de
- Matemática e Estatística da Universidade de São Paulo (IME USP). O grupo
- surgiu com o propósito de fortalecer a presença do curso de Ciência da
- Computação não apenas dentro da comunidade uspiana, mas também na comunidade
- externa, promovendo eventos e atividades relacionadas a essa ciência tão
- essencial e relevante na atualidade.
-
-
+
-
-
- A Semana da Computação
-
-
-
- A Semana da Computação do IME USP é um dos maiores eventos estudantis de
- tecnologia e inovação do Brasil. Organizada por alunos do Instituto de
- Matemática e Estatística da Universidade de São Paulo, reúne palestras,
- workshops, minicursos e painéis sobre ciência da computação, inteligência
- artificial, segurança da informação, desenvolvimento de software, design de
- sistemas e carreira em tecnologia.
-
-
- O evento conecta estudantes, pesquisadores e profissionais da área,
- promovendo troca de conhecimento, networking e contato direto com as
- tendências mais atuais do mercado.
-
-
-
+
+ SymComp
+
+
+ Somos um grupo de extensão do Instituto de Matemática e Estatística da USP
+ formado por alunos da graduação. Nossa missão é disseminar a computação para a
+ comunidade externa e interna da universidade. Venha fazer parte do grupo também!
+
-
-
- Nossos projetos
-
-
-
+
+
+
+ ))}
+
+
+
+
+ Venha fazer parte
+
+
)
From e36479453371f6154391484823611a40c60a23c2 Mon Sep 17 00:00:00 2001
From: Sara Abe
Date: Wed, 30 Sep 2026 16:23:15 -0300
Subject: [PATCH 22/62] fix(backend): restore lint and test suite on dev
Apply ruff format and import sorting to files that reached dev without
them, which failed the backend CI.
Compare the app environment with AppEnv.production when deleting the
refresh cookie on logout, as the cookie builder already does. Reading
.value broke whenever app_env was a plain string, as in the tests.
Clear the test client cookies before replaying the rotated refresh token.
Since the cookie is no longer secure in dev, the client kept the new
token and sent both, so the replay test no longer exercised the old one.
Co-Authored-By: Claude Opus 5.5
---
.../9f1d7a2c4b6e_add_activity_schedule_details.py | 1 -
backend/app/auth/routes.py | 3 ++-
backend/app/challenges/services/challenge.py | 4 +++-
.../app/tests/auth/integration/test_auth_routes.py | 11 ++++++-----
backend/app/users/models.py | 1 +
5 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/backend/alembic/versions/9f1d7a2c4b6e_add_activity_schedule_details.py b/backend/alembic/versions/9f1d7a2c4b6e_add_activity_schedule_details.py
index 16b8f576..98c90f15 100644
--- a/backend/alembic/versions/9f1d7a2c4b6e_add_activity_schedule_details.py
+++ b/backend/alembic/versions/9f1d7a2c4b6e_add_activity_schedule_details.py
@@ -10,7 +10,6 @@
from alembic import op
-
revision: str = "9f1d7a2c4b6e"
down_revision: str | Sequence[str] | None = "508a25128b6c"
branch_labels: str | Sequence[str] | None = None
diff --git a/backend/app/auth/routes.py b/backend/app/auth/routes.py
index 44a984df..ab4d3a55 100644
--- a/backend/app/auth/routes.py
+++ b/backend/app/auth/routes.py
@@ -8,6 +8,7 @@
from app.auth.dependencies import get_current_user
from app.auth.schemas import RequestedScopesBody, Token
from app.auth.scopes import DEFAULT_SCOPES, KNOWN_SCOPES, Scope
+from app.core.config import AppEnv
from app.core.database import get_session
from app.core.exceptions.app_errors import ForbiddenError, UnauthorizedError
from app.users import services as user_services
@@ -113,6 +114,6 @@ async def logout(
response.delete_cookie(
key="refresh_token",
httponly=True,
- secure=services.get_settings().app_env.value == "prod",
+ secure=services.get_settings().app_env == AppEnv.production,
samesite="lax",
)
diff --git a/backend/app/challenges/services/challenge.py b/backend/app/challenges/services/challenge.py
index 9ec4c682..9292dc73 100644
--- a/backend/app/challenges/services/challenge.py
+++ b/backend/app/challenges/services/challenge.py
@@ -144,7 +144,9 @@ async def list_admin_challenges_paginated(
)
).all()
return Page[challenge_schemas.AdminChallengeResponse](
- items=[challenge_schemas.AdminChallengeResponse.model_validate(c) for c in rows],
+ items=[
+ challenge_schemas.AdminChallengeResponse.model_validate(c) for c in rows
+ ],
total=total or 0,
limit=pagination.limit,
offset=pagination.offset,
diff --git a/backend/app/tests/auth/integration/test_auth_routes.py b/backend/app/tests/auth/integration/test_auth_routes.py
index 32b0b405..66fca4d7 100644
--- a/backend/app/tests/auth/integration/test_auth_routes.py
+++ b/backend/app/tests/auth/integration/test_auth_routes.py
@@ -1,7 +1,8 @@
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
@@ -115,9 +116,7 @@ async def test_me_returns_current_user(db_client: AsyncClient, user_factory):
@pytest.mark.asyncio
-async def test_me_does_not_return_semana_username(
- db_client: AsyncClient, user_factory
-):
+async def test_me_does_not_return_semana_username(db_client: AsyncClient, user_factory):
user = await user_factory(email="me-username@example.com", name="Me Username")
token = auth_services.create_access_token(user.id, [Scope.PROFILE, Scope.EMAIL])
@@ -325,6 +324,7 @@ async def test_refresh_old_token_rejected_after_rotation(
assert first.status_code == 200
# 2º refresh com o MESMO cookie antigo — deve falhar
+ db_client.cookies.clear()
db_client.cookies.set("refresh_token", old_token)
second = await db_client.post("/api/v1/auth/refresh")
assert second.status_code == 401
@@ -497,9 +497,10 @@ 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 app.auth.models import RefreshToken
from sqlalchemy import select
+ from app.auth.models import RefreshToken
+
user = await user_factory(email="rot-no-plaintext@example.com")
token = await refresh_token_factory(user.id)
diff --git a/backend/app/users/models.py b/backend/app/users/models.py
index 56793bdd..196ab8ca 100644
--- a/backend/app/users/models.py
+++ b/backend/app/users/models.py
@@ -33,5 +33,6 @@ class User(Base, UUIDPKMixin, TimestampsMixin):
is_verified: Mapped[bool] = mapped_column(
Boolean, nullable=False, default=False, server_default="false"
)
+
def __repr__(self) -> str:
return f""
From 0fee885ec19dfb3cf51f0ffc53286e80cab65eae Mon Sep 17 00:00:00 2001
From: Sara Abe
Date: Wed, 30 Sep 2026 16:52:47 -0300
Subject: [PATCH 23/62] feat(semana): add projects and YouTube to about page
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Add the "Nossos projetos" section with the Semana da Computação and
ByteCafé cards, opening in a new tab. Replace the Facebook placeholder
with the Semana da Computação YouTube channel and drop the join button,
which had no destination yet.
Co-Authored-By: Claude Opus 5.5
---
.../features/semana/components/about-page.tsx | 82 +++++++++++++++----
1 file changed, 68 insertions(+), 14 deletions(-)
diff --git a/frontend/src/features/semana/components/about-page.tsx b/frontend/src/features/semana/components/about-page.tsx
index 9e6035f7..5c9c5c7e 100644
--- a/frontend/src/features/semana/components/about-page.tsx
+++ b/frontend/src/features/semana/components/about-page.tsx
@@ -1,11 +1,6 @@
import Image from 'next/image'
-import { BsFacebook, BsInstagram, BsLinkedin } from 'react-icons/bs'
-
-import { SemanaButton } from './semana-button'
-
-// TODO: substituir pelas URLs oficiais do Facebook e do formulário de entrada.
-const FACEBOOK_URL = '#'
-const JOIN_URL = '#'
+import Link from 'next/link'
+import { BsInstagram, BsLinkedin, BsYoutube } from 'react-icons/bs'
const socialLinks = [
{
@@ -18,7 +13,32 @@ const socialLinks = [
href: 'https://www.linkedin.com/company/symcompimeusp',
icon: BsLinkedin,
},
- { label: 'Facebook da SymComp', href: FACEBOOK_URL, icon: BsFacebook },
+ {
+ label: 'Canal da Semana da Computação no YouTube',
+ href: 'https://www.youtube.com/@semanadacomputacaoime-usp',
+ icon: BsYoutube,
+ },
+]
+
+const projects = [
+ {
+ label: 'Semana da Computação',
+ href: '/semana',
+ imageUrl: '/logo/sc.png',
+ imageWidth: 1080,
+ imageHeight: 1080,
+ description:
+ 'Anualmente reunimos alunos da graduação e visitantes para participar de uma semana de palestras, competições, brindes, networking e coffee breaks.',
+ },
+ {
+ label: 'ByteCafé',
+ href: '/bytecafe',
+ imageUrl: '/logo/bc.png',
+ imageWidth: 477,
+ imageHeight: 592,
+ description:
+ 'Duas vezes por semestre convidamos alunos do Ensino Médio para conhecer a USP e o curso de Ciência da Computação.',
+ },
]
export function AboutPage() {
@@ -65,13 +85,47 @@ export function AboutPage() {
))}
-
-
-
- Venha fazer parte
-
-
+
+
+
+ Nossos projetos
+
+
+ {projects.map((project) => (
+
+
+
+
+
+ {project.label}
+
+ {project.description}
+
+ Conhecer
+ {project.label} (abre em nova aba)
+
+
+ ))}
+
+
)
}
From 4c50098b6a24f4f06339e08d863922f9ac3ee829 Mon Sep 17 00:00:00 2001
From: Sara Abe
Date: Wed, 30 Sep 2026 17:06:05 -0300
Subject: [PATCH 24/62] feat(semana): use SymComp visual identity on about page
Add the SymComp chip mark exported from Figma and render it as an inline
SVG component with currentColor, so its color follows the text class.
It replaces the edition logo in the middle of the about page.
Co-Authored-By: Claude Opus 5.5
---
.../semana/2026/identidade-visual-symcomp.svg | 12 ++++++++++++
.../features/semana/components/about-page.tsx | 13 ++++++-------
.../semana/components/symcomp-logo.tsx | 19 +++++++++++++++++++
3 files changed, 37 insertions(+), 7 deletions(-)
create mode 100644 frontend/public/semana/2026/identidade-visual-symcomp.svg
create mode 100644 frontend/src/features/semana/components/symcomp-logo.tsx
diff --git a/frontend/public/semana/2026/identidade-visual-symcomp.svg b/frontend/public/semana/2026/identidade-visual-symcomp.svg
new file mode 100644
index 00000000..60b503e4
--- /dev/null
+++ b/frontend/public/semana/2026/identidade-visual-symcomp.svg
@@ -0,0 +1,12 @@
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/frontend/src/features/semana/components/about-page.tsx b/frontend/src/features/semana/components/about-page.tsx
index 5c9c5c7e..948cd4af 100644
--- a/frontend/src/features/semana/components/about-page.tsx
+++ b/frontend/src/features/semana/components/about-page.tsx
@@ -2,6 +2,8 @@ import Image from 'next/image'
import Link from 'next/link'
import { BsInstagram, BsLinkedin, BsYoutube } from 'react-icons/bs'
+import { SymcompLogo } from './symcomp-logo'
+
const socialLinks = [
{
label: 'Instagram da SymComp',
@@ -52,13 +54,10 @@ export function AboutPage() {
Conheça o grupo de extensão SymComp, responsável pela 16ª Semana da Computação.
-