nicer looking month view

backend/modules/calendar/service.py

@@ -20,29 +20,57 @@ def create_calendar_event(db: Session, user_id: int, event_data: CalendarEventCr
     return event
 
 def get_calendar_events(db: Session, user_id: int, start: datetime | None, end: datetime | None):
+    """
+    Retrieves calendar events for a user, optionally filtered by a date range.
+
+    Args:
+        db: The database session.
+        user_id: The ID of the user whose events are to be retrieved.
+        start: The start datetime of the filter range (inclusive).
+        end: The end datetime of the filter range (exclusive).
+
+    Returns:
+        A list of CalendarEvent objects matching the criteria, ordered by start time.
+    """
+    print(f"Getting calendar events for user {user_id} in range [{start}, {end})")
     query = db.query(CalendarEvent).filter(CalendarEvent.user_id == user_id)
 
-    # If start and end dates are provided, filter for events overlapping the range.
-    # An event overlaps if: event_start < query_end AND (event_end IS NULL OR event_end > query_start)
+    # If start and end dates are provided, filter for events overlapping the range [start, end).
     if start and end:
+        # An event overlaps the range [start, end) if:
+        # 1. It has a duration (end is not None) AND its interval [event.start, event.end)
+        #    intersects with [start, end). Intersection occurs if:
+        #    event.start < end AND event.end > start
+        # 2. It's a point event (end is None) AND its start time falls within the range:
+        #    start <= event.start < end
         query = query.filter(
-            CalendarEvent.start < end, # Event starts before the query window ends
             or_(
-                CalendarEvent.end == None, # Event has no end date (considered single point in time at start)
-                CalendarEvent.end > start   # Event ends after the query window starts
+                # Case 1: Event has duration and overlaps
+                (CalendarEvent.end != None) & (CalendarEvent.start < end) & (CalendarEvent.end > start),
+                # Case 2: Event is a point event within the range
+                (CalendarEvent.end == None) & (CalendarEvent.start >= start) & (CalendarEvent.start < end)
             )
         )
     # If only start is provided, filter events starting on or after start
     elif start:
+        # Includes events with duration starting >= start
+        # Includes point events occurring >= start
         query = query.filter(CalendarEvent.start >= start)
-    # If only end is provided, filter events ending on or before end (or starting before end if no end date)
+    # If only end is provided, filter events ending before end, or point events occurring before end
     elif end:
+        # Includes events with duration ending <= end (or starting before end if end is None)
+        # Includes point events occurring < end
          query = query.filter(
             or_(
-                CalendarEvent.end <= end,
-                (CalendarEvent.end == None and CalendarEvent.start < end)
+                # Event ends before the specified end time
+                (CalendarEvent.end != None) & (CalendarEvent.end <= end),
+                # Point event occurs before the specified end time
+                (CalendarEvent.end == None) & (CalendarEvent.start < end)
             )
         )
+        # Alternative interpretation for "ending before end": include events that *start* before end
+        # query = query.filter(CalendarEvent.start < end)
+
 
     return query.order_by(CalendarEvent.start).all() # Order by start time