fix(diary): Meal change method fix

2024-07-15 17:10:55 +03:00
parent 76c1effe12
commit ae213f39a5
5 changed files with 83 additions and 78 deletions
--- a/lib/features/diary/presentation/bloc/diary_bloc.dart
+++ b/lib/features/diary/presentation/bloc/diary_bloc.dart
@@ -57,14 +57,23 @@ class DiaryBloc extends Bloc<DiaryEvent, DiaryState> {
      final int? diaryID = data['id'];
      final DiaryModel diary = await diaryRepository.getDiary(diaryID ?? 45);
      final Meal currentMeal = diary.meals[0];
-      List<SelectionPopupModel> portions = [SelectionPopupModel(title: "gr"), SelectionPopupModel(title: "pcs")];
+      List<SelectionPopupModel> portionList = [SelectionPopupModel(title: "gr"), SelectionPopupModel(title: "pcs")];
+      List<SelectionPopupModel> mealList = [
+        SelectionPopupModel(title: "Прием пищи 1", id: 1),
+        SelectionPopupModel(title: "Прием пищи 2", id: 2),
+        SelectionPopupModel(title: "Прием пищи 3", id: 3),
+        SelectionPopupModel(title: "Прием пищи 4", id: 4),
+        SelectionPopupModel(title: "Прием пищи 5", id: 5),
+        SelectionPopupModel(title: "Прием пищи 6", id: 6),
+      ];
      emit(DiaryState.loaded(
          diary: diary,
          currentMeal: currentMeal,
          portions: currentMeal.portions,
          photos: currentMeal.photos,
-          portionList: portions,
-          portionController: portions[0],
+          portionList: portionList,
+          portionController: portionList[0],
+          mealList: mealList,
          selectedMood: currentMeal.mood,
          selectedSatiety: currentMeal.satiety,
          commentController: TextEditingController(),
@@ -209,9 +218,8 @@ class DiaryBloc extends Bloc<DiaryEvent, DiaryState> {
    Emitter<DiaryState> emit,
  ) async {
    if (state is DiaryStateLoaded) {
-      var currentState = state as DiaryStateLoaded;
-      Meal? meal = currentState.diary.meals.firstWhere((meal) => meal.id == event.value.id);
-
+      final currentState = state as DiaryStateLoaded;
+      final Meal meal = currentState.diary.meals.firstWhere((meal) => meal.type == event.value.id);
      DiaryStateLoaded updatedState = currentState.copyWith(
        currentMeal: meal,
        portions: meal.portions,
--- a/lib/features/diary/presentation/bloc/diary_event.dart
+++ b/lib/features/diary/presentation/bloc/diary_event.dart
@@ -110,11 +110,10 @@ class ProductInput extends DiaryEvent {
 }

 class ChangeMeal extends DiaryEvent {
-  ChangeMeal({required this.value, required this.meals});
-  Meal value;
-  List<Meal>? meals;
+  ChangeMeal({required this.value});
+  SelectionPopupModel value;
  @override
-  List<Object?> get props => [value, meals];
+  List<Object?> get props => [value];
 }

 class ClearInput extends DiaryEvent {
--- a/lib/features/diary/presentation/bloc/diary_state.dart
+++ b/lib/features/diary/presentation/bloc/diary_state.dart
@@ -23,6 +23,7 @@ abstract class DiaryState with _$DiaryState {
    required List<int> consumedChartValues,
    required List<Portion> portions,
    required List<Photo> photos,
+    required List<SelectionPopupModel> mealList,
    required List<SelectionPopupModel> portionList,
    required Meal currentMeal,
    required SelectionPopupModel portionController,
--- a/lib/features/diary/presentation/bloc/diary_state.freezed.dart
+++ b/lib/features/diary/presentation/bloc/diary_state.freezed.dart
@@ -28,6 +28,7 @@ mixin _$DiaryState {
            List<int> consumedChartValues,
            List<Portion> portions,
            List<Photo> photos,
+            List<SelectionPopupModel> mealList,
            List<SelectionPopupModel> portionList,
            Meal currentMeal,
            SelectionPopupModel portionController,
@@ -64,6 +65,7 @@ mixin _$DiaryState {
            List<int> consumedChartValues,
            List<Portion> portions,
            List<Photo> photos,
+            List<SelectionPopupModel> mealList,
            List<SelectionPopupModel> portionList,
            Meal currentMeal,
            SelectionPopupModel portionController,
@@ -100,6 +102,7 @@ mixin _$DiaryState {
            List<int> consumedChartValues,
            List<Portion> portions,
            List<Photo> photos,
+            List<SelectionPopupModel> mealList,
            List<SelectionPopupModel> portionList,
            Meal currentMeal,
            SelectionPopupModel portionController,
@@ -218,6 +221,7 @@ class _$DiaryStateImpl implements _DiaryState {
            List<int> consumedChartValues,
            List<Portion> portions,
            List<Photo> photos,
+            List<SelectionPopupModel> mealList,
            List<SelectionPopupModel> portionList,
            Meal currentMeal,
            SelectionPopupModel portionController,
@@ -257,6 +261,7 @@ class _$DiaryStateImpl implements _DiaryState {
            List<int> consumedChartValues,
            List<Portion> portions,
            List<Photo> photos,
+            List<SelectionPopupModel> mealList,
            List<SelectionPopupModel> portionList,
            Meal currentMeal,
            SelectionPopupModel portionController,
@@ -296,6 +301,7 @@ class _$DiaryStateImpl implements _DiaryState {
            List<int> consumedChartValues,
            List<Portion> portions,
            List<Photo> photos,
+            List<SelectionPopupModel> mealList,
            List<SelectionPopupModel> portionList,
            Meal currentMeal,
            SelectionPopupModel portionController,
@@ -416,6 +422,7 @@ class _$DiaryStateLoadingImpl implements DiaryStateLoading {
            List<int> consumedChartValues,
            List<Portion> portions,
            List<Photo> photos,
+            List<SelectionPopupModel> mealList,
            List<SelectionPopupModel> portionList,
            Meal currentMeal,
            SelectionPopupModel portionController,
@@ -455,6 +462,7 @@ class _$DiaryStateLoadingImpl implements DiaryStateLoading {
            List<int> consumedChartValues,
            List<Portion> portions,
            List<Photo> photos,
+            List<SelectionPopupModel> mealList,
            List<SelectionPopupModel> portionList,
            Meal currentMeal,
            SelectionPopupModel portionController,
@@ -494,6 +502,7 @@ class _$DiaryStateLoadingImpl implements DiaryStateLoading {
            List<int> consumedChartValues,
            List<Portion> portions,
            List<Photo> photos,
+            List<SelectionPopupModel> mealList,
            List<SelectionPopupModel> portionList,
            Meal currentMeal,
            SelectionPopupModel portionController,
@@ -580,6 +589,7 @@ abstract class _$$DiaryStateLoadedImplCopyWith<$Res> {
      List<int> consumedChartValues,
      List<Portion> portions,
      List<Photo> photos,
+      List<SelectionPopupModel> mealList,
      List<SelectionPopupModel> portionList,
      Meal currentMeal,
      SelectionPopupModel portionController,
@@ -623,6 +633,7 @@ class __$$DiaryStateLoadedImplCopyWithImpl<$Res>
    Object? consumedChartValues = null,
    Object? portions = null,
    Object? photos = null,
+    Object? mealList = null,
    Object? portionList = null,
    Object? currentMeal = null,
    Object? portionController = null,
@@ -673,6 +684,10 @@ class __$$DiaryStateLoadedImplCopyWithImpl<$Res>
          ? _value._photos
          : photos // ignore: cast_nullable_to_non_nullable
              as List<Photo>,
+      mealList: null == mealList
+          ? _value._mealList
+          : mealList // ignore: cast_nullable_to_non_nullable
+              as List<SelectionPopupModel>,
      portionList: null == portionList
          ? _value._portionList
          : portionList // ignore: cast_nullable_to_non_nullable
@@ -784,6 +799,7 @@ class _$DiaryStateLoadedImpl implements DiaryStateLoaded {
      required final List<int> consumedChartValues,
      required final List<Portion> portions,
      required final List<Photo> photos,
+      required final List<SelectionPopupModel> mealList,
      required final List<SelectionPopupModel> portionList,
      required this.currentMeal,
      required this.portionController,
@@ -809,6 +825,7 @@ class _$DiaryStateLoadedImpl implements DiaryStateLoaded {
        _consumedChartValues = consumedChartValues,
        _portions = portions,
        _photos = photos,
+        _mealList = mealList,
        _portionList = portionList;

  @override
@@ -858,6 +875,14 @@ class _$DiaryStateLoadedImpl implements DiaryStateLoaded {
    return EqualUnmodifiableListView(_photos);
  }

+  final List<SelectionPopupModel> _mealList;
+  @override
+  List<SelectionPopupModel> get mealList {
+    if (_mealList is EqualUnmodifiableListView) return _mealList;
+    // ignore: implicit_dynamic_type
+    return EqualUnmodifiableListView(_mealList);
+  }
+
  final List<SelectionPopupModel> _portionList;
  @override
  List<SelectionPopupModel> get portionList {
@@ -907,7 +932,7 @@ class _$DiaryStateLoadedImpl implements DiaryStateLoaded {

  @override
  String toString() {
-    return 'DiaryState.loaded(diary: $diary, diaryDate: $diaryDate, autocompleteList: $autocompleteList, recommendedChartValues: $recommendedChartValues, consumedChartValues: $consumedChartValues, portions: $portions, photos: $photos, portionList: $portionList, currentMeal: $currentMeal, portionController: $portionController, wakeupController: $wakeupController, retireController: $retireController, mealTimeController: $mealTimeController, commentController: $commentController, productNameController: $productNameController, productQuantityController: $productQuantityController, caloriesController: $caloriesController, fatsController: $fatsController, proteinsController: $proteinsController, carbsController: $carbsController, selectedMood: $selectedMood, selectedSatiety: $selectedSatiety, wakeupExpanded: $wakeupExpanded, moderationExpanded: $moderationExpanded, moodExpanded: $moodExpanded, isLoading: $isLoading, isAdded: $isAdded)';
+    return 'DiaryState.loaded(diary: $diary, diaryDate: $diaryDate, autocompleteList: $autocompleteList, recommendedChartValues: $recommendedChartValues, consumedChartValues: $consumedChartValues, portions: $portions, photos: $photos, mealList: $mealList, portionList: $portionList, currentMeal: $currentMeal, portionController: $portionController, wakeupController: $wakeupController, retireController: $retireController, mealTimeController: $mealTimeController, commentController: $commentController, productNameController: $productNameController, productQuantityController: $productQuantityController, caloriesController: $caloriesController, fatsController: $fatsController, proteinsController: $proteinsController, carbsController: $carbsController, selectedMood: $selectedMood, selectedSatiety: $selectedSatiety, wakeupExpanded: $wakeupExpanded, moderationExpanded: $moderationExpanded, moodExpanded: $moodExpanded, isLoading: $isLoading, isAdded: $isAdded)';
  }

  @override
@@ -926,6 +951,7 @@ class _$DiaryStateLoadedImpl implements DiaryStateLoaded {
                .equals(other._consumedChartValues, _consumedChartValues) &&
            const DeepCollectionEquality().equals(other._portions, _portions) &&
            const DeepCollectionEquality().equals(other._photos, _photos) &&
+            const DeepCollectionEquality().equals(other._mealList, _mealList) &&
            const DeepCollectionEquality()
                .equals(other._portionList, _portionList) &&
            (identical(other.currentMeal, currentMeal) ||
@@ -978,6 +1004,7 @@ class _$DiaryStateLoadedImpl implements DiaryStateLoaded {
        const DeepCollectionEquality().hash(_consumedChartValues),
        const DeepCollectionEquality().hash(_portions),
        const DeepCollectionEquality().hash(_photos),
+        const DeepCollectionEquality().hash(_mealList),
        const DeepCollectionEquality().hash(_portionList),
        currentMeal,
        portionController,
@@ -1020,6 +1047,7 @@ class _$DiaryStateLoadedImpl implements DiaryStateLoaded {
            List<int> consumedChartValues,
            List<Portion> portions,
            List<Photo> photos,
+            List<SelectionPopupModel> mealList,
            List<SelectionPopupModel> portionList,
            Meal currentMeal,
            SelectionPopupModel portionController,
@@ -1051,6 +1079,7 @@ class _$DiaryStateLoadedImpl implements DiaryStateLoaded {
        consumedChartValues,
        portions,
        photos,
+        mealList,
        portionList,
        currentMeal,
        portionController,
@@ -1086,6 +1115,7 @@ class _$DiaryStateLoadedImpl implements DiaryStateLoaded {
            List<int> consumedChartValues,
            List<Portion> portions,
            List<Photo> photos,
+            List<SelectionPopupModel> mealList,
            List<SelectionPopupModel> portionList,
            Meal currentMeal,
            SelectionPopupModel portionController,
@@ -1117,6 +1147,7 @@ class _$DiaryStateLoadedImpl implements DiaryStateLoaded {
        consumedChartValues,
        portions,
        photos,
+        mealList,
        portionList,
        currentMeal,
        portionController,
@@ -1152,6 +1183,7 @@ class _$DiaryStateLoadedImpl implements DiaryStateLoaded {
            List<int> consumedChartValues,
            List<Portion> portions,
            List<Photo> photos,
+            List<SelectionPopupModel> mealList,
            List<SelectionPopupModel> portionList,
            Meal currentMeal,
            SelectionPopupModel portionController,
@@ -1185,6 +1217,7 @@ class _$DiaryStateLoadedImpl implements DiaryStateLoaded {
          consumedChartValues,
          portions,
          photos,
+          mealList,
          portionList,
          currentMeal,
          portionController,
@@ -1256,6 +1289,7 @@ abstract class DiaryStateLoaded implements DiaryState {
      required final List<int> consumedChartValues,
      required final List<Portion> portions,
      required final List<Photo> photos,
+      required final List<SelectionPopupModel> mealList,
      required final List<SelectionPopupModel> portionList,
      required final Meal currentMeal,
      required final SelectionPopupModel portionController,
@@ -1284,6 +1318,7 @@ abstract class DiaryStateLoaded implements DiaryState {
  List<int> get consumedChartValues;
  List<Portion> get portions;
  List<Photo> get photos;
+  List<SelectionPopupModel> get mealList;
  List<SelectionPopupModel> get portionList;
  Meal get currentMeal;
  SelectionPopupModel get portionController;
@@ -1385,6 +1420,7 @@ class _$DiaryStateErrorImpl implements DiaryStateError {
            List<int> consumedChartValues,
            List<Portion> portions,
            List<Photo> photos,
+            List<SelectionPopupModel> mealList,
            List<SelectionPopupModel> portionList,
            Meal currentMeal,
            SelectionPopupModel portionController,
@@ -1424,6 +1460,7 @@ class _$DiaryStateErrorImpl implements DiaryStateError {
            List<int> consumedChartValues,
            List<Portion> portions,
            List<Photo> photos,
+            List<SelectionPopupModel> mealList,
            List<SelectionPopupModel> portionList,
            Meal currentMeal,
            SelectionPopupModel portionController,
@@ -1463,6 +1500,7 @@ class _$DiaryStateErrorImpl implements DiaryStateError {
            List<int> consumedChartValues,
            List<Portion> portions,
            List<Photo> photos,
+            List<SelectionPopupModel> mealList,
            List<SelectionPopupModel> portionList,
            Meal currentMeal,
            SelectionPopupModel portionController,