refactor(diary): API mor produc nutritional and new Product model

lib/features/diary/services/diary_service.dart

@@ -1,5 +1,6 @@
 import 'package:dio/dio.dart';
 import 'package:eatvio_app/features/diary/models/diary_model.dart';
+import 'package:eatvio_app/features/diary/models/product.dart';
 import 'package:retrofit/retrofit.dart';
 
 part 'diary_service.g.dart';
@@ -17,8 +18,9 @@ abstract class DiaryService {
   @GET('/diary/{id}/dailyNutritionData/')
   Future<DiaryModel> getChart(@Path() String id);
 
-  @GET('/diary/product_nutritional_values/filter?{name}')
-  Future<DiaryModel> sendInputProduct(@Path() String name);
+  @GET('/diary/product_nutritional_values/filter')
+  Future<Map<String, List<Product>>> getInputProduct(
+      @Query('name') String name);
 
   @POST('/diary/{diary_id}/meal/{meal_id}/satiety/fill')
   Future<Map<String, int>> sendSatietyData(
@@ -41,8 +43,24 @@ abstract class DiaryService {
   );
 
   @POST('/diary/{diary_id}/retire/fill')
-  Future<DiaryModel> sendRetire(
+  Future<DiaryModel> sendRetireData(
     @Path() int diary_id,
     @Query('retire') String retire,
   );
+
+  @POST('/diary/{diary_id}/meal/{meal_id}/portions/create')
+  Future<Map<String, int>> sendPortionData(
+    @Path() int diary_id,
+    @Path() int meal_id,
+    @Query('product_name') String product_name,
+    @Query('portion') String portion,
+    @Query('quantity') int quantity,
+  );
+
+  @POST('/diary/{diary_id}/meal/{meal_id}/portions/{portion_id}/delete')
+  Future<Map<String, int>> sendRemovePortionData(
+    @Path() int diary_id,
+    @Path() int meal_id,
+    @Path() int portion_id,
+  );
 }

lib/features/diary/services/diary_service.g.dart

@@ -24,22 +24,23 @@ class _DiaryService implements DiaryService {
     final queryParameters = <String, dynamic>{};
     final _headers = <String, dynamic>{};
     const Map<String, dynamic>? _data = null;
-    final _result = await _dio.fetch<Map<String, dynamic>>(_setStreamType<Map<String, int>>(Options(
+    final _result = await _dio
+        .fetch<Map<String, dynamic>>(_setStreamType<Map<String, int>>(Options(
       method: 'GET',
       headers: _headers,
       extra: _extra,
     )
-        .compose(
-          _dio.options,
-          '/diary/index',
-          queryParameters: queryParameters,
-          data: _data,
-        )
-        .copyWith(
-            baseUrl: _combineBaseUrls(
-          _dio.options.baseUrl,
-          baseUrl,
-        ))));
+            .compose(
+              _dio.options,
+              '/diary/index',
+              queryParameters: queryParameters,
+              data: _data,
+            )
+            .copyWith(
+                baseUrl: _combineBaseUrls(
+              _dio.options.baseUrl,
+              baseUrl,
+            ))));
     final _value = _result.data!.cast<String, int>();
     return _value;
   }
@@ -50,23 +51,25 @@ class _DiaryService implements DiaryService {
     final queryParameters = <String, dynamic>{};
     final _headers = <String, dynamic>{};
     const Map<String, dynamic>? _data = null;
-    final _result = await _dio.fetch<Map<String, dynamic>>(_setStreamType<Map<String, DiaryModel>>(Options(
+    final _result = await _dio.fetch<Map<String, dynamic>>(
+        _setStreamType<Map<String, DiaryModel>>(Options(
       method: 'GET',
       headers: _headers,
       extra: _extra,
     )
-        .compose(
-          _dio.options,
-          '/diary/${id}/show/',
-          queryParameters: queryParameters,
-          data: _data,
-        )
-        .copyWith(
-            baseUrl: _combineBaseUrls(
-          _dio.options.baseUrl,
-          baseUrl,
-        ))));
-    var _value = _result.data!.map((k, dynamic v) => MapEntry(k, DiaryModel.fromJson(v as Map<String, dynamic>)));
+            .compose(
+              _dio.options,
+              '/diary/${id}/show/',
+              queryParameters: queryParameters,
+              data: _data,
+            )
+            .copyWith(
+                baseUrl: _combineBaseUrls(
+              _dio.options.baseUrl,
+              baseUrl,
+            ))));
+    var _value = _result.data!.map((k, dynamic v) =>
+        MapEntry(k, DiaryModel.fromJson(v as Map<String, dynamic>)));
     return _value;
   }
 
@@ -76,49 +79,55 @@ class _DiaryService implements DiaryService {
     final queryParameters = <String, dynamic>{};
     final _headers = <String, dynamic>{};
     const Map<String, dynamic>? _data = null;
-    final _result = await _dio.fetch<Map<String, dynamic>>(_setStreamType<DiaryModel>(Options(
+    final _result = await _dio
+        .fetch<Map<String, dynamic>>(_setStreamType<DiaryModel>(Options(
       method: 'GET',
       headers: _headers,
       extra: _extra,
     )
-        .compose(
-          _dio.options,
-          '/diary/${id}/dailyNutritionData/',
-          queryParameters: queryParameters,
-          data: _data,
-        )
-        .copyWith(
-            baseUrl: _combineBaseUrls(
-          _dio.options.baseUrl,
-          baseUrl,
-        ))));
+            .compose(
+              _dio.options,
+              '/diary/${id}/dailyNutritionData/',
+              queryParameters: queryParameters,
+              data: _data,
+            )
+            .copyWith(
+                baseUrl: _combineBaseUrls(
+              _dio.options.baseUrl,
+              baseUrl,
+            ))));
     final _value = DiaryModel.fromJson(_result.data!);
     return _value;
   }
 
   @override
-  Future<DiaryModel> sendInputProduct(String name) async {
+  Future<Map<String, List<Product>>> getInputProduct(String name) async {
     final _extra = <String, dynamic>{};
-    final queryParameters = <String, dynamic>{};
+    final queryParameters = <String, dynamic>{r'name': name};
     final _headers = <String, dynamic>{};
     const Map<String, dynamic>? _data = null;
-    final _result = await _dio.fetch<Map<String, dynamic>>(_setStreamType<DiaryModel>(Options(
+    final _result = await _dio.fetch<Map<String, dynamic>>(
+        _setStreamType<Map<String, List<Product>>>(Options(
       method: 'GET',
       headers: _headers,
       extra: _extra,
     )
-        .compose(
-          _dio.options,
-          '/diary/product_nutritional_values/filter?${name}',
-          queryParameters: queryParameters,
-          data: _data,
-        )
-        .copyWith(
-            baseUrl: _combineBaseUrls(
-          _dio.options.baseUrl,
-          baseUrl,
-        ))));
-    final _value = DiaryModel.fromJson(_result.data!);
+            .compose(
+              _dio.options,
+              '/diary/product_nutritional_values/filter',
+              queryParameters: queryParameters,
+              data: _data,
+            )
+            .copyWith(
+                baseUrl: _combineBaseUrls(
+              _dio.options.baseUrl,
+              baseUrl,
+            ))));
+    var _value = _result.data!.map((k, dynamic v) => MapEntry(
+        k,
+        (v as List)
+            .map((i) => Product.fromJson(i as Map<String, dynamic>))
+            .toList()));
     return _value;
   }
 
@@ -132,22 +141,23 @@ class _DiaryService implements DiaryService {
     final queryParameters = <String, dynamic>{r'satiety': satiety};
     final _headers = <String, dynamic>{};
     const Map<String, dynamic>? _data = null;
-    final _result = await _dio.fetch<Map<String, dynamic>>(_setStreamType<Map<String, int>>(Options(
+    final _result = await _dio
+        .fetch<Map<String, dynamic>>(_setStreamType<Map<String, int>>(Options(
       method: 'POST',
       headers: _headers,
       extra: _extra,
     )
-        .compose(
-          _dio.options,
-          '/diary/${diary_id}/meal/${meal_id}/satiety/fill',
-          queryParameters: queryParameters,
-          data: _data,
-        )
-        .copyWith(
-            baseUrl: _combineBaseUrls(
-          _dio.options.baseUrl,
-          baseUrl,
-        ))));
+            .compose(
+              _dio.options,
+              '/diary/${diary_id}/meal/${meal_id}/satiety/fill',
+              queryParameters: queryParameters,
+              data: _data,
+            )
+            .copyWith(
+                baseUrl: _combineBaseUrls(
+              _dio.options.baseUrl,
+              baseUrl,
+            ))));
     final _value = _result.data!.cast<String, int>();
     return _value;
   }
@@ -162,22 +172,23 @@ class _DiaryService implements DiaryService {
     final queryParameters = <String, dynamic>{r'mood': mood};
     final _headers = <String, dynamic>{};
     const Map<String, dynamic>? _data = null;
-    final _result = await _dio.fetch<Map<String, dynamic>>(_setStreamType<Map<String, int>>(Options(
+    final _result = await _dio
+        .fetch<Map<String, dynamic>>(_setStreamType<Map<String, int>>(Options(
       method: 'POST',
       headers: _headers,
       extra: _extra,
     )
-        .compose(
-          _dio.options,
-          '/diary/${diary_id}/meal/${meal_id}/mood/fill',
-          queryParameters: queryParameters,
-          data: _data,
-        )
-        .copyWith(
-            baseUrl: _combineBaseUrls(
-          _dio.options.baseUrl,
-          baseUrl,
-        ))));
+            .compose(
+              _dio.options,
+              '/diary/${diary_id}/meal/${meal_id}/mood/fill',
+              queryParameters: queryParameters,
+              data: _data,
+            )
+            .copyWith(
+                baseUrl: _combineBaseUrls(
+              _dio.options.baseUrl,
+              baseUrl,
+            ))));
     final _value = _result.data!.cast<String, int>();
     return _value;
   }
@@ -191,28 +202,29 @@ class _DiaryService implements DiaryService {
     final queryParameters = <String, dynamic>{r'wakeup': wakeup};
     final _headers = <String, dynamic>{};
     const Map<String, dynamic>? _data = null;
-    final _result = await _dio.fetch<Map<String, dynamic>>(_setStreamType<DiaryModel>(Options(
+    final _result = await _dio
+        .fetch<Map<String, dynamic>>(_setStreamType<DiaryModel>(Options(
       method: 'POST',
       headers: _headers,
       extra: _extra,
     )
-        .compose(
-          _dio.options,
-          '/diary/${diary_id}/wakeup/fill',
-          queryParameters: queryParameters,
-          data: _data,
-        )
-        .copyWith(
-            baseUrl: _combineBaseUrls(
-          _dio.options.baseUrl,
-          baseUrl,
-        ))));
+            .compose(
+              _dio.options,
+              '/diary/${diary_id}/wakeup/fill',
+              queryParameters: queryParameters,
+              data: _data,
+            )
+            .copyWith(
+                baseUrl: _combineBaseUrls(
+              _dio.options.baseUrl,
+              baseUrl,
+            ))));
     final _value = DiaryModel.fromJson(_result.data!);
     return _value;
   }
 
   @override
-  Future<DiaryModel> sendRetire(
+  Future<DiaryModel> sendRetireData(
     int diary_id,
     String retire,
   ) async {
@@ -220,28 +232,99 @@ class _DiaryService implements DiaryService {
     final queryParameters = <String, dynamic>{r'retire': retire};
     final _headers = <String, dynamic>{};
     const Map<String, dynamic>? _data = null;
-    final _result = await _dio.fetch<Map<String, dynamic>>(_setStreamType<DiaryModel>(Options(
+    final _result = await _dio
+        .fetch<Map<String, dynamic>>(_setStreamType<DiaryModel>(Options(
       method: 'POST',
       headers: _headers,
       extra: _extra,
     )
-        .compose(
-          _dio.options,
-          '/diary/${diary_id}/retire/fill',
-          queryParameters: queryParameters,
-          data: _data,
-        )
-        .copyWith(
-            baseUrl: _combineBaseUrls(
-          _dio.options.baseUrl,
-          baseUrl,
-        ))));
+            .compose(
+              _dio.options,
+              '/diary/${diary_id}/retire/fill',
+              queryParameters: queryParameters,
+              data: _data,
+            )
+            .copyWith(
+                baseUrl: _combineBaseUrls(
+              _dio.options.baseUrl,
+              baseUrl,
+            ))));
     final _value = DiaryModel.fromJson(_result.data!);
     return _value;
   }
 
+  @override
+  Future<Map<String, int>> sendPortionData(
+    int diary_id,
+    int meal_id,
+    String product_name,
+    String portion,
+    int quantity,
+  ) async {
+    final _extra = <String, dynamic>{};
+    final queryParameters = <String, dynamic>{
+      r'product_name': product_name,
+      r'portion': portion,
+      r'quantity': quantity,
+    };
+    final _headers = <String, dynamic>{};
+    const Map<String, dynamic>? _data = null;
+    final _result = await _dio
+        .fetch<Map<String, dynamic>>(_setStreamType<Map<String, int>>(Options(
+      method: 'POST',
+      headers: _headers,
+      extra: _extra,
+    )
+            .compose(
+              _dio.options,
+              '/diary/${diary_id}/meal/${meal_id}/portions/create',
+              queryParameters: queryParameters,
+              data: _data,
+            )
+            .copyWith(
+                baseUrl: _combineBaseUrls(
+              _dio.options.baseUrl,
+              baseUrl,
+            ))));
+    final _value = _result.data!.cast<String, int>();
+    return _value;
+  }
+
+  @override
+  Future<Map<String, int>> sendRemovePortionData(
+    int diary_id,
+    int meal_id,
+    int portion_id,
+  ) async {
+    final _extra = <String, dynamic>{};
+    final queryParameters = <String, dynamic>{};
+    final _headers = <String, dynamic>{};
+    const Map<String, dynamic>? _data = null;
+    final _result = await _dio
+        .fetch<Map<String, dynamic>>(_setStreamType<Map<String, int>>(Options(
+      method: 'POST',
+      headers: _headers,
+      extra: _extra,
+    )
+            .compose(
+              _dio.options,
+              '/diary/${diary_id}/meal/${meal_id}/portions/${portion_id}/delete',
+              queryParameters: queryParameters,
+              data: _data,
+            )
+            .copyWith(
+                baseUrl: _combineBaseUrls(
+              _dio.options.baseUrl,
+              baseUrl,
+            ))));
+    final _value = _result.data!.cast<String, int>();
+    return _value;
+  }
+
   RequestOptions _setStreamType<T>(RequestOptions requestOptions) {
-    if (T != dynamic && !(requestOptions.responseType == ResponseType.bytes || requestOptions.responseType == ResponseType.stream)) {
+    if (T != dynamic &&
+        !(requestOptions.responseType == ResponseType.bytes ||
+            requestOptions.responseType == ResponseType.stream)) {
       if (T == String) {
         requestOptions.responseType = ResponseType.plain;
       } else {