Merge remote-tracking branch 'upstream/main'

This commit is contained in:
Username1548
2024-12-02 15:59:15 +07:00
94 changed files with 2097 additions and 1589 deletions

View File

@@ -1,6 +1,7 @@
import 'dart:io';
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';
@@ -16,68 +17,76 @@ abstract class DiaryService {
@Path('date') required String date,
});
@GET('/api/diary/{diary_id}/show')
@GET('/api/diary/{diary}/show')
Future<DiaryDayWrapperModel> getDiaryDay({
@Path('diary_id') required int index,
@Path('diary') required int diary,
});
@GET('/api/diary/{diary_id}/dailyNutritionData')
@GET('/api/diary/{diary}/dailyNutritionData')
Future<NutritionDataModel> getNutrition({
@Path('diary_id') required int index,
@Path('diary') required int diary,
});
@POST('/api/diary/{diary_id}/meal/{meal_id}/photo/upload')
@POST('/api/diary/{diary}/meals/{type_no}/photo/upload')
@MultiPart()
Future<void> uploadPhotoOfMeal({
@Path('diary_id') required int diaryId,
@Path('meal_id') required int mealId,
@Path('diary') required int diary,
@Path('type_no') required int typeNo,
@Part(name: 'photo') required File photo,
});
@DELETE('/api/diary/{diary_id}/meal/{meal_id}/photo/delete')
@DELETE('/api/diary/{diary}/meals/{type_no}/photo/{user_attachment}/delete')
Future<void> deletePhotoOfMeal({
@Path('diary_id') required int diaryId,
@Path('meal_id') required int mealId,
@Query('id') required int id,
@Query('path') required String path,
@Path('diary') required int diaryId,
@Path('type_no') required int typeNo,
@Path('user_attachment') required int userAttachment,
});
@POST('/api/diary/{diary_id}/meal/{meal_id}/portions/create')
@POST('/api/diary/{diary}/meals/{type_no}/portion/create')
Future<void> addProductToMeal({
@Path('diary_id') required int diaryId,
@Path('meal_id') required int mealId,
@Path('diary') required int diary,
@Path('type_no') required int typeNo,
@Part(name: 'product_name') required String productName,
@Part(name: 'portion') required String portion,
@Part(name: 'quantity') required int quantity,
@Part(name: 'product_nutritional_value_id') int? productNutritionalValueId,
});
@PUT('/api/diary/{diary_id}/meal/{meal_id}/portions/{portion_id}/update')
@PUT('/api/diary/{diary}/meals/{type_no}/portions/{portionModel}/update')
Future<void> updateProductInMeal({
@Path('diary_id') required int diaryId,
@Path('meal_id') required int mealId,
@Path('portion_id') required int portionId,
@Body() required ProductInMeal productInMeal,
@Path('diary') required int diary,
@Path('type_no') required int typeNo,
@Path('portionModel') required int portionModel,
@Body() required Map<String, dynamic> productInMeal,
});
@DELETE('/api/diary/{diary_id}/meal/{meal_id}/portions/{portion_id}/delete')
@DELETE('/api/diary/{diary}/meals/{type_no}/portions/{portionModel}/delete')
Future<void> deleteProductFromMeal({
@Path('diary_id') required int diaryId,
@Path('meal_id') required int mealId,
@Path('portion_id') required int portionId,
@Path('diary') required int diary,
@Path('type_no') required int typeNo,
@Path('portionModel') required int portionModel,
});
@POST('/api/diary/{diary_id}/finishDay')
@POST('/api/diary/{diary}/finishDay')
Future<void> finishDiaryDay({
@Path('diary_id') required int diaryId,
@Path('diary') required int diary,
@Body() required FinishDiaryDayModel finishDiaryDayModel,
});
@POST('/api/diary/{diary_id}/meal/{meal}/satiety/fill')
@POST('/api/diary/{diary}/meals/{type_no}/satiety/fill')
Future<void> fillSatiety({
@Path('diary_id') required int diaryId,
@Path('meal') required int meal,
@Path('diary') required int diary,
@Path('type_no') required int typeNo,
@Field() required int satiety,
});
@POST('/api/diary/{diary}/meals/{type_no}/time/fill')
Future<void> fillTime({
@Path('diary') required int diary,
@Path('type_no') required int typeNo,
@Field() required String time,
});
@POST('/api/diary/product_nutritional_values/sendToModeration')
Future<GlossaryModerationModel> sendProductToModeration({
@Body() required Map<String, dynamic> data,

View File

@@ -58,7 +58,7 @@ class _DiaryService implements DiaryService {
}
@override
Future<DiaryDayWrapperModel> getDiaryDay({required int index}) async {
Future<DiaryDayWrapperModel> getDiaryDay({required int diary}) async {
final _extra = <String, dynamic>{};
final queryParameters = <String, dynamic>{};
final _headers = <String, dynamic>{};
@@ -70,7 +70,7 @@ class _DiaryService implements DiaryService {
)
.compose(
_dio.options,
'/api/diary/${index}/show',
'/api/diary/${diary}/show',
queryParameters: queryParameters,
data: _data,
)
@@ -91,7 +91,7 @@ class _DiaryService implements DiaryService {
}
@override
Future<NutritionDataModel> getNutrition({required int index}) async {
Future<NutritionDataModel> getNutrition({required int diary}) async {
final _extra = <String, dynamic>{};
final queryParameters = <String, dynamic>{};
final _headers = <String, dynamic>{};
@@ -103,7 +103,7 @@ class _DiaryService implements DiaryService {
)
.compose(
_dio.options,
'/api/diary/${index}/dailyNutritionData',
'/api/diary/${diary}/dailyNutritionData',
queryParameters: queryParameters,
data: _data,
)
@@ -125,8 +125,8 @@ class _DiaryService implements DiaryService {
@override
Future<void> uploadPhotoOfMeal({
required int diaryId,
required int mealId,
required int diary,
required int typeNo,
required File photo,
}) async {
final _extra = <String, dynamic>{};
@@ -148,7 +148,7 @@ class _DiaryService implements DiaryService {
)
.compose(
_dio.options,
'/api/diary/${diaryId}/meal/${mealId}/photo/upload',
'/api/diary/${diary}/meals/${typeNo}/photo/upload',
queryParameters: queryParameters,
data: _data,
)
@@ -163,15 +163,11 @@ class _DiaryService implements DiaryService {
@override
Future<void> deletePhotoOfMeal({
required int diaryId,
required int mealId,
required int id,
required String path,
required int typeNo,
required int userAttachment,
}) async {
final _extra = <String, dynamic>{};
final queryParameters = <String, dynamic>{
r'id': id,
r'path': path,
};
final queryParameters = <String, dynamic>{};
final _headers = <String, dynamic>{};
const Map<String, dynamic>? _data = null;
final _options = _setStreamType<void>(Options(
@@ -181,7 +177,7 @@ class _DiaryService implements DiaryService {
)
.compose(
_dio.options,
'/api/diary/${diaryId}/meal/${mealId}/photo/delete',
'/api/diary/${diaryId}/meals/${typeNo}/photo/${userAttachment}/delete',
queryParameters: queryParameters,
data: _data,
)
@@ -195,14 +191,16 @@ class _DiaryService implements DiaryService {
@override
Future<void> addProductToMeal({
required int diaryId,
required int mealId,
required int diary,
required int typeNo,
required String productName,
required String portion,
required int quantity,
int? productNutritionalValueId,
}) async {
final _extra = <String, dynamic>{};
final queryParameters = <String, dynamic>{};
queryParameters.removeWhere((k, v) => v == null);
final _headers = <String, dynamic>{};
final _data = FormData();
_data.fields.add(MapEntry(
@@ -217,6 +215,12 @@ class _DiaryService implements DiaryService {
'quantity',
quantity.toString(),
));
if (productNutritionalValueId != null) {
_data.fields.add(MapEntry(
'product_nutritional_value_id',
productNutritionalValueId.toString(),
));
}
final _options = _setStreamType<void>(Options(
method: 'POST',
headers: _headers,
@@ -224,7 +228,7 @@ class _DiaryService implements DiaryService {
)
.compose(
_dio.options,
'/api/diary/${diaryId}/meal/${mealId}/portions/create',
'/api/diary/${diary}/meals/${typeNo}/portion/create',
queryParameters: queryParameters,
data: _data,
)
@@ -238,15 +242,16 @@ class _DiaryService implements DiaryService {
@override
Future<void> updateProductInMeal({
required int diaryId,
required int mealId,
required int portionId,
required ProductInMeal productInMeal,
required int diary,
required int typeNo,
required int portionModel,
required Map<String, dynamic> productInMeal,
}) async {
final _extra = <String, dynamic>{};
final queryParameters = <String, dynamic>{};
final _headers = <String, dynamic>{};
final _data = productInMeal;
final _data = <String, dynamic>{};
_data.addAll(productInMeal);
final _options = _setStreamType<void>(Options(
method: 'PUT',
headers: _headers,
@@ -254,7 +259,7 @@ class _DiaryService implements DiaryService {
)
.compose(
_dio.options,
'/api/diary/${diaryId}/meal/${mealId}/portions/${portionId}/update',
'/api/diary/${diary}/meals/${typeNo}/portions/${portionModel}/update',
queryParameters: queryParameters,
data: _data,
)
@@ -268,9 +273,9 @@ class _DiaryService implements DiaryService {
@override
Future<void> deleteProductFromMeal({
required int diaryId,
required int mealId,
required int portionId,
required int diary,
required int typeNo,
required int portionModel,
}) async {
final _extra = <String, dynamic>{};
final queryParameters = <String, dynamic>{};
@@ -283,7 +288,7 @@ class _DiaryService implements DiaryService {
)
.compose(
_dio.options,
'/api/diary/${diaryId}/meal/${mealId}/portions/${portionId}/delete',
'/api/diary/${diary}/meals/${typeNo}/portions/${portionModel}/delete',
queryParameters: queryParameters,
data: _data,
)
@@ -296,11 +301,14 @@ class _DiaryService implements DiaryService {
}
@override
Future<void> finishDiaryDay({required int diaryId}) async {
Future<void> finishDiaryDay({
required int diary,
required FinishDiaryDayModel finishDiaryDayModel,
}) async {
final _extra = <String, dynamic>{};
final queryParameters = <String, dynamic>{};
final _headers = <String, dynamic>{};
const Map<String, dynamic>? _data = null;
final _data = finishDiaryDayModel;
final _options = _setStreamType<void>(Options(
method: 'POST',
headers: _headers,
@@ -308,7 +316,7 @@ class _DiaryService implements DiaryService {
)
.compose(
_dio.options,
'/api/diary/${diaryId}/finishDay',
'/api/diary/${diary}/finishDay',
queryParameters: queryParameters,
data: _data,
)
@@ -322,8 +330,8 @@ class _DiaryService implements DiaryService {
@override
Future<void> fillSatiety({
required int diaryId,
required int meal,
required int diary,
required int typeNo,
required int satiety,
}) async {
final _extra = <String, dynamic>{};
@@ -337,7 +345,36 @@ class _DiaryService implements DiaryService {
)
.compose(
_dio.options,
'/api/diary/${diaryId}/meal/${meal}/satiety/fill',
'/api/diary/${diary}/meals/${typeNo}/satiety/fill',
queryParameters: queryParameters,
data: _data,
)
.copyWith(
baseUrl: _combineBaseUrls(
_dio.options.baseUrl,
baseUrl,
)));
await _dio.fetch<void>(_options);
}
@override
Future<void> fillTime({
required int diary,
required int typeNo,
required String time,
}) async {
final _extra = <String, dynamic>{};
final queryParameters = <String, dynamic>{};
final _headers = <String, dynamic>{};
final _data = {'time': time};
final _options = _setStreamType<void>(Options(
method: 'POST',
headers: _headers,
extra: _extra,
)
.compose(
_dio.options,
'/api/diary/${diary}/meals/${typeNo}/time/fill',
queryParameters: queryParameters,
data: _data,
)