Merge pull request #160 from sjefferson99/159-card-scheduler-considers-the-whole-board-for-duplication

159 card scheduler considers the whole board for duplication

Author: sjefferson99

server/app.py

@@ -21,7 +21,7 @@
 logger = logging.getLogger(__name__)
 
 # Application version
-APP_VERSION = "1.2.0"
+APP_VERSION = "1.2.1"
 
 # Settings schema - defines allowed settings and their validation rules
 SETTINGS_SCHEMA = {
@@ -3312,13 +3312,20 @@ def create_card(column_id):
         if scheduled is not None and not isinstance(scheduled, bool):
             return create_error_response("Scheduled must be a boolean", 400)
 
+        # Validate schedule parameter if provided
+        schedule = data.get("schedule")
+        if schedule is not None:
+            if not isinstance(schedule, int):
+                return create_error_response("Schedule must be an integer", 400)
+
         # Create card
         card = Card(
             column_id=column_id, 
             title=title, 
             description=description, 
             order=order,
-            scheduled=scheduled
+            scheduled=scheduled,
+            schedule=schedule
         )
         db.add(card)
         db.commit()
@@ -3330,6 +3337,9 @@ def create_card(column_id):
             "title": card.title,
             "description": card.description,
             "order": card.order,
+            "scheduled": card.scheduled,
+            "schedule": card.schedule,
+            "archived": card.archived
         }
 
         return create_success_response({"card": result}, status_code=201)
@@ -3814,6 +3824,13 @@ def update_card(card_id):
 
             card.description = description
 
+        # Update archived status if provided
+        if "archived" in data:
+            archived = data["archived"]
+            if not isinstance(archived, bool):
+                return create_error_response("Archived must be a boolean", 400)
+            card.archived = archived
+
         # Handle column and order changes
         if "column_id" in data or "order" in data:
             new_column_id = data.get("column_id", card.column_id)

server/card_scheduler.py

@@ -199,19 +199,26 @@ def _process_schedule(self, db, schedule: ScheduledCard, now: datetime):
                 # This prevents creating duplicate cards if the scheduler runs multiple times
                 # within the lookback window (e.g., after a restart)
                 if not schedule.allow_duplicates:  # type: ignore
-                    # For non-duplicate schedules, check if any active cards exist from this schedule
+                    # Get the template card to check its column
+                    template = db.query(Card).filter(Card.id == schedule.card_id).first()
+                    if not template:
+                        logger.error(f"Template card {schedule.card_id} not found for schedule {schedule.id}")
+                        return
+                    
+                    # For non-duplicate schedules, check if any active cards exist from this schedule IN THE SAME COLUMN
                     # This is a simple but effective way to prevent duplicates without needing timestamps
                     existing_card = (
                         db.query(Card)
+                        .filter(Card.column_id == template.column_id)  # Check same column only
                         .filter(Card.schedule == schedule.id)
                         .filter(Card.scheduled.is_(False))  # Don't count template cards
                         .filter(Card.archived.is_(False))  # Only check active cards
                         .first()
                     )
 
                     if existing_card:
-                        # Already have an active card for this schedule, skip
-                        logger.debug(f"Skipping schedule {schedule.id} - active card already exists")
+                        # Already have an active card for this schedule in this column, skip
+                        logger.debug(f"Skipping schedule {schedule.id} - active card already exists in column {template.column_id}")
                         return
 
                 logger.info(f"Creating card for schedule {schedule.id} (missed by {time_since_run:.0f} seconds)")