Put filters back into switch statement

acterglobal · Nov 13, 2024 · 3507b29 · 3507b29
1 parent a8fdca1
commit 3507b29
Showing 1 changed file with 14 additions and 13 deletions.
diff --git a/app/lib/features/events/providers/event_providers.dart b/app/lib/features/events/providers/event_providers.dart
@@ -205,22 +205,23 @@ final eventListSearchedAndFilterProvider = FutureProvider.autoDispose
     .family<List<ffi.CalendarEvent>, String?>((ref, spaceId) async {
   //Declare filtered event list
 
-  final bookmarkedEvents =
-      await ref.watch(bookmarkedEventListProvider(spaceId).future);
-  final ongoingEvents =
-      await ref.watch(allOngoingEventListProvider(spaceId).future);
-  final upcomingEvents =
-      await ref.watch(allUpcomingEventListProvider(spaceId).future);
-  final pastEvents = await ref.watch(allPastEventListProvider(spaceId).future);
-
   final List<ffi.CalendarEvent> filteredEventList =
       switch (ref.watch(eventListFilterProvider(spaceId))) {
-    EventFilters.bookmarked => bookmarkedEvents,
-    EventFilters.ongoing => ongoingEvents,
-    EventFilters.upcoming => upcomingEvents,
-    EventFilters.past => pastEvents,
+    EventFilters.bookmarked =>
+      await ref.watch(bookmarkedEventListProvider(spaceId).future),
+    EventFilters.ongoing =>
+      await ref.watch(allOngoingEventListProvider(spaceId).future),
+    EventFilters.upcoming =>
+      await ref.watch(allUpcomingEventListProvider(spaceId).future),
+    EventFilters.past =>
+      await ref.watch(allPastEventListProvider(spaceId).future),
     EventFilters.all =>
-      ongoingEvents.followedBy(upcomingEvents).followedBy(pastEvents).toList(),
+      (await ref.watch(allOngoingEventListProvider(spaceId).future))
+          .followedBy(
+            await ref.watch(allUpcomingEventListProvider(spaceId).future),
+          )
+          .followedBy(await ref.watch(allPastEventListProvider(spaceId).future))
+          .toList(),
   };
 
   final priotizeBookmarkedEvents = await priotizeBookmarked(