feat(diary): editing of previous and current finished days

2026-10-01 10:44:52 +03:00
parent a1bae68307
commit 603a158cf2
11 changed files with 1099 additions and 242 deletions
--- a/test/features/diary/presentation/pages/diary_screen_smoke_test.dart
+++ b/test/features/diary/presentation/pages/diary_screen_smoke_test.dart
@@ -25,16 +25,25 @@ import 'package:mockito/mockito.dart';

 import 'diary_screen_smoke_test.mocks.dart';

-@GenerateNiceMocks([MockSpec<DiaryCubit>(), MockSpec<ConsultantCommentsCubit>()])
+@GenerateNiceMocks([
+  MockSpec<DiaryCubit>(),
+  MockSpec<ConsultantCommentsCubit>(),
+])
 void main() {
  group('DiaryScreen smoke', () {
    setUpAll(() async {
-      dotenv.loadFromString(envString: 'DEV_BASE_URL=http://localhost\nBASE_URL=http://localhost');
+      dotenv.loadFromString(
+        envString: 'DEV_BASE_URL=http://localhost\nBASE_URL=http://localhost',
+      );
    });

    setUp(() async {
      await sl.reset();
-      sl.registerLazySingleton<AppConfig>(() => AppConfig(buildType: AppBuildType.tests)..setBaseUrl('http://localhost'));
+      sl.registerLazySingleton<AppConfig>(
+        () =>
+            AppConfig(buildType: AppBuildType.tests)
+              ..setBaseUrl('http://localhost'),
+      );
    });

    Widget wrap(Widget child) {
@@ -51,23 +60,53 @@ void main() {
      );
    }

-    DiaryStateLoaded loadedState({required bool hasChosenPlan}) {
+    DiaryStateLoaded loadedState({
+      required bool hasChosenPlan,
+      String date = '2025-01-01',
+      bool isDiaryFinished = false,
+      bool isDiaryCommented = false,
+      int closed = 0,
+    }) {
      final diary = DiaryDayEntity(
        id: 1,
-        date: '2025-01-01',
+        date: date,
        wakeup: '07:00',
        retire: '23:00',
-        closed: 0,
+        closed: closed,
        comment: '',
-        typeOfDiary: TypeOfDiaryModel(hasChosenDiet: false, hasChosenPlan: hasChosenPlan, diaryState: null),
-        meals: const [MealModel(id: 1, time: '08:00', typeNumber: 1, satiety: 0, mood: 0, portions: [], photos: [])],
+        typeOfDiary: TypeOfDiaryModel(
+          hasChosenDiet: false,
+          hasChosenPlan: hasChosenPlan,
+          diaryState: null,
+        ),
+        meals: const [
+          MealModel(
+            id: 1,
+            time: '08:00',
+            typeNumber: 1,
+            satiety: 0,
+            mood: 0,
+            portions: [],
+            photos: [],
+          ),
+        ],
        chosenPlanId: hasChosenPlan ? 10 : null,
        dayOfChosenDiet: null,
        diet: null,
      );
      const nutrition = NutritionDataModel(
-        dailyNutritionIntake: NutritionModel(energy: 0, proteins: 0, fats: 0, carbohydrates: 0),
-        dailyNutritionRecommendation: NutritionModel(energy: 0, proteins: 0, fats: 0, carbohydrates: 0),
+        dailyNutritionIntake: NutritionModel(
+          energy: 0,
+          proteins: 0,
+          fats: 0,
+          carbohydrates: 0,
+        ),
+        dailyNutritionRecommendation: NutritionModel(
+          energy: 0,
+          proteins: 0,
+          fats: 0,
+          carbohydrates: 0,
+        ),
      );
      return DiaryState.loaded(
            diary: diary,
@@ -75,8 +114,8 @@ void main() {
            selectedDay: DateTime(2025, 1, 1),
            selectedMeal: 1,
            isConsultantView: false,
-            isDiaryFinished: false,
-            isDiaryCommented: false,
+            isDiaryFinished: isDiaryFinished,
+            isDiaryCommented: isDiaryCommented,
            isWakeUpAndRetireEnabled: true,
            isMoodEnabled: true,
          )
@@ -86,13 +125,26 @@ void main() {
    testWidgets('renders loading state', (tester) async {
      final diaryCubit = MockDiaryCubit();
      when(diaryCubit.state).thenReturn(const DiaryState.loading());
-      when(diaryCubit.stream).thenAnswer((_) => const Stream<DiaryState>.empty());
+      when(
+        diaryCubit.stream,
+      ).thenAnswer((_) => const Stream<DiaryState>.empty());
      when(diaryCubit.close()).thenAnswer((_) async => Future<void>.value());
-      when(diaryCubit.fetchDiaryV2(needLoading: anyNamed('needLoading'), diaryId: anyNamed('diaryId'))).thenAnswer((_) async => true);
+      when(
+        diaryCubit.fetchDiaryV2(
+          needLoading: anyNamed('needLoading'),
+          diaryId: anyNamed('diaryId'),
+        ),
+      ).thenAnswer((_) async => true);

      final commentsCubit = MockConsultantCommentsCubit();
-      when(commentsCubit.state).thenReturn(ConsultantCommentsState(commentsModel: ConsultantCommentModel(comment: '')));
-      when(commentsCubit.stream).thenAnswer((_) => const Stream<ConsultantCommentsState>.empty());
+      when(commentsCubit.state).thenReturn(
+        ConsultantCommentsState(
+          commentsModel: ConsultantCommentModel(comment: ''),
+        ),
+      );
+      when(
+        commentsCubit.stream,
+      ).thenAnswer((_) => const Stream<ConsultantCommentsState>.empty());
      when(commentsCubit.close()).thenAnswer((_) async => Future<void>.value());

      sl.registerFactory<DiaryCubit>(() => diaryCubit);
@@ -107,13 +159,27 @@ void main() {
    testWidgets('renders loaded state (chosen plan)', (tester) async {
      final diaryCubit = MockDiaryCubit();
      when(diaryCubit.state).thenReturn(loadedState(hasChosenPlan: true));
-      when(diaryCubit.stream).thenAnswer((_) => const Stream<DiaryState>.empty());
+      when(
+        diaryCubit.stream,
+      ).thenAnswer((_) => const Stream<DiaryState>.empty());
      when(diaryCubit.close()).thenAnswer((_) async => Future<void>.value());
-      when(diaryCubit.fetchDiaryV2(needLoading: anyNamed('needLoading'), diaryId: anyNamed('diaryId'))).thenAnswer((_) async => true);
+      when(
+        diaryCubit.fetchDiaryV2(
+          needLoading: anyNamed('needLoading'),
+          diaryId: anyNamed('diaryId'),
+        ),
+      ).thenAnswer((_) async => true);

      final commentsCubit = MockConsultantCommentsCubit();
-      when(commentsCubit.state).thenReturn(ConsultantCommentsState(commentsModel: ConsultantCommentModel(comment: ''), dayCommentNeedsToBeFilled: false));
-      when(commentsCubit.stream).thenAnswer((_) => const Stream<ConsultantCommentsState>.empty());
+      when(commentsCubit.state).thenReturn(
+        ConsultantCommentsState(
+          commentsModel: ConsultantCommentModel(comment: ''),
+          dayCommentNeedsToBeFilled: false,
+        ),
+      );
+      when(
+        commentsCubit.stream,
+      ).thenAnswer((_) => const Stream<ConsultantCommentsState>.empty());
      when(commentsCubit.close()).thenAnswer((_) async => Future<void>.value());

      sl.registerFactory<DiaryCubit>(() => diaryCubit);
@@ -124,19 +190,37 @@ void main() {

      expect(find.byType(DiaryScreen), findsOneWidget);

-      expect(find.text('Дополнительная информация для консультанта'), findsOneWidget);
+      expect(
+        find.text('Дополнительная информация для консультанта'),
+        findsOneWidget,
+      );
    });

    testWidgets('renders error state and reload button', (tester) async {
      final diaryCubit = MockDiaryCubit();
-      when(diaryCubit.state).thenReturn(const DiaryState.error(errorMessage: 'err'));
-      when(diaryCubit.stream).thenAnswer((_) => const Stream<DiaryState>.empty());
+      when(
+        diaryCubit.state,
+      ).thenReturn(const DiaryState.error(errorMessage: 'err'));
+      when(
+        diaryCubit.stream,
+      ).thenAnswer((_) => const Stream<DiaryState>.empty());
      when(diaryCubit.close()).thenAnswer((_) async => Future<void>.value());
-      when(diaryCubit.fetchDiaryV2(needLoading: anyNamed('needLoading'), diaryId: anyNamed('diaryId'))).thenAnswer((_) async => true);
+      when(
+        diaryCubit.fetchDiaryV2(
+          needLoading: anyNamed('needLoading'),
+          diaryId: anyNamed('diaryId'),
+        ),
+      ).thenAnswer((_) async => true);

      final commentsCubit = MockConsultantCommentsCubit();
-      when(commentsCubit.state).thenReturn(ConsultantCommentsState(commentsModel: ConsultantCommentModel(comment: '')));
-      when(commentsCubit.stream).thenAnswer((_) => const Stream<ConsultantCommentsState>.empty());
+      when(commentsCubit.state).thenReturn(
+        ConsultantCommentsState(
+          commentsModel: ConsultantCommentModel(comment: ''),
+        ),
+      );
+      when(
+        commentsCubit.stream,
+      ).thenAnswer((_) => const Stream<ConsultantCommentsState>.empty());
      when(commentsCubit.close()).thenAnswer((_) async => Future<void>.value());

      sl.registerFactory<DiaryCubit>(() => diaryCubit);
@@ -153,19 +237,52 @@ void main() {
      final diaryCubit = MockDiaryCubit();
      const futureDiary = DiaryFutureDietDayEntity(
        date: '2025-01-02',
-        typeOfDiary: TypeOfDiaryModel(hasChosenDiet: true, hasChosenPlan: false, diaryState: null),
-        meals: [MealModel(id: 1, time: '08:00', typeNumber: 1, satiety: 0, mood: 0, portions: [], photos: [])],
+        typeOfDiary: TypeOfDiaryModel(
+          hasChosenDiet: true,
+          hasChosenPlan: false,
+          diaryState: null,
+        ),
+        meals: [
+          MealModel(
+            id: 1,
+            time: '08:00',
+            typeNumber: 1,
+            satiety: 0,
+            mood: 0,
+            portions: [],
+            photos: [],
+          ),
+        ],
        diet: null,
        dayOfChosenDiet: 1,
      );
-      when(diaryCubit.state).thenReturn(DiaryState.loadedTomorrowWithDiet(diary: futureDiary, selectedDay: DateTime(2025, 1, 2), selectedMeal: 1));
-      when(diaryCubit.stream).thenAnswer((_) => const Stream<DiaryState>.empty());
+      when(diaryCubit.state).thenReturn(
+        DiaryState.loadedTomorrowWithDiet(
+          diary: futureDiary,
+          selectedDay: DateTime(2025, 1, 2),
+          selectedMeal: 1,
+        ),
+      );
+      when(
+        diaryCubit.stream,
+      ).thenAnswer((_) => const Stream<DiaryState>.empty());
      when(diaryCubit.close()).thenAnswer((_) async => Future<void>.value());
-      when(diaryCubit.fetchDiaryV2(needLoading: anyNamed('needLoading'), diaryId: anyNamed('diaryId'))).thenAnswer((_) async => true);
+      when(
+        diaryCubit.fetchDiaryV2(
+          needLoading: anyNamed('needLoading'),
+          diaryId: anyNamed('diaryId'),
+        ),
+      ).thenAnswer((_) async => true);

      final commentsCubit = MockConsultantCommentsCubit();
-      when(commentsCubit.state).thenReturn(ConsultantCommentsState(commentsModel: ConsultantCommentModel(comment: '')));
-      when(commentsCubit.stream).thenAnswer((_) => const Stream<ConsultantCommentsState>.empty());
+      when(commentsCubit.state).thenReturn(
+        ConsultantCommentsState(
+          commentsModel: ConsultantCommentModel(comment: ''),
+        ),
+      );
+      when(
+        commentsCubit.stream,
+      ).thenAnswer((_) => const Stream<ConsultantCommentsState>.empty());
      when(commentsCubit.close()).thenAnswer((_) async => Future<void>.value());

      sl.registerFactory<DiaryCubit>(() => diaryCubit);
@@ -187,17 +304,35 @@ void main() {
          planName: 'Plan',
          planDuration: 30,
          currentPlanDay: 1,
-          consultantComments: ConsultantComments(dayComment: 'Nice', mealsComments: const [], portionsComments: const []),
+          consultantComments: ConsultantComments(
+            dayComment: 'Nice',
+            mealsComments: const [],
+            portionsComments: const [],
+          ),
        ),
      );
      when(diaryCubit.state).thenReturn(state);
-      when(diaryCubit.stream).thenAnswer((_) => const Stream<DiaryState>.empty());
+      when(
+        diaryCubit.stream,
+      ).thenAnswer((_) => const Stream<DiaryState>.empty());
      when(diaryCubit.close()).thenAnswer((_) async => Future<void>.value());
-      when(diaryCubit.fetchDiaryV2(needLoading: anyNamed('needLoading'), diaryId: anyNamed('diaryId'))).thenAnswer((_) async => true);
+      when(
+        diaryCubit.fetchDiaryV2(
+          needLoading: anyNamed('needLoading'),
+          diaryId: anyNamed('diaryId'),
+        ),
+      ).thenAnswer((_) async => true);

      final commentsCubit = MockConsultantCommentsCubit();
-      when(commentsCubit.state).thenReturn(ConsultantCommentsState(commentsModel: ConsultantCommentModel(comment: ''), dayCommentNeedsToBeFilled: false));
-      when(commentsCubit.stream).thenAnswer((_) => const Stream<ConsultantCommentsState>.empty());
+      when(commentsCubit.state).thenReturn(
+        ConsultantCommentsState(
+          commentsModel: ConsultantCommentModel(comment: ''),
+          dayCommentNeedsToBeFilled: false,
+        ),
+      );
+      when(
+        commentsCubit.stream,
+      ).thenAnswer((_) => const Stream<ConsultantCommentsState>.empty());
      when(commentsCubit.close()).thenAnswer((_) async => Future<void>.value());
      when(commentsCubit.submitComments(any)).thenAnswer((_) async => true);

@@ -215,13 +350,26 @@ void main() {
      final diaryCubit = MockDiaryCubit();
      final state = loadedState(hasChosenPlan: false);
      when(diaryCubit.state).thenReturn(state);
-      when(diaryCubit.stream).thenAnswer((_) => const Stream<DiaryState>.empty());
+      when(
+        diaryCubit.stream,
+      ).thenAnswer((_) => const Stream<DiaryState>.empty());
      when(diaryCubit.close()).thenAnswer((_) async => Future<void>.value());
-      when(diaryCubit.fetchDiaryV2(needLoading: anyNamed('needLoading'), diaryId: anyNamed('diaryId'))).thenAnswer((_) async => true);
+      when(
+        diaryCubit.fetchDiaryV2(
+          needLoading: anyNamed('needLoading'),
+          diaryId: anyNamed('diaryId'),
+        ),
+      ).thenAnswer((_) async => true);

      final commentsCubit = MockConsultantCommentsCubit();
-      when(commentsCubit.state).thenReturn(ConsultantCommentsState(commentsModel: ConsultantCommentModel(comment: '')));
-      when(commentsCubit.stream).thenAnswer((_) => const Stream<ConsultantCommentsState>.empty());
+      when(commentsCubit.state).thenReturn(
+        ConsultantCommentsState(
+          commentsModel: ConsultantCommentModel(comment: ''),
+        ),
+      );
+      when(
+        commentsCubit.stream,
+      ).thenAnswer((_) => const Stream<ConsultantCommentsState>.empty());
      when(commentsCubit.close()).thenAnswer((_) async => Future<void>.value());

      sl.registerFactory<DiaryCubit>(() => diaryCubit);
@@ -234,5 +382,96 @@ void main() {

      expect(find.byType(Text), findsWidgets);
    });
+
+    testWidgets('shows add button for a finished day inside the edit window', (
+      tester,
+    ) async {
+      final yesterday = DateTime.now().subtract(const Duration(days: 1));
+      final diaryCubit = MockDiaryCubit();
+      when(diaryCubit.state).thenReturn(
+        loadedState(
+          hasChosenPlan: false,
+          date: _calendarDate(yesterday),
+          isDiaryFinished: true,
+        ),
+      );
+      when(
+        diaryCubit.stream,
+      ).thenAnswer((_) => const Stream<DiaryState>.empty());
+      when(diaryCubit.close()).thenAnswer((_) async => Future<void>.value());
+      when(
+        diaryCubit.fetchDiaryV2(
+          needLoading: anyNamed('needLoading'),
+          diaryId: anyNamed('diaryId'),
+        ),
+      ).thenAnswer((_) async => true);
+
+      final commentsCubit = MockConsultantCommentsCubit();
+      when(commentsCubit.state).thenReturn(
+        ConsultantCommentsState(
+          commentsModel: ConsultantCommentModel(comment: ''),
+        ),
+      );
+      when(
+        commentsCubit.stream,
+      ).thenAnswer((_) => const Stream<ConsultantCommentsState>.empty());
+      when(commentsCubit.close()).thenAnswer((_) async => Future<void>.value());
+
+      sl.registerFactory<DiaryCubit>(() => diaryCubit);
+      sl.registerFactory<ConsultantCommentsCubit>(() => commentsCubit);
+
+      await tester.pumpWidget(wrap(DiaryScreen(date: yesterday)));
+      await tester.pump(const Duration(milliseconds: 200));
+
+      expect(find.text('Добавить'), findsOneWidget);
+      expect(find.text('Закончить день'), findsNothing);
+    });
+
+    testWidgets('hides add button for a commented day', (tester) async {
+      final yesterday = DateTime.now().subtract(const Duration(days: 1));
+      final diaryCubit = MockDiaryCubit();
+      when(diaryCubit.state).thenReturn(
+        loadedState(
+          hasChosenPlan: false,
+          date: _calendarDate(yesterday),
+          isDiaryCommented: true,
+        ),
+      );
+      when(
+        diaryCubit.stream,
+      ).thenAnswer((_) => const Stream<DiaryState>.empty());
+      when(diaryCubit.close()).thenAnswer((_) async => Future<void>.value());
+      when(
+        diaryCubit.fetchDiaryV2(
+          needLoading: anyNamed('needLoading'),
+          diaryId: anyNamed('diaryId'),
+        ),
+      ).thenAnswer((_) async => true);
+
+      final commentsCubit = MockConsultantCommentsCubit();
+      when(commentsCubit.state).thenReturn(
+        ConsultantCommentsState(
+          commentsModel: ConsultantCommentModel(comment: ''),
+        ),
+      );
+      when(
+        commentsCubit.stream,
+      ).thenAnswer((_) => const Stream<ConsultantCommentsState>.empty());
+      when(commentsCubit.close()).thenAnswer((_) async => Future<void>.value());
+
+      sl.registerFactory<DiaryCubit>(() => diaryCubit);
+      sl.registerFactory<ConsultantCommentsCubit>(() => commentsCubit);
+
+      await tester.pumpWidget(wrap(DiaryScreen(date: yesterday)));
+      await tester.pump(const Duration(milliseconds: 200));
+
+      expect(find.text('Добавить'), findsNothing);
+    });
  });
 }
+
+String _calendarDate(DateTime date) {
+  final month = date.month.toString().padLeft(2, '0');
+  final day = date.day.toString().padLeft(2, '0');
+  return '${date.year}-$month-$day';
+}