Implement sync_from_state methods for Area, Brand, Item, RoomFunction, and Room models; enhance entity management and foreign key resolution in settings

models/room_functions.py

@@ -6,6 +6,7 @@ from sqlalchemy import Identity, Integer, Unicode
 from sqlalchemy.orm import Mapped, mapped_column, relationship
 
 from . import db
+from ..temp import is_temp_id
 
 class RoomFunction(db.Model):
     __tablename__ = 'Room Functions'
@@ -28,31 +29,46 @@ class RoomFunction(db.Model):
         }
     
     @classmethod
-    def sync_from_state(cls, submitted_items: list[dict]):
-        """
-        Syncs the functions table with the provided list of dictionaries.
-        Adds new functions and removes functions that are not in the list.
-        """
-        submitted = {
-            str(item.get("name", "")).strip()
-            for item in submitted_items
-            if isinstance(item, dict) and str(item.get("name", "")).strip()
-        }
+    def sync_from_state(cls, submitted_items: list[dict]) -> dict[str, int]:
+        submitted_clean = []
+        seen_ids = set()
+        temp_id_map = {}
     
-        existing_query = db.session.query(cls)
-        existing = {item.description: item for item in existing_query.all()}
+        for item in submitted_items:
+            if not isinstance(item, dict):
+                continue
+            description = str(item.get("name", "")).strip()
+            if not description:
+                continue
+            submitted_clean.append({"id": item.get("id"), "description": description})
+            if isinstance(item.get("id"), int) and item["id"] >= 0:
+                seen_ids.add(item["id"])
     
-        existing_descriptions = set(existing.keys())
+        existing_by_id = {f.id: f for f in db.session.query(cls).all()}
+        existing_ids = set(existing_by_id.keys())
     
-        print(f"Existing functions: {existing_descriptions}")
-        print(f"Submitted functions: {submitted}")
-        print(f"Functions to add: {submitted - existing_descriptions}")
-        print(f"Functions to remove: {existing_descriptions - submitted}")
+        print(f"Existing function IDs: {existing_ids}")
+        print(f"Submitted function IDs: {seen_ids}")
     
-        for description in submitted - existing_descriptions:
-            db.session.add(cls(description=description))
-            print(f"➕ Adding item: {description}")
+        for entry in submitted_clean:
+            submitted_id = entry.get("id")
+            description = entry["description"]
     
-        for description in existing_descriptions - submitted:
-            db.session.delete(existing[description])
-            print(f"🗑️ Removing item: {description}")
+            if is_temp_id(submitted_id):
+                obj = cls(description=description)
+                db.session.add(obj)
+                db.session.flush()
+                temp_id_map[submitted_id] = obj.id
+                print(f"➕ Adding function: {description}")
+            elif submitted_id in existing_by_id:
+                obj = existing_by_id[submitted_id]
+                if obj.description != description:
+                    print(f"✏️ Updating function {obj.id}: '{obj.description}' → '{description}'")
+                    obj.description = description
+    
+        for id_to_remove in existing_ids - seen_ids:
+            db.session.delete(existing_by_id[id_to_remove])
+            print(f"🗑️ Removing function ID {id_to_remove}")
+    
+        return temp_id_map
+