Moved to S3
This commit is contained in:
@@ -1,12 +1,11 @@
|
||||
from fastapi import APIRouter, HTTPException, status, UploadFile, File
|
||||
from sqlalchemy import select
|
||||
import uuid
|
||||
from pathlib import Path
|
||||
|
||||
from app.api.deps import DbSession, CurrentUser
|
||||
from app.core.config import settings
|
||||
from app.models import User
|
||||
from app.schemas import UserPublic, UserUpdate, TelegramLink, MessageResponse
|
||||
from app.services.storage import storage_service
|
||||
|
||||
router = APIRouter(prefix="/users", tags=["users"])
|
||||
|
||||
@@ -64,16 +63,21 @@ async def upload_avatar(
|
||||
detail=f"Invalid file type. Allowed: {settings.ALLOWED_IMAGE_EXTENSIONS}",
|
||||
)
|
||||
|
||||
# Save file
|
||||
filename = f"{current_user.id}_{uuid.uuid4().hex}.{ext}"
|
||||
filepath = Path(settings.UPLOAD_DIR) / "avatars" / filename
|
||||
filepath.parent.mkdir(parents=True, exist_ok=True)
|
||||
# Delete old avatar if exists
|
||||
if current_user.avatar_path:
|
||||
await storage_service.delete_file(current_user.avatar_path)
|
||||
|
||||
with open(filepath, "wb") as f:
|
||||
f.write(contents)
|
||||
# Upload file
|
||||
filename = storage_service.generate_filename(current_user.id, file.filename)
|
||||
file_path = await storage_service.upload_file(
|
||||
content=contents,
|
||||
folder="avatars",
|
||||
filename=filename,
|
||||
content_type=file.content_type or "image/jpeg",
|
||||
)
|
||||
|
||||
# Update user
|
||||
current_user.avatar_path = str(filepath)
|
||||
current_user.avatar_path = file_path
|
||||
await db.commit()
|
||||
await db.refresh(current_user)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user