From e9a4c518be46ade4d6277f869d5f281d536fb255 Mon Sep 17 00:00:00 2001
From: Username1548 <mikhail_zakharov_15482356@mail.ru>
Date: Wed, 11 Dec 2024 19:51:40 +0700
Subject: [PATCH] glossary for diet creation fixed

---
 .../glossary_moderation_request_modal_widget.dart  |  7 ++++---
 .../diary/repositories/diary_repository.dart       |  3 ++-
 lib/features/diary/services/diary_service.dart     |  3 ++-
 lib/features/diary/services/diary_service.g.dart   | 14 +++++++++++---
 .../feed/models/diets_pagination_model.g.dart      |  3 ---
 5 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/lib/features/diary/presentation/widgets/glossary_moderation_request_modal_widget.dart b/lib/features/diary/presentation/widgets/glossary_moderation_request_modal_widget.dart
index 1648f59f..09fd00cb 100644
--- a/lib/features/diary/presentation/widgets/glossary_moderation_request_modal_widget.dart
+++ b/lib/features/diary/presentation/widgets/glossary_moderation_request_modal_widget.dart
@@ -1,6 +1,7 @@
 import 'package:eatvio_app/features/diary/presentation/bloc/diary_cubit.dart';
 import 'package:eatvio_app/core/theme/theme_helper.dart';
 import 'package:eatvio_app/core/widgets/custom_text_form_field.dart';
+import 'package:eatvio_app/features/glossary/models/glossary_model.dart';
 import 'package:flutter/material.dart';
 import 'package:lottie/lottie.dart';
 
@@ -27,7 +28,7 @@ class _GlossaryModerationRequestModalWidgetState extends State<GlossaryModeratio
   final proteinsController = TextEditingController();
   final fatsController = TextEditingController();
   final carbohydratesController = TextEditingController();
-
+  GlossaryModel? glossary;
   @override
   Widget build(BuildContext context) {
     if (glossaryState == GlossaryState.alert) {
@@ -160,7 +161,7 @@ class _GlossaryModerationRequestModalWidgetState extends State<GlossaryModeratio
           const SizedBox(height: 16),
           InkWell(
             onTap: () {
-              Navigator.of(context).pop();
+              Navigator.of(context).pop(glossary);
             },
             borderRadius: BorderRadius.circular(20),
             child: Ink(
@@ -263,7 +264,7 @@ class _GlossaryModerationRequestModalWidgetState extends State<GlossaryModeratio
           const SizedBox(height: 12),
           InkWell(
             onTap: () async {
-              await widget.diaryCubit.sendProductToModeration(
+              glossary = (await widget.diaryCubit.sendProductToModeration(
                 name: productNameController.text,
                 energy: double.parse(energyController.text),
                 proteins: double.parse(proteinsController.text),
diff --git a/lib/features/diary/repositories/diary_repository.dart b/lib/features/diary/repositories/diary_repository.dart
index 6839722a..d5b696a6 100644
--- a/lib/features/diary/repositories/diary_repository.dart
+++ b/lib/features/diary/repositories/diary_repository.dart
@@ -4,6 +4,7 @@ import 'package:eatvio_app/features/diary/models/finish_diary_day_model.dart';
 import 'package:eatvio_app/features/diary/models/nutrition_model.dart';
 import 'package:eatvio_app/features/diary/models/product_moderation_model.dart';
 import 'package:eatvio_app/features/diary/services/diary_service.dart';
+import 'package:eatvio_app/features/glossary/models/glossary_model.dart';
 
 class DiaryRepository {
   final DiaryService diaryService;
@@ -127,7 +128,7 @@ class DiaryRepository {
     );
   }
 
-  Future<void> sendProductToModeration({
+  Future<GlossaryModerationModel> sendProductToModeration({
     required String name,
     required double energy,
     required double proteins,
diff --git a/lib/features/diary/services/diary_service.dart b/lib/features/diary/services/diary_service.dart
index e484ee08..bb14e8cf 100644
--- a/lib/features/diary/services/diary_service.dart
+++ b/lib/features/diary/services/diary_service.dart
@@ -3,6 +3,7 @@ import 'package:dio/dio.dart';
 import 'package:eatvio_app/features/diary/models/diary_day_model.dart';
 import 'package:eatvio_app/features/diary/models/finish_diary_day_model.dart';
 import 'package:eatvio_app/features/diary/models/nutrition_model.dart';
+import 'package:eatvio_app/features/glossary/models/glossary_model.dart';
 import 'package:retrofit/retrofit.dart';
 
 part 'diary_service.g.dart';
@@ -87,7 +88,7 @@ abstract class DiaryService {
   });
 
   @POST('/api/diary/product_nutritional_values/sendToModeration')
-  Future<void> sendProductToModeration({
+  Future<GlossaryModerationModel> sendProductToModeration({
     @Body() required Map<String, dynamic> data,
   });
 }
diff --git a/lib/features/diary/services/diary_service.g.dart b/lib/features/diary/services/diary_service.g.dart
index 19253e5c..13951947 100644
--- a/lib/features/diary/services/diary_service.g.dart
+++ b/lib/features/diary/services/diary_service.g.dart
@@ -387,14 +387,14 @@ class _DiaryService implements DiaryService {
   }
 
   @override
-  Future<void> sendProductToModeration(
+  Future<GlossaryModerationModel> sendProductToModeration(
       {required Map<String, dynamic> data}) async {
     final _extra = <String, dynamic>{};
     final queryParameters = <String, dynamic>{};
     final _headers = <String, dynamic>{};
     final _data = <String, dynamic>{};
     _data.addAll(data);
-    final _options = _setStreamType<void>(Options(
+    final _options = _setStreamType<GlossaryModerationModel>(Options(
       method: 'POST',
       headers: _headers,
       extra: _extra,
@@ -410,7 +410,15 @@ class _DiaryService implements DiaryService {
           _dio.options.baseUrl,
           baseUrl,
         )));
-    await _dio.fetch<void>(_options);
+    final _result = await _dio.fetch<Map<String, dynamic>>(_options);
+    late GlossaryModerationModel _value;
+    try {
+      _value = GlossaryModerationModel.fromJson(_result.data!);
+    } on Object catch (e, s) {
+      errorLogger?.logError(e, s, _options);
+      rethrow;
+    }
+    return _value;
   }
 
   RequestOptions _setStreamType<T>(RequestOptions requestOptions) {
diff --git a/lib/features/feed/models/diets_pagination_model.g.dart b/lib/features/feed/models/diets_pagination_model.g.dart
index 38852f84..7a54baa0 100644
--- a/lib/features/feed/models/diets_pagination_model.g.dart
+++ b/lib/features/feed/models/diets_pagination_model.g.dart
@@ -85,10 +85,7 @@ _$AuthorImpl _$$AuthorImplFromJson(Map<String, dynamic> json) => _$AuthorImpl(
       authorProfileIcon: json['author_profile_icon'] as String,
       authorIsMe: json['author_is_me'] as bool,
       isEntitySubscribedByMe: json['is_entity_subscribed_by_me'] as bool?,
-<<<<<<< HEAD
       authorPlaceInRating: (json['author_place_in_rating'] as num?)?.toInt(),
-=======
->>>>>>> upstream/main
     );
 
 Map<String, dynamic> _$$AuthorImplToJson(_$AuthorImpl instance) =>