diff --git a/backend/auth.py b/backend/auth.py
index a4d5af3..0b3bff1 100644
--- a/backend/auth.py
+++ b/backend/auth.py
@@ -87,7 +87,7 @@ def get_current_user(
user_id = int(payload["sub"])
with db() as conn:
row = conn.execute(
- "SELECT id, email, name, rolle, is_premium, is_moderator, is_banned, ban_reason, is_social_media, notes_ki_enabled, gassi_stunde_push, breeder_status, is_founder, is_partner, founder_number, email_verified, luna_trial_until FROM users WHERE id=?",
+ "SELECT id, email, name, rolle, is_premium, is_moderator, is_banned, ban_reason, is_social_media, notes_ki_enabled, gassi_stunde_push, breeder_status, is_founder, is_partner, founder_number, email_verified, luna_trial_until, subscription_tier FROM users WHERE id=?",
(user_id,)
).fetchone()
@@ -130,6 +130,32 @@ def require_admin(user=Depends(get_current_user)):
return user
+def has_pro_access(user: dict) -> bool:
+ """True wenn User Pro-Features nutzen darf."""
+ if not user:
+ return False
+ role = user.get("rolle", "user")
+ tier = user.get("subscription_tier", "standard")
+ if role in ("admin", "moderator"):
+ return True
+ if user.get("is_moderator") or user.get("is_social_media"):
+ return True
+ return tier in ("pro", "breeder", "pro_test", "breeder_test")
+
+
+def has_breeder_access(user: dict) -> bool:
+ """True wenn User Züchter-Features nutzen darf."""
+ if not user:
+ return False
+ role = user.get("rolle", "user")
+ tier = user.get("subscription_tier", "standard")
+ if role in ("admin", "moderator"):
+ return True
+ if user.get("is_moderator") or user.get("is_social_media"):
+ return True
+ return tier in ("breeder", "breeder_test") or role == "breeder"
+
+
def require_social_media(user=Depends(get_current_user)):
"""Dependency: Social-Media-Manager, Luna-Probezugang oder Admin."""
from datetime import datetime as _dt
diff --git a/backend/database.py b/backend/database.py
index efb9266..c56a2f6 100644
--- a/backend/database.py
+++ b/backend/database.py
@@ -2075,6 +2075,14 @@ def _migrate(conn_factory):
_seed_help_articles(conn)
logger.info("Migration: Hilfe/FAQ-Tabelle bereit.")
+ # ---- Feature: Subscription-Tier ----
+ try:
+ conn.execute("ALTER TABLE users ADD COLUMN subscription_tier TEXT DEFAULT 'standard'")
+ conn.execute("CREATE INDEX IF NOT EXISTS idx_users_tier ON users(subscription_tier)")
+ logger.info("Migration: subscription_tier Spalte hinzugefügt.")
+ except Exception:
+ pass # Spalte existiert bereits
+
def _seed_help_articles(conn):
"""Befüllt help_articles mit Starter-FAQs — nur wenn die Tabelle noch leer ist."""
diff --git a/backend/main.py b/backend/main.py
index 93a4f28..3bb5f90 100644
--- a/backend/main.py
+++ b/backend/main.py
@@ -327,7 +327,7 @@ MEDIA_DIR = os.getenv("MEDIA_DIR", "/data/media")
os.makedirs(MEDIA_DIR, exist_ok=True)
app.mount("/media", StaticFiles(directory=MEDIA_DIR), name="media")
-APP_VER = "733" # muss mit APP_VER in app.js übereinstimmen
+APP_VER = "734" # muss mit APP_VER in app.js übereinstimmen
@app.get("/api/version")
async def app_version():
diff --git a/backend/routes/admin.py b/backend/routes/admin.py
index c2ffebb..5e82927 100644
--- a/backend/routes/admin.py
+++ b/backend/routes/admin.py
@@ -81,12 +81,15 @@ def require_admin(user=Depends(get_current_user)):
# ------------------------------------------------------------------
# Schemas
# ------------------------------------------------------------------
+_VALID_TIERS = {"standard", "pro", "breeder", "standard_test", "pro_test", "breeder_test"}
+
class UserPatch(BaseModel):
- rolle: Optional[str] = None # user | moderator | admin
- is_moderator: Optional[int] = None
- is_banned: Optional[int] = None
- ban_reason: Optional[str] = None
- is_social_media: Optional[int] = None
+ rolle: Optional[str] = None # user | moderator | admin
+ is_moderator: Optional[int] = None
+ is_banned: Optional[int] = None
+ ban_reason: Optional[str] = None
+ is_social_media: Optional[int] = None
+ subscription_tier: Optional[str] = None
class WikiEnrichBody(BaseModel):
limit: int = 10
@@ -331,7 +334,7 @@ async def list_users(
SELECT u.id, u.name, {_email_col}, u.rolle, u.is_premium,
u.is_moderator, u.is_banned, u.ban_reason,
u.is_founder, u.is_partner, u.founder_number,
- u.created_at, u.last_login,
+ u.created_at, u.last_login, u.subscription_tier,
(SELECT COUNT(*) FROM dogs d WHERE d.user_id=u.id) AS dog_count,
(SELECT COUNT(*) FROM forum_threads t WHERE t.user_id=u.id AND t.is_deleted=0) AS thread_count,
ROUND(COALESCE((SELECT SUM(r.distanz_km) FROM routes r WHERE r.user_id=u.id), 0), 1) AS total_km,
@@ -365,6 +368,10 @@ async def patch_user(uid: int, data: UserPatch, user=Depends(require_mod)):
raise HTTPException(403, "is_moderator darf nur von Admins geändert werden.")
if data.is_social_media is not None and user["rolle"] != "admin":
raise HTTPException(403, "is_social_media darf nur von Admins geändert werden.")
+ if data.subscription_tier is not None and user["rolle"] != "admin":
+ raise HTTPException(403, "subscription_tier darf nur von Admins geändert werden.")
+ if data.subscription_tier is not None and data.subscription_tier not in _VALID_TIERS:
+ raise HTTPException(400, f"Ungültiger Tier. Erlaubt: {', '.join(sorted(_VALID_TIERS))}")
with db() as conn:
target = conn.execute("SELECT id, rolle, name FROM users WHERE id=?", (uid,)).fetchone()
@@ -385,7 +392,7 @@ async def patch_user(uid: int, data: UserPatch, user=Depends(require_mod)):
cols = ", ".join(f"{k}=?" for k in updates)
conn.execute(f"UPDATE users SET {cols} WHERE id=?", [*updates.values(), uid])
row = conn.execute(
- "SELECT id, name, email, rolle, is_moderator, is_banned, ban_reason FROM users WHERE id=?",
+ "SELECT id, name, email, rolle, is_moderator, is_banned, ban_reason, subscription_tier FROM users WHERE id=?",
(uid,)
).fetchone()
@@ -395,6 +402,8 @@ async def patch_user(uid: int, data: UserPatch, user=Depends(require_mod)):
detail_parts.append("gesperrt" if updates["is_banned"] else "entsperrt")
if "rolle" in updates:
detail_parts.append(f"Rolle→{updates['rolle']}")
+ if "subscription_tier" in updates:
+ detail_parts.append(f"Tier→{updates['subscription_tier']}")
_audit(conn, user, "user_patch", f"user:{uid} ({target['name']})", ", ".join(detail_parts) or None)
return dict(row)
diff --git a/backend/static/index.html b/backend/static/index.html
index 5782464..ffe279f 100644
--- a/backend/static/index.html
+++ b/backend/static/index.html
@@ -578,7 +578,7 @@
-
+
diff --git a/backend/static/js/app.js b/backend/static/js/app.js
index 5f77fd1..7aebf45 100644
--- a/backend/static/js/app.js
+++ b/backend/static/js/app.js
@@ -3,7 +3,7 @@
Router, State-Management, Navigation, Initialisierung.
============================================================ */
-const APP_VER = '733'; // ← bei jedem Deploy mit Frontend-Änderungen erhöhen
+const APP_VER = '734'; // ← bei jedem Deploy mit Frontend-Änderungen erhöhen
const APP_VERSION = '1.4.0'; // ← semantische Version, wird bei make release gesetzt
const IS_STAGING = location.hostname === 'staging.banyaro.app';
diff --git a/backend/static/js/pages/admin.js b/backend/static/js/pages/admin.js
index 3e485d5..b03c463 100644
--- a/backend/static/js/pages/admin.js
+++ b/backend/static/js/pages/admin.js
@@ -795,6 +795,9 @@ window.Page_admin = (() => {
${_esc(u.rolle)}
+ ·
+ ${_esc(u.subscription_tier || 'standard')}
+
· ${u.dog_count} Hund${u.dog_count !== 1 ? 'e' : ''}
· ${u.thread_count} Threads
@@ -823,6 +826,11 @@ window.Page_admin = (() => {
title="Rolle ändern">
+