From 1f714b3bc2a812e6141987084a7446546fb77a61 Mon Sep 17 00:00:00 2001
From: Username1548 <mikhail_zakharov_15482356@mail.ru>
Date: Wed, 6 Aug 2025 20:29:56 +0700
Subject: [PATCH] feat(diary): fixed commenting of diary

---
 .../diary/presentation/bloc/diary_cubit.dart  | 58 +++++++------------
 1 file changed, 22 insertions(+), 36 deletions(-)

diff --git a/lib/features/diary/presentation/bloc/diary_cubit.dart b/lib/features/diary/presentation/bloc/diary_cubit.dart
index 1bbfbbc7..8f8c8a0a 100644
--- a/lib/features/diary/presentation/bloc/diary_cubit.dart
+++ b/lib/features/diary/presentation/bloc/diary_cubit.dart
@@ -136,15 +136,7 @@ class DiaryCubit extends Cubit<DiaryState> {
       final fifthMeal = MealModel(id: 0, time: '0', typeNumber: 5, satiety: 0, mood: 0, portions: fifthMealPortions ?? [], photos: []);
       emit(
         DiaryState.loadedTomorrowWithDiet(
-          diary: diaryDay.copyWith(
-            meals: [
-              firstMeal,
-              secondMeal,
-              thirdMeal,
-              fourthMeal,
-              fifthMeal,
-            ],
-          ),
+          diary: diaryDay.copyWith(meals: [firstMeal, secondMeal, thirdMeal, fourthMeal, fifthMeal]),
           selectedDay: selectedDay,
           selectedMeal: selectedMeal,
         ),
@@ -156,7 +148,7 @@ class DiaryCubit extends Cubit<DiaryState> {
 
   Future<void> fetchDiary([bool needLoading = false, int? diaryId, int? currentDay]) async {
     this.diaryId ??= diaryId;
-
+    final isConsultantView = this.diaryId != null;
     if (needLoading) {
       emit(const DiaryState.loading());
       selectedMeal = 1;
@@ -180,7 +172,8 @@ class DiaryCubit extends Cubit<DiaryState> {
       String? planName;
       if (diaryDay.chosenPlanId != null) {
         final chosenPlanModel = await chatRepository.getChosenPlan(id: diaryDay.chosenPlanId!);
-        if (diaryDay.typeOfDiary.diaryState == DiaryStateEnum.lastDayCommented || diaryDay.typeOfDiary.diaryState == DiaryStateEnum.commented) {
+        if (isConsultantView &&
+            (diaryDay.typeOfDiary.diaryState == DiaryStateEnum.lastDayCommented || diaryDay.typeOfDiary.diaryState == DiaryStateEnum.commented)) {
           await diaryRepository.viewCommentOfDiaryDayByConsultant(diaryId: diaryDay.id);
         }
         consultantReview = await diaryRepository.getDiaryComments(planId: diaryDay.chosenPlanId!, diaryId: diaryDay.id);
@@ -192,24 +185,26 @@ class DiaryCubit extends Cubit<DiaryState> {
 
       final isDiaryFinished = diaryDay.typeOfDiary.diaryState == DiaryStateEnum.finished || diaryDay.typeOfDiary.diaryState == DiaryStateEnum.lastDayFinished;
 
-      final isDiaryCommented = diaryDay.typeOfDiary.diaryState == DiaryStateEnum.commented ||
+      final isDiaryCommented =
+          diaryDay.typeOfDiary.diaryState == DiaryStateEnum.commented ||
           diaryDay.typeOfDiary.diaryState == DiaryStateEnum.lastDayCommented ||
           diaryDay.typeOfDiary.diaryState == DiaryStateEnum.reviewedByUser;
       emit(
         DiaryState.loaded(
-            diary: diaryDay,
-            nutrition: nutrition,
-            selectedDay: selectedDay,
-            selectedMeal: selectedMeal,
-            isConsultantView: this.diaryId != null,
-            consultantReview: consultantReview,
-            isDiaryFinished: isDiaryFinished,
-            isDiaryCommented: isDiaryCommented,
-            chosenPlanCurrentDay: currentPlanDay,
-            chosenPlanDuration: planDuration,
-            chosenPlanName: planName,
-            isMoodEnabled: isMoodEnabled,
-            isWakeUpAndRetireEnabled: isWakeUpAndRetireTimeEnabled),
+          diary: diaryDay,
+          nutrition: nutrition,
+          selectedDay: selectedDay,
+          selectedMeal: selectedMeal,
+          isConsultantView: isConsultantView,
+          consultantReview: consultantReview,
+          isDiaryFinished: isDiaryFinished,
+          isDiaryCommented: isDiaryCommented,
+          chosenPlanCurrentDay: currentPlanDay,
+          chosenPlanDuration: planDuration,
+          chosenPlanName: planName,
+          isMoodEnabled: isMoodEnabled,
+          isWakeUpAndRetireEnabled: isWakeUpAndRetireTimeEnabled,
+        ),
       );
     } catch (e, st) {
       log(e.toString(), stackTrace: st);
@@ -217,17 +212,8 @@ 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,
-    );
+  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();
   }