update pek

modules/interfaces/interfaceDbRealEstateAccess.py

@@ -64,7 +64,8 @@ class RealEstateAccess:
 
     def canModify(self, model_class: type, recordId: Optional[str] = None) -> bool:
         """Checks if the current user can modify records."""
-        if self.privilege == UserPrivilege.SYSADMIN:
+        # System admins can modify all records
+        if "sysadmin" in self.roleLabels:
             return True
             
         if recordId is not None:
@@ -74,9 +75,11 @@ class RealEstateAccess:
                 
             record = records[0]
             
-            if self.privilege == UserPrivilege.ADMIN and record.get("mandateId", "-") == self.mandateId:
+            # Admins can modify records in their mandate
+            if "admin" in self.roleLabels and record.get("mandateId", "-") == self.mandateId:
                 return True
                 
+            # Regular users can modify their own records
             if (record.get("mandateId", "-") == self.mandateId and 
                 record.get("_createdBy") == self.userId):
                 return True

modules/interfaces/interfaceDbRealEstateObjects.py

@@ -5,7 +5,7 @@ Handles CRUD operations on Real Estate entities (Projekt, Parzelle, etc.).
 """
 
 import logging
-from typing import Dict, Any, List, Optional
+from typing import Dict, Any, List, Optional, Union
 from modules.datamodels.datamodelRealEstate import (
     Projekt,
     Parzelle,
@@ -157,21 +157,33 @@ class RealEstateObjects:
         
         return [Projekt(**r) for r in filtered]
 
-    def updateProjekt(self, projektId: str, updateData: Dict[str, Any]) -> Optional[Projekt]:
-        """Update a project."""
-        projekt = self.getProjekt(projektId)
-        if not projekt:
-            return None
+    def updateProjekt(self, projektId_or_projekt: Union[str, Projekt], updateData: Optional[Dict[str, Any]] = None) -> Optional[Projekt]:
+        """Update a project.
+        
+        Args:
+            projektId_or_projekt: Either a project ID (str) or a Projekt object
+            updateData: Optional dict of fields to update (only used when projektId_or_projekt is a string)
+        """
+        # Handle both Projekt object and projektId string
+        if isinstance(projektId_or_projekt, Projekt):
+            projekt = projektId_or_projekt
+            projektId = projekt.id
+        else:
+            projektId = projektId_or_projekt
+            projekt = self.getProjekt(projektId)
+            if not projekt:
+                return None
+            
+            # Update fields from updateData if provided
+            if updateData:
+                for key, value in updateData.items():
+                    if hasattr(projekt, key):
+                        setattr(projekt, key, value)
         
         # Check if user can modify
         if not self.access.canModify(Projekt, projektId):
             raise PermissionError(f"User {self.userId} cannot modify project {projektId}")
         
-        # Update fields
-        for key, value in updateData.items():
-            if hasattr(projekt, key):
-                setattr(projekt, key, value)
-        
         # Save to database
         self.db.recordModify(Projekt, projektId, projekt.model_dump())