refactor: made the changes

Author: Mayank4352

lib/controllers/rooms_controller.dart

@@ -8,7 +8,6 @@ import 'package:get/get.dart';
 import 'package:loading_animation_widget/loading_animation_widget.dart';
 import 'package:resonate/controllers/tabview_controller.dart';
 import 'package:resonate/models/appwrite_room.dart';
-import 'package:resonate/models/appwrite_upcomming_room.dart';
 import 'package:resonate/services/appwrite_service.dart';
 import 'package:resonate/services/room_service.dart';
 import 'package:resonate/themes/theme_controller.dart';
@@ -27,8 +26,6 @@ class RoomsController extends GetxController {
   RxBool isSearching = false.obs;
   RxBool searchBarIsEmpty = true.obs;
   RxList<AppwriteRoom> filteredRooms = <AppwriteRoom>[].obs;
-  RxList<AppwriteUpcommingRoom> filteredUpcomingRooms =
-      <AppwriteUpcommingRoom>[].obs;
 
   @override
   void onInit() async {
@@ -151,52 +148,29 @@ class RoomsController extends GetxController {
     }
   }
 
-  Future<void> searchRooms(
-    String query, {
-    bool isLiveRooms = true,
-    List<AppwriteUpcommingRoom>? upcomingRooms,
-  }) async {
+  Future<void> searchLiveRooms(String query) async {
     if (query.isEmpty) {
-      if (isLiveRooms) {
-        filteredRooms.value = rooms;
-        searchBarIsEmpty.value = true;
-      } else {
-        filteredUpcomingRooms.value = upcomingRooms ?? [];
-      }
+      filteredRooms.value = rooms;
+      searchBarIsEmpty.value = true;
       return;
     }
-    if (isLiveRooms) {
-      isSearching.value = true;
-      searchBarIsEmpty.value = false;
-    }
+    isSearching.value = true;
+    searchBarIsEmpty.value = false;
     try {
       final lowerQuery = query.toLowerCase();
-      if (isLiveRooms) {
-        filteredRooms.value = rooms.where((room) {
-          return room.name.toLowerCase().contains(lowerQuery) ||
-              room.description.toLowerCase().contains(lowerQuery);
-        }).toList();
-      } else {
-        filteredUpcomingRooms.value = (upcomingRooms ?? []).where((room) {
-          return room.name.toLowerCase().contains(lowerQuery) ||
-              room.description.toLowerCase().contains(lowerQuery);
-        }).toList();
-      }
+      filteredRooms.value = rooms.where((room) {
+        return room.name.toLowerCase().contains(lowerQuery) ||
+            room.description.toLowerCase().contains(lowerQuery);
+      }).toList();
     } catch (e) {
-      log('Error searching ${isLiveRooms ? 'rooms' : 'upcoming rooms'}: $e');
-      if (isLiveRooms) {
-        filteredRooms.value = [];
-      } else {
-        filteredUpcomingRooms.value = [];
-      }
+      log('Error searching rooms: $e');
+      filteredRooms.value = [];
     } finally {
-      if (isLiveRooms) {
-        isSearching.value = false;
-      }
+      isSearching.value = false;
     }
   }
 
-  void clearSearch() {
+  void clearLiveSearch() {
     filteredRooms.value = rooms;
     searchBarIsEmpty.value = true;
   }

lib/controllers/upcomming_rooms_controller.dart

@@ -36,6 +36,9 @@ class UpcomingRoomsController extends GetxController {
   late String localTimeZoneName;
   late bool isOffsetNegetive;
   Rx<bool> isLoading = false.obs;
+  RxBool searchBarIsEmpty = true.obs;
+  RxList<AppwriteUpcommingRoom> filteredUpcomingRooms =
+      <AppwriteUpcommingRoom>[].obs;
   late DateTime currentTimeInstance;
   final Map<String, String> monthMap = {
     "1": "Jan",
@@ -185,6 +188,9 @@ class UpcomingRoomsController extends GetxController {
             await fetchUpcomingRoomDetails(upcomingRoom);
         upcomingRooms.add(appwriteUpcomingRoom);
       }
+      if (searchBarIsEmpty.value) {
+        filteredUpcomingRooms.value = upcomingRooms;
+      }
     } catch (e) {
       log(e.toString());
     } finally {
@@ -205,8 +211,6 @@ class UpcomingRoomsController extends GetxController {
 
     // Delete UpcomingRoom as it is now a room
     await deleteUpcomingRoom(upcomingRoomId);
-
-    await getUpcomingRooms();
   }
 
   Future<void> createUpcomingRoom() async {
@@ -346,4 +350,30 @@ class UpcomingRoomsController extends GetxController {
       isDismissible: false,
     );
   }
+
+  Future<void> searchUpcomingRooms(String query) async {
+    if (query.isEmpty) {
+      filteredUpcomingRooms.value = upcomingRooms;
+      searchBarIsEmpty.value = true;
+      return;
+    }
+
+    searchBarIsEmpty.value = false;
+
+    try {
+      final lowerQuery = query.toLowerCase();
+      filteredUpcomingRooms.value = upcomingRooms.where((room) {
+        return room.name.toLowerCase().contains(lowerQuery) ||
+            room.description.toLowerCase().contains(lowerQuery);
+      }).toList();
+    } catch (e) {
+      log('Error searching upcoming rooms: $e');
+      filteredUpcomingRooms.value = [];
+    }
+  }
+
+  void clearUpcomingSearch() {
+    filteredUpcomingRooms.value = upcomingRooms;
+    searchBarIsEmpty.value = true;
+  }
 }

lib/views/screens/home_screen.dart

@@ -52,7 +52,8 @@ class _HomeScreenState extends State<HomeScreen> {
                         isLiveSelected = selectedTab;
                         _showSearchOverlay = false;
                       });
-                      roomsController.clearSearch();
+                      roomsController.clearLiveSearch();
+                      upcomingRoomsController.clearUpcomingSearch();
                     },
                     onSearchTapped: () {
                       setState(() {
@@ -95,19 +96,21 @@ class _HomeScreenState extends State<HomeScreen> {
             SearchOverlay(
               isVisible: _showSearchOverlay,
               onSearchChanged: (query) {
-                roomsController.searchRooms(
-                  query,
-                  isLiveRooms: isLiveSelected,
-                  upcomingRooms: isLiveSelected
-                      ? null
-                      : upcomingRoomsController.upcomingRooms,
-                );
+                if (isLiveSelected) {
+                  roomsController.searchLiveRooms(query);
+                } else {
+                  upcomingRoomsController.searchUpcomingRooms(query);
+                }
               },
               onClose: () {
                 setState(() {
                   _showSearchOverlay = false;
                 });
-                roomsController.clearSearch();
+                if (isLiveSelected) {
+                  roomsController.clearLiveSearch();
+                } else {
+                  upcomingRoomsController.clearUpcomingSearch();
+                }
               },
               isSearching: isLiveSelected
                   ? roomsController.isSearching.value
@@ -185,9 +188,9 @@ class UpcomingRoomsListView extends StatelessWidget {
   Widget build(BuildContext context) {
     return Obx(() {
       final roomsToShow =
-          roomsController.filteredUpcomingRooms.isNotEmpty ||
-              !roomsController.searchBarIsEmpty.value
-          ? roomsController.filteredUpcomingRooms
+          upcomingRoomsController.filteredUpcomingRooms.isNotEmpty ||
+              !upcomingRoomsController.searchBarIsEmpty.value
+          ? upcomingRoomsController.filteredUpcomingRooms
           : upcomingRoomsController.upcomingRooms;
 
       if (roomsToShow.isNotEmpty) {
@@ -205,7 +208,7 @@ class UpcomingRoomsListView extends StatelessWidget {
         );
       } else {
         return upcomingRoomsController.upcomingRooms.isEmpty &&
-                roomsController.searchBarIsEmpty.value
+                upcomingRoomsController.searchBarIsEmpty.value
             ? const NoRoomScreen(isRoom: false)
             : Center(
                 child: Column(