feat(diary): added v2 methods for diary

2025-09-18 18:47:07 +03:00
parent 1a6fb39d84
commit 8d3ae15112
16 changed files with 237 additions and 133 deletions
--- a/lib/features/diary/presentation/bloc/diary_cubit.dart
+++ b/lib/features/diary/presentation/bloc/diary_cubit.dart
@@ -1,10 +1,13 @@
 import 'dart:developer';
 import 'dart:io';

+import 'package:dio/dio.dart';
 import 'package:eatvio_app/core/image_compressing/image_compress_utility.dart';
 import 'package:eatvio_app/core/utils/date_time_utils.dart';
 import 'package:eatvio_app/features/chat/repositories/chat_repository.dart';
 import 'package:eatvio_app/features/consultations/models/consultation_model.dart';
+import 'package:eatvio_app/features/diary/entities/diary_day_entity.dart';
+import 'package:eatvio_app/features/diary/entities/diary_future_diet_day_entity.dart';
 import 'package:eatvio_app/features/diary/models/consultant_review_model.dart';
 import 'package:eatvio_app/features/diary/models/diary_day_model.dart';
 import 'package:eatvio_app/features/diary/models/nutrition_model.dart';
@@ -39,20 +42,50 @@ class DiaryCubit extends Cubit<DiaryState> {
    today = DateTime.now();
    selectedDay = today;
    diaryRepository.forceFetchStream.listen((_) {
-      fetchDiary(true, diaryId);
+      fetchDiaryV2(needLoading: true, diaryId: diaryId);
    });
  }

  String comment = '';

-  Future<bool?> setSelectedDay(DateTime day, {bool? forDietOnly}) async {
+  Future<bool> setSelectedDay(DateTime day, {bool? forDietOnly}) async {
    selectedDay = day;
    if (forDietOnly ?? false) {
-      final result = await fetchDiaryForDietOnly();
+      final result = await fetchDiaryV2();
      return result;
    }
-    await fetchDiary(true);
-    return null;
+    await fetchDiaryV2(needLoading: true);
+    return true;
+  }
+
+  Future<bool> fetchDiaryV2({bool needLoading = false, int? diaryId, int? currentDay}) async {
+    final (diaryDay, error) = await qwe();
+    if (error != null) {
+      if (error == DiaryFetchingErrors.canNotCreateFutureDays) {
+        return false;
+      }
+      emit(DiaryState.error(errorMessage: error.toString()));
+    }
+
+    if (diaryDay != null) {
+      final diaryEntity = diaryDay.toEntity();
+      if (diaryEntity != null) {
+        setDiary(diaryDay: diaryEntity);
+        return true;
+      }
+      setDiaryForDietOnly(diaryDay.toDiaryFutureDayEntity());
+    }
+    return true;
+  }
+
+  Future<(DiaryDayModel?, DiaryFetchingErrors?)> qwe() async {
+    try {
+      final diaryDay = await diaryRepository.getDiaryDayV2(day: selectedDay.toISO8601WithTimeZoneOffset());
+    } on DioException catch (e) {
+      
+    }
+
+    return (null, null);
  }

  void setSelectedMeal(int meal) {
@@ -65,9 +98,7 @@ class DiaryCubit extends Cubit<DiaryState> {
    }
  }

-  Future<bool> fetchDiaryForDietOnly() async {
-    final stringDate = selectedDay.format('yyyy-MM-dd');
-    final diaryDay = await diaryRepository.getDiaryByDateForDietOnly(stringDate);
+  Future<bool> setDiaryForDietOnly(DiaryFutureDietDayEntity diaryDay) async {
    if (!diaryDay.typeOfDiary.hasChosenDiet) {
      return false;
    }
@@ -146,13 +177,9 @@ class DiaryCubit extends Cubit<DiaryState> {
    return false;
  }

-  Future<void> fetchDiary([bool needLoading = false, int? diaryId, int? currentDay]) async {
+  Future<void> setDiary({int? diaryId, int? currentDay, required DiaryDayEntity diaryDay}) async {
    this.diaryId ??= diaryId;
    final isConsultantView = this.diaryId != null;
-    if (needLoading) {
-      emit(const DiaryState.loading());
-      selectedMeal = 1;
-    }
    try {
      final DiaryDayModel diaryDay;
      bool isMoodEnabled = false;
@@ -174,14 +201,14 @@ class DiaryCubit extends Cubit<DiaryState> {
        final chosenPlanModel = await chatRepository.getChosenPlan(id: diaryDay.chosenPlanId!);
        if (!isConsultantView &&
            (diaryDay.typeOfDiary.diaryState == DiaryStateEnum.lastDayCommented || diaryDay.typeOfDiary.diaryState == DiaryStateEnum.commented)) {
-          await diaryRepository.viewCommentOfDiaryDayByConsultant(diaryId: diaryDay.id);
+          await diaryRepository.viewCommentOfDiaryDayByConsultant(diaryId: diaryDay.id!);
        }
-        consultantReview = await diaryRepository.getDiaryComments(planId: diaryDay.chosenPlanId!, diaryId: diaryDay.id);
+        consultantReview = await diaryRepository.getDiaryComments(planId: diaryDay.chosenPlanId!, diaryId: diaryDay.id!);
        planDuration = chosenPlanModel.plan.duration;
        planName = chosenPlanModel.plan.name;
        currentPlanDay = consultantReview.currentPlanDay;
      }
-      final nutrition = await getNutrition(diaryDay.id);
+      final nutrition = await getNutrition(diaryDay.id!);

      final isDiaryFinished = diaryDay.typeOfDiary.diaryState == DiaryStateEnum.finished || diaryDay.typeOfDiary.diaryState == DiaryStateEnum.lastDayFinished;

@@ -191,7 +218,7 @@ class DiaryCubit extends Cubit<DiaryState> {
          diaryDay.typeOfDiary.diaryState == DiaryStateEnum.reviewedByUser;
      emit(
        DiaryState.loaded(
-          diary: diaryDay,
+          diary: diaryDay.toEntity()!,
          nutrition: nutrition,
          selectedDay: selectedDay,
          selectedMeal: selectedMeal,
@@ -214,7 +241,7 @@ class DiaryCubit extends Cubit<DiaryState> {

  Future<void> finishDiaryDay({required int diaryId, required String wakeUp, required String retire}) async {
    await diaryRepository.finishDiaryDay(diaryId: diaryId, wakeUp: wakeUp, retire: retire, comment: comment.isEmpty ? null : comment);
-    await fetchDiary();
+    await fetchDiaryV2();
  }

  Future<NutritionDataModel> getNutrition(int index) async {
@@ -238,7 +265,7 @@ class DiaryCubit extends Cubit<DiaryState> {
      quantity: quantity,
      productNutritionalValueId: productNutritionalValueId,
    );
-    await fetchDiary();
+    await fetchDiaryV2();
  }

  Future<void> updateProductInMeal({
@@ -272,27 +299,27 @@ class DiaryCubit extends Cubit<DiaryState> {
        portionState: portionState,
      );
    }
-    await fetchDiary();
+    await fetchDiaryV2();
  }

  Future<void> markEaten({required int diaryId, required int mealId, required int portionId}) async {
    await diaryRepository.markEaten(diaryId: diaryId, mealId: mealId, portionId: portionId);
-    await fetchDiary();
+    await fetchDiaryV2();
  }

  Future<void> unmarkEaten({required int diaryId, required int mealId, required int portionId}) async {
    await diaryRepository.unmarkEaten(diaryId: diaryId, mealId: mealId, portionId: portionId);
-    await fetchDiary();
+    await fetchDiaryV2();
  }

  Future<void> restore({required int diaryId, required int mealId, required int portionId}) async {
    await diaryRepository.restore(diaryId: diaryId, mealId: mealId, portionId: portionId);
-    await fetchDiary();
+    await fetchDiaryV2();
  }

  Future<void> deleteProductFromMeal({required int diaryId, required int mealId, required int portionId}) async {
    await diaryRepository.deleteProductFromMeal(diaryId: diaryId, mealId: mealId, portionId: portionId);
-    await fetchDiary();
+    await fetchDiaryV2();
  }

  Future<List<GlossaryModel>> getGlossaryListByQuery(String query) async {
@@ -301,12 +328,12 @@ class DiaryCubit extends Cubit<DiaryState> {

  Future<void> uploadPhotos({required List<File> files, required int diaryId}) async {
    await diaryRepository.uploadPhotos(files: await ImageCompressUtility.compressFilesList(files), diaryId: diaryId, mealId: selectedMeal);
-    await fetchDiary();
+    await fetchDiaryV2();
  }

  Future<void> deletePhoto({required DiaryPhotoModel photo, required int diaryId}) async {
    await diaryRepository.deletePhoto(photo: photo, diaryId: diaryId, mealId: selectedMeal);
-    await fetchDiary();
+    await fetchDiaryV2();
  }

  Future<GlossaryModerationModel?> sendProductToModeration({
@@ -326,30 +353,34 @@ class DiaryCubit extends Cubit<DiaryState> {

  Future<void> fillTime({required int diaryId, required String time}) async {
    await diaryRepository.fillTime(diaryId: diaryId, mealId: selectedMeal, time: time);
-    await fetchDiary();
+    await fetchDiaryV2();
  }

  Future<void> fillWakeup({required int diaryId, required String time}) async {
    await diaryRepository.fillWakeup(diaryId: diaryId, time: time);
-    await fetchDiary();
+    await fetchDiaryV2();
  }

  Future<void> fillRetire({required int diaryId, required String time}) async {
    await diaryRepository.fillRetire(diaryId: diaryId, time: time);
-    await fetchDiary();
+    await fetchDiaryV2();
  }

  Future<void> fillSatiety({required int diaryId, required int satiety}) async {
    await diaryRepository.fillSatiety(diaryId: diaryId, mealId: selectedMeal, satiety: satiety);
-    await fetchDiary();
+    await fetchDiaryV2();
  }

  Future<void> fillMood({required int diaryId, required int mood}) async {
    await diaryRepository.fillMood(diaryId: diaryId, mealId: selectedMeal, mood: mood);
-    await fetchDiary();
+    await fetchDiaryV2();
  }

  void fillComment(String comment) {
    this.comment = comment;
  }
+
+
 }
+
+enum DiaryFetchingErrors { canNotCreateFutureDays, dayAlreadyExists }
--- a/lib/features/diary/presentation/bloc/diary_state.dart
+++ b/lib/features/diary/presentation/bloc/diary_state.dart
@@ -1,3 +1,5 @@
+import 'package:eatvio_app/features/diary/entities/diary_day_entity.dart';
+import 'package:eatvio_app/features/diary/entities/diary_future_diet_day_entity.dart';
 import 'package:eatvio_app/features/diary/models/consultant_review_model.dart';
 import 'package:eatvio_app/features/diary/models/diary_day_model.dart';
 import 'package:eatvio_app/features/diary/models/nutrition_model.dart';
@@ -11,12 +13,10 @@ abstract class DiaryState with _$DiaryState {

  const factory DiaryState.loading() = DiaryStateLoading;

-  const factory DiaryState.error({
-    required String errorMessage,
-  }) = DiaryStateError;
+  const factory DiaryState.error({required String errorMessage}) = DiaryStateError;

  const factory DiaryState.loaded({
-    required DiaryDayModel diary,
+    required DiaryDayEntity diary,
    required NutritionDataModel nutrition,
    required DateTime selectedDay,
    required int selectedMeal,
@@ -32,9 +32,6 @@ abstract class DiaryState with _$DiaryState {
    @Default(false) bool isLoadingAddingProductInMeal,
  }) = DiaryStateLoaded;

-  const factory DiaryState.loadedTomorrowWithDiet({
-    required DiaryFutureDietDayModel diary,
-    required DateTime selectedDay,
-    required int selectedMeal,
-  }) = DiaryStateLoadedTomorrowWithDiet;
+  const factory DiaryState.loadedTomorrowWithDiet({required DiaryFutureDietDayEntity diary, required DateTime selectedDay, required int selectedMeal}) =
+      DiaryStateLoadedTomorrowWithDiet;
 }
--- a/lib/features/diary/presentation/pages/diary_screen.dart
+++ b/lib/features/diary/presentation/pages/diary_screen.dart
@@ -35,19 +35,12 @@ class DiaryScreen extends StatelessWidget {
 class UserDiaryScreen extends StatelessWidget {
  static const path = '/user-diary-screen';
  static const name = 'userDiaryScreen';
-  const UserDiaryScreen({
-    super.key,
-    required this.diaryId,
-    required this.currentPlanDay,
-  });
+  const UserDiaryScreen({super.key, required this.diaryId, required this.currentPlanDay});
  final int diaryId;
  final int currentPlanDay;
  @override
  Widget build(BuildContext context) {
-    return DiaryScreenContent(
-      diaryId: diaryId,
-      currentPlanDay: currentPlanDay,
-    );
+    return DiaryScreenContent(diaryId: diaryId, currentPlanDay: currentPlanDay);
  }
 }

@@ -60,12 +53,8 @@ class DiaryScreenContent extends StatelessWidget {
    final s = S.of(context);
    return MultiBlocProvider(
      providers: [
-        BlocProvider<DiaryCubit>(
-          create: (BuildContext context) => sl<DiaryCubit>()..fetchDiary(true, diaryId, currentPlanDay),
-        ),
-        BlocProvider(
-          create: (context) => sl<ConsultantCommentsCubit>(),
-        ),
+        BlocProvider<DiaryCubit>(create: (BuildContext context) => sl<DiaryCubit>()..fetchDiaryV2(needLoading: true, diaryId: diaryId, currentDay: currentPlanDay)),
+        BlocProvider(create: (context) => sl<ConsultantCommentsCubit>()),
      ],
      child: BlocBuilder<DiaryCubit, DiaryState>(
        builder: (BuildContext context, DiaryState state) {
@@ -73,17 +62,13 @@ class DiaryScreenContent extends StatelessWidget {
            log(state.diary.id.toString());
          }
          if (state is DiaryStateError) {
-            return Scaffold(
-              body: DataErrorWidget(onReload: () => context.read<DiaryCubit>().fetchDiary(false, diaryId)),
-            );
+            return Scaffold(body: DataErrorWidget(onReload: () => context.read<DiaryCubit>().fetchDiaryV2(needLoading: false, diaryId: diaryId)));
          }

          return Scaffold(
            backgroundColor: Colors.grey.shade200,
            appBar: diaryId == null
-                ? AppBar(
-                    toolbarHeight: 0,
-                  )
+                ? AppBar(toolbarHeight: 0)
                : AppBar(
                    title: Text(
                      state is DiaryStateLoaded ? DateTime.parse(state.diary.date).toLocal().format('d MMMM') : '',
@@ -97,12 +82,7 @@ class DiaryScreenContent extends StatelessWidget {
              child: Column(
                children: [
                  if (diaryId == null) const CalendarWidget(),
-                  if (state is DiaryStateLoading) ...[
-                    const SizedBox(
-                      height: 60,
-                    ),
-                    const Loader()
-                  ],
+                  if (state is DiaryStateLoading) ...[const SizedBox(height: 60), const Loader()],
                  if (state is DiaryStateLoaded)
                    WakeupAndRetireWidget(
                      isEnabled: state.diary.typeOfDiary.hasChosenPlan || state.isConsultantView || state.isWakeUpAndRetireEnabled,
@@ -114,40 +94,31 @@ class DiaryScreenContent extends StatelessWidget {
                      showMood: state.diary.typeOfDiary.hasChosenPlan || state.isConsultantView || state.isMoodEnabled,
                      showAddButton: !state.isConsultantView && !state.isDiaryFinished && !state.isDiaryCommented,
                    ),
-                  if (state is DiaryStateLoadedTomorrowWithDiet)
-                    const MealWidget(
-                      showMood: false,
-                      showAddButton: false,
-                    ),
+                  if (state is DiaryStateLoadedTomorrowWithDiet) const MealWidget(showMood: false, showAddButton: false),
                  if (state is DiaryStateLoaded) const CaloriesChartWidget(),
                  const SizedBox(height: 12),
-                  Builder(builder: (context) {
-                    if (state is DiaryStateLoaded && state.diary.typeOfDiary.hasChosenPlan) {
-                      if (state.diary.comment.isNotEmpty) {
-                        return CommentForConsultantWidget(
-                          comment: state.diary.comment,
-                        );
+                  Builder(
+                    builder: (context) {
+                      if (state is DiaryStateLoaded && state.diary.typeOfDiary.hasChosenPlan) {
+                        if (state.diary.comment.isNotEmpty) {
+                          return CommentForConsultantWidget(comment: state.diary.comment);
+                        }
+                        if (state.isDiaryCommented || state.isDiaryFinished) {
+                          return const SizedBox.shrink();
+                        }
+                        return const CommentForConsultantWidget();
                      }
-                      if (state.isDiaryCommented || state.isDiaryFinished) {
-                        return const SizedBox.shrink();
-                      }
-                      return const CommentForConsultantWidget();
-                    }
-                    return const SizedBox.shrink();
-                  }),
+                      return const SizedBox.shrink();
+                    },
+                  ),
                  if (state is DiaryStateLoaded && !state.isConsultantView && !state.isDiaryFinished && !state.isDiaryCommented)
                    Padding(
                      padding: const EdgeInsets.only(top: 12),
-                      child: FinishDayButtonWidget(
-                        diaryDay: state.diary,
-                      ),
+                      child: FinishDayButtonWidget(diaryDay: state.diary),
                    ),
                  if (state is DiaryStateLoaded && state.isConsultantView && !state.isDiaryCommented) ...[
                    const SizedBox(height: 16),
-                    const MainBackgroundBouble(
-                      padding: EdgeInsets.all(16),
-                      child: DayCommentWidget(),
-                    )
+                    const MainBackgroundBouble(padding: EdgeInsets.all(16), child: DayCommentWidget()),
                  ],
                  if (state is DiaryStateLoaded && state.consultantReview?.consultantComments.dayComment != null) ...[
                    const SizedBox(height: 12),
@@ -155,10 +126,7 @@ class DiaryScreenContent extends StatelessWidget {
                      padding: const EdgeInsets.all(16),
                      child: Column(
                        children: [
-                          Text(
-                            s.dayComment,
-                            style: TextStyles.textLSemibold.copyWith(color: appTheme.black),
-                          ),
+                          Text(s.dayComment, style: TextStyles.textLSemibold.copyWith(color: appTheme.black)),
                          const SizedBox(height: 12),
                          CommentContainer(comment: state.consultantReview?.consultantComments.dayComment ?? ''),
                        ],
--- a/lib/features/diary/presentation/widgets/finish_day_button_widget.dart
+++ b/lib/features/diary/presentation/widgets/finish_day_button_widget.dart
@@ -1,11 +1,11 @@
-import 'package:eatvio_app/features/diary/models/diary_day_model.dart';
+import 'package:eatvio_app/features/diary/entities/diary_day_entity.dart';
 import 'package:eatvio_app/features/diary/presentation/bloc/diary_cubit.dart';
 import 'package:eatvio_app/core/theme/theme_helper.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';

 class FinishDayButtonWidget extends StatefulWidget {
-  final DiaryDayModel diaryDay;
+  final DiaryDayEntity diaryDay;

  const FinishDayButtonWidget({super.key, required this.diaryDay});

--- a/lib/features/diary/presentation/widgets/photo_gallery_widget.dart
+++ b/lib/features/diary/presentation/widgets/photo_gallery_widget.dart
@@ -5,7 +5,7 @@ import 'package:eatvio_app/core/app_router.dart';
 import 'package:eatvio_app/core/const.dart';
 import 'package:eatvio_app/core/permission_handler/permission_handler.dart';
 import 'package:eatvio_app/core/theme/theme_helper.dart';
-import 'package:eatvio_app/features/diary/models/diary_day_model.dart';
+import 'package:eatvio_app/features/diary/entities/diary_day_entity.dart';
 import 'package:eatvio_app/features/diary/presentation/bloc/diary_cubit.dart';
 import 'package:eatvio_app/features/diary/presentation/bloc/diary_state.dart';
 import 'package:eatvio_app/generated/l10n.dart';
@@ -34,7 +34,7 @@ class _PhotoGalleryWidgetState extends State<PhotoGalleryWidget> {
    diaryCubit = context.read<DiaryCubit>();
  }

-  void showImagePicker(DiaryDayModel diaryDay) {
+  void showImagePicker(DiaryDayEntity diaryDay) {
    showCupertinoModalPopup<void>(
      context: context,
      builder: (context) {