Merge pull request 'main' (#37) from main into diary_refactor

Reviewed-on: maxxkim/eatvio_app#37
2024-07-03 08:54:03 +00:00
parent 9b97967d88 5cda945d1f
commit ca81316eed
21 changed files with 193 additions and 76 deletions
--- a/lib/app_router.dart
+++ b/lib/app_router.dart
@@ -5,7 +5,7 @@ import 'package:eatvio_app/presentation/auth/auth_screen/auth_screen.dart';
 import 'package:eatvio_app/presentation/diary/diary_edit_screen/diary_edit_screen.dart';
 import 'package:eatvio_app/presentation/diets/diet_create_screen/diet_create_screen.dart';
 import 'package:eatvio_app/presentation/diets/diet_select_screen/diet_select_screen.dart';
-import 'package:eatvio_app/presentation/feed/blog_post_create_screen/blog_post_create_screen.dart';
+import 'package:eatvio_app/features/blog_post_create/presentation/pages/blog_post_create_screen.dart';
 import 'package:eatvio_app/presentation/feed/blog_post_edit_screen/blog_post_edit_screen.dart';
 import 'package:eatvio_app/features/blog_post/presentation/pages/blog_post_screen.dart';
 import 'package:eatvio_app/features/feed/presentation/pages/feed_screen.dart';
--- a/lib/core/initialization_cubit/initialization_cubit.dart
+++ b/lib/core/initialization_cubit/initialization_cubit.dart
@@ -2,7 +2,6 @@ import 'package:eatvio_app/core/app_export.dart';
 import 'package:eatvio_app/core/initialization_cubit/initialization_state.dart';
 import 'package:eatvio_app/core/token_storage.dart';
 import 'package:eatvio_app/features/chat/repositories/chat_repository.dart';
-import 'package:pusher_client/pusher_client.dart';

 class InitializationCubit extends Cubit<InitializationState> {
  final ChatRepository chatRepository;
@@ -12,40 +11,48 @@ class InitializationCubit extends Cubit<InitializationState> {
  runInitialization() async {
    try {
      await TokenStorage.haveTokenInStorage();
-
-      final wsUrl = await chatRepository.getWebsocket();
-
-      PusherOptions options = PusherOptions(
-        host: 'socket.mobile-stage.eatvio.ru',
-        wsPort: 443,
-        encrypted: true,
-        auth: PusherAuth(
-          'wss://' + wsUrl.host + '/app/' + wsUrl.key,
-          headers: {
-            'Authorization': 'Bearer ${TokenStorage.getTokenFromStorage()}',
-          },
-        ),
-      );
-
-      PusherClient pusherClient = PusherClient(
-        wsUrl.key,
-        options,
-        autoConnect: true,
-        enableLogging: true,
-      );
-
-      await pusherClient.connect();
-
+      // final wsUrl = await chatRepository.getWebsocket();
+      // final options = PusherChannelsOptions.fromHost(
+      //   scheme: 'wss',
+      //   key: wsUrl.key,
+      //   host: wsUrl.host,
+      //   shouldSupplyMetadataQueries: true,
+      //   metadata: PusherChannelsOptionsMetadata.byDefault(),
+      //   port: 443,
+      // );
+      // final client = PusherChannelsClient.websocket(
+      //   options: options,
+      //   connectionErrorHandler: (exception, trace, refresh) {
+      //     refresh();
+      //   },
+      //   minimumReconnectDelayDuration: const Duration(
+      //     seconds: 1,
+      //   ),
+      //   defaultActivityDuration: const Duration(
+      //     seconds: 120,
+      //   ),
+      //   activityDurationOverride: const Duration(
+      //     seconds: 120,
+      //   ),
+      //   waitForPongDuration: const Duration(
+      //     seconds: 30,
+      //   ),
+      // );
+      // await client.connect();
+      // final myPrivateChannel = client.privateChannel(
+      //   'private-message-events.${wsUrl.userId}',
+      //   authorizationDelegate: EndpointAuthorizableChannelTokenAuthorizationDelegate.forPrivateChannel(
+      //     authorizationEndpoint: Uri.parse('https://mobile-stage.eatvio.ru/broadcasting/auth'),
+      //     headers: {
+      //       'Authorization' : 'Bearer ${await TokenStorage.getTokenFromStorage()}',
+      //     },
+      //   ),
+      // );
+      // myPrivateChannel.subscribe();
+      // myPrivateChannel.bindToAll().listen((event) {
+      //   print(event.name);
+      // });
      emit(const InitializationState.success());
-
-      Channel channel = pusherClient.subscribe('private-direct-chat.' + '7909ea56-7822-4d5f-8892-134bc937127f');
-
-      channel.bind("pusher_internal:subscription_succeeded", (PusherEvent? event) {
-        channel.trigger("pusher_internal:subscription_succeeded", {});
-      });
-
-      channel.registerListener('pusher:subscribe', (data) => print(data.toString()));
-
    } catch (e) {
      print(e);
      emit(InitializationState.error(errorMessage: e.toString()));
--- a/lib/core/token_storage.dart
+++ b/lib/core/token_storage.dart
@@ -18,14 +18,12 @@ abstract class TokenStorage {
    }
  }

-  static Future<String> getTokenFromStorage() async =>
-      (await Hive.openBox('token')).get('token');
+  static Future<String> getTokenFromStorage() async => (await Hive.openBox('token')).get('token');

  static saveTokenInStorage(String token) async {
    (await Hive.openBox('token')).put('token', token);
    _addTokenToDioHeader(token);
  }

-  static removeTokenInStorage() async =>
-      (await Hive.openBox('token')).delete('token');
+  static removeTokenInStorage() async => (await Hive.openBox('token')).delete('token');
 }
--- a/lib/presentation/feed/blog_post_create_screen/models/blog_post_create_credentials_model.dart
+++ b/lib/presentation/feed/blog_post_create_screen/models/blog_post_create_credentials_model.dart
@@ -1,6 +1,6 @@
 import 'package:freezed_annotation/freezed_annotation.dart';
-part 'blog_post_create_credentials_model.freezed.dart';
-part 'blog_post_create_credentials_model.g.dart';
+part '../../../presentation/feed/blog_post_create_screen/models/blog_post_create_credentials_model.freezed.dart';
+part '../../../presentation/feed/blog_post_create_screen/models/blog_post_create_credentials_model.g.dart';

@freezed
 class BlogPostCreateCredentialsModel with _$BlogPostCreateCredentialsModel {
--- a/lib/features/blog_post_create/presentation/pages/blog_post_create_screen.dart
+++ b/lib/features/blog_post_create/presentation/pages/blog_post_create_screen.dart
@@ -1,5 +1,5 @@
-import 'bloc/blog_post_create_bloc.dart';
-import 'models/blog_post_create_model.dart';
+import '../../../../presentation/feed/blog_post_create_screen/bloc/blog_post_create_bloc.dart';
+import '../../../../presentation/feed/blog_post_create_screen/models/blog_post_create_model.dart';
 import 'package:eatvio_app/core/app_export.dart';
 import 'package:flutter/material.dart';
 import 'package:image_picker/image_picker.dart';
--- a/lib/presentation/feed/blog_post_create_screen/repositories/blog_repository.dart
+++ b/lib/presentation/feed/blog_post_create_screen/repositories/blog_repository.dart
@@ -1,5 +1,5 @@
-import 'package:eatvio_app/presentation/feed/blog_post_create_screen/models/blog_post_create_credentials_model.dart';
-import 'package:eatvio_app/presentation/feed/blog_post_create_screen/services/blog_service.dart';
+import 'package:eatvio_app/features/blog_post_create/models/blog_post_create_credentials_model.dart';
+import 'package:eatvio_app/features/blog_post_create/services/blog_service.dart';

 class BlogRepository {
  final BlogService blogService;
--- a/lib/presentation/feed/blog_post_create_screen/services/blog_service.dart
+++ b/lib/presentation/feed/blog_post_create_screen/services/blog_service.dart
@@ -1,4 +1,4 @@
-import 'package:eatvio_app/presentation/feed/blog_post_create_screen/models/blog_post_create_credentials_model.dart';
+import 'package:eatvio_app/features/blog_post_create/models/blog_post_create_credentials_model.dart';
 import 'package:dio/dio.dart';
 import 'package:retrofit/retrofit.dart';

--- a/lib/presentation/feed/blog_post_create_screen/services/blog_service.g.dart
+++ b/lib/presentation/feed/blog_post_create_screen/services/blog_service.g.dart
--- a/lib/features/chat/models/websocket_info_model.dart
+++ b/lib/features/chat/models/websocket_info_model.dart
@@ -10,6 +10,9 @@ class WebsocketInfoModel with _$WebsocketInfoModel {
    required String key,
    required String host,
    required String port,
+    required String cluster,
+    @JsonKey(name: 'user_id')
+    required int userId,
  }) = _WebsocketInfoModel;

  factory WebsocketInfoModel.fromJson(Map<String, Object?> json) => _$WebsocketInfoModelFromJson(json);
--- a/lib/features/chat/models/websocket_info_model.freezed.dart
+++ b/lib/features/chat/models/websocket_info_model.freezed.dart
@@ -23,6 +23,9 @@ mixin _$WebsocketInfoModel {
  String get key => throw _privateConstructorUsedError;
  String get host => throw _privateConstructorUsedError;
  String get port => throw _privateConstructorUsedError;
+  String get cluster => throw _privateConstructorUsedError;
+  @JsonKey(name: 'user_id')
+  int get userId => throw _privateConstructorUsedError;

  Map<String, dynamic> toJson() => throw _privateConstructorUsedError;
  @JsonKey(ignore: true)
@@ -36,7 +39,12 @@ abstract class $WebsocketInfoModelCopyWith<$Res> {
          WebsocketInfoModel value, $Res Function(WebsocketInfoModel) then) =
      _$WebsocketInfoModelCopyWithImpl<$Res, WebsocketInfoModel>;
  @useResult
-  $Res call({String key, String host, String port});
+  $Res call(
+      {String key,
+      String host,
+      String port,
+      String cluster,
+      @JsonKey(name: 'user_id') int userId});
 }

 /// @nodoc
@@ -55,6 +63,8 @@ class _$WebsocketInfoModelCopyWithImpl<$Res, $Val extends WebsocketInfoModel>
    Object? key = null,
    Object? host = null,
    Object? port = null,
+    Object? cluster = null,
+    Object? userId = null,
  }) {
    return _then(_value.copyWith(
      key: null == key
@@ -69,6 +79,14 @@ class _$WebsocketInfoModelCopyWithImpl<$Res, $Val extends WebsocketInfoModel>
          ? _value.port
          : port // ignore: cast_nullable_to_non_nullable
              as String,
+      cluster: null == cluster
+          ? _value.cluster
+          : cluster // ignore: cast_nullable_to_non_nullable
+              as String,
+      userId: null == userId
+          ? _value.userId
+          : userId // ignore: cast_nullable_to_non_nullable
+              as int,
    ) as $Val);
  }
 }
@@ -81,7 +99,12 @@ abstract class _$$WebsocketInfoModelImplCopyWith<$Res>
      __$$WebsocketInfoModelImplCopyWithImpl<$Res>;
  @override
  @useResult
-  $Res call({String key, String host, String port});
+  $Res call(
+      {String key,
+      String host,
+      String port,
+      String cluster,
+      @JsonKey(name: 'user_id') int userId});
 }

 /// @nodoc
@@ -98,6 +121,8 @@ class __$$WebsocketInfoModelImplCopyWithImpl<$Res>
    Object? key = null,
    Object? host = null,
    Object? port = null,
+    Object? cluster = null,
+    Object? userId = null,
  }) {
    return _then(_$WebsocketInfoModelImpl(
      key: null == key
@@ -112,6 +137,14 @@ class __$$WebsocketInfoModelImplCopyWithImpl<$Res>
          ? _value.port
          : port // ignore: cast_nullable_to_non_nullable
              as String,
+      cluster: null == cluster
+          ? _value.cluster
+          : cluster // ignore: cast_nullable_to_non_nullable
+              as String,
+      userId: null == userId
+          ? _value.userId
+          : userId // ignore: cast_nullable_to_non_nullable
+              as int,
    ));
  }
 }
@@ -120,7 +153,11 @@ class __$$WebsocketInfoModelImplCopyWithImpl<$Res>
@JsonSerializable()
 class _$WebsocketInfoModelImpl implements _WebsocketInfoModel {
  const _$WebsocketInfoModelImpl(
-      {required this.key, required this.host, required this.port});
+      {required this.key,
+      required this.host,
+      required this.port,
+      required this.cluster,
+      @JsonKey(name: 'user_id') required this.userId});

  factory _$WebsocketInfoModelImpl.fromJson(Map<String, dynamic> json) =>
      _$$WebsocketInfoModelImplFromJson(json);
@@ -131,10 +168,15 @@ class _$WebsocketInfoModelImpl implements _WebsocketInfoModel {
  final String host;
  @override
  final String port;
+  @override
+  final String cluster;
+  @override
+  @JsonKey(name: 'user_id')
+  final int userId;

  @override
  String toString() {
-    return 'WebsocketInfoModel(key: $key, host: $host, port: $port)';
+    return 'WebsocketInfoModel(key: $key, host: $host, port: $port, cluster: $cluster, userId: $userId)';
  }

  @override
@@ -144,12 +186,15 @@ class _$WebsocketInfoModelImpl implements _WebsocketInfoModel {
            other is _$WebsocketInfoModelImpl &&
            (identical(other.key, key) || other.key == key) &&
            (identical(other.host, host) || other.host == host) &&
-            (identical(other.port, port) || other.port == port));
+            (identical(other.port, port) || other.port == port) &&
+            (identical(other.cluster, cluster) || other.cluster == cluster) &&
+            (identical(other.userId, userId) || other.userId == userId));
  }

  @JsonKey(ignore: true)
  @override
-  int get hashCode => Object.hash(runtimeType, key, host, port);
+  int get hashCode =>
+      Object.hash(runtimeType, key, host, port, cluster, userId);

  @JsonKey(ignore: true)
  @override
@@ -168,9 +213,12 @@ class _$WebsocketInfoModelImpl implements _WebsocketInfoModel {

 abstract class _WebsocketInfoModel implements WebsocketInfoModel {
  const factory _WebsocketInfoModel(
-      {required final String key,
-      required final String host,
-      required final String port}) = _$WebsocketInfoModelImpl;
+          {required final String key,
+          required final String host,
+          required final String port,
+          required final String cluster,
+          @JsonKey(name: 'user_id') required final int userId}) =
+      _$WebsocketInfoModelImpl;

  factory _WebsocketInfoModel.fromJson(Map<String, dynamic> json) =
      _$WebsocketInfoModelImpl.fromJson;
@@ -182,6 +230,11 @@ abstract class _WebsocketInfoModel implements WebsocketInfoModel {
  @override
  String get port;
  @override
+  String get cluster;
+  @override
+  @JsonKey(name: 'user_id')
+  int get userId;
+  @override
  @JsonKey(ignore: true)
  _$$WebsocketInfoModelImplCopyWith<_$WebsocketInfoModelImpl> get copyWith =>
      throw _privateConstructorUsedError;
--- a/lib/features/chat/models/websocket_info_model.g.dart
+++ b/lib/features/chat/models/websocket_info_model.g.dart
@@ -12,6 +12,8 @@ _$WebsocketInfoModelImpl _$$WebsocketInfoModelImplFromJson(
      key: json['key'] as String,
      host: json['host'] as String,
      port: json['port'] as String,
+      cluster: json['cluster'] as String,
+      userId: (json['user_id'] as num).toInt(),
    );

 Map<String, dynamic> _$$WebsocketInfoModelImplToJson(
@@ -20,4 +22,6 @@ Map<String, dynamic> _$$WebsocketInfoModelImplToJson(
      'key': instance.key,
      'host': instance.host,
      'port': instance.port,
+      'cluster': instance.cluster,
+      'user_id': instance.userId,
    };
--- a/lib/presentation/diary/diary_edit_screen/bloc/diary_edit_bloc.dart
+++ b/lib/presentation/diary/diary_edit_screen/bloc/diary_edit_bloc.dart
@@ -190,12 +190,12 @@ class DiaryEditBloc extends Bloc<DiaryEditEvent, DiaryEditState> {
      final recommendedChartValues =
          jsonDecode(responseChart.body)['dailyNutritionRecommendation']
              .values
-              .map<int>((value) => value as int)
+              .map<double>((value) => value as double)
              .toList();
      final consumedChartValues =
          jsonDecode(responseChart.body)['dailyNutritionIntake']
              .values
-              .map<int>((value) => value as int)
+              .map<double>((value) => value as double)
              .toList();
      return [recommendedChartValues, consumedChartValues];
    } else {
@@ -275,10 +275,10 @@ class DiaryEditBloc extends Bloc<DiaryEditEvent, DiaryEditState> {
                      moderationExpanded: false,
                      token: token,
                      recommendedChartValues: recommendedChartValues.values
-                          .map<int>((value) => value as int)
+                          .map<double>((value) => value as double)
                          .toList(),
                      consumedChartValues: consumedChartValues.values
-                          .map<int>((value) => value as int)
+                          .map<double>((value) => value as double)
                          .toList(),
                      meals: diary['meals'],
                      portions: diary['meals'][0]['portions'],
--- a/lib/presentation/diary/diary_edit_screen/bloc/diary_edit_state.dart
+++ b/lib/presentation/diary/diary_edit_screen/bloc/diary_edit_state.dart
@@ -57,8 +57,8 @@ class DiaryEditLoadedState extends DiaryEditState {
  List<dynamic>? portions;
  List<dynamic>? photos;
  List<dynamic>? autocompleteList;
-  List<int> recommendedChartValues;
-  List<int> consumedChartValues;
+  List<double> recommendedChartValues;
+  List<double> consumedChartValues;
  SelectionPopupModel? currentMeal;
  SelectionPopupModel? portionController;
  TimeOfDay? wakeupController;
@@ -117,8 +117,8 @@ class DiaryEditLoadedState extends DiaryEditState {
    SelectionPopupModel? portionController,
    String? diaryDate,
    String? token,
-    List<int>? recommendedChartValues,
-    List<int>? consumedChartValues,
+    List<double>? recommendedChartValues,
+    List<double>? consumedChartValues,
    List<dynamic>? meals,
    List<dynamic>? portions,
    List<dynamic>? photos,
--- a/lib/presentation/diary/diary_edit_screen/diary_edit_screen.dart
+++ b/lib/presentation/diary/diary_edit_screen/diary_edit_screen.dart
@@ -720,8 +720,8 @@ class DiaryEditScreen extends StatelessWidget {
  }

  _buildNutritionChart(BuildContext context, DiaryEditLoadedState state) {
-    final List<int> recommendedValues = state.recommendedChartValues; // Рекомендуемые значения: калории, жиры, белки, углеводы
-    final List<int> consumedValues = state.consumedChartValues; //
+    final List<double> recommendedValues = state.recommendedChartValues; // Рекомендуемые значения: калории, жиры, белки, углеводы
+    final List<double> consumedValues = state.consumedChartValues; //
    return Container(
      margin: EdgeInsets.symmetric(horizontal: 16.h),
      padding: EdgeInsets.symmetric(
@@ -1196,7 +1196,7 @@ class DiaryEditScreen extends StatelessWidget {
  }
 }

-bool checkConsumedValues(List<int> recommendedValues, List<int> consumedValues) {
+bool checkConsumedValues(List<double> recommendedValues, List<double> consumedValues) {
  for (int i = 0; i < recommendedValues.length; i++) {
    if (consumedValues[i] > recommendedValues[i]) {
      // Если хотя бы одно потребленное значение превышает рекомендованное
--- a/lib/presentation/feed/blog_post_create_screen/models/blog_post_create_credentials_model.freezed.dart
+++ b/lib/presentation/feed/blog_post_create_screen/models/blog_post_create_credentials_model.freezed.dart
@@ -3,7 +3,7 @@
 // ignore_for_file: type=lint
 // ignore_for_file: unused_element, deprecated_member_use, deprecated_member_use_from_same_package, use_function_type_syntax_for_parameters, unnecessary_const, avoid_init_to_null, invalid_override_different_default_values_named, prefer_expression_function_bodies, annotate_overrides, invalid_annotation_target, unnecessary_question_mark

-part of 'blog_post_create_credentials_model.dart';
+part of '../../../../features/blog_post_create/models/blog_post_create_credentials_model.dart';

 // **************************************************************************
 // FreezedGenerator
--- a/lib/presentation/feed/blog_post_create_screen/models/blog_post_create_credentials_model.g.dart
+++ b/lib/presentation/feed/blog_post_create_screen/models/blog_post_create_credentials_model.g.dart
@@ -1,6 +1,6 @@
 // GENERATED CODE - DO NOT MODIFY BY HAND

-part of 'blog_post_create_credentials_model.dart';
+part of '../../../../features/blog_post_create/models/blog_post_create_credentials_model.dart';

 // **************************************************************************
 // JsonSerializableGenerator