feat: show current events firstly, then future, and then past

backend/src/modules/events/repository.py

@@ -1,5 +1,6 @@
 __all__ = ["events_repository"]
 
+
 from beanie import PydanticObjectId, SortDirection
 from beanie.odm.operators.find.comparison import GTE, LTE, Eq, In
 from beanie.odm.operators.find.logical import And, Or
@@ -105,13 +106,15 @@ async def read_with_filters(
             query = query.sort(
                 ("start_date", SortDirection.ASCENDING if sort.date == "asc" else SortDirection.DESCENDING)
             )
+
         if sort.participant_count:
             query = query.sort(
                 (
                     "participant_count",
                     SortDirection.ASCENDING if sort.participant_count == "asc" else SortDirection.DESCENDING,
                 )
             )
+
         if sort.age:
             query = query.sort(("age_min", SortDirection.ASCENDING if sort.age == "asc" else SortDirection.DESCENDING))
 

backend/src/modules/events/routes.py

@@ -1,4 +1,4 @@
-from datetime import datetime, timedelta
+from datetime import UTC, datetime, timedelta
 
 import icalendar
 from beanie import PydanticObjectId
@@ -72,7 +72,20 @@ async def search_events(filters: Filters, sort: Sort, pagination: Pagination) ->
     """
     Search events.
     """
+    now_ = datetime.now(UTC)
+
+    def key(event: Event):
+        if event.start_date <= now_ <= event.end_date:
+            return 0
+        if event.start_date > now_:
+            return 1
+        return 2
+
     events = await events_repository.read_with_filters(filters, sort, pagination)
+    if not sort.date:
+        # sort default: current events, future events, past events
+        events = sorted(events, key=key)
+
     return SearchEventsResponse(
         filters=filters,
         sort=sort,