Update database.py

database.py

@@ -85,7 +85,8 @@ def load_db(user_id=None):
     if conn:
         try:
             with conn.cursor(cursor_factory=RealDictCursor) as cur:
-                cur.execute("SELECT * FROM machine_states;")
+                # Query strictly using the active user_id
+                cur.execute("SELECT * FROM machine_states WHERE user_id = %s;", (user_id,))
                 rows = cur.fetchall()
                 for r in rows:
                     upcoming = r["upcoming_tasks"]
@@ -118,6 +119,26 @@ def load_db(user_id=None):
     merged_machines = []
     has_changes = False
     
+    # 1. Identify deleted or inaccessible machines for this specific user
+    openremote_ids = {om["id"] for om in openremote_machines}
+    deleted_ids = [s_id for s_id in supabase_lookup if s_id not in openremote_ids]
+    
+    # 2. Sync deletion (remove machines from Supabase that this user no longer has access to)
+    if deleted_ids:
+        try:
+            conn_del = get_supabase_connection()
+            if conn_del:
+                with conn_del.cursor() as cur:
+                    cur.execute(
+                        "DELETE FROM machine_states WHERE id = ANY(%s) AND user_id = %s;", 
+                        (deleted_ids, user_id)
+                    )
+                conn_del.commit()
+                conn_del.close()
+                print(f"[Supabase Sync] Deleted obsolete/unauthorized machines for user {user_id}: {deleted_ids}")
+        except Exception as e:
+            print(f"[Supabase Sync] Failed to delete obsolete machines: {e}")
+
     for om in openremote_machines:
         m_id = om["id"]
         if m_id in supabase_lookup:
@@ -129,7 +150,7 @@ def load_db(user_id=None):
             om["history_logs"] = sm.get("history_logs", [])
             om["safety_alerts"] = sm.get("safety_alerts", [])
         else:
-            # Found a new machine from OpenRemote
+            # Found a new machine from OpenRemote for this user
             om["status"] = "Operational"
             om["health_score"] = 90
             om["last_maintenance"] = None
@@ -142,11 +163,11 @@ def load_db(user_id=None):
 
     # Save the updated list to Supabase to preserve the initial states
     if has_changes:
-        save_db({"machines": merged_machines})
+        save_db({"machines": merged_machines}, user_id)
 
     return {"machines": merged_machines}
 
-def save_db(data):
+def save_db(data, user_id=None):
     """Save dynamic modifications (logs, tasks, health score, etc.) back to Supabase PostgreSQL."""
     conn = get_supabase_connection()
     if not conn:
@@ -156,9 +177,9 @@ def save_db(data):
         with conn.cursor() as cur:
             for m in data.get("machines", []):
                 cur.execute("""
-                    INSERT INTO machine_states (id, status, health_score, last_maintenance, upcoming_tasks, history_logs, safety_alerts)
-                    VALUES (%s, %s, %s, %s, %s, %s, %s)
-                    ON CONFLICT (id) 
+                    INSERT INTO machine_states (id, user_id, status, health_score, last_maintenance, upcoming_tasks, history_logs, safety_alerts)
+                    VALUES (%s, %s, %s, %s, %s, %s, %s, %s)
+                    ON CONFLICT (id, user_id) 
                     DO UPDATE SET 
                         status = EXCLUDED.status,
                         health_score = EXCLUDED.health_score,
@@ -168,6 +189,7 @@ def save_db(data):
                         safety_alerts = EXCLUDED.safety_alerts
                 """, (
                     m["id"],
+                    user_id,
                     m.get("status", "Operational"),
                     m.get("health_score", 90),
                     m.get("last_maintenance"),