User-Löschen: Upgrade-Anfragen + Hund-Daten mit aufräumen (Admin + Self-Delete)
- admin.py delete_user: löscht jetzt auch Hund-zentrierte Daten (diary, health, training_sessions, training_streaks, expenses), dogs, upgrade_requests, push_subscriptions, notifications, forum_posts bevor der User-Row weg ist. Vorher: nur DELETE FROM users → Waisen in allen FK-Tabellen. - profile.py delete_account: gleicher Cleanup-Set, vergisst jetzt upgrade_requests nicht mehr. - admin.py Dashboard-Counter 'Zu Erledigen': JOIN users, damit verwaiste Anfragen nicht mehr im Header-Badge erscheinen (Liste selbst filtert sie schon korrekt via JOIN). Bump 1135→1136.
This commit is contained in:
parent
6bc63e3818
commit
bd9acda084
7 changed files with 37 additions and 17 deletions
2
VERSION
2
VERSION
|
|
@ -1 +1 @@
|
|||
1135
|
||||
1136
|
||||
|
|
@ -136,8 +136,13 @@ async def action_items(user=Depends(require_mod)):
|
|||
"SELECT COUNT(*) FROM users WHERE DATE(created_at)=DATE('now')"
|
||||
).fetchone()[0]
|
||||
try:
|
||||
# JOIN mit users, damit verwaiste Anfragen von gelöschten Usern
|
||||
# nicht mehr im „Zu Erledigen"-Counter auftauchen (Liste filtert
|
||||
# das via JOIN bereits, der Counter tat es früher nicht).
|
||||
upgrades_pending = conn.execute(
|
||||
"SELECT COUNT(*) FROM upgrade_requests WHERE fulfilled_at IS NULL"
|
||||
"SELECT COUNT(*) FROM upgrade_requests r "
|
||||
"JOIN users u ON u.id = r.user_id "
|
||||
"WHERE r.fulfilled_at IS NULL"
|
||||
).fetchone()[0]
|
||||
except Exception:
|
||||
upgrades_pending = 0
|
||||
|
|
@ -457,6 +462,20 @@ async def delete_user(uid: int, user=Depends(require_admin)):
|
|||
raise HTTPException(404, "User nicht gefunden.")
|
||||
if target["id"] == user["id"]:
|
||||
raise HTTPException(400, "Du kannst deinen eigenen Account nicht löschen.")
|
||||
# Hund-zentrierte Daten zuerst löschen, sonst hängt der FK an der Hunde-ID
|
||||
dog_ids = [r["id"] for r in conn.execute(
|
||||
"SELECT id FROM dogs WHERE user_id=?", (uid,)).fetchall()]
|
||||
for did in dog_ids:
|
||||
conn.execute("DELETE FROM diary WHERE dog_id=?", (did,))
|
||||
conn.execute("DELETE FROM health WHERE dog_id=?", (did,))
|
||||
conn.execute("DELETE FROM training_sessions WHERE dog_id=?", (did,))
|
||||
conn.execute("DELETE FROM training_streaks WHERE dog_id=?", (did,))
|
||||
conn.execute("DELETE FROM expenses WHERE dog_id=?", (did,))
|
||||
conn.execute("DELETE FROM dogs WHERE user_id=?", (uid,))
|
||||
conn.execute("DELETE FROM upgrade_requests WHERE user_id=?", (uid,))
|
||||
conn.execute("DELETE FROM push_subscriptions WHERE user_id=?", (uid,))
|
||||
conn.execute("DELETE FROM notifications WHERE user_id=?", (uid,))
|
||||
conn.execute("DELETE FROM forum_posts WHERE user_id=?", (uid,))
|
||||
conn.execute("DELETE FROM users WHERE id=?", (uid,))
|
||||
_audit(conn, user, "user_delete", f"user:{uid} ({target['name']})")
|
||||
|
||||
|
|
|
|||
|
|
@ -164,6 +164,7 @@ async def delete_account(user=Depends(get_current_user)):
|
|||
conn.execute("DELETE FROM training_streaks WHERE dog_id=?", (did,))
|
||||
conn.execute("DELETE FROM expenses WHERE dog_id=?", (did,))
|
||||
conn.execute("DELETE FROM dogs WHERE user_id=?", (uid,))
|
||||
conn.execute("DELETE FROM upgrade_requests WHERE user_id=?", (uid,))
|
||||
conn.execute("DELETE FROM push_subscriptions WHERE user_id=?", (uid,))
|
||||
conn.execute("DELETE FROM notifications WHERE user_id=?", (uid,))
|
||||
conn.execute("DELETE FROM forum_posts WHERE user_id=?", (uid,))
|
||||
|
|
|
|||
|
|
@ -86,14 +86,14 @@
|
|||
<title>Ban Yaro</title>
|
||||
|
||||
<!-- Theme + theme-color Statusleiste vor CSS setzen -->
|
||||
<script src="/js/boot-early.js?v=1135"></script>
|
||||
<script src="/js/boot-early.js?v=1136"></script>
|
||||
|
||||
<!-- CSS: Reihenfolge ist wichtig — ?v= zwingt Browser zur Neuladung -->
|
||||
<link rel="stylesheet" href="/css/design-system.css?v=1135">
|
||||
<link rel="stylesheet" href="/css/layout.css?v=1135">
|
||||
<link rel="stylesheet" href="/css/components.css?v=1135">
|
||||
<link rel="stylesheet" href="/css/utilities.css?v=1135">
|
||||
<link rel="stylesheet" href="/css/lists.css?v=1135">
|
||||
<link rel="stylesheet" href="/css/design-system.css?v=1136">
|
||||
<link rel="stylesheet" href="/css/layout.css?v=1136">
|
||||
<link rel="stylesheet" href="/css/components.css?v=1136">
|
||||
<link rel="stylesheet" href="/css/utilities.css?v=1136">
|
||||
<link rel="stylesheet" href="/css/lists.css?v=1136">
|
||||
</head>
|
||||
<body>
|
||||
|
||||
|
|
@ -617,11 +617,11 @@
|
|||
<div id="modal-container"></div>
|
||||
|
||||
<!-- JS: Reihenfolge ist wichtig — erst Basis, dann Features -->
|
||||
<script src="/js/api.js?v=1135"></script>
|
||||
<script src="/js/ui.js?v=1135"></script>
|
||||
<script src="/js/app.js?v=1135"></script>
|
||||
<script src="/js/worlds.js?v=1135"></script>
|
||||
<script src="/js/offline-indicator.js?v=1135"></script>
|
||||
<script src="/js/api.js?v=1136"></script>
|
||||
<script src="/js/ui.js?v=1136"></script>
|
||||
<script src="/js/app.js?v=1136"></script>
|
||||
<script src="/js/worlds.js?v=1136"></script>
|
||||
<script src="/js/offline-indicator.js?v=1136"></script>
|
||||
|
||||
<!-- Feature-Seiten werden lazy geladen -->
|
||||
|
||||
|
|
@ -631,7 +631,7 @@
|
|||
|
||||
|
||||
<!-- Boot: Offline-Banner + SW-Registration (extrahiert für CSP) -->
|
||||
<script src="/js/boot.js?v=1135"></script>
|
||||
<script src="/js/boot.js?v=1136"></script>
|
||||
|
||||
|
||||
</body>
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
Router, State-Management, Navigation, Initialisierung.
|
||||
============================================================ */
|
||||
|
||||
const APP_VER = '1135'; // ← bei jedem Deploy mit Frontend-Änderungen erhöhen
|
||||
const APP_VER = '1136'; // ← bei jedem Deploy mit Frontend-Änderungen erhöhen
|
||||
const APP_VERSION = '1.6.0'; // ← semantische Version, wird bei make release gesetzt
|
||||
window.APP_VER = APP_VER; // global verfügbar für andere Module (z.B. offline-indicator)
|
||||
window.APP_VERSION = APP_VERSION;
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
<meta charset="UTF-8">
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
||||
<meta name="color-scheme" content="light dark">
|
||||
<script src="/js/landing-init.js?v=1135"></script>
|
||||
<script src="/js/landing-init.js?v=1136"></script>
|
||||
<title>Ban Yaro — Die Hunde-App für Deutschland, Österreich & Schweiz</title>
|
||||
<meta name="description" content="Ban Yaro: Die kostenlose All-in-One Hunde-App für DACH. Tagebuch, Giftköder-Alarm, Training mit KI, Forum, Wurfbörse, Stammbaum, Inzucht-Check — DSGVO-konform, offline-fähig, ohne App Store.">
|
||||
<meta name="keywords" content="Hunde App, Hunde Community, Wurfbörse, Züchter, Welpen kaufen, Stammbaum Hund, Inzuchtkoeffizient, Hundezucht, Impfpass Hund, Giftköder Alarm, Gassi Community, Hundetraining App, Hunde Forum, Hunde KI, Hundefilm Datenbank, Welpen Marktplatz">
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
============================================================ */
|
||||
|
||||
// ← EINZIGE Stelle für die Version — STATIC_ASSETS und CACHE_VERSION leiten sich ab
|
||||
const VER = '1135';
|
||||
const VER = '1136';
|
||||
const CACHE_VERSION = `by-v${VER}`;
|
||||
const CACHE_STATIC = `${CACHE_VERSION}-static`;
|
||||
const CACHE_TILES = 'ban-yaro-tiles-v1'; // bleibt über SW-Updates erhalten
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue