some fix

# Conflicts:
#	lib/presentation/navigation/app_router.dart
#	pubspec.yaml

lib/data/exceptions/auth_block_exception.dart

@@ -1,8 +1,8 @@
-class AuthBlockException implements Exception {
-  String description = "Неверный код. Вы временно заблокированы, попробуйте позже.";
-
-  AuthBlockException();
-
-  @override
-  String toString() => description;
-}
+class AuthBlockException implements Exception {
+  String description = "Неверный код. Вы временно заблокированы, попробуйте позже.";
+
+  AuthBlockException();
+
+  @override
+  String toString() => description;
+}

lib/data/exceptions/auth_exception.dart

@@ -1,9 +1,9 @@
-class AuthException implements Exception {
-  int attemptsLeft;
-  String? description;
-
-  AuthException(this.description, this.attemptsLeft);
-
-  @override
-  String toString() => description ?? "Ошибка авторизации";
-}
+class AuthException implements Exception {
+  int attemptsLeft;
+  String? description;
+
+  AuthException(this.description, this.attemptsLeft);
+
+  @override
+  String toString() => description ?? "Ошибка авторизации";
+}

lib/data/exceptions/route_history_not_found_exception.dart

@@ -1,8 +1,8 @@
-class RouteHistoryNotFoundException implements Exception {
-  final String message;
-
-  RouteHistoryNotFoundException({this.message = "История маршрута не найдена"});
-
-  @override
-  String toString() => message;
-}
+class RouteHistoryNotFoundException implements Exception {
+  final String message;
+
+  RouteHistoryNotFoundException({this.message = "История маршрута не найдена"});
+
+  @override
+  String toString() => message;
+}

lib/data/exceptions/scooter_not_found_exception.dart

@@ -1,8 +1,8 @@
-class ScooterNotFoundException implements Exception {
-  final String message;
-
-  ScooterNotFoundException({this.message = "Самокат не найден"});
-
-  @override
-  String toString() => message;
-}
+class ScooterNotFoundException implements Exception {
+  final String message;
+
+  ScooterNotFoundException({this.message = "Самокат не найден"});
+
+  @override
+  String toString() => message;
+}

lib/data/exceptions/unauthorized_exception.dart

@@ -1,5 +1,5 @@
-class UnauthorizedException implements Exception {
-
-  @override
-  String toString() => "Ошибка авторизации. Пользователь не авторизован";
-}
+class UnauthorizedException implements Exception {
+
+  @override
+  String toString() => "Ошибка авторизации. Пользователь не авторизован";
+}

lib/data/exceptions/wrong_zone_exception.dart

@@ -1,6 +1,6 @@
-class WrongZoneException implements Exception {
-  final String message;
-
-  WrongZoneException({required this.message});
-
-}
+class WrongZoneException implements Exception {
+  final String message;
+
+  WrongZoneException({required this.message});
+
+}

lib/data/interceptor/auth_interceptor.dart

@@ -1,26 +1,26 @@
-import 'package:dio/dio.dart';
-import 'package:be_happy/presentation/viewmodel/splash_bloc.dart';
-import 'package:be_happy/presentation/event/spalsh_event.dart';
-
-import '../../di/service_locator.dart';
-
-class AuthInterceptor extends Interceptor {
-
-  AuthInterceptor();
-
-  @override
-  void onError(DioException err, ErrorInterceptorHandler handler) {
-    final String path = err.requestOptions.path;
-
-    if (err.response?.statusCode == 401) {
-      if (!path.contains('/auth/client/refresh') && !path.contains('/auth/client/login')) {
-        print('Interceptor: 401 на обычном запросе. Пытаемся обновить токен...');
-        getIt<SplashBloc>().add(AuthCheckRequested());
-      } else {
-        print('Interceptor: 401 на запросе авторизации. Пробрасываем ошибку дальше.');
-      }
-    }
-
-    return super.onError(err, handler);
-  }
+import 'package:dio/dio.dart';
+import 'package:be_happy/presentation/viewmodel/splash_bloc.dart';
+import 'package:be_happy/presentation/event/spalsh_event.dart';
+
+import '../../di/service_locator.dart';
+
+class AuthInterceptor extends Interceptor {
+
+  AuthInterceptor();
+
+  @override
+  void onError(DioException err, ErrorInterceptorHandler handler) {
+    final String path = err.requestOptions.path;
+
+    if (err.response?.statusCode == 401) {
+      if (!path.contains('/auth/client/refresh') && !path.contains('/auth/client/login')) {
+        print('Interceptor: 401 на обычном запросе. Пытаемся обновить токен...');
+        getIt<SplashBloc>().add(AuthCheckRequested());
+      } else {
+        print('Interceptor: 401 на запросе авторизации. Пробрасываем ошибку дальше.');
+      }
+    }
+
+    return super.onError(err, handler);
+  }
 }

lib/data/models/auth_response_dto.dart

@@ -1,13 +1,13 @@
-class AuthResponseDto {
-  final String accessToken;
-  final String refreshToken;
-
-  AuthResponseDto({required this.accessToken, required this.refreshToken});
-
-  factory AuthResponseDto.fromJson(Map<String, dynamic> json) {
-    return AuthResponseDto(
-      accessToken: json["accessToken"] ?? "",
-      refreshToken: json["refreshToken"] ?? "",
-    );
-  }
+class AuthResponseDto {
+  final String accessToken;
+  final String refreshToken;
+
+  AuthResponseDto({required this.accessToken, required this.refreshToken});
+
+  factory AuthResponseDto.fromJson(Map<String, dynamic> json) {
+    return AuthResponseDto(
+      accessToken: json["accessToken"] ?? "",
+      refreshToken: json["refreshToken"] ?? "",
+    );
+  }
 }

lib/data/models/client_notification_dto.dart

@@ -1,89 +1,89 @@
-import 'dart:convert';
-import '../../domain/entities/client_notification.dart';
-
-class ClientNotificationDto {
-  final int id;
-  final String content;
-  final int clientId;
-  final String type;
-  final String category;
-  final String createdAt;
-  final String? canceledAt;
-  final String? readAt;
-
-  ClientNotificationDto({
-    required this.id,
-    required this.content,
-    required this.clientId,
-    required this.type,
-    required this.category,
-    required this.createdAt,
-    this.canceledAt,
-    this.readAt,
-  });
-
-  factory ClientNotificationDto.fromJson(Map<String, dynamic> json) {
-    return ClientNotificationDto(
-      id: json['id'] as int,
-      content: json['content'] as String,
-      clientId: json['clientId'] as int,
-      type: json['type'] as String,
-      category: json['category'] as String,
-      createdAt: json['createdAt'] as String,
-      canceledAt: json['canceledAt'] as String?,
-      readAt: json['readAt'] as String?,
-    );
-  }
-
-  ClientNotification toEntity() {
-    return ClientNotification(
-      id: id,
-      content: content,
-      clientId: clientId,
-      type: _parseType(type),
-      category: _parseCategory(category),
-      createdAt: _parseUtcDate(createdAt),
-      canceledAt: canceledAt != null ? _parseUtcDate(canceledAt!) : null,
-      readAt: readAt != null ? _parseUtcDate(readAt!) : null,
-    );
-  }
-
-  DateTime _parseUtcDate(String dateString) {
-    if (dateString.endsWith('Z') || dateString.contains('+') || dateString.contains('-')) {
-      return DateTime.parse(dateString).toLocal();
-    }
-    return DateTime.parse('${dateString}Z').toLocal();
-  }
-
-  NotificationType _parseType(String type) {
-    switch (type.toLowerCase()) {
-      case 'info':
-        return NotificationType.info;
-      case 'attention':
-        return NotificationType.attention;
-      case 'warning':
-        return NotificationType.warning;
-      default:
-        return NotificationType.info;
-    }
-  }
-
-  NotificationCategory _parseCategory(String category) {
-    switch (category.toLowerCase()) {
-      case 'auth':
-        return NotificationCategory.auth;
-      case 'zone':
-        return NotificationCategory.zone;
-      case 'payment':
-        return NotificationCategory.payment;
-      case 'companyinfo':
-        return NotificationCategory.companyInfo;
-      case 'admininfo':
-        return NotificationCategory.adminInfo;
-      case 'scooter':
-        return NotificationCategory.scooter;
-      default:
-        return NotificationCategory.companyInfo;
-    }
-  }
+import 'dart:convert';
+import '../../domain/entities/client_notification.dart';
+
+class ClientNotificationDto {
+  final int id;
+  final String content;
+  final int clientId;
+  final String type;
+  final String category;
+  final String createdAt;
+  final String? canceledAt;
+  final String? readAt;
+
+  ClientNotificationDto({
+    required this.id,
+    required this.content,
+    required this.clientId,
+    required this.type,
+    required this.category,
+    required this.createdAt,
+    this.canceledAt,
+    this.readAt,
+  });
+
+  factory ClientNotificationDto.fromJson(Map<String, dynamic> json) {
+    return ClientNotificationDto(
+      id: json['id'] as int,
+      content: json['content'] as String,
+      clientId: json['clientId'] as int,
+      type: json['type'] as String,
+      category: json['category'] as String,
+      createdAt: json['createdAt'] as String,
+      canceledAt: json['canceledAt'] as String?,
+      readAt: json['readAt'] as String?,
+    );
+  }
+
+  ClientNotification toEntity() {
+    return ClientNotification(
+      id: id,
+      content: content,
+      clientId: clientId,
+      type: _parseType(type),
+      category: _parseCategory(category),
+      createdAt: _parseUtcDate(createdAt),
+      canceledAt: canceledAt != null ? _parseUtcDate(canceledAt!) : null,
+      readAt: readAt != null ? _parseUtcDate(readAt!) : null,
+    );
+  }
+
+  DateTime _parseUtcDate(String dateString) {
+    if (dateString.endsWith('Z') || dateString.contains('+') || dateString.contains('-')) {
+      return DateTime.parse(dateString).toLocal();
+    }
+    return DateTime.parse('${dateString}Z').toLocal();
+  }
+
+  NotificationType _parseType(String type) {
+    switch (type.toLowerCase()) {
+      case 'info':
+        return NotificationType.info;
+      case 'attention':
+        return NotificationType.attention;
+      case 'warning':
+        return NotificationType.warning;
+      default:
+        return NotificationType.info;
+    }
+  }
+
+  NotificationCategory _parseCategory(String category) {
+    switch (category.toLowerCase()) {
+      case 'auth':
+        return NotificationCategory.auth;
+      case 'zone':
+        return NotificationCategory.zone;
+      case 'payment':
+        return NotificationCategory.payment;
+      case 'companyinfo':
+        return NotificationCategory.companyInfo;
+      case 'admininfo':
+        return NotificationCategory.adminInfo;
+      case 'scooter':
+        return NotificationCategory.scooter;
+      default:
+        return NotificationCategory.companyInfo;
+    }
+  }
 }

lib/data/models/login_request_dto.dart

@@ -1,9 +1,9 @@
-class LoginRequestDto {
-  final String phone;
-
-  LoginRequestDto({required this.phone});
-
-  Map<String, dynamic> toJson() {
-    return {"phone": phone};
-  }
+class LoginRequestDto {
+  final String phone;
+
+  LoginRequestDto({required this.phone});
+
+  Map<String, dynamic> toJson() {
+    return {"phone": phone};
+  }
 }

lib/data/models/payment_card_request_dto.dart

@@ -1,25 +1,25 @@
-class PaymentCardRequestDto {
-  final String cardNumber;
-  final String cardHolder;
-  final int expirationMonth;
-  final int expirationYear;
-  final String cvv;
-
-  PaymentCardRequestDto({
-    required this.cardNumber,
-    required this.cardHolder,
-    required this.expirationMonth,
-    required this.expirationYear,
-    required this.cvv,
-  });
-
-  Map<String, dynamic> toJson() {
-    return {
-      'cardNumber': cardNumber.replaceAll(' ', ''),
-      'cardHolder': cardHolder,
-      'expirationMonth': expirationMonth,
-      'expirationYear': expirationYear,
-      'cvv': cvv,
-    };
-  }
+class PaymentCardRequestDto {
+  final String cardNumber;
+  final String cardHolder;
+  final int expirationMonth;
+  final int expirationYear;
+  final String cvv;
+
+  PaymentCardRequestDto({
+    required this.cardNumber,
+    required this.cardHolder,
+    required this.expirationMonth,
+    required this.expirationYear,
+    required this.cvv,
+  });
+
+  Map<String, dynamic> toJson() {
+    return {
+      'cardNumber': cardNumber.replaceAll(' ', ''),
+      'cardHolder': cardHolder,
+      'expirationMonth': expirationMonth,
+      'expirationYear': expirationYear,
+      'cvv': cvv,
+    };
+  }
 }

lib/data/models/payment_card_response_dto.dart

@@ -1,45 +1,45 @@
-import '../../domain/entities/payment_card.dart';
-
-class PaymentCardResponseDto {
-  final int id;
-  final String bindingId;
-  final int expirationMonth;
-  final int expirationYear;
-  final String cardHolder;
-  final String cardLastNumber;
-  final String type;
-  final bool isMain;
-
-  PaymentCardResponseDto({
-    required this.id,
-    required this.bindingId,
-    required this.expirationMonth,
-    required this.expirationYear,
-    required this.cardHolder,
-    required this.cardLastNumber,
-    required this.type,
-    required this.isMain,
-  });
-
-  factory PaymentCardResponseDto.fromJson(Map<String, dynamic> json) {
-    return PaymentCardResponseDto(
-      id: json['id'] as int,
-      bindingId: json['bindingId'] as String,
-      expirationMonth: json['expirationMonth'] as int,
-      expirationYear: json['expirationYear'] as int,
-      cardHolder: json['cardHolder'] as String,
-      cardLastNumber: json['cardLastNumber'] as String,
-      isMain: json['isMain'] as bool,
-      type: json['type'] as String,
-    );
-  }
-
-  PaymentCard toEntity(String? fullCardNumber) {
-    return PaymentCard(
-      id: id,
-      bindingId: bindingId,
-      cardLastNumber: cardLastNumber,
-      isMain: isMain,
-    );
-  }
-}
+import '../../domain/entities/payment_card.dart';
+
+class PaymentCardResponseDto {
+  final int id;
+  final String bindingId;
+  final int expirationMonth;
+  final int expirationYear;
+  final String cardHolder;
+  final String cardLastNumber;
+  final String type;
+  final bool isMain;
+
+  PaymentCardResponseDto({
+    required this.id,
+    required this.bindingId,
+    required this.expirationMonth,
+    required this.expirationYear,
+    required this.cardHolder,
+    required this.cardLastNumber,
+    required this.type,
+    required this.isMain,
+  });
+
+  factory PaymentCardResponseDto.fromJson(Map<String, dynamic> json) {
+    return PaymentCardResponseDto(
+      id: json['id'] as int,
+      bindingId: json['bindingId'] as String,
+      expirationMonth: json['expirationMonth'] as int,
+      expirationYear: json['expirationYear'] as int,
+      cardHolder: json['cardHolder'] as String,
+      cardLastNumber: json['cardLastNumber'] as String,
+      isMain: json['isMain'] as bool,
+      type: json['type'] as String,
+    );
+  }
+
+  PaymentCard toEntity(String? fullCardNumber) {
+    return PaymentCard(
+      id: id,
+      bindingId: bindingId,
+      cardLastNumber: cardLastNumber,
+      isMain: isMain,
+    );
+  }
+}

lib/data/models/promo_code_response_dto.dart

@@ -1,25 +1,25 @@
-import '../../domain/entities/promo_code_result.dart';
-
-class PromoCodeResponseDto {
-  final bool success;
-  final double balance;
-
-  PromoCodeResponseDto({
-    required this.success,
-    required this.balance,
-  });
-
-  factory PromoCodeResponseDto.fromJson(Map<String, dynamic> json) {
-    return PromoCodeResponseDto(
-      success: json['success'] as bool,
-      balance: (json['balance'] as num).toDouble(),
-    );
-  }
-
-  PromoCodeResult toEntity() {
-    return PromoCodeResult(
-      success: success,
-      balance: balance,
-    );
-  }
+import '../../domain/entities/promo_code_result.dart';
+
+class PromoCodeResponseDto {
+  final bool success;
+  final double balance;
+
+  PromoCodeResponseDto({
+    required this.success,
+    required this.balance,
+  });
+
+  factory PromoCodeResponseDto.fromJson(Map<String, dynamic> json) {
+    return PromoCodeResponseDto(
+      success: json['success'] as bool,
+      balance: (json['balance'] as num).toDouble(),
+    );
+  }
+
+  PromoCodeResult toEntity() {
+    return PromoCodeResult(
+      success: success,
+      balance: balance,
+    );
+  }
 }

lib/data/models/scooter_order_history_response.dart

@@ -1,21 +1,21 @@
-import '../../domain/entities/scooter_order.dart';
-import '../../domain/entities/pagination.dart';
-
-class ScooterOrderHistoryResponse {
-  final List<ScooterOrder> orders;
-  final Pagination pagination;
-
-  ScooterOrderHistoryResponse({
-    required this.orders,
-    required this.pagination,
-  });
-
-  factory ScooterOrderHistoryResponse.fromJson(Map<String, dynamic> json) {
-    return ScooterOrderHistoryResponse(
-      orders: (json['data'] as List<dynamic>)
-          .map((e) => ScooterOrder.fromJson(e as Map<String, dynamic>))
-          .toList(),
-      pagination: Pagination.fromJson(json['pagination']),
-    );
-  }
+import '../../domain/entities/scooter_order.dart';
+import '../../domain/entities/pagination.dart';
+
+class ScooterOrderHistoryResponse {
+  final List<ScooterOrder> orders;
+  final Pagination pagination;
+
+  ScooterOrderHistoryResponse({
+    required this.orders,
+    required this.pagination,
+  });
+
+  factory ScooterOrderHistoryResponse.fromJson(Map<String, dynamic> json) {
+    return ScooterOrderHistoryResponse(
+      orders: (json['data'] as List<dynamic>)
+          .map((e) => ScooterOrder.fromJson(e as Map<String, dynamic>))
+          .toList(),
+      pagination: Pagination.fromJson(json['pagination']),
+    );
+  }
 }

lib/data/models/scooters_response.dart

@@ -1,21 +1,21 @@
-import '../../domain/entities/pagination.dart';
-import '../../domain/entities/scooter.dart';
-
-class ScootersResponse {
-  final List<Scooter> scooters;
-  final Pagination pagination;
-
-  ScootersResponse({
-    required this.scooters,
-    required this.pagination,
-  });
-
-  factory ScootersResponse.fromJson(Map<String, dynamic> json) {
-    return ScootersResponse(
-      scooters: (json['data'] as List<dynamic>)
-          .map((e) => Scooter.fromJson(e as Map<String, dynamic>))
-          .toList(),
-      pagination: Pagination.fromJson(json['pagination']),
-    );
-  }
+import '../../domain/entities/pagination.dart';
+import '../../domain/entities/scooter.dart';
+
+class ScootersResponse {
+  final List<Scooter> scooters;
+  final Pagination pagination;
+
+  ScootersResponse({
+    required this.scooters,
+    required this.pagination,
+  });
+
+  factory ScootersResponse.fromJson(Map<String, dynamic> json) {
+    return ScootersResponse(
+      scooters: (json['data'] as List<dynamic>)
+          .map((e) => Scooter.fromJson(e as Map<String, dynamic>))
+          .toList(),
+      pagination: Pagination.fromJson(json['pagination']),
+    );
+  }
 }

lib/data/models/subscriptions_response.dart

@@ -1,15 +1,15 @@
-import 'package:be_happy/domain/entities/subscription.dart';
-
-class SubscriptionsResponse {
-  final List<Subscription> subscriptions;
-
-  SubscriptionsResponse({required this.subscriptions});
-
-  factory SubscriptionsResponse.fromJson(Map<String, dynamic> json) {
-    return SubscriptionsResponse(
-      subscriptions: (json['data'] as List<dynamic>)
-          .map((e) => Subscription.fromJson(e as Map<String, dynamic>))
-          .toList(),
-    );
-  }
-}
+import 'package:be_happy/domain/entities/subscription.dart';
+
+class SubscriptionsResponse {
+  final List<Subscription> subscriptions;
+
+  SubscriptionsResponse({required this.subscriptions});
+
+  factory SubscriptionsResponse.fromJson(Map<String, dynamic> json) {
+    return SubscriptionsResponse(
+      subscriptions: (json['data'] as List<dynamic>)
+          .map((e) => Subscription.fromJson(e as Map<String, dynamic>))
+          .toList(),
+    );
+  }
+}

lib/data/models/tariffs_response.dart

@@ -1,15 +1,15 @@
-import 'package:be_happy/domain/entities/tariff.dart';
-
-class TariffsResponse {
-  final List<Tariff> tariffs;
-
-  TariffsResponse({required this.tariffs});
-
-  factory TariffsResponse.fromJson(Map<String, dynamic> json) {
-    return TariffsResponse(
-      tariffs: (json['data'] as List<dynamic>)
-          .map((e) => Tariff.fromJson(e as Map<String, dynamic>))
-          .toList(),
-    );
-  }
-}
+import 'package:be_happy/domain/entities/tariff.dart';
+
+class TariffsResponse {
+  final List<Tariff> tariffs;
+
+  TariffsResponse({required this.tariffs});
+
+  factory TariffsResponse.fromJson(Map<String, dynamic> json) {
+    return TariffsResponse(
+      tariffs: (json['data'] as List<dynamic>)
+          .map((e) => Tariff.fromJson(e as Map<String, dynamic>))
+          .toList(),
+    );
+  }
+}

lib/data/models/user_check_response_dto.dart

@@ -1,22 +1,22 @@
-class UserCheckResponseDto {
-  final bool success;
-  final bool hasFine;
-  final bool hasUnpaidOrder;
-  final bool hasCard;
-
-  UserCheckResponseDto({
-    required this.success,
-    required this.hasFine,
-    required this.hasUnpaidOrder,
-    required this.hasCard,
-  });
-
-  factory UserCheckResponseDto.fromJson(Map<String, dynamic> json) {
-    return UserCheckResponseDto(
-      success: json['success'] ?? false,
-      hasFine: json['hasFine'] ?? false,
-      hasUnpaidOrder: json['hasUnpaidOrder'] ?? false,
-      hasCard: json['hasCard'] ?? false,
-    );
-  }
-}
+class UserCheckResponseDto {
+  final bool success;
+  final bool hasFine;
+  final bool hasUnpaidOrder;
+  final bool hasCard;
+
+  UserCheckResponseDto({
+    required this.success,
+    required this.hasFine,
+    required this.hasUnpaidOrder,
+    required this.hasCard,
+  });
+
+  factory UserCheckResponseDto.fromJson(Map<String, dynamic> json) {
+    return UserCheckResponseDto(
+      success: json['success'] ?? false,
+      hasFine: json['hasFine'] ?? false,
+      hasUnpaidOrder: json['hasUnpaidOrder'] ?? false,
+      hasCard: json['hasCard'] ?? false,
+    );
+  }
+}

lib/data/models/verify_code_request_dto.dart

@@ -1,10 +1,10 @@
-class VerifyCodeRequestDto {
-  final String code;
-  final String token;
-
-  VerifyCodeRequestDto({required this.code, required this.token});
-
-  Map<String, dynamic> toJson() {
-    return {"code": code, "token": token};
-  }
+class VerifyCodeRequestDto {
+  final String code;
+  final String token;
+
+  VerifyCodeRequestDto({required this.code, required this.token});
+
+  Map<String, dynamic> toJson() {
+    return {"code": code, "token": token};
+  }
 }

lib/data/models/zones_response.dart

@@ -1,22 +1,22 @@
-import '../../domain/entities/pagination.dart';
-import '../../domain/entities/scooter.dart';
-import '../../domain/entities/zone.dart';
-
-class ZonesResponse {
-  final List<Zone> zones;
-  final Pagination pagination;
-
-  ZonesResponse({
-    required this.zones,
-    required this.pagination,
-  });
-
-  factory ZonesResponse.fromJson(Map<String, dynamic> json) {
-    return ZonesResponse(
-      zones: (json['data'] as List<dynamic>)
-          .map((e) => Zone.fromJson(e as Map<String, dynamic>))
-          .toList(),
-      pagination: Pagination.fromJson(json['pagination']),
-    );
-  }
+import '../../domain/entities/pagination.dart';
+import '../../domain/entities/scooter.dart';
+import '../../domain/entities/zone.dart';
+
+class ZonesResponse {
+  final List<Zone> zones;
+  final Pagination pagination;
+
+  ZonesResponse({
+    required this.zones,
+    required this.pagination,
+  });
+
+  factory ZonesResponse.fromJson(Map<String, dynamic> json) {
+    return ZonesResponse(
+      zones: (json['data'] as List<dynamic>)
+          .map((e) => Zone.fromJson(e as Map<String, dynamic>))
+          .toList(),
+      pagination: Pagination.fromJson(json['pagination']),
+    );
+  }
 }

lib/data/network/geocoding_remote_datasource.dart

@@ -1,101 +1,101 @@
-import 'dart:async';
-
-import 'package:yandex_mapkit/yandex_mapkit.dart';
-
-class GeocodingRemoteDataSource {
-
-  Future<String> getAddressFromPoint({
-    required double latitude,
-    required double longitude,
-  }) async {
-    final point = Point(
-      latitude: latitude,
-      longitude: longitude,
-    );
-
-    final (session, resultFuture) = await YandexSearch.searchByPoint(
-      point: point,
-      zoom: 16,
-      searchOptions: const SearchOptions(
-        searchType: SearchType.geo,
-        resultPageSize: 1,
-      ),
-    );
-
-    try {
-      final result = await resultFuture;
-
-      if (result.items == null || result.items!.isEmpty) {
-        throw Exception("Адрес не найден");
-      }
-
-      final item = result.items!.first;
-
-      print("ADDRESS FETCH RESULT ${item.name}");
-
-      final toponymAddress =
-          item.toponymMetadata?.address?.formattedAddress;
-
-      if (toponymAddress != null && toponymAddress.isNotEmpty) {
-        return toponymAddress;
-      }
-
-      final businessAddress =
-          item.businessMetadata?.address?.formattedAddress;
-
-      if (businessAddress != null && businessAddress.isNotEmpty) {
-        return businessAddress;
-      }
-
-      return item.name;
-    } catch (e) {
-      throw Exception("Ошибка получения адреса: $e");
-    } finally {
-      await session.close();
-    }
-  }
-
-  Future<List<MasstransitRoute>?> getPedestrianRoutes(
-      Point userPosition,
-      Point targetPosition,
-      ) async {
-    try {
-
-      print("From: ${userPosition.latitude}, ${userPosition.longitude}");
-      print("To: ${targetPosition.latitude}, ${targetPosition.longitude}");
-
-      final (session, resultFuture) = await YandexPedestrian.requestRoutes(
-          points: [
-            RequestPoint(point: userPosition, requestPointType: RequestPointType.wayPoint),
-            RequestPoint(point: targetPosition, requestPointType: RequestPointType.wayPoint)
-          ],
-          fitnessOptions: const FitnessOptions(avoidSteep: false, avoidStairs: false),
-          timeOptions: const TimeOptions()
-      );
-
-      final result = await resultFuture;
-
-      if (result.routes == null || result.routes!.isEmpty) {
-        print("Маршруты не найдены: список пуст или null");
-        return [];
-      }
-
-      final route = result.routes!.first;
-
-      final distance = route.metadata.weight.walkingDistance?.value;
-
-      if (distance != null) {
-        print("Дистанция до самоката: $distance м");
-      } else {
-        print("Дистанция не найдена в метаданных маршрута");
-      }
-
-      return result.routes;
-
-    } catch (e, stack) {
-      print('Pedestrian route error: $e');
-      print('Stack trace: $stack');
-      return null;
-    }
-  }
+import 'dart:async';
+
+import 'package:yandex_mapkit/yandex_mapkit.dart';
+
+class GeocodingRemoteDataSource {
+
+  Future<String> getAddressFromPoint({
+    required double latitude,
+    required double longitude,
+  }) async {
+    final point = Point(
+      latitude: latitude,
+      longitude: longitude,
+    );
+
+    final (session, resultFuture) = await YandexSearch.searchByPoint(
+      point: point,
+      zoom: 16,
+      searchOptions: const SearchOptions(
+        searchType: SearchType.geo,
+        resultPageSize: 1,
+      ),
+    );
+
+    try {
+      final result = await resultFuture;
+
+      if (result.items == null || result.items!.isEmpty) {
+        throw Exception("Адрес не найден");
+      }
+
+      final item = result.items!.first;
+
+      print("ADDRESS FETCH RESULT ${item.name}");
+
+      final toponymAddress =
+          item.toponymMetadata?.address?.formattedAddress;
+
+      if (toponymAddress != null && toponymAddress.isNotEmpty) {
+        return toponymAddress;
+      }
+
+      final businessAddress =
+          item.businessMetadata?.address?.formattedAddress;
+
+      if (businessAddress != null && businessAddress.isNotEmpty) {
+        return businessAddress;
+      }
+
+      return item.name;
+    } catch (e) {
+      throw Exception("Ошибка получения адреса: $e");
+    } finally {
+      await session.close();
+    }
+  }
+
+  Future<List<MasstransitRoute>?> getPedestrianRoutes(
+      Point userPosition,
+      Point targetPosition,
+      ) async {
+    try {
+
+      print("From: ${userPosition.latitude}, ${userPosition.longitude}");
+      print("To: ${targetPosition.latitude}, ${targetPosition.longitude}");
+
+      final (session, resultFuture) = await YandexPedestrian.requestRoutes(
+          points: [
+            RequestPoint(point: userPosition, requestPointType: RequestPointType.wayPoint),
+            RequestPoint(point: targetPosition, requestPointType: RequestPointType.wayPoint)
+          ],
+          fitnessOptions: const FitnessOptions(avoidSteep: false, avoidStairs: false),
+          timeOptions: const TimeOptions()
+      );
+
+      final result = await resultFuture;
+
+      if (result.routes == null || result.routes!.isEmpty) {
+        print("Маршруты не найдены: список пуст или null");
+        return [];
+      }
+
+      final route = result.routes!.first;
+
+      final distance = route.metadata.weight.walkingDistance?.value;
+
+      if (distance != null) {
+        print("Дистанция до самоката: $distance м");
+      } else {
+        print("Дистанция не найдена в метаданных маршрута");
+      }
+
+      return result.routes;
+
+    } catch (e, stack) {
+      print('Pedestrian route error: $e');
+      print('Stack trace: $stack');
+      return null;
+    }
+  }
 }

lib/data/repositories/app_settings_repository_impl.dart

@@ -1,42 +1,42 @@
-import 'package:be_happy/data/service/app_setting_service.dart';
-import 'package:be_happy/domain/entities/map_settings.dart';
-import 'package:be_happy/domain/repositories/app_settings_repository.dart';
-
-class AppSettingsRepositoryImpl extends AppSettingsRepository {
-  static const String SHOW_ALL_PLACEMARKS = "all_placemarks";
-  static const String SHOW_ALL_ZONES = "all_zones";
-  static const String SHOW_PARKING_ZONES = "parking_zones";
-  static const String SHOW_RESTRICTED_PARKING_ZONES = "restricted_parking_zones";
-  static const String SHOW_RESTRICTED_DRIVING_ZONES = "restricted_driving_zones";
-
-  final AppSettingsService appSettingsService;
-
-  AppSettingsRepositoryImpl(this.appSettingsService);
-
-  @override
-  Future<MapSettings> getMapSettings() async {
-    MapSettings settings = MapSettings(
-        all_placemarks: appSettingsService.getMapSettingsFlag(
-            SHOW_ALL_PLACEMARKS),
-        all_zones: appSettingsService.getMapSettingsFlag(
-            SHOW_ALL_ZONES),
-        parking_zones: appSettingsService.getMapSettingsFlag(
-            SHOW_PARKING_ZONES),
-        restricted_parking_zones: appSettingsService.getMapSettingsFlag(
-            SHOW_RESTRICTED_PARKING_ZONES),
-        restricted_driving_zones: appSettingsService.getMapSettingsFlag(
-            SHOW_RESTRICTED_DRIVING_ZONES)
-    );
-
-    return settings;
-  }
-
-  @override
-  Future<void> saveMapSettings(MapSettings settings) async {
-    appSettingsService.saveMapSettingsFlag(SHOW_ALL_PLACEMARKS, settings.all_placemarks);
-    appSettingsService.saveMapSettingsFlag(SHOW_ALL_ZONES, settings.all_zones);
-    appSettingsService.saveMapSettingsFlag(SHOW_PARKING_ZONES, settings.parking_zones);
-    appSettingsService.saveMapSettingsFlag(SHOW_RESTRICTED_PARKING_ZONES, settings.restricted_parking_zones);
-    appSettingsService.saveMapSettingsFlag(SHOW_RESTRICTED_DRIVING_ZONES, settings.restricted_driving_zones);
-  }
-}
+import 'package:be_happy/data/service/app_setting_service.dart';
+import 'package:be_happy/domain/entities/map_settings.dart';
+import 'package:be_happy/domain/repositories/app_settings_repository.dart';
+
+class AppSettingsRepositoryImpl extends AppSettingsRepository {
+  static const String SHOW_ALL_PLACEMARKS = "all_placemarks";
+  static const String SHOW_ALL_ZONES = "all_zones";
+  static const String SHOW_PARKING_ZONES = "parking_zones";
+  static const String SHOW_RESTRICTED_PARKING_ZONES = "restricted_parking_zones";
+  static const String SHOW_RESTRICTED_DRIVING_ZONES = "restricted_driving_zones";
+
+  final AppSettingsService appSettingsService;
+
+  AppSettingsRepositoryImpl(this.appSettingsService);
+
+  @override
+  Future<MapSettings> getMapSettings() async {
+    MapSettings settings = MapSettings(
+        all_placemarks: appSettingsService.getMapSettingsFlag(
+            SHOW_ALL_PLACEMARKS),
+        all_zones: appSettingsService.getMapSettingsFlag(
+            SHOW_ALL_ZONES),
+        parking_zones: appSettingsService.getMapSettingsFlag(
+            SHOW_PARKING_ZONES),
+        restricted_parking_zones: appSettingsService.getMapSettingsFlag(
+            SHOW_RESTRICTED_PARKING_ZONES),
+        restricted_driving_zones: appSettingsService.getMapSettingsFlag(
+            SHOW_RESTRICTED_DRIVING_ZONES)
+    );
+
+    return settings;
+  }
+
+  @override
+  Future<void> saveMapSettings(MapSettings settings) async {
+    appSettingsService.saveMapSettingsFlag(SHOW_ALL_PLACEMARKS, settings.all_placemarks);
+    appSettingsService.saveMapSettingsFlag(SHOW_ALL_ZONES, settings.all_zones);
+    appSettingsService.saveMapSettingsFlag(SHOW_PARKING_ZONES, settings.parking_zones);
+    appSettingsService.saveMapSettingsFlag(SHOW_RESTRICTED_PARKING_ZONES, settings.restricted_parking_zones);
+    appSettingsService.saveMapSettingsFlag(SHOW_RESTRICTED_DRIVING_ZONES, settings.restricted_driving_zones);
+  }
+}

lib/data/repositories/auth_repository_impl.dart

@@ -1,85 +1,85 @@
-import 'package:be_happy/core/failures.dart';
-import 'package:be_happy/core/result.dart';
-import 'package:be_happy/data/exceptions/auth_block_exception.dart';
-import 'package:be_happy/data/exceptions/auth_exception.dart';
-import 'package:be_happy/data/repositories/pin_repository_impl.dart';
-import 'package:be_happy/domain/service/device_info_service.dart';
-import 'package:be_happy/domain/service/security_service.dart';
-
-import '../../domain/repositories/auth_repository.dart';
-import '../../domain/entities/user_auth_data.dart';
-
-import '../network/api_service.dart';
-
-class AuthRepositoryImpl implements AuthRepository {
-  final ApiService _apiService;
-  final DeviceInfoService _deviceInfoService;
-  final SecurityService _securityService;
-
-  String tempToken = "";
-
-  AuthRepositoryImpl(
-    this._apiService,
-    this._deviceInfoService,
-    this._securityService,
-  );
-
-  @override
-  Future<String> login(String phone) async {
-    final systemId = await _deviceInfoService.getSystemId() ?? "UnknownId";
-    final deviceModel = await _deviceInfoService.getDeviceModel();
-
-    final response = await _apiService.sendPhone(phone, deviceModel, systemId);
-    if (response != null) {
-      tempToken = response;
-      print("TEMP TOKEN IS $tempToken");
-      return response;
-    } else {
-      throw Exception("Login failed");
-    }
-  }
-
-  @override
-  Future<Result<void>> verifyCode(String code, String token) async {
-    late final Result<UserAuthData> result;
-    try {
-      final response = await _apiService.verifyCode(code, tempToken);
-      if (response != null) {
-        final authData = UserAuthData(
-          accessToken: response["accessToken"]!,
-          refreshToken: response["refreshToken"]!,
-        );
-        await _securityService.saveTokens(authData);
-        result = Success(null);
-      }
-    } on AuthException catch (e) {
-      result = Failure(AuthFailure(e.attemptsLeft));
-    } on AuthBlockException {
-      result = Failure(AuthBlockFailure("Ошибка. Вы заблокированы."));
-    } catch (e) {
-      result = Failure(UnknownFailure("Неизвестная ошибка"));
-    }
-    return result;
-  }
-
-  @override
-  Future<UserAuthData> refreshToken() async {
-    final response = await _apiService.refresh();
-    print("REFRESH: $response");
-    if (response != null) {
-      final authData = UserAuthData(
-        accessToken: response["accessToken"]!,
-        refreshToken: response["refreshToken"]!,
-      );
-      await _securityService.saveTokens(authData);
-      return authData;
-    } else {
-      throw Exception("Refresh token failed");
-    }
-  }
-
-  @override
-  Future<void> logout() async {
-    await _securityService.removeTokens();
-  }
-}
+import 'package:be_happy/core/failures.dart';
+import 'package:be_happy/core/result.dart';
+import 'package:be_happy/data/exceptions/auth_block_exception.dart';
+import 'package:be_happy/data/exceptions/auth_exception.dart';
+import 'package:be_happy/data/repositories/pin_repository_impl.dart';
+import 'package:be_happy/domain/service/device_info_service.dart';
+import 'package:be_happy/domain/service/security_service.dart';
+
+import '../../domain/repositories/auth_repository.dart';
+import '../../domain/entities/user_auth_data.dart';
+
+import '../network/api_service.dart';
+
+class AuthRepositoryImpl implements AuthRepository {
+  final ApiService _apiService;
+  final DeviceInfoService _deviceInfoService;
+  final SecurityService _securityService;
+
+  String tempToken = "";
+
+  AuthRepositoryImpl(
+    this._apiService,
+    this._deviceInfoService,
+    this._securityService,
+  );
+
+  @override
+  Future<String> login(String phone) async {
+    final systemId = await _deviceInfoService.getSystemId() ?? "UnknownId";
+    final deviceModel = await _deviceInfoService.getDeviceModel();
+
+    final response = await _apiService.sendPhone(phone, deviceModel, systemId);
+    if (response != null) {
+      tempToken = response;
+      print("TEMP TOKEN IS $tempToken");
+      return response;
+    } else {
+      throw Exception("Login failed");
+    }
+  }
+
+  @override
+  Future<Result<void>> verifyCode(String code, String token) async {
+    late final Result<UserAuthData> result;
+    try {
+      final response = await _apiService.verifyCode(code, tempToken);
+      if (response != null) {
+        final authData = UserAuthData(
+          accessToken: response["accessToken"]!,
+          refreshToken: response["refreshToken"]!,
+        );
+        await _securityService.saveTokens(authData);
+        result = Success(null);
+      }
+    } on AuthException catch (e) {
+      result = Failure(AuthFailure(e.attemptsLeft));
+    } on AuthBlockException {
+      result = Failure(AuthBlockFailure("Ошибка. Вы заблокированы."));
+    } catch (e) {
+      result = Failure(UnknownFailure("Неизвестная ошибка"));
+    }
+    return result;
+  }
+
+  @override
+  Future<UserAuthData> refreshToken() async {
+    final response = await _apiService.refresh();
+    print("REFRESH: $response");
+    if (response != null) {
+      final authData = UserAuthData(
+        accessToken: response["accessToken"]!,
+        refreshToken: response["refreshToken"]!,
+      );
+      await _securityService.saveTokens(authData);
+      return authData;
+    } else {
+      throw Exception("Refresh token failed");
+    }
+  }
+
+  @override
+  Future<void> logout() async {
+    await _securityService.removeTokens();
+  }
+}

lib/data/repositories/certificate_repository_impl.dart

@@ -1,59 +1,59 @@
-import '../../core/failures.dart';
-import '../../core/result.dart';
-import '../../domain/entities/certificate.dart';
-import '../../domain/repositories/certificate_repository.dart';
-import '../../domain/service/security_service.dart';
-import '../network/api_service.dart';
-import '../exceptions/auth_exception.dart';
-import '../exceptions/auth_block_exception.dart';
-import '../exceptions/unauthorized_exception.dart';
-
-class CertificateRepositoryImpl implements CertificateRepository {
-  final ApiService apiService;
-  final SecurityService securityService;
-
-  CertificateRepositoryImpl(this.apiService, this.securityService);
-
-  @override
-  Future<Result<List<Certificate>>> getCertificates() async {
-    try {
-      final certificates = await apiService.getCertificates();
-      return Success(certificates);
-    } on AuthException catch (e) {
-      return Failure(AuthFailure(e.attemptsLeft));
-    } on AuthBlockException catch (_) {
-      return Failure(AuthBlockFailure("Ошибка. Вы заблокированы."));
-    } on UnauthorizedException catch (_) {
-      return Failure(UnknownFailure("Неизвестная ошибка"));
-    } catch (e) {
-      return Failure(UnknownFailure("Неизвестная ошибка"));
-    }
-  }
-
-  @override
-  Future<Result<Map<String, dynamic>>> purchaseCertificate({
-    required int certificateId,
-    required int cardId,
-  }) async {
-    try {
-      final result = await apiService.purchaseCertificate(
-        certificateId: certificateId,
-        cardId: cardId,
-      );
-
-      if (result != null) {
-        return Success(result);
-      } else {
-        return Failure(UnknownFailure("Неизвестная ошибка"));
-      }
-    } on AuthException catch (e) {
-      return Failure(AuthFailure(e.attemptsLeft));
-    } on AuthBlockException catch (_) {
-      return Failure(AuthBlockFailure("Ошибка. Вы заблокированы."));
-    } on UnauthorizedException catch (_) {
-      return Failure(UnknownFailure("Неизвестная ошибка"));
-    } catch (e) {
-      return Failure(UnknownFailure("Неизвестная ошибка"));
-    }
-  }
-}
+import '../../core/failures.dart';
+import '../../core/result.dart';
+import '../../domain/entities/certificate.dart';
+import '../../domain/repositories/certificate_repository.dart';
+import '../../domain/service/security_service.dart';
+import '../network/api_service.dart';
+import '../exceptions/auth_exception.dart';
+import '../exceptions/auth_block_exception.dart';
+import '../exceptions/unauthorized_exception.dart';
+
+class CertificateRepositoryImpl implements CertificateRepository {
+  final ApiService apiService;
+  final SecurityService securityService;
+
+  CertificateRepositoryImpl(this.apiService, this.securityService);
+
+  @override
+  Future<Result<List<Certificate>>> getCertificates() async {
+    try {
+      final certificates = await apiService.getCertificates();
+      return Success(certificates);
+    } on AuthException catch (e) {
+      return Failure(AuthFailure(e.attemptsLeft));
+    } on AuthBlockException catch (_) {
+      return Failure(AuthBlockFailure("Ошибка. Вы заблокированы."));
+    } on UnauthorizedException catch (_) {
+      return Failure(UnknownFailure("Неизвестная ошибка"));
+    } catch (e) {
+      return Failure(UnknownFailure("Неизвестная ошибка"));
+    }
+  }
+
+  @override
+  Future<Result<Map<String, dynamic>>> purchaseCertificate({
+    required int certificateId,
+    required int cardId,
+  }) async {
+    try {
+      final result = await apiService.purchaseCertificate(
+        certificateId: certificateId,
+        cardId: cardId,
+      );
+
+      if (result != null) {
+        return Success(result);
+      } else {
+        return Failure(UnknownFailure("Неизвестная ошибка"));
+      }
+    } on AuthException catch (e) {
+      return Failure(AuthFailure(e.attemptsLeft));
+    } on AuthBlockException catch (_) {
+      return Failure(AuthBlockFailure("Ошибка. Вы заблокированы."));
+    } on UnauthorizedException catch (_) {
+      return Failure(UnknownFailure("Неизвестная ошибка"));
+    } catch (e) {
+      return Failure(UnknownFailure("Неизвестная ошибка"));
+    }
+  }
+}

lib/data/repositories/news_repository_impl.dart

@@ -1,46 +1,46 @@
-import '../../domain/entities/news.dart';
-import '../../domain/repositories/news_repository.dart';
-import '../service/news_api_service.dart';
-import 'dart:developer' as dev;
-
-class NewsRepositoryImpl implements NewsRepository {
-  final NewsApiService _apiService;
-
-  NewsRepositoryImpl(this._apiService);
-
-  @override
-  Future<List<NewsEntity>> getNews() async {
-    try {
-      dev.log('NewsRepository: Загрузка новостей...');
-
-      final response = await _apiService.getNews();
-      final List<dynamic> data = response['data'] ?? [];
-
-      final newsList = data.map((json) => NewsEntity.fromJson(json)).toList();
-
-      dev.log('NewsRepository: Загружено ${newsList.length} новостей');
-
-      return newsList;
-    } catch (e, stackTrace) {
-      dev.log('NewsRepository: Ошибка: $e', stackTrace: stackTrace);
-      throw Exception('Не удалось загрузить новости: $e');
-    }
-  }
-
-  @override
-  Future<NewsEntity> getNewsById(int id) async {
-    try {
-      dev.log('NewsRepository: Загрузка новости с ID: $id');
-
-      final response = await _apiService.getNewsById(id);
-
-      final news = NewsEntity.fromJson(response);
-
-      dev.log('NewsRepository: Успешно загружена новость с ID: $id');
-      return news;
-    } catch (e, stackTrace) {
-      dev.log('NewsRepository: Ошибка: $e', stackTrace: stackTrace);
-      throw Exception('Не удалось загрузить новость: $e');
-    }
-  }
+import '../../domain/entities/news.dart';
+import '../../domain/repositories/news_repository.dart';
+import '../service/news_api_service.dart';
+import 'dart:developer' as dev;
+
+class NewsRepositoryImpl implements NewsRepository {
+  final NewsApiService _apiService;
+
+  NewsRepositoryImpl(this._apiService);
+
+  @override
+  Future<List<NewsEntity>> getNews() async {
+    try {
+      dev.log('NewsRepository: Загрузка новостей...');
+
+      final response = await _apiService.getNews();
+      final List<dynamic> data = response['data'] ?? [];
+
+      final newsList = data.map((json) => NewsEntity.fromJson(json)).toList();
+
+      dev.log('NewsRepository: Загружено ${newsList.length} новостей');
+
+      return newsList;
+    } catch (e, stackTrace) {
+      dev.log('NewsRepository: Ошибка: $e', stackTrace: stackTrace);
+      throw Exception('Не удалось загрузить новости: $e');
+    }
+  }
+
+  @override
+  Future<NewsEntity> getNewsById(int id) async {
+    try {
+      dev.log('NewsRepository: Загрузка новости с ID: $id');
+
+      final response = await _apiService.getNewsById(id);
+
+      final news = NewsEntity.fromJson(response);
+
+      dev.log('NewsRepository: Успешно загружена новость с ID: $id');
+      return news;
+    } catch (e, stackTrace) {
+      dev.log('NewsRepository: Ошибка: $e', stackTrace: stackTrace);
+      throw Exception('Не удалось загрузить новость: $e');
+    }
+  }
 }

lib/data/repositories/notification_repository_impl.dart

@@ -1,64 +1,64 @@
-import 'package:be_happy/domain/entities/client_notification.dart';
-
-import '../../data/network/api_service.dart';
-import '../../domain/entities/pagination_meta.dart';
-import '../../domain/repositories/notification_repository.dart';
-import '../../domain/usecase/get_notifications_usecase.dart';
-import '../models/client_notification_dto.dart';
-
-class NotificationRepositoryImpl implements NotificationRepository {
-  final ApiService _apiService;
-
-  NotificationRepositoryImpl(this._apiService);
-
-  @override
-  Stream<ClientNotification> getNotificationsStream() {
-    return _apiService.getNotificationsStream().map((data) {
-      // Создаем DTO из данных API
-      final dto = ClientNotificationDto.fromJson(data);
-      // Преобразуем в entity
-      return dto.toEntity();
-    });
-  }
-
-  @override
-  Future<ClientNotification> cancelNotification(int id) async {
-    final data = await _apiService.cancelNotification(id);
-    if (data == null) {
-      throw Exception("Failed to cancel notification");
-    }
-    final dto = ClientNotificationDto.fromJson(data);
-    return dto.toEntity();
-  }
-
-  @override
-  void closeStream() {
-    // соединение закрывается автоматически при отписке от stream
-  }
-
-  @override
-  Future<NotificationsResult> getNotifications({
-    int page = 1,
-    int pageSize = 10,
-  }) async {
-    try {
-      final response = await _apiService.getNotifications(
-        page: page,
-        pageSize: pageSize,
-      );
-
-      final notifications = (response['data'] as List)
-          .map((json) => ClientNotificationDto.fromJson(json).toEntity())
-          .toList();
-
-      final pagination = PaginationMeta.fromJson(response['pagination']);
-
-      return NotificationsResult(
-        notifications: notifications,
-        pagination: pagination,
-      );
-    } catch (e, stackTrace) {
-      throw Exception('Не удалось загрузить уведомления: $e');
-    }
-  }
-}
+import 'package:be_happy/domain/entities/client_notification.dart';
+
+import '../../data/network/api_service.dart';
+import '../../domain/entities/pagination_meta.dart';
+import '../../domain/repositories/notification_repository.dart';
+import '../../domain/usecase/get_notifications_usecase.dart';
+import '../models/client_notification_dto.dart';
+
+class NotificationRepositoryImpl implements NotificationRepository {
+  final ApiService _apiService;
+
+  NotificationRepositoryImpl(this._apiService);
+
+  @override
+  Stream<ClientNotification> getNotificationsStream() {
+    return _apiService.getNotificationsStream().map((data) {
+      // Создаем DTO из данных API
+      final dto = ClientNotificationDto.fromJson(data);
+      // Преобразуем в entity
+      return dto.toEntity();
+    });
+  }
+
+  @override
+  Future<ClientNotification> cancelNotification(int id) async {
+    final data = await _apiService.cancelNotification(id);
+    if (data == null) {
+      throw Exception("Failed to cancel notification");
+    }
+    final dto = ClientNotificationDto.fromJson(data);
+    return dto.toEntity();
+  }
+
+  @override
+  void closeStream() {
+    // соединение закрывается автоматически при отписке от stream
+  }
+
+  @override
+  Future<NotificationsResult> getNotifications({
+    int page = 1,
+    int pageSize = 10,
+  }) async {
+    try {
+      final response = await _apiService.getNotifications(
+        page: page,
+        pageSize: pageSize,
+      );
+
+      final notifications = (response['data'] as List)
+          .map((json) => ClientNotificationDto.fromJson(json).toEntity())
+          .toList();
+
+      final pagination = PaginationMeta.fromJson(response['pagination']);
+
+      return NotificationsResult(
+        notifications: notifications,
+        pagination: pagination,
+      );
+    } catch (e, stackTrace) {
+      throw Exception('Не удалось загрузить уведомления: $e');
+    }
+  }
+}

lib/data/repositories/payment_repository_impl.dart

@@ -1,115 +1,115 @@
-import '../../core/failures.dart';
-import '../../core/result.dart';
-import '../../domain/entities/payment_card.dart';
-import '../../domain/repositories/payment_repository.dart';
-import '../../domain/service/security_service.dart';
-import '../network/api_service.dart';
-import '../exceptions/auth_exception.dart';
-import '../exceptions/auth_block_exception.dart';
-import '../exceptions/unauthorized_exception.dart';
-import '../service/security_service_impl.dart';
-
-class PaymentRepositoryImpl implements PaymentRepository {
-  final ApiService apiService;
-  final SecurityService securityService;
-
-  PaymentRepositoryImpl(this.apiService, this.securityService);
-
-  @override
-  Future<Result<List<PaymentCard>>> getPaymentCards() async {
-    try {
-      final cards = await apiService.getPaymentCards();
-      return Success(cards);
-    } on AuthException catch (e) {
-      return Failure(AuthFailure(e.attemptsLeft));
-    } on AuthBlockException catch (_) {
-      return Failure(AuthBlockFailure("Ошибка. Вы заблокированы."));
-    } on UnauthorizedException catch (_) {
-      return Failure(UnknownFailure("Неизвестная ошибка"));
-    } catch (e) {
-      return Failure(UnknownFailure("Неизвестная ошибка"));
-    }
-  }
-
-  @override
-  Future<Result<Map<String, dynamic>>> addPaymentCard(
-    /*required String cardNumber,
-    required String cardHolder,
-    required String expiryMonth,
-    required String expiryYear,
-    required String cvv,*/
-  ) async {
-    try {
-      final result = await apiService.addPaymentCard(
-        /*cardNumber: cardNumber,
-        cardHolder: cardHolder,
-        expirationMonth: int.parse(expiryMonth),
-        expirationYear: int.parse(expiryYear),
-        cvv: cvv,*/
-      );
-
-      // await securityService.saveCardFullNumber(cardId, cardNumber);
-
-      return Success(result);
-    } on AuthException catch (e) {
-      return Failure(AuthFailure(e.attemptsLeft));
-    } on AuthBlockException catch (_) {
-      return Failure(AuthBlockFailure("Ошибка. Вы заблокированы."));
-    } on UnauthorizedException catch (_) {
-      return Failure(UnknownFailure("Неизвестная ошибка"));
-    } on FormatException catch (_) {
-      return Failure(UnknownFailure("Неизвестная ошибка"));
-    } catch (e) {
-      return Failure(UnknownFailure("Неизвестная ошибка"));
-    }
-  }
-
-  @override
-  Future<Result<void>> setMainPaymentCard(int cardId) async {
-    try {
-      await apiService.setMainPaymentCard(cardId);
-      return Success(null);
-    } on AuthException catch (e) {
-      return Failure(AuthFailure(e.attemptsLeft));
-    } on AuthBlockException catch (_) {
-      return Failure(AuthBlockFailure("Ошибка. Вы заблокированы."));
-    } on UnauthorizedException catch (_) {
-      return Failure(UnknownFailure("Неизвестная ошибка"));
-    } catch (e) {
-      return Failure(UnknownFailure("Неизвестная ошибка"));
-    }
-  }
-
-  @override
-  Future<Result<void>> removePaymentCard(int cardId) async {
-    try {
-      await apiService.removePaymentCard(cardId);
-      await securityService.removeCardFullNumber(cardId);
-      return Success(null);
-    } on AuthException catch (e) {
-      return Failure(AuthFailure(e.attemptsLeft));
-    } on AuthBlockException catch (_) {
-      return Failure(AuthBlockFailure("Ошибка. Вы заблокированы."));
-    } on UnauthorizedException catch (_) {
-      return Failure(UnknownFailure("Неизвестная ошибка"));
-    } catch (e) {
-      return Failure(UnknownFailure("Неизвестная ошибка"));
-    }
-  }
-
-  @override
-  Future<Result<bool>> activateSubscription(int optionId, int cardId) async {
-    try {
-      final success = await apiService.activateSubscription(optionId: optionId, cardId: cardId);
-      return Success(success);
-    } on AuthException catch (e) {
-      return Failure(AuthFailure(e.attemptsLeft));
-    } on AuthBlockException catch (_) {
-      return Failure(AuthBlockFailure("Ошибка. Вы заблокированы."));
-    } on UnauthorizedException catch (_) {
-      return Failure(UnknownFailure("Неизвестная ошибка"));
-    } catch (e) {
-      return Failure(UnknownFailure("Неизвестная ошибка"));
-    }
-  }
-}
+import '../../core/failures.dart';
+import '../../core/result.dart';
+import '../../domain/entities/payment_card.dart';
+import '../../domain/repositories/payment_repository.dart';
+import '../../domain/service/security_service.dart';
+import '../network/api_service.dart';
+import '../exceptions/auth_exception.dart';
+import '../exceptions/auth_block_exception.dart';
+import '../exceptions/unauthorized_exception.dart';
+import '../service/security_service_impl.dart';
+
+class PaymentRepositoryImpl implements PaymentRepository {
+  final ApiService apiService;
+  final SecurityService securityService;
+
+  PaymentRepositoryImpl(this.apiService, this.securityService);
+
+  @override
+  Future<Result<List<PaymentCard>>> getPaymentCards() async {
+    try {
+      final cards = await apiService.getPaymentCards();
+      return Success(cards);
+    } on AuthException catch (e) {
+      return Failure(AuthFailure(e.attemptsLeft));
+    } on AuthBlockException catch (_) {
+      return Failure(AuthBlockFailure("Ошибка. Вы заблокированы."));
+    } on UnauthorizedException catch (_) {
+      return Failure(UnknownFailure("Неизвестная ошибка"));
+    } catch (e) {
+      return Failure(UnknownFailure("Неизвестная ошибка"));
+    }
+  }
+
+  @override
+  Future<Result<Map<String, dynamic>>> addPaymentCard(
+    /*required String cardNumber,
+    required String cardHolder,
+    required String expiryMonth,
+    required String expiryYear,
+    required String cvv,*/
+  ) async {
+    try {
+      final result = await apiService.addPaymentCard(
+        /*cardNumber: cardNumber,
+        cardHolder: cardHolder,
+        expirationMonth: int.parse(expiryMonth),
+        expirationYear: int.parse(expiryYear),
+        cvv: cvv,*/
+      );
+
+      // await securityService.saveCardFullNumber(cardId, cardNumber);
+
+      return Success(result);
+    } on AuthException catch (e) {
+      return Failure(AuthFailure(e.attemptsLeft));
+    } on AuthBlockException catch (_) {
+      return Failure(AuthBlockFailure("Ошибка. Вы заблокированы."));
+    } on UnauthorizedException catch (_) {
+      return Failure(UnknownFailure("Неизвестная ошибка"));
+    } on FormatException catch (_) {
+      return Failure(UnknownFailure("Неизвестная ошибка"));
+    } catch (e) {
+      return Failure(UnknownFailure("Неизвестная ошибка"));
+    }
+  }
+
+  @override
+  Future<Result<void>> setMainPaymentCard(int cardId) async {
+    try {
+      await apiService.setMainPaymentCard(cardId);
+      return Success(null);
+    } on AuthException catch (e) {
+      return Failure(AuthFailure(e.attemptsLeft));
+    } on AuthBlockException catch (_) {
+      return Failure(AuthBlockFailure("Ошибка. Вы заблокированы."));
+    } on UnauthorizedException catch (_) {
+      return Failure(UnknownFailure("Неизвестная ошибка"));
+    } catch (e) {
+      return Failure(UnknownFailure("Неизвестная ошибка"));
+    }
+  }
+
+  @override
+  Future<Result<void>> removePaymentCard(int cardId) async {
+    try {
+      await apiService.removePaymentCard(cardId);
+      await securityService.removeCardFullNumber(cardId);
+      return Success(null);
+    } on AuthException catch (e) {
+      return Failure(AuthFailure(e.attemptsLeft));
+    } on AuthBlockException catch (_) {
+      return Failure(AuthBlockFailure("Ошибка. Вы заблокированы."));
+    } on UnauthorizedException catch (_) {
+      return Failure(UnknownFailure("Неизвестная ошибка"));
+    } catch (e) {
+      return Failure(UnknownFailure("Неизвестная ошибка"));
+    }
+  }
+
+  @override
+  Future<Result<bool>> activateSubscription(int optionId, int cardId) async {
+    try {
+      final success = await apiService.activateSubscription(optionId: optionId, cardId: cardId);
+      return Success(success);
+    } on AuthException catch (e) {
+      return Failure(AuthFailure(e.attemptsLeft));
+    } on AuthBlockException catch (_) {
+      return Failure(AuthBlockFailure("Ошибка. Вы заблокированы."));
+    } on UnauthorizedException catch (_) {
+      return Failure(UnknownFailure("Неизвестная ошибка"));
+    } catch (e) {
+      return Failure(UnknownFailure("Неизвестная ошибка"));
+    }
+  }
+}

lib/data/repositories/pin_repository_impl.dart

@@ -1,24 +1,24 @@
-import 'package:be_happy/domain/repositories/pin_repository.dart';
-import 'package:flutter_secure_storage/flutter_secure_storage.dart';
-
-class PinRepositoryImpl implements PinRepository {
-  final FlutterSecureStorage _storage;
-
-  PinRepositoryImpl(this._storage);
-
-  @override
-  Future<String?> getSavedPin() {
-    return _storage.read(key: "user_pin");
-  }
-
-  @override
-  Future<void> savePin(String? pin) async {
-    await _storage.write(key: "user_pin", value: pin);
-  }
-
-  @override
-  Future<void> removePin() async {
-    await _storage.delete(key: "user_pin");
-  }
-}
-
+import 'package:be_happy/domain/repositories/pin_repository.dart';
+import 'package:flutter_secure_storage/flutter_secure_storage.dart';
+
+class PinRepositoryImpl implements PinRepository {
+  final FlutterSecureStorage _storage;
+
+  PinRepositoryImpl(this._storage);
+
+  @override
+  Future<String?> getSavedPin() {
+    return _storage.read(key: "user_pin");
+  }
+
+  @override
+  Future<void> savePin(String? pin) async {
+    await _storage.write(key: "user_pin", value: pin);
+  }
+
+  @override
+  Future<void> removePin() async {
+    await _storage.delete(key: "user_pin");
+  }
+}
+

lib/data/repositories/profile_repository_impl.dart

@@ -1,48 +1,48 @@
-import 'dart:io';
-
-import 'package:be_happy/data/network/api_service.dart';
-
-import '../../domain/entities/user_profile.dart';
-import '../../domain/entities/user_check_flags.dart';
-import '../../domain/repositories/profile_repository.dart';
-
-class UserProfileRepositoryImpl implements UserProfileRepository {
-  final ApiService _apiService;
-
-  static const String kAccessToken = "access_token";
-  static const String kRefreshToken = "refresh_token";
-
-  final UserProfile _cachedProfile = UserProfile(
-    name: 'Иванов Антон',
-    birthDate: '12-03-2005',
-    phone: '+375 00 000-00-00',
-    balance: null,
-    email: 'почта@gmail.com',
-  );
-
-  UserProfileRepositoryImpl(this._apiService);
-
-  @override
-  Future<UserProfile> getProfile() async {
-    return await _apiService.getProfile() ?? _cachedProfile;
-  }
-
-  @override
-  Future<UserProfile?> updateProfile(UserProfile profile) async {
-    //await Future.delayed(const Duration(milliseconds: 300));
-    print("UPDATE PROFILE DATA: $profile");
-    return await _apiService.updateProfile(profile);
-  }
-
-  @override
-  Future<int?> uploadProfilePhoto(File imageFile) async {
-    return await _apiService.uploadPhoto(imageFile);
-  }
-
-  @override
-  Future<UserCheckFlags?> checkUser() async {
-    return await _apiService.checkUser();
-  }
-
-
-}
+import 'dart:io';
+
+import 'package:be_happy/data/network/api_service.dart';
+
+import '../../domain/entities/user_profile.dart';
+import '../../domain/entities/user_check_flags.dart';
+import '../../domain/repositories/profile_repository.dart';
+
+class UserProfileRepositoryImpl implements UserProfileRepository {
+  final ApiService _apiService;
+
+  static const String kAccessToken = "access_token";
+  static const String kRefreshToken = "refresh_token";
+
+  final UserProfile _cachedProfile = UserProfile(
+    name: 'Иванов Антон',
+    birthDate: '12-03-2005',
+    phone: '+375 00 000-00-00',
+    balance: null,
+    email: 'почта@gmail.com',
+  );
+
+  UserProfileRepositoryImpl(this._apiService);
+
+  @override
+  Future<UserProfile> getProfile() async {
+    return await _apiService.getProfile() ?? _cachedProfile;
+  }
+
+  @override
+  Future<UserProfile?> updateProfile(UserProfile profile) async {
+    //await Future.delayed(const Duration(milliseconds: 300));
+    print("UPDATE PROFILE DATA: $profile");
+    return await _apiService.updateProfile(profile);
+  }
+
+  @override
+  Future<int?> uploadProfilePhoto(File imageFile) async {
+    return await _apiService.uploadPhoto(imageFile);
+  }
+
+  @override
+  Future<UserCheckFlags?> checkUser() async {
+    return await _apiService.checkUser();
+  }
+
+
+}

lib/data/repositories/promo_code_repository_impl.dart

@@ -1,23 +1,23 @@
-import '../../domain/entities/promo_code_result.dart';
-import '../../domain/repositories/promo_code_repository.dart';
-import '../models/promo_code_response_dto.dart';
-import '../network/api_service.dart';
-
-class PromoCodeRepositoryImpl implements PromoCodeRepository {
-  final ApiService apiService;
-
-  PromoCodeRepositoryImpl(this.apiService);
-
-  @override
-  Future<PromoCodeResult> applyPromoCode(String code) async {
-    try {
-      final data = await apiService.applyPromoCode(code);
-      final dto = PromoCodeResponseDto.fromJson(data);
-      return dto.toEntity();
-    } on PromoCodeNotFoundException {
-      throw Exception('Промокод не найден');
-    } catch (e) {
-      throw Exception('Ошибка активации промокода: $e');
-    }
-  }
+import '../../domain/entities/promo_code_result.dart';
+import '../../domain/repositories/promo_code_repository.dart';
+import '../models/promo_code_response_dto.dart';
+import '../network/api_service.dart';
+
+class PromoCodeRepositoryImpl implements PromoCodeRepository {
+  final ApiService apiService;
+
+  PromoCodeRepositoryImpl(this.apiService);
+
+  @override
+  Future<PromoCodeResult> applyPromoCode(String code) async {
+    try {
+      final data = await apiService.applyPromoCode(code);
+      final dto = PromoCodeResponseDto.fromJson(data);
+      return dto.toEntity();
+    } on PromoCodeNotFoundException {
+      throw Exception('Промокод не найден');
+    } catch (e) {
+      throw Exception('Ошибка активации промокода: $e');
+    }
+  }
 }

lib/data/repositories/scooter_repository_impl.dart

@@ -1,428 +1,477 @@
-import 'dart:io';
-import 'package:be_happy/data/exceptions/auth_block_exception.dart';
-import 'package:be_happy/data/exceptions/route_history_not_found_exception.dart';
-import 'package:be_happy/data/exceptions/scooter_not_found_exception.dart';
-import 'package:be_happy/data/exceptions/unauthorized_exception.dart';
-import 'package:be_happy/data/exceptions/wrong_zone_exception.dart';
-import 'package:be_happy/domain/entities/point.dart';
-import 'package:be_happy/domain/repositories/scooter_repository.dart';
-
-import '../../core/failures.dart';
-import '../../core/result.dart';
-import '../../domain/entities/active_scooter_order.dart';
-import '../../domain/entities/client_subscription.dart';
-import '../../domain/entities/scooter.dart';
-import '../../domain/entities/tariff.dart';
-import '../../domain/entities/subscription.dart';
-import '../../domain/entities/scooter_order.dart';
-import '../exceptions/auth_exception.dart';
-import '../network/api_service.dart';
-
-class ScooterRepositoryImpl extends ScooterRepository {
-  final ApiService _apiService;
-
-  final scooter = Scooter(
-    id: 123,
-    title: "Unnamed",
-    status: "Available",
-    latitude: 55.178960,
-    longitude: 30.222316,
-    batteryLevel: 89,
-    isOnline: true,
-    maxSpeed: 25,
-    number: "Unnamed",
-  );
-
-  ScooterRepositoryImpl(this._apiService);
-
-  @override
-  Future<List<Scooter>> getScooters(
-    List<double> area,
-    int page,
-    int pageSize,
-  ) async {
-    final responce = await _apiService.getScooters(
-      area: area,
-      page: page,
-      pageSize: pageSize,
-    );
-
-    final List<Scooter>? list = responce?.scooters;
-    // list?.add(scooter);
-
-    // print("Scooters: ${list?.first.status}");
-
-    if (responce != null) {
-      return list ?? List.empty();
-    }
-
-    return List.empty();
-  }
-
-  @override
-  Future<Result<Scooter?>> getScooter(int id) async {
-    late final Result<Scooter> result;
-    try {
-      final scooter = await _apiService.getScooterById(id: id);
-      if (scooter != null) {
-        result = Success(scooter);
-      }
-    } on AuthException catch (e) {
-      result = Failure(AuthFailure(e.attemptsLeft));
-    } catch (e) {
-      result = Failure(UnknownFailure("Неизвестная ошибка"));
-    }
-    return result;
-  }
-
-  @override
-  Future<Result<List<Tariff>>> getAvailableTariffs(int scooterId) async {
-    late final Result<List<Tariff>> result;
-    try {
-      final response = await _apiService.getAvailableTariffs(
-        scooterId: scooterId,
-      );
-      if (response != null) {
-        result = Success(response.tariffs);
-      } else {
-        result = Failure(UnknownFailure("Неизвестная ошибка"));
-      }
-    } catch (e) {
-      result = Failure(UnknownFailure("Неизвестная ошибка"));
-    }
-    return result;
-  }
-
-  @override
-  Future<Result<List<Subscription>>> getAvailableSubscriptions() async {
-    late final Result<List<Subscription>> result;
-    try {
-      final response = await _apiService.getAvailableSubscriptions();
-      if (response != null) {
-        result = Success(response.subscriptions);
-      } else {
-        result = Failure(UnknownFailure("Неизвестная ошибка"));
-      }
-    } catch (e) {
-      result = Failure(UnknownFailure("Неизвестная ошибка"));
-    }
-    return result;
-  }
-
-  @override
-  Future<Result<Subscription>> getSubscriptionById(int id) async {
-    late final Result<Subscription> result;
-    try {
-      final subscription = await _apiService.getSubscriptionById(id: id);
-      if (subscription != null) {
-        result = Success(subscription);
-      } else {
-        result = Failure(UnknownFailure("Неизвестная ошибка"));
-      }
-    } on AuthException catch (e) {
-      result = Failure(AuthFailure(e.attemptsLeft));
-    } catch (e) {
-      result = Failure(UnknownFailure("Неизвестная ошибка"));
-    }
-    return result;
-  }
-
-  @override
-  Future<Result<List<ClientSubscription>>> getClientSubscriptions() async {
-    late final Result<List<ClientSubscription>> result;
-    try {
-      final subscriptions = await _apiService.getClientSubscriptions();
-      result = Success(subscriptions);
-    } catch (e) {
-      result = Failure(UnknownFailure("Неизвестная ошибка"));
-    }
-    return result;
-  }
-
-  @override
-  Future<Result<ScooterOrder>> bookScooter({
-    required int scooterId,
-    required int planId,
-    int? subscriptionId,
-    int? cardId,
-    required bool isBalance,
-    required bool isInsurance,
-  }) async {
-    late final Result<ScooterOrder> result;
-    try {
-      final order = await _apiService.bookScooter(
-        scooterId: scooterId,
-        planId: planId,
-        subscriptionId: subscriptionId,
-        cardId: cardId,
-        isBalance: isBalance,
-        isInsurance: isInsurance,
-      );
-      if (order != null) {
-        result = Success(order);
-      } else {
-        result = Failure(UnknownFailure("Неизвестная ошибка"));
-      }
-    } on AuthException catch (e) {
-      result = Failure(AuthFailure(e.attemptsLeft));
-    } on WrongZoneException catch (e) {
-      result = Failure(WrongZoneFailure(e.message));
-    } catch (e) {
-      result = Failure(UnknownFailure("Неизвестная ошибка"));
-    }
-    return result;
-  }
-
-  @override
-  Future<Result<ScooterOrder>> startRide(int orderId) async {
-    late final Result<ScooterOrder> result;
-    try {
-      final order = await _apiService.startRide(orderId);
-      if (order != null) {
-        result = Success(order);
-      } else {
-        result = Failure(UnknownFailure("Неизвестная ошибка"));
-      }
-    } on AuthException catch (e) {
-      result = Failure(AuthFailure(e.attemptsLeft));
-    } catch (e) {
-      result = Failure(UnknownFailure("Неизвестная ошибка"));
-    }
-    return result;
-  }
-
-  @override
-  Future<Result<void>> cancelRide(int orderId) async {
-    late final Result<void> result;
-    try {
-      await _apiService.cancelRide(orderId);
-      result = Success(null);
-    } on AuthException catch (e) {
-      result = Failure(AuthFailure(e.attemptsLeft));
-    } catch (e) {
-      result = Failure(UnknownFailure("Неизвестная ошибка"));
-    }
-    return result;
-  }
-
-  @override
-  Future<Result<ScooterOrder>> pauseRide(int orderId) async {
-    late final Result<ScooterOrder> result;
-    try {
-      final order = await _apiService.pauseRide(orderId);
-      if (order != null) {
-        result = Success(order);
-      } else {
-        result = Failure(UnknownFailure("Неизвестная ошибка"));
-      }
-    } on AuthException catch (e) {
-      result = Failure(AuthFailure(e.attemptsLeft));
-    } catch (e) {
-      result = Failure(UnknownFailure("Неизвестная ошибка"));
-    }
-    return result;
-  }
-
-  @override
-  Future<Result<ScooterOrder>> resumeRide(int orderId) async {
-    late final Result<ScooterOrder> result;
-    try {
-      final order = await _apiService.resumeRide(orderId);
-      if (order != null) {
-        result = Success(order);
-      } else {
-        result = Failure(UnknownFailure("Неизвестная ошибка"));
-      }
-    } on AuthException catch (e) {
-      result = Failure(AuthFailure(e.attemptsLeft));
-    } catch (e) {
-      result = Failure(UnknownFailure("Неизвестная ошибка"));
-    }
-    return result;
-  }
-
-  @override
-  Future<Result<void>> finishRide(int orderId, List<int> files) async {
-    late final Result<ScooterOrder> result;
-    try {
-      await _apiService.finishRide(orderId: orderId, filesId: files);
-      result = Success(null);
-    } on AuthException catch (e) {
-      result = Failure(AuthFailure(e.attemptsLeft));
-    } on WrongZoneException catch (e) {
-      result = Failure(WrongZoneFailure(e.message));
-    } catch (e) {
-      result = Failure(UnknownFailure("Неизвестная ошибка"));
-    }
-    return result;
-  }
-
-  @override
-  Future<Result<void>> payRide(int orderId) async {
-    late final Result<void> result;
-    try {
-      await _apiService.payRide(orderId);
-      result = Success(null);
-    } on AuthException catch (e) {
-      result = Failure(AuthFailure(e.attemptsLeft));
-    } catch (e) {
-      result = Failure(UnknownFailure("Неизвестная ошибка"));
-    }
-    return result;
-  }
-
-  @override
-  Future<Result<List<ScooterOrder>>> getClientOrders() async {
-    late final Result<List<ScooterOrder>> result;
-    try {
-      final orders = await _apiService.getClientOrders();
-      result = Success(orders);
-    } on AuthException catch (e) {
-      result = Failure(AuthFailure(e.attemptsLeft));
-    } catch (e) {
-      result = Failure(UnknownFailure("Неизвестная ошибка"));
-    }
-    return result;
-  }
-
-  @override
-  Future<Result<List<int>>> uploadScooterPhotos(List<File> images) async {
-    late final Result<List<int>> result;
-    try {
-      final filesId = await _apiService.uploadScooterPhotos(images);
-      result = Success(filesId);
-    } on AuthException catch (e) {
-      result = Failure(AuthFailure(e.attemptsLeft));
-    } catch (e) {
-      result = Failure(UnknownFailure("Неизвестная ошибка"));
-    }
-    return result;
-  }
-
-  @override
-  Future<Result<ActiveScooterOrder>> updateScooterOrderData({
-    required int orderId,
-  }) async {
-    late final Result<ActiveScooterOrder> result;
-    try {
-      final order = await _apiService.updateScooterOrderData(orderId: orderId);
-      if (order != null) {
-        print("ORDER DATA FROM REPOSITORY: $order");
-        result = Success(order);
-      } else {
-        result = Failure(UnknownFailure("Неизвестная ошибка"));
-      }
-    } on AuthException catch (e) {
-      result = Failure(AuthFailure(e.attemptsLeft));
-    } catch (e) {
-      result = Failure(UnknownFailure("Неизвестная ошибка"));
-    }
-    return result;
-  }
-
-  @override
-  Future<Result<void>> payScooterOrderWithPhotos({
-    required int orderId,
-    required int? cardId,
-    required bool isBalance,
-  }) async {
-    late final Result<void> result;
-    try {
-      final order = await _apiService.payScooterOrderWithPhotos(
-        orderId: orderId,
-        cardId: cardId,
-        isBalance: isBalance,
-      );
-      result = Success(null);
-    } on AuthException catch (e) {
-      result = Failure(AuthFailure(e.attemptsLeft));
-    } catch (e) {
-      result = Failure(UnknownFailure("Неизвестная ошибка"));
-    }
-    return result;
-  }
-
-  @override
-  Future<Result<ScooterOrder>> getScooterOrderById(int id) async {
-    late final Result<ScooterOrder> result;
-    try {
-      final order = await _apiService.getScooterOrderById(id: id);
-      if (order != null) {
-        result = Success(order);
-      } else {
-        result = Failure(UnknownFailure("Неизвестная ошибка"));
-      }
-    } on AuthException catch (e) {
-      result = Failure(AuthFailure(e.attemptsLeft));
-    } catch (e) {
-      result = Failure(UnknownFailure("Неизвестная ошибка"));
-    }
-    return result;
-  }
-
-  @override
-  Future<Result<List<ScooterOrder>>> getScooterOrderHistory({
-    int page = 1,
-    int pageSize = 20,
-  }) async {
-    late final Result<List<ScooterOrder>> result;
-    try {
-      final response = await _apiService.getScooterOrderHistory(
-        page: page,
-        pageSize: pageSize,
-      );
-      final List<dynamic> data = response['data'] ?? [];
-      final orders = data.map((json) => ScooterOrder.fromJson(json)).toList();
-      result = Success(orders);
-    } on AuthException catch (e) {
-      result = Failure(AuthFailure(e.attemptsLeft));
-    } catch (e) {
-      result = Failure(UnknownFailure("Неизвестная ошибка"));
-    }
-    return result;
-  }
-
-  @override
-  Future<Result<Scooter?>> getScooterByTitle(String title) async {
-    late final Result<Scooter?> result;
-    try {
-      final scooter = await _apiService.getScooterByTitle(title: title);
-      if (scooter != null) {
-        result = Success(scooter);
-      } else {
-        result = Failure(UnknownFailure("Неизвестная ошибка"));
-      }
-    } on ScooterNotFoundException catch (e) {
-      result = Failure(ScooterNotFoundFailure(e.message));
-    } on UnauthorizedException catch (e) {
-      result = Failure(AuthFailure(0, message: e.toString()));
-    } on AuthBlockException catch (e) {
-      result = Failure(AuthBlockFailure(e.toString()));
-    } catch (e, stacktrace) {
-      print("REPOSITORY ERROR: $e");
-      print("STACKTRACE: $stacktrace");
-      result = Failure(UnknownFailure("Неизвестная ошибка"));
-    }
-    return result;
-  }
-
-  @override
-  Future<Result<List<Point>>> getScooterOrderRouteHistory(int id) async {
-    late final Result<List<Point>> result;
-    try {
-      final route = await _apiService.getScooterOrderRouteHistory(id: id);
-      result = Success(route);
-    } on RouteHistoryNotFoundException catch (e) {
-      result = Failure(RouteHistoryNotFoundFailure(e.message));
-    } on UnauthorizedException catch (e) {
-      result = Failure(AuthFailure(0, message: e.toString()));
-    } on AuthBlockException catch (e) {
-      result = Failure(AuthBlockFailure(e.toString()));
-    } catch (e, stacktrace) {
-      print("REPOSITORY ERROR: $e");
-      print("STACKTRACE: $stacktrace");
-      result = Failure(UnknownFailure("Неизвестная ошибка"));
-    }
-    return result;
-  }
-}
+import 'dart:io';
+
+import '../../core/failures.dart';
+import '../../core/result.dart';
+import '../../domain/entities/active_scooter_order.dart';
+import '../../domain/entities/client_subscription.dart';
+import '../../domain/entities/fine.dart';
+import '../../domain/entities/point.dart';
+import '../../domain/entities/scooter.dart';
+import '../../domain/entities/tariff.dart';
+import '../../domain/entities/subscription.dart';
+import '../../domain/entities/scooter_order.dart';
+import '../../domain/repositories/scooter_repository.dart';
+import '../exceptions/auth_block_exception.dart';
+import '../exceptions/auth_exception.dart';
+import '../exceptions/route_history_not_found_exception.dart';
+import '../exceptions/scooter_not_found_exception.dart';
+import '../exceptions/unauthorized_exception.dart';
+import '../exceptions/wrong_zone_exception.dart';
+import '../network/api_service.dart';
+
+class ScooterRepositoryImpl extends ScooterRepository {
+  final ApiService _apiService;
+
+  final scooter = Scooter(
+    id: 123,
+    title: "Unnamed",
+    status: "Available",
+    latitude: 55.178960,
+    longitude: 30.222316,
+    batteryLevel: 89,
+    isOnline: true,
+    maxSpeed: 25,
+    number: "Unnamed",
+  );
+
+  ScooterRepositoryImpl(this._apiService);
+
+  @override
+  Future<List<Scooter>> getScooters(
+    List<double> area,
+    int page,
+    int pageSize,
+  ) async {
+    final responce = await _apiService.getScooters(
+      area: area,
+      page: page,
+      pageSize: pageSize,
+    );
+
+    final List<Scooter>? list = responce?.scooters;
+    // list?.add(scooter);
+
+    // print("Scooters: ${list?.first.status}");
+
+    if (responce != null) {
+      return list ?? List.empty();
+    }
+
+    return List.empty();
+  }
+
+  @override
+  Future<Result<Scooter?>> getScooter(int id) async {
+    late final Result<Scooter> result;
+    try {
+      final scooter = await _apiService.getScooterById(id: id);
+      if (scooter != null) {
+        result = Success(scooter);
+      }
+    } on AuthException catch (e) {
+      result = Failure(AuthFailure(e.attemptsLeft));
+    } catch (e) {
+      result = Failure(UnknownFailure("Неизвестная ошибка"));
+    }
+    return result;
+  }
+
+  @override
+  Future<Result<List<Tariff>>> getAvailableTariffs(int scooterId) async {
+    late final Result<List<Tariff>> result;
+    try {
+      final response = await _apiService.getAvailableTariffs(
+        scooterId: scooterId,
+      );
+      if (response != null) {
+        result = Success(response.tariffs);
+      } else {
+        result = Failure(UnknownFailure("Неизвестная ошибка"));
+      }
+    } catch (e) {
+      result = Failure(UnknownFailure("Неизвестная ошибка"));
+    }
+    return result;
+  }
+
+  @override
+  Future<Result<List<Subscription>>> getAvailableSubscriptions() async {
+    late final Result<List<Subscription>> result;
+    try {
+      final response = await _apiService.getAvailableSubscriptions();
+      if (response != null) {
+        result = Success(response.subscriptions);
+      } else {
+        result = Failure(UnknownFailure("Неизвестная ошибка"));
+      }
+    } catch (e) {
+      result = Failure(UnknownFailure("Неизвестная ошибка"));
+    }
+    return result;
+  }
+
+  @override
+  Future<Result<Subscription>> getSubscriptionById(int id) async {
+    late final Result<Subscription> result;
+    try {
+      final subscription = await _apiService.getSubscriptionById(id: id);
+      if (subscription != null) {
+        result = Success(subscription);
+      } else {
+        result = Failure(UnknownFailure("Неизвестная ошибка"));
+      }
+    } on AuthException catch (e) {
+      result = Failure(AuthFailure(e.attemptsLeft));
+    } catch (e) {
+      result = Failure(UnknownFailure("Неизвестная ошибка"));
+    }
+    return result;
+  }
+
+  @override
+  Future<Result<List<ClientSubscription>>> getClientSubscriptions() async {
+    late final Result<List<ClientSubscription>> result;
+    try {
+      final subscriptions = await _apiService.getClientSubscriptions();
+      result = Success(subscriptions);
+    } catch (e) {
+      result = Failure(UnknownFailure("Неизвестная ошибка"));
+    }
+    return result;
+  }
+
+  @override
+  Future<Result<ScooterOrder>> bookScooter({
+    required int scooterId,
+    required int planId,
+    int? subscriptionId,
+    int? cardId,
+    required bool isBalance,
+    required bool isInsurance,
+  }) async {
+    late final Result<ScooterOrder> result;
+    try {
+      final order = await _apiService.bookScooter(
+        scooterId: scooterId,
+        planId: planId,
+        subscriptionId: subscriptionId,
+        cardId: cardId,
+        isBalance: isBalance,
+        isInsurance: isInsurance,
+      );
+      if (order != null) {
+        result = Success(order);
+      } else {
+        result = Failure(UnknownFailure("Неизвестная ошибка"));
+      }
+    } on AuthException catch (e) {
+      result = Failure(AuthFailure(e.attemptsLeft));
+    } on WrongZoneException catch (e) {
+      result = Failure(WrongZoneFailure(e.message));
+    } catch (e) {
+      result = Failure(UnknownFailure("Неизвестная ошибка"));
+    }
+    return result;
+  }
+
+  @override
+  Future<Result<ScooterOrder>> startRide(int orderId) async {
+    late final Result<ScooterOrder> result;
+    try {
+      final order = await _apiService.startRide(orderId);
+      if (order != null) {
+        result = Success(order);
+      } else {
+        result = Failure(UnknownFailure("Неизвестная ошибка"));
+      }
+    } on AuthException catch (e) {
+      result = Failure(AuthFailure(e.attemptsLeft));
+    } catch (e) {
+      result = Failure(UnknownFailure("Неизвестная ошибка"));
+    }
+    return result;
+  }
+
+  @override
+  Future<Result<void>> cancelRide(int orderId) async {
+    late final Result<void> result;
+    try {
+      await _apiService.cancelRide(orderId);
+      result = Success(null);
+    } on AuthException catch (e) {
+      result = Failure(AuthFailure(e.attemptsLeft));
+    } catch (e) {
+      result = Failure(UnknownFailure("Неизвестная ошибка"));
+    }
+    return result;
+  }
+
+  @override
+  Future<Result<ScooterOrder>> pauseRide(int orderId) async {
+    late final Result<ScooterOrder> result;
+    try {
+      final order = await _apiService.pauseRide(orderId);
+      if (order != null) {
+        result = Success(order);
+      } else {
+        result = Failure(UnknownFailure("Неизвестная ошибка"));
+      }
+    } on AuthException catch (e) {
+      result = Failure(AuthFailure(e.attemptsLeft));
+    } catch (e) {
+      result = Failure(UnknownFailure("Неизвестная ошибка"));
+    }
+    return result;
+  }
+
+  @override
+  Future<Result<ScooterOrder>> resumeRide(int orderId) async {
+    late final Result<ScooterOrder> result;
+    try {
+      final order = await _apiService.resumeRide(orderId);
+      if (order != null) {
+        result = Success(order);
+      } else {
+        result = Failure(UnknownFailure("Неизвестная ошибка"));
+      }
+    } on AuthException catch (e) {
+      result = Failure(AuthFailure(e.attemptsLeft));
+    } catch (e) {
+      result = Failure(UnknownFailure("Неизвестная ошибка"));
+    }
+    return result;
+  }
+
+  @override
+  Future<Result<void>> finishRide(int orderId, List<int> files) async {
+    late final Result<ScooterOrder> result;
+    try {
+      await _apiService.finishRide(orderId: orderId, filesId: files);
+      result = Success(null);
+    } on AuthException catch (e) {
+      result = Failure(AuthFailure(e.attemptsLeft));
+    } on WrongZoneException catch (e) {
+      result = Failure(WrongZoneFailure(e.message));
+    } catch (e) {
+      result = Failure(UnknownFailure("Неизвестная ошибка"));
+    }
+    return result;
+  }
+
+  @override
+  Future<Result<void>> payRide(int orderId) async {
+    late final Result<void> result;
+    try {
+      await _apiService.payRide(orderId);
+      result = Success(null);
+    } on AuthException catch (e) {
+      result = Failure(AuthFailure(e.attemptsLeft));
+    } catch (e) {
+      result = Failure(UnknownFailure("Неизвестная ошибка"));
+    }
+    return result;
+  }
+
+  @override
+  Future<Result<List<ScooterOrder>>> getClientOrders() async {
+    late final Result<List<ScooterOrder>> result;
+    try {
+      final orders = await _apiService.getClientOrders();
+      result = Success(orders);
+    } on AuthException catch (e) {
+      result = Failure(AuthFailure(e.attemptsLeft));
+    } catch (e) {
+      result = Failure(UnknownFailure("Неизвестная ошибка"));
+    }
+    return result;
+  }
+
+  @override
+  Future<Result<List<int>>> uploadScooterPhotos(List<File> images) async {
+    late final Result<List<int>> result;
+    try {
+      final filesId = await _apiService.uploadScooterPhotos(images);
+      result = Success(filesId);
+    } on AuthException catch (e) {
+      result = Failure(AuthFailure(e.attemptsLeft));
+    } catch (e) {
+      result = Failure(UnknownFailure("Неизвестная ошибка"));
+    }
+    return result;
+  }
+
+  @override
+  Future<Result<ActiveScooterOrder>> updateScooterOrderData({
+    required int orderId,
+  }) async {
+    late final Result<ActiveScooterOrder> result;
+    try {
+      final order = await _apiService.updateScooterOrderData(orderId: orderId);
+      if (order != null) {
+        print("ORDER DATA FROM REPOSITORY: $order");
+        result = Success(order);
+      } else {
+        result = Failure(UnknownFailure("Неизвестная ошибка"));
+      }
+    } on AuthException catch (e) {
+      result = Failure(AuthFailure(e.attemptsLeft));
+    } catch (e) {
+      result = Failure(UnknownFailure("Неизвестная ошибка"));
+    }
+    return result;
+  }
+
+  @override
+  Future<Result<void>> payScooterOrderWithPhotos({
+    required int orderId,
+    required int? cardId,
+    required bool isBalance,
+  }) async {
+    late final Result<void> result;
+    try {
+      final order = await _apiService.payScooterOrderWithPhotos(
+        orderId: orderId,
+        cardId: cardId,
+        isBalance: isBalance,
+      );
+      result = Success(null);
+    } on AuthException catch (e) {
+      result = Failure(AuthFailure(e.attemptsLeft));
+    } catch (e) {
+      result = Failure(UnknownFailure("Неизвестная ошибка"));
+    }
+    return result;
+  }
+
+  @override
+  Future<Result<ScooterOrder>> getScooterOrderById(int id) async {
+    late final Result<ScooterOrder> result;
+    try {
+      final order = await _apiService.getScooterOrderById(id: id);
+      if (order != null) {
+        result = Success(order);
+      } else {
+        result = Failure(UnknownFailure("Неизвестная ошибка"));
+      }
+    } on AuthException catch (e) {
+      result = Failure(AuthFailure(e.attemptsLeft));
+    } catch (e) {
+      result = Failure(UnknownFailure("Неизвестная ошибка"));
+    }
+    return result;
+  }
+
+  @override
+  Future<Result<List<ScooterOrder>>> getScooterOrderHistory({
+    int page = 1,
+    int pageSize = 20,
+  }) async {
+    late final Result<List<ScooterOrder>> result;
+    try {
+      final response = await _apiService.getScooterOrderHistory(
+        page: page,
+        pageSize: pageSize,
+      );
+      final List<dynamic> data = response['data'] ?? [];
+      final orders = data.map((json) => ScooterOrder.fromJson(json)).toList();
+      result = Success(orders);
+    } on AuthException catch (e) {
+      result = Failure(AuthFailure(e.attemptsLeft));
+    } catch (e) {
+      result = Failure(UnknownFailure("Неизвестная ошибка"));
+    }
+    return result;
+  }
+
+  @override
+  Future<Result<Scooter?>> getScooterByTitle(String title) async {
+    late final Result<Scooter?> result;
+    try {
+      final scooter = await _apiService.getScooterByTitle(title: title);
+      if (scooter != null) {
+        result = Success(scooter);
+      } else {
+        result = Failure(UnknownFailure("Неизвестная ошибка"));
+      }
+    } on ScooterNotFoundException catch (e) {
+      result = Failure(ScooterNotFoundFailure(e.message));
+    } on UnauthorizedException catch (e) {
+      result = Failure(AuthFailure(0, message: e.toString()));
+    } on AuthBlockException catch (e) {
+      result = Failure(AuthBlockFailure(e.toString()));
+    } catch (e, stacktrace) {
+      print("REPOSITORY ERROR: $e");
+      print("STACKTRACE: $stacktrace");
+      result = Failure(UnknownFailure("Неизвестная ошибка"));
+    }
+    return result;
+  }
+
+  @override
+  Future<Result<List<Point>>> getScooterOrderRouteHistory(int id) async {
+    late final Result<List<Point>> result;
+    try {
+      final route = await _apiService.getScooterOrderRouteHistory(id: id);
+      result = Success(route);
+    } on RouteHistoryNotFoundException catch (e) {
+      result = Failure(RouteHistoryNotFoundFailure(e.message));
+    } on UnauthorizedException catch (e) {
+      result = Failure(AuthFailure(0, message: e.toString()));
+    } on AuthBlockException catch (e) {
+      result = Failure(AuthBlockFailure(e.toString()));
+    } catch (e, stacktrace) {
+      print("REPOSITORY ERROR: $e");
+      print("STACKTRACE: $stacktrace");
+      result = Failure(UnknownFailure("Неизвестная ошибка"));
+    }
+    return result;
+  }
+
+  @override
+  Future<Result<Fine>> getFineDetails(int orderId) async {
+    late final Result<Fine> result;
+    try {
+      final fine = await _apiService.getFineDetails(orderId);
+      if (fine != null) {
+        result = Success(fine);
+      } else {
+        result = Failure(UnknownFailure("Не удалось получить данные о штрафе"));
+      }
+    } on AuthException catch (e) {
+      result = Failure(AuthFailure(e.attemptsLeft));
+    } on UnauthorizedException catch (e) {
+      result = Failure(AuthFailure(0, message: e.toString()));
+    } on AuthBlockException catch (e) {
+      result = Failure(AuthBlockFailure(e.toString()));
+    } catch (e) {
+      result = Failure(UnknownFailure("Неизвестная ошибка"));
+    }
+    return result;
+  }
+
+  @override
+  Future<Result<void>> payFine({
+    required int orderId,
+    int? cardId,
+    required bool isBalance,
+  }) async {
+    late final Result<void> result;
+    try {
+      await _apiService.payFine(
+        orderId: orderId,
+        cardId: cardId,
+        isBalance: isBalance,
+      );
+      result = Success(null);
+    } on AuthException catch (e) {
+      result = Failure(AuthFailure(e.attemptsLeft));
+    } on UnauthorizedException catch (e) {
+      result = Failure(AuthFailure(0, message: e.toString()));
+    } on AuthBlockException catch (e) {
+      result = Failure(AuthBlockFailure(e.toString()));
+    } catch (e) {
+      result = Failure(UnknownFailure("Неизвестная ошибка"));
+    }
+    return result;
+  }
+}

lib/data/repositories/zone_repository_impl.dart

@@ -1,69 +1,69 @@
-import 'package:be_happy/domain/entities/zone.dart';
-import 'package:be_happy/domain/repositories/zone_repository.dart';
-
-import '../../domain/entities/point.dart';
-import '../network/api_service.dart';
-
-class ZoneRepositoryImpl extends ZoneRepository {
-  final ApiService _apiService;
-
-  ZoneRepositoryImpl(this._apiService);
-
-  @override
-  Future<List<Zone>> getZones(List<double> area,
-      int page,
-      int pageSize,) async {
-
-    final List<Point> list = [];
-    final List<Point> list2 = [];
-
-    /*list.add(Point(55.182372,30.203347));
-    list.add(Point(55.173746,30.200257));
-    list.add(Point(55.172153,30.212531));
-    list.add(Point(55.179946,30.215964));
-
-    list2.add(Point(55.178304,30.227380));
-    list2.add(Point(55.178059,30.229654));
-    list2.add(Point(55.191339,30.234718));
-    list2.add(Point(55.194352,30.234890));
-    list2.add(Point(55.194377,30.231972));
-    list2.add(Point(55.192123,30.232744));
-
-    final zone = Zone(id: 123,
-        title: "Zone 01",
-        description: "description",
-        type: "Finish",
-        isActive: true,
-        shapeType: "polygon",
-        points: list,
-        speedLimit: "speedLimit");
-
-    final zone2 = Zone(id: 124,
-        title: "Zone 02",
-        description: "description",
-        type: "NotDrive",
-        isActive: true,
-        shapeType: "polygon",
-        points: list2,
-        speedLimit: "speedLimit");
-*/
-
-    final responce = await _apiService.getZones(
-      area: area,
-      page: page,
-      pageSize: pageSize,
-    );
-
-    final List<Zone>? zones = responce?.zones;
-    // zones?.add(zone);
-    // zones?.add(zone2);
-
-    print("Scooters: ${zones?.first.title}");
-
-    if (responce != null) {
-      return zones ?? List.empty();
-    }
-
-    return List.empty();
-  }
-}
+import 'package:be_happy/domain/entities/zone.dart';
+import 'package:be_happy/domain/repositories/zone_repository.dart';
+
+import '../../domain/entities/point.dart';
+import '../network/api_service.dart';
+
+class ZoneRepositoryImpl extends ZoneRepository {
+  final ApiService _apiService;
+
+  ZoneRepositoryImpl(this._apiService);
+
+  @override
+  Future<List<Zone>> getZones(List<double> area,
+      int page,
+      int pageSize,) async {
+
+    final List<Point> list = [];
+    final List<Point> list2 = [];
+
+    /*list.add(Point(55.182372,30.203347));
+    list.add(Point(55.173746,30.200257));
+    list.add(Point(55.172153,30.212531));
+    list.add(Point(55.179946,30.215964));
+
+    list2.add(Point(55.178304,30.227380));
+    list2.add(Point(55.178059,30.229654));
+    list2.add(Point(55.191339,30.234718));
+    list2.add(Point(55.194352,30.234890));
+    list2.add(Point(55.194377,30.231972));
+    list2.add(Point(55.192123,30.232744));
+
+    final zone = Zone(id: 123,
+        title: "Zone 01",
+        description: "description",
+        type: "Finish",
+        isActive: true,
+        shapeType: "polygon",
+        points: list,
+        speedLimit: "speedLimit");
+
+    final zone2 = Zone(id: 124,
+        title: "Zone 02",
+        description: "description",
+        type: "NotDrive",
+        isActive: true,
+        shapeType: "polygon",
+        points: list2,
+        speedLimit: "speedLimit");
+*/
+
+    final responce = await _apiService.getZones(
+      area: area,
+      page: page,
+      pageSize: pageSize,
+    );
+
+    final List<Zone>? zones = responce?.zones;
+    // zones?.add(zone);
+    // zones?.add(zone2);
+
+    print("Scooters: ${zones?.first.title}");
+
+    if (responce != null) {
+      return zones ?? List.empty();
+    }
+
+    return List.empty();
+  }
+}

lib/data/service/app_setting_service.dart

@@ -1,15 +1,15 @@
-import 'package:shared_preferences/shared_preferences.dart';
-
-class AppSettingsService {
-  final SharedPreferences sharedPreferences;
-
-  AppSettingsService(this.sharedPreferences);
-
-  Future<void> saveMapSettingsFlag(String key, bool value) async {
-    sharedPreferences.setBool(key, value);
-  }
-
-  bool getMapSettingsFlag(String key) {
-    return sharedPreferences.getBool(key) ?? false;
-  }
-}
+import 'package:shared_preferences/shared_preferences.dart';
+
+class AppSettingsService {
+  final SharedPreferences sharedPreferences;
+
+  AppSettingsService(this.sharedPreferences);
+
+  Future<void> saveMapSettingsFlag(String key, bool value) async {
+    sharedPreferences.setBool(key, value);
+  }
+
+  bool getMapSettingsFlag(String key) {
+    return sharedPreferences.getBool(key) ?? false;
+  }
+}

lib/data/service/device_info_service_impl.dart

@@ -1,43 +1,43 @@
-import 'dart:io';
-
-import 'package:android_id/android_id.dart';
-import 'package:device_info_plus/device_info_plus.dart';
-
-import '../../domain/service/device_info_service.dart';
-
-class DeviceInfoServiceImpl extends DeviceInfoService {
-  final DeviceInfoPlugin _deviceInfo = DeviceInfoPlugin();
-  final AndroidId _androidId = const AndroidId();
-
-  @override
-  Future<String> getDeviceModel() async {
-    try {
-      if (Platform.isAndroid) {
-        final androidInfo = await _deviceInfo.androidInfo;
-        return '${androidInfo.manufacturer} ${androidInfo.model}';
-      } else if (Platform.isIOS) {
-        final iosInfo = await _deviceInfo.iosInfo;
-        return iosInfo.utsname.machine;
-      }
-    } catch (e) {
-      print("ERROR: $e");
-    }
-    return 'Unknown';
-  }
-
-  @override
-  Future<String?> getSystemId() async {
-    try {
-      if (Platform.isAndroid) {
-        return await _androidId.getId();
-      } else if (Platform.isIOS) {
-        final iosInfo = await _deviceInfo.iosInfo;
-        return iosInfo.identifierForVendor;
-      }
-    } catch (e) {
-      print("ERROR: $e");
-      return null;
-    }
-    return null;
-  }
-}
+import 'dart:io';
+
+import 'package:android_id/android_id.dart';
+import 'package:device_info_plus/device_info_plus.dart';
+
+import '../../domain/service/device_info_service.dart';
+
+class DeviceInfoServiceImpl extends DeviceInfoService {
+  final DeviceInfoPlugin _deviceInfo = DeviceInfoPlugin();
+  final AndroidId _androidId = const AndroidId();
+
+  @override
+  Future<String> getDeviceModel() async {
+    try {
+      if (Platform.isAndroid) {
+        final androidInfo = await _deviceInfo.androidInfo;
+        return '${androidInfo.manufacturer} ${androidInfo.model}';
+      } else if (Platform.isIOS) {
+        final iosInfo = await _deviceInfo.iosInfo;
+        return iosInfo.utsname.machine;
+      }
+    } catch (e) {
+      print("ERROR: $e");
+    }
+    return 'Unknown';
+  }
+
+  @override
+  Future<String?> getSystemId() async {
+    try {
+      if (Platform.isAndroid) {
+        return await _androidId.getId();
+      } else if (Platform.isIOS) {
+        final iosInfo = await _deviceInfo.iosInfo;
+        return iosInfo.identifierForVendor;
+      }
+    } catch (e) {
+      print("ERROR: $e");
+      return null;
+    }
+    return null;
+  }
+}

lib/data/service/news_api_service.dart

@@ -1,36 +1,36 @@
-import 'dart:developer' as dev;
-import '../network/api_service.dart';
-
-class NewsApiService {
-  final ApiService _apiService;
-
-  NewsApiService(this._apiService);
-
-  Future<Map<String, dynamic>> getNews() async {
-    try {
-      dev.log('NewsApiService: Запрос GET /news');
-
-      final response = await _apiService.getNews();
-
-      dev.log('NewsApiService: Успешно получено ${response['data']?.length ?? 0} новостей');
-      return response;
-    } catch (e, stackTrace) {
-      dev.log('NewsApiService: Ошибка: $e', stackTrace: stackTrace);
-      throw Exception('Не удалось загрузить новости: $e');
-    }
-  }
-
-  Future<Map<String, dynamic>> getNewsById(int newsId) async {
-    try {
-      dev.log('NewsApiService: Запрос GET /news/$newsId');
-
-      final response = await _apiService.getNewsById(newsId);
-
-      dev.log('NewsApiService: Успешно получена новость с ID: $newsId');
-      return response!;
-    } catch (e, stackTrace) {
-      dev.log('NewsApiService: Ошибка: $e', stackTrace: stackTrace);
-      throw Exception('Не удалось загрузить новость: $e');
-    }
-  }
+import 'dart:developer' as dev;
+import '../network/api_service.dart';
+
+class NewsApiService {
+  final ApiService _apiService;
+
+  NewsApiService(this._apiService);
+
+  Future<Map<String, dynamic>> getNews() async {
+    try {
+      dev.log('NewsApiService: Запрос GET /news');
+
+      final response = await _apiService.getNews();
+
+      dev.log('NewsApiService: Успешно получено ${response['data']?.length ?? 0} новостей');
+      return response;
+    } catch (e, stackTrace) {
+      dev.log('NewsApiService: Ошибка: $e', stackTrace: stackTrace);
+      throw Exception('Не удалось загрузить новости: $e');
+    }
+  }
+
+  Future<Map<String, dynamic>> getNewsById(int newsId) async {
+    try {
+      dev.log('NewsApiService: Запрос GET /news/$newsId');
+
+      final response = await _apiService.getNewsById(newsId);
+
+      dev.log('NewsApiService: Успешно получена новость с ID: $newsId');
+      return response!;
+    } catch (e, stackTrace) {
+      dev.log('NewsApiService: Ошибка: $e', stackTrace: stackTrace);
+      throw Exception('Не удалось загрузить новость: $e');
+    }
+  }
 }

lib/data/service/security_service_impl.dart

@@ -1,80 +1,80 @@
-import 'package:be_happy/domain/entities/user_auth_data.dart';
-import 'package:flutter_secure_storage/flutter_secure_storage.dart';
-
-import '../../domain/service/security_service.dart';
-
-class SecurityServiceImpl extends SecurityService {
-  static const String kAccessToken = "access_token";
-  static const String kRefreshToken = "refresh_token";
-  static const String kCardNumberPrefix = "card_number_";
-
-  final FlutterSecureStorage _secureStorage;
-
-  SecurityServiceImpl(this._secureStorage);
-
-  @override
-  Future<void> saveTokens(UserAuthData data) async {
-    await _secureStorage.write(key: kAccessToken, value: data.accessToken);
-    await _secureStorage.write(key: kRefreshToken, value: data.refreshToken);
-  }
-
-  @override
-  Future<void> removeTokens() async {
-    await _secureStorage.delete(key: kRefreshToken);
-    await _secureStorage.delete(key: kAccessToken);
-  }
-
-  @override
-  Future<String?> getAccessToken() async {
-    return await _secureStorage.read(key: kAccessToken);
-  }
-
-  @override
-  Future<String?> getRefreshToken() async {
-    return await _secureStorage.read(key: kRefreshToken);
-  }
-
-  @override
-  Future<void> saveCardFullNumber(int cardId, String fullCardNumber) async {
-    await _secureStorage.write(
-      key: '${kCardNumberPrefix}_$cardId',
-      value: fullCardNumber,
-    );
-  }
-
-  @override
-  Future<String?> getCardFullNumber(int cardId) async {
-    return await _secureStorage.read(key: '${kCardNumberPrefix}_$cardId');
-  }
-
-  @override
-  Future<void> removeCardFullNumber(int cardId) async {
-    await _secureStorage.delete(key: '${kCardNumberPrefix}_$cardId');
-  }
-
-  @override
-  Future<void> clearAllCardsNumbers() async {
-    // Получаем все ключи и удаляем те, что начинаются с префикса карты
-    final allKeys = await _secureStorage.readAll();
-    for (final key in allKeys.keys) {
-      if (key.startsWith(kCardNumberPrefix)) {
-        await _secureStorage.delete(key: key);
-      }
-    }
-  }
-
-  // @override
-  // Future<UserAuthData?> getTokens() async {
-  //   final accessToken = await _secureStorage.read(key: kAccessToken);
-  //   final refreshToken = await _secureStorage.read(key: kRefreshToken);
-  //
-  //   if(accessToken != null && refreshToken != null) {
-  //       return UserAuthData(
-  //       accessToken: accessToken,
-  //       refreshToken: refreshToken,
-  //     );
-  //   }
-  //
-  //   return null;
-  // }
-}
+import 'package:be_happy/domain/entities/user_auth_data.dart';
+import 'package:flutter_secure_storage/flutter_secure_storage.dart';
+
+import '../../domain/service/security_service.dart';
+
+class SecurityServiceImpl extends SecurityService {
+  static const String kAccessToken = "access_token";
+  static const String kRefreshToken = "refresh_token";
+  static const String kCardNumberPrefix = "card_number_";
+
+  final FlutterSecureStorage _secureStorage;
+
+  SecurityServiceImpl(this._secureStorage);
+
+  @override
+  Future<void> saveTokens(UserAuthData data) async {
+    await _secureStorage.write(key: kAccessToken, value: data.accessToken);
+    await _secureStorage.write(key: kRefreshToken, value: data.refreshToken);
+  }
+
+  @override
+  Future<void> removeTokens() async {
+    await _secureStorage.delete(key: kRefreshToken);
+    await _secureStorage.delete(key: kAccessToken);
+  }
+
+  @override
+  Future<String?> getAccessToken() async {
+    return await _secureStorage.read(key: kAccessToken);
+  }
+
+  @override
+  Future<String?> getRefreshToken() async {
+    return await _secureStorage.read(key: kRefreshToken);
+  }
+
+  @override
+  Future<void> saveCardFullNumber(int cardId, String fullCardNumber) async {
+    await _secureStorage.write(
+      key: '${kCardNumberPrefix}_$cardId',
+      value: fullCardNumber,
+    );
+  }
+
+  @override
+  Future<String?> getCardFullNumber(int cardId) async {
+    return await _secureStorage.read(key: '${kCardNumberPrefix}_$cardId');
+  }
+
+  @override
+  Future<void> removeCardFullNumber(int cardId) async {
+    await _secureStorage.delete(key: '${kCardNumberPrefix}_$cardId');
+  }
+
+  @override
+  Future<void> clearAllCardsNumbers() async {
+    // Получаем все ключи и удаляем те, что начинаются с префикса карты
+    final allKeys = await _secureStorage.readAll();
+    for (final key in allKeys.keys) {
+      if (key.startsWith(kCardNumberPrefix)) {
+        await _secureStorage.delete(key: key);
+      }
+    }
+  }
+
+  // @override
+  // Future<UserAuthData?> getTokens() async {
+  //   final accessToken = await _secureStorage.read(key: kAccessToken);
+  //   final refreshToken = await _secureStorage.read(key: kRefreshToken);
+  //
+  //   if(accessToken != null && refreshToken != null) {
+  //       return UserAuthData(
+  //       accessToken: accessToken,
+  //       refreshToken: refreshToken,
+  //     );
+  //   }
+  //
+  //   return null;
+  // }
+}