benya
0b4bb19425
Some checks failed
CI / test (push) Failing after 20s
- add chats.public_id random identifier with migration 0011
- expose public_id in chat API payloads
- use chat public_id in message search UI label
- fix users router order so /users/blocked no longer conflicts with /users/{user_id}
105 lines
3.4 KiB
Python
105 lines
3.4 KiB
Python
from fastapi import APIRouter, Depends, HTTPException, status
|
|
from sqlalchemy.ext.asyncio import AsyncSession
|
|
|
|
from app.auth.service import get_current_user
|
|
from app.database.session import get_db
|
|
from app.users.models import User
|
|
from app.users.schemas import UserProfileUpdate, UserRead, UserSearchRead
|
|
from app.users.service import (
|
|
block_user,
|
|
get_user_by_id,
|
|
get_user_by_username,
|
|
list_blocked_users,
|
|
search_users_by_username,
|
|
unblock_user,
|
|
update_user_profile,
|
|
)
|
|
|
|
router = APIRouter(prefix="/users", tags=["users"])
|
|
|
|
|
|
@router.get("/me", response_model=UserRead)
|
|
async def read_me(current_user: User = Depends(get_current_user)) -> UserRead:
|
|
return current_user
|
|
|
|
|
|
@router.get("/search", response_model=list[UserSearchRead])
|
|
async def search_users(
|
|
query: str,
|
|
limit: int = 20,
|
|
db: AsyncSession = Depends(get_db),
|
|
current_user: User = Depends(get_current_user),
|
|
) -> list[UserSearchRead]:
|
|
if len(query.strip().lstrip("@")) < 2:
|
|
return []
|
|
users = await search_users_by_username(
|
|
db,
|
|
query=query,
|
|
limit=limit,
|
|
exclude_user_id=current_user.id,
|
|
)
|
|
return users
|
|
|
|
|
|
@router.put("/profile", response_model=UserRead)
|
|
async def update_profile(
|
|
payload: UserProfileUpdate,
|
|
db: AsyncSession = Depends(get_db),
|
|
current_user: User = Depends(get_current_user),
|
|
) -> UserRead:
|
|
if payload.username and payload.username != current_user.username:
|
|
username_owner = await get_user_by_username(db, payload.username)
|
|
if username_owner:
|
|
raise HTTPException(status_code=status.HTTP_409_CONFLICT, detail="Username already taken")
|
|
|
|
updated = await update_user_profile(
|
|
db,
|
|
current_user,
|
|
name=payload.name,
|
|
username=payload.username,
|
|
bio=payload.bio,
|
|
avatar_url=payload.avatar_url,
|
|
)
|
|
return updated
|
|
|
|
|
|
@router.get("/blocked", response_model=list[UserSearchRead])
|
|
async def read_blocked_users(
|
|
db: AsyncSession = Depends(get_db),
|
|
current_user: User = Depends(get_current_user),
|
|
) -> list[UserSearchRead]:
|
|
return await list_blocked_users(db, user_id=current_user.id)
|
|
|
|
|
|
@router.post("/{user_id}/block", status_code=status.HTTP_204_NO_CONTENT)
|
|
async def block_user_endpoint(
|
|
user_id: int,
|
|
db: AsyncSession = Depends(get_db),
|
|
current_user: User = Depends(get_current_user),
|
|
) -> None:
|
|
if user_id == current_user.id:
|
|
raise HTTPException(status_code=status.HTTP_422_UNPROCESSABLE_ENTITY, detail="Cannot block yourself")
|
|
target = await get_user_by_id(db, user_id)
|
|
if not target:
|
|
raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="User not found")
|
|
await block_user(db, user_id=current_user.id, blocked_user_id=user_id)
|
|
|
|
|
|
@router.delete("/{user_id}/block", status_code=status.HTTP_204_NO_CONTENT)
|
|
async def unblock_user_endpoint(
|
|
user_id: int,
|
|
db: AsyncSession = Depends(get_db),
|
|
current_user: User = Depends(get_current_user),
|
|
) -> None:
|
|
if user_id == current_user.id:
|
|
return
|
|
await unblock_user(db, user_id=current_user.id, blocked_user_id=user_id)
|
|
|
|
|
|
@router.get("/{user_id}", response_model=UserRead)
|
|
async def read_user(user_id: int, db: AsyncSession = Depends(get_db), _current_user: User = Depends(get_current_user)) -> UserRead:
|
|
user = await get_user_by_id(db, user_id)
|
|
if not user:
|
|
raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="User not found")
|
|
return user
|