Update main.py

main.py

@@ -254,7 +254,7 @@ def assign_roster(job_id):
         job_ref = db.reference(f"jobs/{job_id}")
         job_data = job_ref.get()
 
-        if not job_data: # Fixed the condition: job_data is None, not job_id
+        if not job_data:
             logger.error(f"Job {job_id} not found")
             return
 
@@ -276,6 +276,32 @@ def assign_roster(job_id):
             logger.warning(f"No members assigned to job {job_id}")
             return
 
+        # CRITICAL FIX: Ensure all guarding points have IDs
+        points_updated = False
+        for i, point in enumerate(guarding_points):
+            if "id" not in point or not point["id"]:
+                point["id"] = f"point_{i+1}"
+                points_updated = True
+                logger.warning(f"Point missing ID in job {job_id}, assigned: point_{i+1}")
+
+        # Update database if points were missing IDs
+        if points_updated:
+            job_ref.update({"guarding_points": guarding_points})
+            logger.info(f"Updated guarding points with missing IDs for job {job_id}")
+
+        # CRITICAL FIX: Ensure all assigned members have IDs
+        members_updated = False
+        for i, member in enumerate(assigned_members):
+            if "id" not in member or not member["id"]:
+                member["id"] = f"member_{i+1}_{uuid.uuid4().hex[:6]}"
+                members_updated = True
+                logger.warning(f"Member missing ID in job {job_id}, assigned: {member['id']}")
+
+        # Update database if members were missing IDs
+        if members_updated:
+            job_ref.update({"assigned_members": assigned_members})
+            logger.info(f"Updated assigned members with missing IDs for job {job_id}")
+
         # Get current assignments and rotation history
         current_assignments = job_data.get("assignments", [])
         rotation_history = job_data.get("rotation_history", {})
@@ -298,8 +324,8 @@ def assign_roster(job_id):
         if special_assignment:
             logger.info(f"Applying special case assignment for job {job_id}, shift {shift_number}")
             # Apply special case assignment
-            assigned_point = next((p for p in guarding_points if p["id"] == special_assignment["point_id"]), None)
-            assigned_member = next((m for m in assigned_members if m["id"] == special_assignment["member_id"]), None)
+            assigned_point = next((p for p in guarding_points if p.get("id") == special_assignment.get("point_id")), None)
+            assigned_member = next((m for m in assigned_members if m.get("id") == special_assignment.get("member_id")), None)
 
             if assigned_point and assigned_member:
                 shift_assignments.append({
@@ -309,15 +335,17 @@ def assign_roster(job_id):
                     "special_case_reason": special_assignment.get("reason", "Special Assignment")
                 })
             else:
-                 logger.warning(f"Special case assignment failed: Point or Member not found for job {job_id}")
+                logger.warning(f"Special case assignment failed: Point or Member not found for job {job_id}")
+                logger.debug(f"Looking for point_id: {special_assignment.get('point_id')}, member_id: {special_assignment.get('member_id')}")
         else:
             logger.info(f"Applying standard rotation algorithm for job {job_id}, shift {shift_number}")
             # Standard rotation algorithm
-            # Create point-specific rotation history
-            # point_assignments = {} # This variable was defined but not used, removed.
-
             for point in guarding_points:
-                point_id = point["id"]
+                point_id = point.get("id")
+                if not point_id:
+                    logger.error(f"Point still missing ID after fix attempt: {point}")
+                    continue
+
                 point_history = rotation_history.get(point_id, [])
 
                 # Find member who hasn't been assigned to this point recently
@@ -325,12 +353,12 @@ def assign_roster(job_id):
 
                 # Remove recently assigned members (no immediate repetition)
                 recently_assigned_member_ids = set()
-                lookback_window = min(len(guarding_points), len(assigned_members)) # Prevent index error
-                for recent_assignment in point_history[-lookback_window:]:  # Look back N assignments
-                    recently_assigned_member_ids.add(recent_assignment["member_id"])
+                lookback_window = min(len(guarding_points), len(assigned_members))
+                for recent_assignment in point_history[-lookback_window:]:
+                    recently_assigned_member_ids.add(recent_assignment.get("member_id"))
 
                 # Filter available members
-                available_members = [m for m in available_members if m["id"] not in recently_assigned_member_ids]
+                available_members = [m for m in available_members if m.get("id") not in recently_assigned_member_ids]
 
                 # If all members have been recently assigned, use all members
                 if not available_members:
@@ -340,21 +368,21 @@ def assign_roster(job_id):
                 # Select next member (simple round-robin from available)
                 selected_member = None
                 if point_history and available_members:
-                    last_assigned_member_id = point_history[-1]["member_id"]
-                    last_member_index = next((i for i, m in enumerate(available_members) if m["id"] == last_assigned_member_id), -1)
-                    if last_member_index != -1: # Only proceed if last member was in available list
+                    last_assigned_member_id = point_history[-1].get("member_id")
+                    last_member_index = next((i for i, m in enumerate(available_members) if m.get("id") == last_assigned_member_id), -1)
+                    if last_member_index != -1:
                         next_member_index = (last_member_index + 1) % len(available_members)
                     else:
                         # Last assigned member is not in available list, pick first available
                         next_member_index = 0
                     selected_member = available_members[next_member_index]
                 elif available_members:
-                     # No history or last member not in available list, pick first
-                     selected_member = available_members[0]
+                    # No history or last member not in available list, pick first
+                    selected_member = available_members[0]
                 else:
-                     # This shouldn't happen due to the fallback, but log if it does
-                     logger.error(f"No available members for point {point_id} in job {job_id}")
-                     continue # Skip this point
+                    # This shouldn't happen due to the fallback, but log if it does
+                    logger.error(f"No available members for point {point_id} in job {job_id}")
+                    continue
 
                 if selected_member:
                     # Record assignment
@@ -366,53 +394,56 @@ def assign_roster(job_id):
 
                     # Update rotation history
                     point_history.append({
-                        "member_id": selected_member["id"],
+                        "member_id": selected_member.get("id"),
                         "member_name": selected_member.get("name", "Unknown"),
                         "assigned_at": datetime.datetime.now().isoformat(),
                         "shift_number": shift_number
                     })
                     rotation_history[point_id] = point_history
                 else:
-                     logger.warning(f"Could not select a member for point {point_id} in job {job_id}")
+                    logger.warning(f"Could not select a member for point {point_id} in job {job_id}")
 
-            # Update rotation history in database
+        # Update rotation history in database only if we have assignments
+        if shift_assignments:
             job_ref.update({"rotation_history": rotation_history})
 
-        # Create shift record
-        shift_record = {
-            "shift_number": shift_number,
-            "assigned_at": datetime.datetime.now().isoformat(),
-            "assignments": shift_assignments,
-            "shift_id": str(uuid.uuid4())
-        }
-
-        # Add to current assignments
-        current_assignments.append(shift_record)
-
-        # Update job with new assignment
-        job_ref.update({
-            "assignments": current_assignments,
-            "last_updated": datetime.datetime.now().isoformat()
-        })
-
-        logger.info(f"Shift {shift_number} assigned for job {job_id} with {len(shift_assignments)} assignments")
-
-        # Send email notification to admins
-        send_rotation_notification(job_id, shift_record)
-
-        # Schedule next rotation based on job's rotation period
-        rotation_period = job_data.get("rotation_period", 28800)  # Default 8 hours
-        next_run_time = datetime.datetime.now() + datetime.timedelta(seconds=rotation_period)
-
-        scheduler.add_job(
-            func=assign_roster,
-            trigger="date",
-            run_date=next_run_time,
-            args=[job_id],
-            id=f"rotate_{job_id}_{uuid.uuid4().hex[:8]}"
-        )
-
-        logger.info(f"Scheduled next rotation for job {job_id} in {rotation_period} seconds")
+            # Create shift record
+            shift_record = {
+                "shift_number": shift_number,
+                "assigned_at": datetime.datetime.now().isoformat(),
+                "assignments": shift_assignments,
+                "shift_id": str(uuid.uuid4())
+            }
+
+            # Add to current assignments
+            current_assignments.append(shift_record)
+
+            # Update job with new assignment
+            job_ref.update({
+                "assignments": current_assignments,
+                "last_updated": datetime.datetime.now().isoformat()
+            })
+
+            logger.info(f"Shift {shift_number} assigned for job {job_id} with {len(shift_assignments)} assignments")
+
+            # Send email notification to admins
+            send_rotation_notification(job_id, shift_record)
+
+            # Schedule next rotation based on job's rotation period
+            rotation_period = job_data.get("rotation_period", 28800)  # Default 8 hours
+            next_run_time = datetime.datetime.now() + datetime.timedelta(seconds=rotation_period)
+
+            scheduler.add_job(
+                func=assign_roster,
+                trigger="date",
+                run_date=next_run_time,
+                args=[job_id],
+                id=f"rotate_{job_id}_{uuid.uuid4().hex[:8]}"
+            )
+
+            logger.info(f"Scheduled next rotation for job {job_id} in {rotation_period} seconds")
+        else:
+            logger.error(f"No assignments created for job {job_id}, shift {shift_number}")
 
     except Exception as e:
         logger.error(f"Error in assign_roster for job {job_id}: {e}", exc_info=True)