greedy

models/department.py

@@ -55,23 +55,22 @@ class Department:
         if self._id:
             # Update existing department
             department_dict["updated_at"] = datetime.now()
-            
-            # Remove _id field when updating an existing document to avoid MongoDB error
             if "_id" in department_dict:
                 del department_dict["_id"]
-            
             result = departments_collection.update_one(
                 {"_id": ObjectId(self._id)},
                 {"$set": department_dict}
             )
-            return result.modified_count > 0
+            success = result.modified_count > 0
         else:
             # Insert new department
             department_dict["created_at"] = datetime.now()
             department_dict["updated_at"] = datetime.now()
             result = departments_collection.insert_one(department_dict)
             self._id = result.inserted_id
-            return result.acknowledged
+            success = result.acknowledged
+            
+        return success
     
     @classmethod
     def find_by_id(cls, department_id):

models/incident.py

@@ -69,6 +69,8 @@ class Incident:
         if self._id:
             # Update existing incident
             incident_dict["updated_at"] = datetime.now()
+            if "_id" in incident_dict:
+                del incident_dict["_id"]
             result = incidents_collection.update_one(
                 {"_id": ObjectId(self._id)},
                 {"$set": incident_dict}

models/log.py

@@ -59,6 +59,8 @@ class Log:
         if self._id:
             # Update existing log
             log_dict["updated_at"] = datetime.now()
+            if "_id" in log_dict:
+                del log_dict["_id"]
             result = logs_collection.update_one(
                 {"_id": ObjectId(self._id)},
                 {"$set": log_dict}

models/user.py

@@ -89,30 +89,49 @@ class User:
         users_collection = get_users_collection()
         user_dict = self.to_dict()
         
-        # Add password for database storage
-        if self.password:
-            user_dict["password"] = self.password
-        
+        # Remove password from the dictionary for safety before saving
+        # Password should only be updated via set_password method
+        if 'password' in user_dict:
+            del user_dict['password']
+            
         if self._id:
             # Update existing user
             user_dict["updated_at"] = datetime.now()
-            
-            # Remove _id field when updating an existing document
+            # --- Remove _id before updating --- 
             if "_id" in user_dict:
-                del user_dict["_id"]
-                
+                 del user_dict["_id"] 
+            # --- End Remove _id --- 
             result = users_collection.update_one(
                 {"_id": ObjectId(self._id)},
                 {"$set": user_dict}
             )
-            return result.modified_count > 0
+            success = result.modified_count > 0
         else:
-            # Insert new user
+            # Insert new user - Requires password which was deleted above!
+            # We need the hashed password for insertion.
+            # Let's re-add the hashed password if it exists on the object
+            if self.password:
+                 user_dict['password'] = self.password
+            else:
+                 # This should ideally not happen if creating a new user
+                 # Maybe throw an error or log a warning?
+                 logger.warning(f"Attempting to insert new user {self.email} without a password hash.")
+                 # Handle appropriately - perhaps prevent save or set a placeholder? 
+                 # For now, let it proceed but log it.
+
             user_dict["created_at"] = datetime.now()
             user_dict["updated_at"] = datetime.now()
             result = users_collection.insert_one(user_dict)
             self._id = result.inserted_id
-            return result.acknowledged
+            success = result.acknowledged
+            
+            # Add user to department if insert was successful
+            if success and self.department_id:
+                department = Department.find_by_id(self.department_id)
+                if department:
+                    department.add_member(self._id)
+
+        return success
 
     @classmethod
     def find_by_id(cls, user_id):

models/workflow.py

@@ -1,6 +1,7 @@
 from bson import ObjectId
 from datetime import datetime
 from db import get_workflows_collection
+from models.department import Department
 
 class Workflow:
     def __init__(self, title, description, data_requirements=None, raw_forms=None, form_fields=None, 
@@ -52,39 +53,31 @@ class Workflow:
         workflows_collection = get_workflows_collection()
         workflow_dict = self.to_dict()
         
-        # Exclude _id from the dictionary for the $set operation
-        update_data = {k: v for k, v in workflow_dict.items() if k != '_id'}
-        
         if self._id:
             # Update existing workflow
-            update_data["updated_at"] = datetime.now()
-            # Ensure department_id is ObjectId if it exists in the update_data
-            if 'department_id' in update_data and update_data['department_id'] is not None:
-                 update_data['department_id'] = ObjectId(update_data['department_id'])
-                 
+            workflow_dict["updated_at"] = datetime.now()
+            if "_id" in workflow_dict:
+                del workflow_dict["_id"]
             result = workflows_collection.update_one(
                 {"_id": ObjectId(self._id)},
-                {"$set": update_data} # Use the dictionary without _id
+                {"$set": workflow_dict}
             )
-            # Update the instance's updated_at timestamp after successful save
-            if result.modified_count > 0:
-                self.updated_at = update_data["updated_at"]
-                return True
-            return result.matched_count > 0 # Return True if found even if not modified
+            success = result.modified_count > 0
         else:
             # Insert new workflow
-            # Ensure department_id is ObjectId before insert
-            if 'department_id' in workflow_dict and workflow_dict['department_id'] is not None:
-                 workflow_dict['department_id'] = ObjectId(workflow_dict['department_id'])
-                 
             workflow_dict["created_at"] = datetime.now()
-            workflow_dict["updated_at"] = workflow_dict["created_at"]
+            workflow_dict["updated_at"] = datetime.now()
             result = workflows_collection.insert_one(workflow_dict)
             self._id = result.inserted_id
-            # Update instance timestamps
-            self.created_at = workflow_dict["created_at"]
-            self.updated_at = workflow_dict["updated_at"]
-            return result.acknowledged
+            success = result.acknowledged
+            
+            # Add workflow to department if insert was successful
+            if success and self.department_id:
+                department = Department.find_by_id(self.department_id)
+                if department:
+                    department.add_workflow(self._id)
+        
+        return success
     
     @classmethod
     def find_by_id(cls, workflow_id):