bug fixes

lib/presentation/viewmodel/map_bloc.dart

@@ -4,7 +4,7 @@ import 'package:be_happy/core/result.dart';
 import 'package:be_happy/domain/entities/client_notification.dart';
 import 'package:be_happy/domain/entities/map_settings.dart';
 import 'package:be_happy/domain/usecase/check_user_usecase.dart';
-import 'package:be_happy/domain/usecase/get_available_zones_usecase.dart';
+import 'package:be_happy/domain/usecase/get_all_zones_usecase.dart';
 import 'package:be_happy/domain/usecase/get_client_orders_usecase.dart';
 import 'package:be_happy/domain/usecase/get_map_settings_usecase.dart';
 import 'package:be_happy/domain/usecase/get_notifications_stream_usecase.dart';
@@ -26,7 +26,7 @@ import 'package:maps_toolkit/maps_toolkit.dart' as mt;
 class MapBloc extends Bloc<ScooterEvent, ScooterState> {
   final GetAvailableScootersUsecase getScootersUsecase;
   final GetClientOrdersUsecase getClientOrdersUsecase;
-  final GetAvailableZonesUsecase getAvailableZonesUsecase;
+  final GetAllZonesUsecase getAllZonesUsecase;
   final GetMapSettingsUsecase getMapSettingsUsecase;
   final GetNotificationsStreamUseCase getNotificationsStreamUseCase;
   final GetProfileUseCase getProfileUseCase;
@@ -35,17 +35,19 @@ class MapBloc extends Bloc<ScooterEvent, ScooterState> {
   final SplashBloc splashBloc;
   StreamSubscription<ClientNotification>? _notificationSubscription;
 
+  Future<List<Zone>>? _zonesFuture;
+
   MapBloc(
-    this.getAvailableZonesUsecase,
-    this.getScootersUsecase,
-    this.getClientOrdersUsecase,
-    this.getMapSettingsUsecase,
-    this.getNotificationsStreamUseCase,
-    this.getProfileUseCase,
-    this.checkUserUseCase,
-    this.logoutUseCase,
-    this.splashBloc,
-  ) : super(ScooterState(isGeomarksShowed: true)) {
+      this.getAllZonesUsecase,
+      this.getScootersUsecase,
+      this.getClientOrdersUsecase,
+      this.getMapSettingsUsecase,
+      this.getNotificationsStreamUseCase,
+      this.getProfileUseCase,
+      this.checkUserUseCase,
+      this.logoutUseCase,
+      this.splashBloc,
+      ) : super(ScooterState(isGeomarksShowed: true)) {
     on<FetchScooters>(_onFetchScooters);
     on<UpdateMap>(_onUpdateMap);
     on<UpdateUserLocation>(_onUpdateUserLocation);
@@ -58,11 +60,43 @@ class MapBloc extends Bloc<ScooterEvent, ScooterState> {
     on<ClearMapFocus>(_onClearMapFocus);
   }
 
+  Future<List<Zone>> _getZones() async {
+    _zonesFuture ??= getAllZonesUsecase();
+
+    try {
+      return await _zonesFuture!;
+    } catch (e) {
+      // Не кешируем неудачную попытку — иначе сбой первого запроса
+      // (сеть/авторизация) навсегда "выключает" зоны до перезапуска
+      // приложения. Следующий FetchScooters/UpdateMap попробует заново.
+      _zonesFuture = null;
+      rethrow;
+    }
+  }
+
+  List<Zone> _filterZones(List<Zone> zones, MapSettings settings) {
+    List<Zone> filteredZones = [];
+
+    if (settings.all_zones) {
+      if (settings.parking_zones) {
+        filteredZones.addAll(zones.where((el) => el.type == "Finish"));
+      }
+      if (settings.restricted_parking_zones) {
+        filteredZones.addAll(zones.where((el) => el.type == "Drive"));
+      }
+      if (settings.restricted_driving_zones) {
+        filteredZones.addAll(zones.where((el) => el.type == "NotDrive"));
+      }
+    }
+
+    return filteredZones;
+  }
+
   void startNotificationStream() {
     _notificationSubscription?.cancel();
 
     _notificationSubscription = getNotificationsStreamUseCase().listen(
-      (notification) {
+          (notification) {
         add(NotificationReceived(notification));
       },
       onError: (error) {
@@ -94,15 +128,15 @@ class MapBloc extends Bloc<ScooterEvent, ScooterState> {
   }
 
   Future<void> _onFetchScooters(
-    FetchScooters event,
-    Emitter<ScooterState> emit,
-  ) async {
+      FetchScooters event,
+      Emitter<ScooterState> emit,
+      ) async {
     emit(state.copyWith(status: ScooterStatus.loading));
 
     try {
       final results = await Future.wait([
         getScootersUsecase(event.areaScooters, 0, 100),
-        getAvailableZonesUsecase(event.area, 0, 100),
+        _getZones(),
         getMapSettingsUsecase(),
         getClientOrdersUsecase(),
       ]);
@@ -112,23 +146,7 @@ class MapBloc extends Bloc<ScooterEvent, ScooterState> {
       final settings = results[2] as MapSettings;
       final orders = results[3];
 
-
-
-      zones.forEach(print);
-
-      List<Zone> filteredZones = [];
-
-      if (settings.all_zones) {
-        if (settings.parking_zones) {
-          filteredZones.addAll(zones.where((el) => el.type == "Finish"));
-        }
-        if (settings.restricted_parking_zones) {
-          filteredZones.addAll(zones.where((el) => el.type == "Drive"));
-        }
-        if (settings.restricted_driving_zones) {
-          filteredZones.addAll(zones.where((el) => el.type == "NotDrive"));
-        }
-      }
+      final filteredZones = _filterZones(zones, settings);
 
       print(
         " FETCH: filteredZones.length = ${filteredZones.length}, all_zones=${settings.all_zones}",
@@ -162,7 +180,7 @@ class MapBloc extends Bloc<ScooterEvent, ScooterState> {
     try {
       final results = await Future.wait([
         getScootersUsecase(state.areaScooters, 0, 100),
-        getAvailableZonesUsecase(state.area, 0, 100),
+        _getZones(),
         getMapSettingsUsecase(),
       ]);
 
@@ -170,33 +188,17 @@ class MapBloc extends Bloc<ScooterEvent, ScooterState> {
       final zones = results[1] as List<Zone>;
       final settings = results[2] as MapSettings;
 
-      List<Zone> filteredZones = [];
-
-      if (settings.all_zones) {
-        if (settings.parking_zones) {
-          filteredZones.addAll(zones.where((el) => el.type == "Finish"));
-        }
-        if (settings.restricted_parking_zones) {
-          filteredZones.addAll(zones.where((el) => el.type == "Drive"));
-        }
-        if (settings.restricted_driving_zones) {
-          filteredZones.addAll(zones.where((el) => el.type == "NotDrive"));
-        }
-      }
+      final filteredZones = _filterZones(zones, settings);
 
       print(
         " UPDATE MAP: filteredZones.length = ${filteredZones.length}, all_zones=${settings.all_zones}",
       );
 
-      final zonesToEmit = filteredZones.isNotEmpty
-          ? filteredZones
-          : state.zones;
-
       emit(
         state.copyWith(
           status: ScooterStatus.success,
           scooters: scooters,
-          zones: zonesToEmit,
+          zones: filteredZones,
           isGeomarksShowed: settings.all_placemarks,
         ),
       );
@@ -212,9 +214,9 @@ class MapBloc extends Bloc<ScooterEvent, ScooterState> {
   }
 
   FutureOr<void> _onUpdateUserLocation(
-    UpdateUserLocation event,
-    Emitter<ScooterState> emit,
-  ) {
+      UpdateUserLocation event,
+      Emitter<ScooterState> emit,
+      ) {
     print("USER LOCATION UPDATED EVENT start");
     state.zones.forEach((z) {
       if (checkUserInZone(Point(event.latitude, event.longitude), z.points)) {
@@ -224,9 +226,9 @@ class MapBloc extends Bloc<ScooterEvent, ScooterState> {
   }
 
   FutureOr<void> _onNotificationReceived(
-    NotificationReceived event,
-    Emitter<ScooterState> emit,
-  ) {
+      NotificationReceived event,
+      Emitter<ScooterState> emit,
+      ) {
     print("NOTIFICATION RECEIVED: ${event.notification.content}");
     emit(state.copyWith(lastNotification: event.notification));
   }
@@ -242,9 +244,9 @@ class MapBloc extends Bloc<ScooterEvent, ScooterState> {
   }
 
   FutureOr<void> _onFetchProfileData(
-    FetchProfileData event,
-    Emitter<ScooterState> emit,
-  ) async {
+      FetchProfileData event,
+      Emitter<ScooterState> emit,
+      ) async {
     try {
       final profile = await getProfileUseCase();
 
@@ -262,18 +264,19 @@ class MapBloc extends Bloc<ScooterEvent, ScooterState> {
   }
 
   FutureOr<void> _onLogoutPressed(
-    LogoutPressed event,
-    Emitter<ScooterState> emit,
-  ) async {
+      LogoutPressed event,
+      Emitter<ScooterState> emit,
+      ) async {
     await logoutUseCase();
     stopNotificationStream();
+    _zonesFuture = null;
     splashBloc.add(AuthLogoutRequested());
   }
 
   FutureOr<void> _onCheckUser(
-    CheckUser event,
-    Emitter<ScooterState> emit,
-  ) async {
+      CheckUser event,
+      Emitter<ScooterState> emit,
+      ) async {
     try {
       final flags = await checkUserUseCase();
 
@@ -341,6 +344,4 @@ class MapBloc extends Bloc<ScooterEvent, ScooterState> {
       selectedScooterForFocus: null,
     ));
   }
-}
-
-
+}