Complete Redesign of Backend Handling for Client Group Assignments

server/routes/clients.py

@@ -1,12 +1,49 @@
 from server.database import Session
 from models.models import Client, ClientGroup
 from flask import Blueprint, request, jsonify
+from server.mqtt_helper import publish_client_group, delete_client_group_message, publish_multiple_client_groups
 import sys
 sys.path.append('/workspace')
 
 clients_bp = Blueprint("clients", __name__, url_prefix="/api/clients")
 
 
+@clients_bp.route("/sync-all-groups", methods=["POST"])
+def sync_all_client_groups():
+    """
+    Administrative Route: Synchronisiert alle bestehenden Client-Gruppenzuordnungen mit MQTT
+    Nützlich für die einmalige Migration bestehender Clients
+    """
+    session = Session()
+    try:
+        # Alle aktiven Clients abrufen
+        clients = session.query(Client).filter(Client.is_active == True).all()
+
+        if not clients:
+            session.close()
+            return jsonify({"message": "Keine aktiven Clients gefunden", "synced": 0})
+
+        # Alle Clients synchronisieren
+        client_group_mappings = {
+            client.uuid: client.group_id for client in clients}
+        success_count, failed_count = publish_multiple_client_groups(
+            client_group_mappings)
+
+        session.close()
+
+        return jsonify({
+            "success": True,
+            "message": f"Synchronisation abgeschlossen",
+            "synced": success_count,
+            "failed": failed_count,
+            "total": len(clients)
+        })
+
+    except Exception as e:
+        session.close()
+        return jsonify({"error": f"Fehler bei der Synchronisation: {str(e)}"}), 500
+
+
 @clients_bp.route("/without_description", methods=["GET"])
 def get_clients_without_description():
     session = Session()
@@ -46,10 +83,20 @@ def set_client_description(uuid):
     if not client:
         session.close()
         return jsonify({"error": "Client nicht gefunden"}), 404
+
     client.description = description
     session.commit()
+
+    # MQTT: Gruppenzuordnung publizieren (wichtig für neue Clients aus SetupMode)
+    mqtt_success = publish_client_group(client.uuid, client.group_id)
+
     session.close()
-    return jsonify({"success": True})
+
+    response = {"success": True}
+    if not mqtt_success:
+        response["warning"] = "Beschreibung gespeichert, aber MQTT-Publishing fehlgeschlagen"
+
+    return jsonify(response)
 
 
 @clients_bp.route("", methods=["GET"])
@@ -83,18 +130,51 @@ def get_clients():
 def update_clients_group():
     data = request.get_json()
     client_ids = data.get("client_ids", [])
+    group_id = data.get("group_id")
     group_name = data.get("group_name")
+
+    if not isinstance(client_ids, list) or len(client_ids) == 0:
+        return jsonify({"error": "client_ids muss eine nicht-leere Liste sein"}), 400
+
     session = Session()
-    group = session.query(ClientGroup).filter_by(name=group_name).first()
-    if not group:
+
+    # Bestimme Ziel-Gruppe: Priorität hat group_id, ansonsten group_name
+    group = None
+    if group_id is not None:
+        group = session.query(ClientGroup).filter_by(id=group_id).first()
+        if not group:
+            session.close()
+            return jsonify({"error": f"Gruppe mit id={group_id} nicht gefunden"}), 404
+    elif group_name:
+        group = session.query(ClientGroup).filter_by(name=group_name).first()
+        if not group:
+            session.close()
+            return jsonify({"error": f"Gruppe '{group_name}' nicht gefunden"}), 404
+    else:
         session.close()
-        return jsonify({"error": "Gruppe nicht gefunden"}), 404
+        return jsonify({"error": "Entweder group_id oder group_name ist erforderlich"}), 400
+
+    # WICHTIG: group.id vor dem Schließen puffern, um DetachedInstanceError zu vermeiden
+    target_group_id = group.id
+
     session.query(Client).filter(Client.uuid.in_(client_ids)).update(
-        {Client.group_id: group.id}, synchronize_session=False
+        {Client.group_id: target_group_id}, synchronize_session=False
     )
     session.commit()
     session.close()
-    return jsonify({"success": True})
+
+    # MQTT: Gruppenzuordnungen für alle betroffenen Clients publizieren (nutzt gecachten target_group_id)
+    client_group_mappings = {
+        client_id: target_group_id for client_id in client_ids}
+    success_count, failed_count = publish_multiple_client_groups(
+        client_group_mappings)
+
+    response = {"success": True}
+    if failed_count > 0:
+        response[
+            "warning"] = f"Gruppenzuordnung gespeichert, aber {failed_count} MQTT-Publishing(s) fehlgeschlagen"
+
+    return jsonify(response)
 
 
 @clients_bp.route("/<uuid>", methods=["PATCH"])
@@ -194,7 +274,16 @@ def delete_client(uuid):
     if not client:
         session.close()
         return jsonify({"error": "Client nicht gefunden"}), 404
+
     session.delete(client)
     session.commit()
     session.close()
-    return jsonify({"success": True})
+
+    # MQTT: Retained message für gelöschten Client entfernen
+    mqtt_success = delete_client_group_message(uuid)
+
+    response = {"success": True}
+    if not mqtt_success:
+        response["warning"] = "Client gelöscht, aber MQTT-Message-Löschung fehlgeschlagen"
+
+    return jsonify(response)