update time filtering

backend/events.py

@@ -2,19 +2,30 @@ from database import execute
 from database import fetch_all, fetch_one
 
 
-def get_user_events(user_id):
-
+def get_user_events(user_id, date_from=None, date_to=None):
     query = """
-    SELECT events.*
-    FROM events
-    JOIN room_members
-        ON events.room_id = room_members.room_id
-    WHERE room_members.user_id = ?
+        SELECT events.*
+        FROM events
+        JOIN room_members
+            ON events.room_id = room_members.room_id
+        WHERE room_members.user_id = ?
     """
 
+    params = [user_id]
+
+    if date_from:
+        query += " AND events.start_time >= ?"
+        params.append(date_from)
+
+    if date_to:
+        query += " AND events.start_time <= ?"
+        params.append(date_to)
+
+    query += " ORDER BY events.start_time"
+
     return fetch_all(
         query,
-        (user_id,)
+        tuple(params),
     )
 
 def create_event(
@@ -166,19 +177,29 @@ def update_event(
             event_id,
         ),
     )
-    
-def get_room_events(room_id):
 
-    from database import fetch_all
-
-    return fetch_all(
-        """
+def get_room_events(room_id, date_from=None, date_to=None):
+    query = """
         SELECT *
         FROM events
         WHERE room_id = ?
-        ORDER BY start_time
-        """,
-        (room_id,)
+    """
+
+    params = [room_id]
+
+    if date_from:
+        query += " AND start_time >= ?"
+        params.append(date_from)
+
+    if date_to:
+        query += " AND start_time <= ?"
+        params.append(date_to)
+
+    query += " ORDER BY start_time"
+
+    return fetch_all(
+        query,
+        tuple(params),
     )
 
 def get_event(event_id):