Merge remote-tracking branch 'upstream/main'

2026-02-10 12:38:08 +03:00
parent f81aebe9d8 531f732b1a
commit 042cc0ea20
88 changed files with 1161 additions and 610 deletions
--- a/lib/features/feed/models/plan_pagination_model.dart
+++ b/lib/features/feed/models/plan_pagination_model.dart
@@ -66,7 +66,7 @@ abstract class PacketOptions with _$PacketOptions {
    @JsonKey(name: "items", fromJson: _parseItems) required List<String> items,
    @JsonKey(name: "price") required dynamic price,
    @JsonKey(name: "short") required String short,
-    @JsonKey(name: "description_md") required String description,
+    @JsonKey(name: "description_md") String? description,
    @JsonKey(name: "has_personal_diet", fromJson: _parseHasPersonalDietField) required bool hasPersonalDiet,
  }) = _PacketOptions;

--- a/lib/features/feed/presentation/pages/feed_screen.dart
+++ b/lib/features/feed/presentation/pages/feed_screen.dart
@@ -72,7 +72,7 @@ class _FeedScreenContentState extends State<FeedScreenContent> {
  final consultantsScrollController = ScrollController();
  @override
  void initState() {
-    chipsLabelList = hidePlans ? ['Все', 'Рецепты', 'Диеты', 'Консультанты'] : ['Все', 'Рецепты', 'Диеты', 'Планы питания', 'Консультанты'];
+    chipsLabelList = hidePlans ? ['Все', 'Консультанты', 'Рецепты', 'Диеты'] : ['Все', 'Планы питания', 'Консультанты', 'Рецепты', 'Диеты'];
    consultantsScrollController.addListener(_onScrollConsultants);
    _checkRegistrationDate(context);
    // Инициализация глобальных кубитов при первом открытии экрана
@@ -115,7 +115,7 @@ class _FeedScreenContentState extends State<FeedScreenContent> {
  Widget build(BuildContext context) {
    FlutterNativeSplash.remove();
    return Scaffold(
-      floatingActionButton: _selectedChipIndex == 1
+      floatingActionButton: ((_selectedChipIndex == 2 && hidePlans) || (_selectedChipIndex == 3 && !hidePlans))
          ? FloatingActionButton.small(
              heroTag: 'recipesTagsFilter',
              backgroundColor: appTheme.blueA400,
@@ -137,11 +137,13 @@ class _FeedScreenContentState extends State<FeedScreenContent> {
      body: NestedScrollView(
        controller: switch (_selectedChipIndex) {
          0 => blogPostsScrollController,
-          1 => recipesScrollController,
-          2 => dietsScrollController,
-          3 when !hidePlans => plansScrollController,
-          3 when hidePlans => consultantsScrollController,
-          4 when !hidePlans => consultantsScrollController,
+          1 when !hidePlans => plansScrollController,
+          1 when hidePlans => consultantsScrollController,
+          2 when !hidePlans => consultantsScrollController,
+          2 when hidePlans => recipesScrollController,
+          3 when !hidePlans => recipesScrollController,
+          3 when hidePlans => dietsScrollController,
+          4 when !hidePlans => dietsScrollController,
          _ => blogPostsScrollController,
        },
        headerSliverBuilder: (BuildContext context, bool innerBoxIsScrolled) {
@@ -173,11 +175,13 @@ class _FeedScreenContentState extends State<FeedScreenContent> {
                    children: [
                      CustomSearchBar(
                        searchController: switch (_selectedChipIndex) {
-                          1 => recipesController,
-                          2 => dietsController,
-                          3 when !hidePlans => plansController,
-                          3 when hidePlans => consultantsController,
-                          4 when !hidePlans => consultantsController,
+                          1 when !hidePlans => plansController,
+                          1 when hidePlans => consultantsController,
+                          2 when !hidePlans => consultantsController,
+                          2 when hidePlans => recipesController,
+                          3 when !hidePlans => recipesController,
+                          3 when hidePlans => dietsController,
+                          4 when !hidePlans => dietsController,
                          _ => postsController,
                        },
                        onChanged: (query) {
@@ -187,18 +191,20 @@ class _FeedScreenContentState extends State<FeedScreenContent> {
                                case 0:
                                  context.read<FeedCubit>().loadFeedBlogPostList(query: query);
                                  break;
-                                case 1:
-                                  context.read<RecipesCubit>().loadRecipesList(query: query);
-                                  break;
-                                case 2:
-                                  context.read<DietsCubit>().loadDiets(query: query);
-                                  break;
-                                case 3 when !hidePlans:
+                                case 1 when !hidePlans:
                                  context.read<PlansCubit>().loadPlans(query: query);
                                  break;
+                                case 1 when hidePlans:
+                                case 2 when !hidePlans:
+                                  context.read<ConsultantsCubit>().getConsultants();
+                                  break;
+                                case 2 when hidePlans:
+                                case 3 when !hidePlans:
+                                  context.read<RecipesCubit>().loadRecipesList(query: query);
+                                  break;
                                case 3 when hidePlans:
                                case 4 when !hidePlans:
-                                  context.read<ConsultantsCubit>().getConsultants();
+                                  context.read<DietsCubit>().loadDiets(query: query);
                                  break;
                              }
                            });
@@ -208,18 +214,20 @@ class _FeedScreenContentState extends State<FeedScreenContent> {
                                case 0:
                                  context.read<FeedCubit>().loadFeedBlogPostList();
                                  break;
-                                case 1:
-                                  context.read<RecipesCubit>().loadRecipesList();
-                                  break;
-                                case 2:
-                                  context.read<DietsCubit>().loadDiets();
-                                  break;
-                                case 3 when !hidePlans:
+                                case 1 when !hidePlans:
                                  context.read<PlansCubit>().loadPlans();
                                  break;
+                                case 1 when hidePlans:
+                                case 2 when !hidePlans:
+                                  context.read<ConsultantsCubit>().getConsultants();
+                                  break;
+                                case 2 when hidePlans:
+                                case 3 when !hidePlans:
+                                  context.read<RecipesCubit>().loadRecipesList();
+                                  break;
                                case 3 when hidePlans:
                                case 4 when !hidePlans:
-                                  context.read<ConsultantsCubit>().getConsultants();
+                                  context.read<DietsCubit>().loadDiets();
                                  break;
                              }
                            });
@@ -228,18 +236,28 @@ class _FeedScreenContentState extends State<FeedScreenContent> {
                      ),
                      const SizedBox(width: 12),
                      switch (_selectedChipIndex) {
-                        1 => AddItemButton(
+                        1 when !hidePlans => AddItemButton(
+                          onTap: state.profile?.roles.contains('consultant') ?? false ? () => GoRouter.of(context).pushNamed(CreatePlanScreen.name) : null,
+                        ),
+                        2 when hidePlans => AddItemButton(
                          onTap: state.profile?.roles.contains('consultant') ?? false ? () => GoRouter.of(context).pushNamed(RecipeCreateScreen.name) : null,
                        ),
-                        2 => AddItemButton(
+                        3 when !hidePlans => AddItemButton(
+                          onTap: state.profile?.roles.contains('consultant') ?? false ? () => GoRouter.of(context).pushNamed(RecipeCreateScreen.name) : null,
+                        ),
+                        3 when hidePlans => AddItemButton(
                          onTap: state.profile?.roles.contains('consultant') ?? false
                              ? () async {
                                  await GoRouter.of(context).pushNamed(CreateDietScreen.name, extra: {'isEditing': false});
                                }
                              : null,
                        ),
-                        3 when !hidePlans => AddItemButton(
-                          onTap: state.profile?.roles.contains('consultant') ?? false ? () => GoRouter.of(context).pushNamed(CreatePlanScreen.name) : null,
+                        4 when !hidePlans => AddItemButton(
+                          onTap: state.profile?.roles.contains('consultant') ?? false
+                              ? () async {
+                                  await GoRouter.of(context).pushNamed(CreateDietScreen.name);
+                                }
+                              : null,
                        ),
                        _ => const AddItemButton(key: AppKeys.feedScreenBlogPostCreationButton),
                      },
@@ -252,11 +270,13 @@ class _FeedScreenContentState extends State<FeedScreenContent> {
        },
        body: switch (_selectedChipIndex) {
          0 => BlogPosts(handleVisibility: context.read<ViewsCubit>().handleVisibility),
-          1 => Recipes(handleVisibility: context.read<ViewsCubit>().handleVisibility),
-          2 => Diets(handleVisibility: context.read<ViewsCubit>().handleVisibility),
-          3 when !hidePlans => Plans(handleVisibility: context.read<ViewsCubit>().handleVisibility),
-          3 when hidePlans => const Consultants(),
-          4 when !hidePlans => const Consultants(),
+          1 when !hidePlans => Plans(handleVisibility: context.read<ViewsCubit>().handleVisibility),
+          1 when hidePlans => const Consultants(),
+          2 when !hidePlans => const Consultants(),
+          2 when hidePlans => Recipes(handleVisibility: context.read<ViewsCubit>().handleVisibility),
+          3 when !hidePlans => Recipes(handleVisibility: context.read<ViewsCubit>().handleVisibility),
+          3 when hidePlans => Diets(handleVisibility: context.read<ViewsCubit>().handleVisibility),
+          4 when !hidePlans => Diets(handleVisibility: context.read<ViewsCubit>().handleVisibility),
          _ => Center(child: Text(chipsLabelList[_selectedChipIndex])),
        },
      ),
--- a/lib/features/feed/repositories/feed_repository.dart
+++ b/lib/features/feed/repositories/feed_repository.dart
@@ -7,6 +7,7 @@ import 'package:eatvio_app/features/feed/models/plan_pagination_model.dart';
 import 'package:eatvio_app/features/feed/models/recipes_model.dart';
 import 'package:eatvio_app/features/feed/models/view_model.dart';
 import 'package:eatvio_app/features/feed/services/feed_service.dart';
+import 'package:sentry_flutter/sentry_flutter.dart';

 class FeedRepository {
  final FeedService feedService;
@@ -16,7 +17,8 @@ class FeedRepository {
  Future<FeedBlogPostSettingsModel> getFeedBlogPosts({String? query, int page = 1}) async {
    try {
      return (await feedService.getBlogPostList(page: page, query: query));
-    } catch (e) {
+    } catch (e, s) {
+      await Sentry.captureException(e, stackTrace: s);
      rethrow;
    }
  }
@@ -24,7 +26,8 @@ class FeedRepository {
  Future<FeedBlogPostModel> getBlogPost({required int id}) async {
    try {
      return await feedService.getBlogPost(postId: id);
-    } catch (e) {
+    } catch (e, s) {
+      await Sentry.captureException(e, stackTrace: s);
      rethrow;
    }
  }
@@ -32,7 +35,8 @@ class FeedRepository {
  Future<List<Recipe>> getRecipes({String? query, List<int>? tags, int page = 1}) async {
    try {
      return (await feedService.getRecipes(query: query, tags: tags, page: page)).recipesList;
-    } catch (e) {
+    } catch (e, s) {
+      await Sentry.captureException(e, stackTrace: s);
      rethrow;
    }
  }
@@ -40,7 +44,8 @@ class FeedRepository {
  Future<DietsPagination> getDiets({int page = 1, String? query, String? types, int? duration, String? sorting}) async {
    try {
      return (await feedService.getDiets(page: page, query: query, types: types, duration: duration, sorting: sorting));
-    } catch (e) {
+    } catch (e, s) {
+      await Sentry.captureException(e, stackTrace: s);
      rethrow;
    }
  }
@@ -48,7 +53,8 @@ class FeedRepository {
  Future<PlanPaginationModel> getPlans({int page = 1, String? query, String? types, int? duration, int? minPrice, int? maxPrice}) async {
    try {
      return (await feedService.getPlans(page: page, query: query, types: types, duration: duration, minPrice: minPrice, maxPrice: maxPrice));
-    } catch (e) {
+    } catch (e, s) {
+      await Sentry.captureException(e, stackTrace: s);
      rethrow;
    }
  }
@@ -56,7 +62,8 @@ class FeedRepository {
  Future<CommentModel> getBlogPostComments({required String id}) async {
    try {
      return (await feedService.getBlogPostComments(id: id));
-    } catch (e) {
+    } catch (e, s) {
+      await Sentry.captureException(e, stackTrace: s);
      rethrow;
    }
  }
@@ -64,7 +71,8 @@ class FeedRepository {
  Future<void> sendBlogPostComment({required String id, required String commentText, int? parentCommentId}) async {
    try {
      await feedService.sendBlogPostComment(id: id, body: commentText, parentCommentId: parentCommentId);
-    } catch (e) {
+    } catch (e, s) {
+      await Sentry.captureException(e, stackTrace: s);
      rethrow;
    }
  }
@@ -72,7 +80,8 @@ class FeedRepository {
  Future<CommentModel> getDietsComments({required String id}) async {
    try {
      return (await feedService.getDietsComments(id: id));
-    } catch (e) {
+    } catch (e, s) {
+      await Sentry.captureException(e, stackTrace: s);
      rethrow;
    }
  }
@@ -80,7 +89,8 @@ class FeedRepository {
  Future<void> sendDietsComment({required String id, required String commentText, int? parentCommentId}) async {
    try {
      await feedService.sendDietsComment(id: id, body: commentText, parentCommentId: parentCommentId);
-    } catch (e) {
+    } catch (e, s) {
+      await Sentry.captureException(e, stackTrace: s);
      rethrow;
    }
  }
@@ -88,7 +98,8 @@ class FeedRepository {
  Future<CommentModel> getRecipesComments({required String id}) async {
    try {
      return (await feedService.getRecipesComments(id: id));
-    } catch (e) {
+    } catch (e, s) {
+      await Sentry.captureException(e, stackTrace: s);
      rethrow;
    }
  }
@@ -96,7 +107,8 @@ class FeedRepository {
  Future<void> sendRecipesComment({required String id, required String commentText, int? parentCommentId}) async {
    try {
      await feedService.sendRecipesComment(id: id, body: commentText, parentCommentId: parentCommentId);
-    } catch (e) {
+    } catch (e, s) {
+      await Sentry.captureException(e, stackTrace: s);
      rethrow;
    }
  }
@@ -104,7 +116,8 @@ class FeedRepository {
  Future<CommentModel> getPlansComments({required String slug}) async {
    try {
      return (await feedService.getPlansComments(slug: slug));
-    } catch (e) {
+    } catch (e, s) {
+      await Sentry.captureException(e, stackTrace: s);
      rethrow;
    }
  }
@@ -112,7 +125,8 @@ class FeedRepository {
  Future<void> sendPlansComment({required String slug, required String commentText, int? parentCommentId}) async {
    try {
      await feedService.sendPlansComment(slug: slug, body: commentText, parentCommentId: parentCommentId);
-    } catch (e) {
+    } catch (e, s) {
+      await Sentry.captureException(e, stackTrace: s);
      rethrow;
    }
  }
@@ -120,7 +134,8 @@ class FeedRepository {
  Future<void> likeBlogPost({required int id}) async {
    try {
      await feedService.likeBlogPost(id: id);
-    } catch (e) {
+    } catch (e, s) {
+      await Sentry.captureException(e, stackTrace: s);
      rethrow;
    }
  }
@@ -128,7 +143,8 @@ class FeedRepository {
  Future<void> unlikedBlogPost({required int id}) async {
    try {
      await feedService.unlikedBlogPost(id: id);
-    } catch (e) {
+    } catch (e, s) {
+      await Sentry.captureException(e, stackTrace: s);
      rethrow;
    }
  }
@@ -136,7 +152,8 @@ class FeedRepository {
  Future<List<FeedConsultantModel>> getConsultants([String? name]) async {
    try {
      return (await feedService.getConsultants(name: name)).data;
-    } catch (e) {
+    } catch (e, s) {
+      await Sentry.captureException(e, stackTrace: s);
      rethrow;
    }
  }
@@ -144,7 +161,8 @@ class FeedRepository {
  Future<void> viewPost(int id) async {
    try {
      return (await feedService.viewPost(id: id));
-    } catch (e) {
+    } catch (e, s) {
+      await Sentry.captureException(e, stackTrace: s);
      rethrow;
    }
  }
@@ -152,7 +170,8 @@ class FeedRepository {
  Future<void> viewRecipe(String slug) async {
    try {
      return (await feedService.viewRecipe(slug: slug));
-    } catch (e) {
+    } catch (e, s) {
+      await Sentry.captureException(e, stackTrace: s);
      rethrow;
    }
  }
@@ -160,7 +179,8 @@ class FeedRepository {
  Future<void> viewDiet(int id) async {
    try {
      return (await feedService.viewDiet(id: id));
-    } catch (e) {
+    } catch (e, s) {
+      await Sentry.captureException(e, stackTrace: s);
      rethrow;
    }
  }
@@ -168,7 +188,8 @@ class FeedRepository {
  Future<void> viewPlan(String slug) async {
    try {
      return (await feedService.viewPlan(slug: slug));
-    } catch (e) {
+    } catch (e, s) {
+      await Sentry.captureException(e, stackTrace: s);
      rethrow;
    }
  }
@@ -176,7 +197,8 @@ class FeedRepository {
  Future<void> viewContent({required ViewModel viewModel}) async {
    try {
      await feedService.viewContent(viewModel: viewModel);
-    } catch (e) {
+    } catch (e, s) {
+      await Sentry.captureException(e, stackTrace: s);
      rethrow;
    }
  }