Feature: Partner-Profile Backend + Pro-Zugang für Partner
Die Partner-Showcase-Seite (#partner) und der Profil-Editor (#partner-profil) existierten seit v1102 nur als Frontend — /api/partners/public und /api/partner/my-profile gab es nie (vermutlich Worktree-Merge-Verlust). Backend neu: - partner_profiles-Tabelle (user_id PK, ON DELETE CASCADE → DSGVO-Delete greift) - GET/PUT /partner/my-profile (Texte, Website-Normalisierung, @-Instagram) - Logo-Upload (≤5 MB → WebP 512px, altes Logo wird geräumt) - Foto/Video-Upload (max 6, 200-MB-Budget, HEIC→JPEG, MOV→MP4 via ffmpeg, Bilder→WebP 1600px) + Lösch-Endpoint - Submit-Workflow (approved 0/1/-1) + Admin-Mail (best effort) - GET /partners/public (nur freigegebene, JOIN users für Name/Avatar) - Admin: GET /admin/partner/profiles + POST .../review Pro für Partner: has_pro_access() + App._hasPro() prüfen jetzt is_partner — Multiplikatoren bekommen Pro gratis (mehrere Hunde, KI-Trainer etc.). UI: Admin-Partner-Tab mit Freigabe-Sektion (offen-Badge, ✓/✗), Settings zeigt Partnern eine Karte mit Link zum Profil-Editor. Tests: tests/test_partner_profile.py — 5 Smoke-Tests (403, Voll-Flow inkl. Freigabe/Ablehnung, Pflicht-Anzeigename, Logo+Foto-Upload, Pro-Zugang). Suite: 44 passed.
This commit is contained in:
parent
178aef7fb0
commit
ce8aa2b699
11 changed files with 557 additions and 19 deletions
|
|
@ -1,10 +1,16 @@
|
|||
"""BAN YARO — Partner-Codes + Gründer-Lizenz"""
|
||||
"""BAN YARO — Partner-Codes + Gründer-Lizenz + Partner-Profile (Showcase)"""
|
||||
|
||||
import asyncio
|
||||
import json
|
||||
import os
|
||||
import uuid
|
||||
from typing import Optional
|
||||
from fastapi import APIRouter, HTTPException, Depends
|
||||
from fastapi import APIRouter, HTTPException, Depends, UploadFile, File
|
||||
from pydantic import BaseModel, Field
|
||||
from database import db
|
||||
from auth import require_admin, get_current_user
|
||||
from config import MEDIA_DIR
|
||||
from media_utils import validate_upload, convert_media, safe_media_path
|
||||
|
||||
router = APIRouter()
|
||||
|
||||
|
|
@ -206,3 +212,329 @@ def partner_code_info(code: str):
|
|||
r["founder_slots_open"] = None
|
||||
r["redeemable"] = r["max_uses"] is None or r["uses"] < r["max_uses"]
|
||||
return r
|
||||
|
||||
|
||||
# ------------------------------------------------------------------
|
||||
# Partner-Profile — Self-Service-Editor + öffentlicher Showcase
|
||||
# Frontend: partner-profil.js (Editor), partner.js (Showcase)
|
||||
# ------------------------------------------------------------------
|
||||
|
||||
_PP_STORAGE_LIMIT_MB = 200 # Gesamt-Budget pro Partner (Frontend zeigt die Bar dazu)
|
||||
_PP_MAX_PHOTOS = 6
|
||||
_PP_LOGO_MAX_MB = 5
|
||||
_PP_FILE_MAX_MB = 200 # pro Datei (Videos)
|
||||
|
||||
_PP_IMAGE_EXTS = {".jpg", ".jpeg", ".png", ".webp", ".gif", ".heic", ".heif"}
|
||||
_PP_VIDEO_EXTS = {".mp4", ".webm", ".mov", ".avi", ".m4v"}
|
||||
|
||||
|
||||
def require_partner(user=Depends(get_current_user)):
|
||||
if not (user.get("is_partner") or user.get("rolle") == "admin"):
|
||||
raise HTTPException(403, "Nur für Partner.")
|
||||
return user
|
||||
|
||||
|
||||
def _pp_dir(user_id: int) -> str:
|
||||
path = os.path.join(MEDIA_DIR, "partner", str(user_id))
|
||||
os.makedirs(path, exist_ok=True)
|
||||
return path
|
||||
|
||||
|
||||
def _pp_storage_mb(user_id: int) -> float:
|
||||
"""Belegter Speicher des Partners in MB (Logo + Fotos/Videos)."""
|
||||
path = os.path.join(MEDIA_DIR, "partner", str(user_id))
|
||||
if not os.path.isdir(path):
|
||||
return 0.0
|
||||
total = sum(
|
||||
os.path.getsize(os.path.join(path, f))
|
||||
for f in os.listdir(path)
|
||||
if os.path.isfile(os.path.join(path, f))
|
||||
)
|
||||
return round(total / (1024 * 1024), 4)
|
||||
|
||||
|
||||
def _pp_profile_dict(row) -> dict:
|
||||
d = dict(row)
|
||||
try:
|
||||
d["photos"] = json.loads(d.pop("photos_json") or "[]")
|
||||
except (ValueError, TypeError):
|
||||
d["photos"] = []
|
||||
return d
|
||||
|
||||
|
||||
def _pp_get_or_empty(conn, user_id: int) -> dict:
|
||||
row = conn.execute(
|
||||
"SELECT * FROM partner_profiles WHERE user_id=?", (user_id,)
|
||||
).fetchone()
|
||||
return _pp_profile_dict(row) if row else {}
|
||||
|
||||
|
||||
class PartnerProfileUpdate(BaseModel):
|
||||
display_name: Optional[str] = Field(None, max_length=60)
|
||||
tagline: Optional[str] = Field(None, max_length=80)
|
||||
bio: Optional[str] = Field(None, max_length=500)
|
||||
website: Optional[str] = Field(None, max_length=300)
|
||||
instagram: Optional[str] = Field(None, max_length=100)
|
||||
|
||||
|
||||
@router.get("/partner/my-profile")
|
||||
def get_my_partner_profile(user=Depends(require_partner)):
|
||||
with db() as conn:
|
||||
profile = _pp_get_or_empty(conn, user["id"])
|
||||
return {
|
||||
"profile": profile,
|
||||
"storage_mb": _pp_storage_mb(user["id"]),
|
||||
"storage_limit_mb": _PP_STORAGE_LIMIT_MB,
|
||||
}
|
||||
|
||||
|
||||
@router.put("/partner/my-profile")
|
||||
def update_my_partner_profile(data: PartnerProfileUpdate, user=Depends(require_partner)):
|
||||
website = (data.website or "").strip()
|
||||
if website and not website.startswith(("http://", "https://")):
|
||||
website = "https://" + website
|
||||
instagram = (data.instagram or "").strip().lstrip("@")
|
||||
with db() as conn:
|
||||
conn.execute(
|
||||
"""INSERT INTO partner_profiles
|
||||
(user_id, display_name, tagline, bio, website, instagram, updated_at)
|
||||
VALUES (?,?,?,?,?,?, datetime('now'))
|
||||
ON CONFLICT(user_id) DO UPDATE SET
|
||||
display_name=excluded.display_name, tagline=excluded.tagline,
|
||||
bio=excluded.bio, website=excluded.website,
|
||||
instagram=excluded.instagram, updated_at=datetime('now')""",
|
||||
(user["id"], (data.display_name or "").strip() or None,
|
||||
(data.tagline or "").strip() or None, (data.bio or "").strip() or None,
|
||||
website or None, ("@" + instagram) if instagram else None)
|
||||
)
|
||||
profile = _pp_get_or_empty(conn, user["id"])
|
||||
return {"profile": profile}
|
||||
|
||||
|
||||
@router.post("/partner/my-profile/logo")
|
||||
async def upload_partner_logo(file: UploadFile = File(...), user=Depends(require_partner)):
|
||||
raw = await file.read()
|
||||
filename = file.filename or "logo.png"
|
||||
ext = os.path.splitext(filename)[1].lower()
|
||||
if ext not in _PP_IMAGE_EXTS:
|
||||
raise HTTPException(400, "Nur Bilder (PNG, JPG, WebP) als Logo.")
|
||||
if len(raw) > _PP_LOGO_MAX_MB * 1024 * 1024:
|
||||
raise HTTPException(400, f"Logo zu groß (max. {_PP_LOGO_MAX_MB} MB).")
|
||||
try:
|
||||
validate_upload(raw, filename)
|
||||
except ValueError as e:
|
||||
raise HTTPException(400, str(e))
|
||||
|
||||
save_dir = _pp_dir(user["id"])
|
||||
new_name = f"logo_{uuid.uuid4().hex[:8]}.webp"
|
||||
new_path = os.path.join(save_dir, new_name)
|
||||
|
||||
def _save():
|
||||
import io
|
||||
from PIL import Image, ImageOps
|
||||
img = Image.open(io.BytesIO(raw))
|
||||
img = ImageOps.exif_transpose(img)
|
||||
# Transparenz erhalten (Logos sind oft PNG mit Alpha)
|
||||
img = img.convert("RGBA" if "A" in (img.mode or "") or img.mode == "P" else "RGB")
|
||||
img.thumbnail((512, 512))
|
||||
img.save(new_path, format="WEBP", quality=85)
|
||||
|
||||
loop = asyncio.get_event_loop()
|
||||
try:
|
||||
await loop.run_in_executor(None, _save)
|
||||
except Exception:
|
||||
raise HTTPException(400, "Bild konnte nicht verarbeitet werden.")
|
||||
|
||||
logo_url = f"/media/partner/{user['id']}/{new_name}"
|
||||
with db() as conn:
|
||||
old = conn.execute(
|
||||
"SELECT logo_url FROM partner_profiles WHERE user_id=?", (user["id"],)
|
||||
).fetchone()
|
||||
conn.execute(
|
||||
"""INSERT INTO partner_profiles (user_id, logo_url, updated_at)
|
||||
VALUES (?,?, datetime('now'))
|
||||
ON CONFLICT(user_id) DO UPDATE SET
|
||||
logo_url=excluded.logo_url, updated_at=datetime('now')""",
|
||||
(user["id"], logo_url)
|
||||
)
|
||||
# Altes Logo vom Datenträger räumen
|
||||
if old and old["logo_url"]:
|
||||
old_path = safe_media_path(MEDIA_DIR, old["logo_url"])
|
||||
if old_path and os.path.isfile(old_path):
|
||||
try:
|
||||
os.unlink(old_path)
|
||||
except OSError:
|
||||
pass
|
||||
return {"logo_url": logo_url}
|
||||
|
||||
|
||||
@router.post("/partner/my-profile/photos")
|
||||
async def upload_partner_photo(file: UploadFile = File(...), user=Depends(require_partner)):
|
||||
raw = await file.read()
|
||||
filename = file.filename or "upload.jpg"
|
||||
ext = os.path.splitext(filename)[1].lower()
|
||||
if ext not in _PP_IMAGE_EXTS | _PP_VIDEO_EXTS:
|
||||
raise HTTPException(400, "Nur Bilder (JPG, PNG, HEIC) oder Videos (MP4, MOV).")
|
||||
if len(raw) > _PP_FILE_MAX_MB * 1024 * 1024:
|
||||
raise HTTPException(400, f"Datei zu groß (max. {_PP_FILE_MAX_MB} MB).")
|
||||
used_mb = _pp_storage_mb(user["id"])
|
||||
if used_mb + len(raw) / (1024 * 1024) > _PP_STORAGE_LIMIT_MB:
|
||||
raise HTTPException(400, f"Speicherlimit erreicht ({_PP_STORAGE_LIMIT_MB} MB). Bitte zuerst Dateien löschen.")
|
||||
try:
|
||||
validate_upload(raw, filename)
|
||||
except ValueError as e:
|
||||
raise HTTPException(400, str(e))
|
||||
|
||||
with db() as conn:
|
||||
profile = _pp_get_or_empty(conn, user["id"])
|
||||
photos = profile.get("photos", [])
|
||||
if len(photos) >= _PP_MAX_PHOTOS:
|
||||
raise HTTPException(400, f"Maximal {_PP_MAX_PHOTOS} Fotos/Videos.")
|
||||
|
||||
loop = asyncio.get_event_loop()
|
||||
# HEIC→JPEG bzw. MOV/AVI→MP4 (ffmpeg, komprimiert) — blockierend, daher Threadpool
|
||||
data, ext = await loop.run_in_executor(None, lambda: convert_media(raw, filename))
|
||||
|
||||
save_dir = _pp_dir(user["id"])
|
||||
file_id = uuid.uuid4().hex[:12]
|
||||
if ext in _PP_VIDEO_EXTS:
|
||||
new_name = f"media_{file_id}{ext}"
|
||||
new_path = os.path.join(save_dir, new_name)
|
||||
|
||||
def _save_video():
|
||||
with open(new_path, "wb") as f:
|
||||
f.write(data)
|
||||
await loop.run_in_executor(None, _save_video)
|
||||
else:
|
||||
new_name = f"media_{file_id}.webp"
|
||||
new_path = os.path.join(save_dir, new_name)
|
||||
|
||||
def _save_image():
|
||||
import io
|
||||
from PIL import Image, ImageOps
|
||||
img = Image.open(io.BytesIO(data))
|
||||
img = ImageOps.exif_transpose(img)
|
||||
img = img.convert("RGB")
|
||||
img.thumbnail((1600, 1600))
|
||||
img.save(new_path, format="WEBP", quality=85)
|
||||
try:
|
||||
await loop.run_in_executor(None, _save_image)
|
||||
except Exception:
|
||||
raise HTTPException(400, "Bild konnte nicht verarbeitet werden.")
|
||||
|
||||
photos.append(f"/media/partner/{user['id']}/{new_name}")
|
||||
with db() as conn:
|
||||
conn.execute(
|
||||
"""INSERT INTO partner_profiles (user_id, photos_json, updated_at)
|
||||
VALUES (?,?, datetime('now'))
|
||||
ON CONFLICT(user_id) DO UPDATE SET
|
||||
photos_json=excluded.photos_json, updated_at=datetime('now')""",
|
||||
(user["id"], json.dumps(photos))
|
||||
)
|
||||
return {"photos": photos}
|
||||
|
||||
|
||||
@router.post("/partner/my-profile/photos/{idx}/delete")
|
||||
def delete_partner_photo(idx: int, user=Depends(require_partner)):
|
||||
with db() as conn:
|
||||
profile = _pp_get_or_empty(conn, user["id"])
|
||||
photos = profile.get("photos", [])
|
||||
if not (0 <= idx < len(photos)):
|
||||
raise HTTPException(404, "Foto nicht gefunden.")
|
||||
url = photos.pop(idx)
|
||||
conn.execute(
|
||||
"UPDATE partner_profiles SET photos_json=?, updated_at=datetime('now') WHERE user_id=?",
|
||||
(json.dumps(photos), user["id"])
|
||||
)
|
||||
path = safe_media_path(MEDIA_DIR, url)
|
||||
if path and os.path.isfile(path):
|
||||
try:
|
||||
os.unlink(path)
|
||||
except OSError:
|
||||
pass
|
||||
return {"photos": photos}
|
||||
|
||||
|
||||
@router.post("/partner/my-profile/submit")
|
||||
def submit_partner_profile(user=Depends(require_partner)):
|
||||
with db() as conn:
|
||||
profile = _pp_get_or_empty(conn, user["id"])
|
||||
if not profile.get("display_name"):
|
||||
raise HTTPException(400, "Bitte zuerst einen Anzeigenamen speichern.")
|
||||
# Abgelehnt → erneutes Einreichen setzt zurück auf 'in Prüfung'
|
||||
conn.execute(
|
||||
"""UPDATE partner_profiles
|
||||
SET submitted_at=datetime('now'),
|
||||
approved=CASE WHEN approved=1 THEN 1 ELSE 0 END,
|
||||
updated_at=datetime('now')
|
||||
WHERE user_id=?""",
|
||||
(user["id"],)
|
||||
)
|
||||
profile = _pp_get_or_empty(conn, user["id"])
|
||||
# Admin benachrichtigen (best effort — Silent-Skip ohne ADMIN_EMAIL)
|
||||
admin_email = os.getenv("ADMIN_EMAIL", "")
|
||||
if admin_email and profile.get("approved") != 1:
|
||||
try:
|
||||
from routes.outreach import _send_smtp
|
||||
_send_smtp(
|
||||
admin_email,
|
||||
f"[Ban Yaro] Partner-Profil eingereicht: {profile.get('display_name')}",
|
||||
(f"Partner {user['name']} ({user['email']}) hat sein Profil zur "
|
||||
f"Freigabe eingereicht.\n\nAdmin-Panel: https://banyaro.app/#admin"),
|
||||
"support",
|
||||
)
|
||||
except Exception:
|
||||
pass
|
||||
return {"profile": profile}
|
||||
|
||||
|
||||
@router.get("/partners/public")
|
||||
def list_public_partners():
|
||||
"""Freigegebene Partner-Profile für die öffentliche Partner-Seite."""
|
||||
with db() as conn:
|
||||
rows = conn.execute(
|
||||
"""SELECT pp.user_id, pp.display_name, pp.tagline, pp.bio, pp.website,
|
||||
pp.instagram, pp.logo_url, pp.photos_json,
|
||||
u.name, u.avatar_url
|
||||
FROM partner_profiles pp
|
||||
JOIN users u ON u.id = pp.user_id
|
||||
WHERE pp.approved=1 AND u.is_partner=1
|
||||
ORDER BY pp.submitted_at ASC"""
|
||||
).fetchall()
|
||||
return {"partners": [_pp_profile_dict(r) for r in rows]}
|
||||
|
||||
|
||||
# ---- Admin: Freigabe-Workflow ------------------------------------
|
||||
|
||||
class PartnerProfileReview(BaseModel):
|
||||
approved: int = Field(..., ge=-1, le=1)
|
||||
|
||||
|
||||
@router.get("/admin/partner/profiles")
|
||||
def list_partner_profiles(user=Depends(require_admin)):
|
||||
"""Alle Partner-Profile mit Status für den Admin-Tab."""
|
||||
with db() as conn:
|
||||
rows = conn.execute(
|
||||
"""SELECT pp.*, u.name, u.email
|
||||
FROM partner_profiles pp
|
||||
JOIN users u ON u.id = pp.user_id
|
||||
ORDER BY CASE WHEN pp.submitted_at IS NOT NULL AND pp.approved=0 THEN 0 ELSE 1 END,
|
||||
pp.updated_at DESC"""
|
||||
).fetchall()
|
||||
return [_pp_profile_dict(r) for r in rows]
|
||||
|
||||
|
||||
@router.post("/admin/partner/profiles/{user_id}/review")
|
||||
def review_partner_profile(user_id: int, data: PartnerProfileReview, user=Depends(require_admin)):
|
||||
with db() as conn:
|
||||
row = conn.execute(
|
||||
"SELECT user_id FROM partner_profiles WHERE user_id=?", (user_id,)
|
||||
).fetchone()
|
||||
if not row:
|
||||
raise HTTPException(404, "Partner-Profil nicht gefunden.")
|
||||
conn.execute(
|
||||
"UPDATE partner_profiles SET approved=?, updated_at=datetime('now') WHERE user_id=?",
|
||||
(data.approved, user_id)
|
||||
)
|
||||
profile = _pp_get_or_empty(conn, user_id)
|
||||
return {"profile": profile}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue