Модели и миграция 0014: groups.nine_rounds_rule, снимок правила в matches,
matches.end_round, match_participants.objectives/worlds. CHECK причины победы
расширяется, только если он в БД есть (старые БД без CHECK таблицу не
пересоздают); пересоздание matches отказывает при PRAGMA foreign_keys=ON,
иначе DROP унёс бы участников каскадом. Бэкфилл: last_standing у завершённых
партий с одним невыбывшим. Проверено на копии dev-БД и на схеме origin/dev
с CHECK: строки, CHECK, FK и индексы на месте, повтор и downgrade работают.
API и валидация: end_round от 1 до лимита раундов партии (9 при хоумруле
и 5+ игроках), у выбывшего миров 0, last_standing ровно при одном невыбывшем —
в завершении и правке (игрока и админа); черновик хранит раунд, цели и миры
без проверки правила. MatchRead отдаёт end_round, снимок правила и max_rounds.
PATCH /groups/{id} принимает nine_rounds_rule вместе с названием. #23
Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01LqSoRj99iwVEH5U5fnZgsd
241 lines
9.0 KiB
Python
241 lines
9.0 KiB
Python
"""Группы, членство, доступные фракции, список партий и статистика группы."""
|
|
from __future__ import annotations
|
|
|
|
from fastapi import APIRouter, Depends, Query, Request
|
|
from sqlmodel import Session
|
|
|
|
from app.auth.deps import get_current_user
|
|
from app.core.security import client_ip
|
|
from app.core.timeutil import iso_utc
|
|
from app.db.session import get_session
|
|
from app.models import User
|
|
from app.schemas import api as s
|
|
from app.services import (
|
|
audit_service,
|
|
group_service,
|
|
invitation_service,
|
|
membership_service,
|
|
notification_service,
|
|
notify,
|
|
stats_service,
|
|
user_service,
|
|
)
|
|
|
|
router = APIRouter(prefix="/groups", tags=["groups"])
|
|
|
|
|
|
def _detail(session: Session, group_id: int, user_id: int) -> s.GroupDetail:
|
|
group = group_service.get_group(session, group_id)
|
|
member = group_service.assert_member(session, group_id, user_id)
|
|
return s.GroupDetail(
|
|
id=group.id, # type: ignore[arg-type]
|
|
name=group.name,
|
|
owner_id=group.owner_id,
|
|
my_role=member.role,
|
|
expansion_ids=group_service.group_expansion_ids(session, group_id),
|
|
nine_rounds_rule=group.nine_rounds_rule,
|
|
)
|
|
|
|
|
|
@router.get("", response_model=list[s.GroupBrief])
|
|
def my_groups(
|
|
session: Session = Depends(get_session),
|
|
user: User = Depends(get_current_user),
|
|
) -> list[s.GroupBrief]:
|
|
return [
|
|
s.GroupBrief(id=g.id, name=g.name, role=role)
|
|
for g, role in group_service.list_user_groups(session, user.id) # type: ignore[arg-type]
|
|
]
|
|
|
|
|
|
@router.post("", response_model=s.GroupDetail)
|
|
def create_group(
|
|
body: s.GroupCreate,
|
|
request: Request,
|
|
session: Session = Depends(get_session),
|
|
user: User = Depends(get_current_user),
|
|
) -> s.GroupDetail:
|
|
group = group_service.create_group(session, user, body.name, body.expansion_ids)
|
|
audit_service.record(
|
|
session,
|
|
actor_id=user.id,
|
|
action="create",
|
|
entity_type="group",
|
|
entity_id=group.id,
|
|
payload={"name": group.name},
|
|
ip=client_ip(request),
|
|
user_agent=request.headers.get("user-agent"),
|
|
)
|
|
session.commit()
|
|
return _detail(session, group.id, user.id) # type: ignore[arg-type]
|
|
|
|
|
|
@router.get("/{group_id}", response_model=s.GroupDetail)
|
|
def get_group(
|
|
group_id: int,
|
|
session: Session = Depends(get_session),
|
|
user: User = Depends(get_current_user),
|
|
) -> s.GroupDetail:
|
|
return _detail(session, group_id, user.id) # type: ignore[arg-type]
|
|
|
|
|
|
@router.patch("/{group_id}", response_model=s.GroupDetail)
|
|
def update_group(
|
|
group_id: int,
|
|
body: s.GroupUpdate,
|
|
session: Session = Depends(get_session),
|
|
user: User = Depends(get_current_user),
|
|
) -> s.GroupDetail:
|
|
"""Название и домашние правила группы; меняются только переданные поля."""
|
|
group_service.assert_member(session, group_id, user.id) # type: ignore[arg-type]
|
|
group = group_service.get_group(session, group_id)
|
|
if body.name is not None:
|
|
group_service.rename_group(session, group, body.name)
|
|
if body.nine_rounds_rule is not None:
|
|
group_service.set_nine_rounds_rule(session, group, body.nine_rounds_rule)
|
|
return _detail(session, group_id, user.id) # type: ignore[arg-type]
|
|
|
|
|
|
@router.put("/{group_id}/expansions", response_model=s.GroupDetail)
|
|
def set_expansions(
|
|
group_id: int,
|
|
body: s.GroupExpansionsUpdate,
|
|
session: Session = Depends(get_session),
|
|
user: User = Depends(get_current_user),
|
|
) -> s.GroupDetail:
|
|
group_service.assert_member(session, group_id, user.id) # type: ignore[arg-type]
|
|
group = group_service.get_group(session, group_id)
|
|
group_service.set_expansions(session, group, body.expansion_ids)
|
|
return _detail(session, group_id, user.id) # type: ignore[arg-type]
|
|
|
|
|
|
@router.get("/{group_id}/factions", response_model=list[s.FactionRead])
|
|
def group_factions(
|
|
group_id: int,
|
|
session: Session = Depends(get_session),
|
|
user: User = Depends(get_current_user),
|
|
) -> list[s.FactionRead]:
|
|
group_service.assert_member(session, group_id, user.id) # type: ignore[arg-type]
|
|
return [
|
|
s.FactionRead(
|
|
id=f.id, code=f.code, name_ru=f.name_ru, expansion_id=f.expansion_id # type: ignore[arg-type]
|
|
)
|
|
for f in group_service.available_factions(session, group_id)
|
|
]
|
|
|
|
|
|
# ─── Членство ────────────────────────────────────────────────────────────────
|
|
|
|
@router.get("/{group_id}/members", response_model=list[s.MemberRead])
|
|
def list_members(
|
|
group_id: int,
|
|
session: Session = Depends(get_session),
|
|
user: User = Depends(get_current_user),
|
|
) -> list[s.MemberRead]:
|
|
group_service.assert_member(session, group_id, user.id) # type: ignore[arg-type]
|
|
return [
|
|
s.MemberRead(
|
|
user_id=u.id,
|
|
nickname=u.nickname,
|
|
role=m.role,
|
|
avatar_url=user_service.avatar_url_for(u.id, u.avatar_path, u.updated_at),
|
|
)
|
|
for m, u in membership_service.list_members(session, group_id)
|
|
]
|
|
|
|
|
|
@router.post("/{group_id}/invitations", response_model=s.InvitationRead)
|
|
def invite_member(
|
|
group_id: int,
|
|
body: s.MemberAdd,
|
|
request: Request,
|
|
session: Session = Depends(get_session),
|
|
user: User = Depends(get_current_user),
|
|
) -> s.InvitationRead:
|
|
# Приглашать вправе ЛЮБОЙ участник группы (не только владелец) — assert_member.
|
|
group_service.assert_member(session, group_id, user.id) # type: ignore[arg-type]
|
|
group = group_service.get_group(session, group_id)
|
|
inv, invited = invitation_service.create_invitation(session, group, user, body.nickname)
|
|
audit_service.record(
|
|
session,
|
|
actor_id=user.id,
|
|
action="create",
|
|
entity_type="group_invitation",
|
|
entity_id=group_id,
|
|
payload={"invited_user_id": invited.id, "nickname": invited.nickname},
|
|
ip=client_ip(request),
|
|
user_agent=request.headers.get("user-agent"),
|
|
)
|
|
session.commit()
|
|
notify.invitations_changed(invited.id) # type: ignore[arg-type] # живое появление у получателя
|
|
notification_service.invited_to_group(
|
|
session, invited.id, group.name, user.nickname # type: ignore[arg-type]
|
|
)
|
|
return s.InvitationRead(
|
|
id=inv.id, # type: ignore[arg-type]
|
|
group_id=group_id,
|
|
group_name=group.name,
|
|
invited_by_nickname=user.nickname,
|
|
created_at=iso_utc(inv.created_at),
|
|
)
|
|
|
|
|
|
@router.delete("/{group_id}/members/{user_id}", response_model=s.OkResponse)
|
|
def remove_member(
|
|
group_id: int,
|
|
user_id: int,
|
|
session: Session = Depends(get_session),
|
|
user: User = Depends(get_current_user),
|
|
) -> s.OkResponse:
|
|
# Любой участник управляет составом; защита создателя — в membership_service
|
|
# (нельзя удалить последнего владельца).
|
|
group_service.assert_member(session, group_id, user.id) # type: ignore[arg-type]
|
|
group = group_service.get_group(session, group_id)
|
|
membership_service.remove_member(session, group, user_id)
|
|
notify.group_changed(session, group_id, extra_user_ids=[user_id]) # + удалённому
|
|
return s.OkResponse()
|
|
|
|
|
|
@router.patch("/{group_id}/members/{user_id}", response_model=s.MemberRead)
|
|
def change_member_role(
|
|
group_id: int,
|
|
user_id: int,
|
|
body: s.MemberRoleUpdate,
|
|
session: Session = Depends(get_session),
|
|
user: User = Depends(get_current_user),
|
|
) -> s.MemberRead:
|
|
group_service.assert_owner(session, group_id, user.id) # type: ignore[arg-type]
|
|
group = group_service.get_group(session, group_id)
|
|
member = membership_service.change_role(session, group, user_id, body.role)
|
|
u = user_service.get_user(session, user_id)
|
|
return s.MemberRead(
|
|
user_id=u.id,
|
|
nickname=u.nickname,
|
|
role=member.role,
|
|
avatar_url=user_service.avatar_url_for(u.id, u.avatar_path, u.updated_at),
|
|
)
|
|
|
|
|
|
# ─── Партии и статистика группы ──────────────────────────────────────────────
|
|
|
|
@router.get("/{group_id}/matches", response_model=s.MatchList)
|
|
def group_matches(
|
|
group_id: int,
|
|
limit: int = Query(20, ge=1, le=100),
|
|
offset: int = Query(0, ge=0),
|
|
session: Session = Depends(get_session),
|
|
user: User = Depends(get_current_user),
|
|
) -> dict:
|
|
group_service.assert_member(session, group_id, user.id) # type: ignore[arg-type]
|
|
return stats_service.group_match_list(session, group_id, limit=limit, offset=offset)
|
|
|
|
|
|
@router.get("/{group_id}/stats", response_model=s.GroupStats)
|
|
def group_stats(
|
|
group_id: int,
|
|
session: Session = Depends(get_session),
|
|
user: User = Depends(get_current_user),
|
|
) -> dict:
|
|
group_service.assert_member(session, group_id, user.id) # type: ignore[arg-type]
|
|
return stats_service.group_stats(session, group_id)
|