update

backend/app/features.py

@@ -6,6 +6,7 @@ Jeder darf aufschreiben, was er sich wünscht. Alle sehen alle Wünsche,
 
 from datetime import datetime, timezone
 
+from . import users
 from .db import connect
 from .users import besitzer, gehoert_mir
 
@@ -13,6 +14,7 @@ SCHEMA = """
 CREATE TABLE IF NOT EXISTS features (
     id         INTEGER PRIMARY KEY AUTOINCREMENT,
     session_id TEXT NOT NULL,
+    user_id    INTEGER,
     text       TEXT NOT NULL,
     created_at TEXT NOT NULL
 );
@@ -21,23 +23,10 @@ CREATE TABLE IF NOT EXISTS features (
 MAX_LAENGE = 500
 
 
-def _spalte_user_id(conn, tabelle):
-    """Nachrüsten und aus der Sitzung füllen — einmalig je Datenbank."""
-    spalten = {r[1] for r in conn.execute(f"PRAGMA table_info({tabelle})")}
-    if "user_id" in spalten:
-        return
-    conn.execute(f"ALTER TABLE {tabelle} ADD COLUMN user_id INTEGER")
-    conn.execute(
-        f"UPDATE {tabelle} SET user_id = ("
-        "  SELECT user_id FROM user_sessions s WHERE s.session_id = "
-        f"  {tabelle}.session_id)"
-    )
-
-
 def init():
     with connect() as conn:
         conn.executescript(SCHEMA)
-        _spalte_user_id(conn, "features")
+        users.user_id_nachruesten(conn, "features")
 
 
 def alle(session_id):
@@ -45,8 +34,7 @@ def alle(session_id):
     with connect() as conn:
         rows = conn.execute(
             "SELECT f.*, u.name FROM features f "
-            "LEFT JOIN user_sessions s ON s.session_id = f.session_id "
-            "LEFT JOIN users u ON u.id = s.user_id "
+            "LEFT JOIN users u ON u.id = f.user_id "
             "ORDER BY f.created_at DESC"
         ).fetchall()
     ich = besitzer(session_id)