789d2bf0a6
Backend (FastAPI + SQLAlchemy + SQLite): - JWT auth with access/refresh tokens, bcrypt password hashing - User model with member/organizer/admin roles, auto-approve members - Championship, Registration, ParticipantList, Notification models - Alembic async migrations, seed data with test users - Registration endpoint returns tokens for members, pending for organizers - /registrations/my returns championship title/date/location via eager loading - Admin endpoints: list users, approve/reject organizers Mobile (React Native + Expo + TypeScript): - Zustand auth store, Axios client with token refresh interceptor - Role-based registration (Member vs Organizer) with contextual form labels - Tab navigation with Ionicons, safe area headers, admin tab for admin role - Championships list with status badges, detail screen with registration progress - My Registrations with championship title, progress bar, and tap-to-navigate - Admin panel with pending/all filter, approve/reject with confirmation - Profile screen with role badge, Ionicons info rows, sign out - Password visibility toggle (Ionicons), keyboard flow hints (returnKeyType) Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
58 lines
1.8 KiB
Python
58 lines
1.8 KiB
Python
import uuid
|
|
|
|
from sqlalchemy import select
|
|
from sqlalchemy.ext.asyncio import AsyncSession
|
|
|
|
from app.models.user import User
|
|
from app.schemas.user import UserRegister, UserUpdate
|
|
from app.services.auth_service import hash_password
|
|
|
|
|
|
async def get_by_id(db: AsyncSession, user_id: str | uuid.UUID) -> User | None:
|
|
uid = user_id if isinstance(user_id, uuid.UUID) else uuid.UUID(str(user_id))
|
|
result = await db.execute(select(User).where(User.id == uid))
|
|
return result.scalar_one_or_none()
|
|
|
|
|
|
async def get_by_email(db: AsyncSession, email: str) -> User | None:
|
|
result = await db.execute(select(User).where(User.email == email.lower()))
|
|
return result.scalar_one_or_none()
|
|
|
|
|
|
async def create(db: AsyncSession, data: UserRegister) -> User:
|
|
user = User(
|
|
email=data.email.lower(),
|
|
hashed_password=hash_password(data.password),
|
|
full_name=data.full_name,
|
|
phone=data.phone,
|
|
role=data.requested_role,
|
|
organization_name=data.organization_name,
|
|
instagram_handle=data.instagram_handle,
|
|
# Members are auto-approved; organizers require admin review
|
|
status="approved" if data.requested_role == "member" else "pending",
|
|
)
|
|
db.add(user)
|
|
await db.commit()
|
|
await db.refresh(user)
|
|
return user
|
|
|
|
|
|
async def update(db: AsyncSession, user: User, data: UserUpdate) -> User:
|
|
for field, value in data.model_dump(exclude_none=True).items():
|
|
setattr(user, field, value)
|
|
await db.commit()
|
|
await db.refresh(user)
|
|
return user
|
|
|
|
|
|
async def set_status(db: AsyncSession, user: User, status: str) -> User:
|
|
user.status = status
|
|
await db.commit()
|
|
await db.refresh(user)
|
|
return user
|
|
|
|
|
|
async def list_all(db: AsyncSession, skip: int = 0, limit: int = 100) -> list[User]:
|
|
result = await db.execute(select(User).offset(skip).limit(limit))
|
|
return list(result.scalars().all())
|