forked from eatvio/eatvio_app
fix: review fixes
This commit is contained in:
@@ -14,6 +14,7 @@ import 'package:eatvio_app/features/diary/models/nutrition_model.dart';
|
||||
import 'package:eatvio_app/features/diary/presentation/bloc/diary_state.dart';
|
||||
import 'package:eatvio_app/features/diary/repositories/diary_repository.dart';
|
||||
import 'package:eatvio_app/features/diets/repositories/diet_repository.dart';
|
||||
import 'package:eatvio_app/features/feed/models/diets_pagination_model.dart';
|
||||
import 'package:eatvio_app/features/glossary/models/glossary_model.dart';
|
||||
import 'package:eatvio_app/features/glossary/repositories/glossary_repository.dart';
|
||||
import 'package:eatvio_app/features/profile/repositories/profile_repository.dart';
|
||||
@@ -38,6 +39,8 @@ class DiaryCubit extends Cubit<DiaryState> {
|
||||
final ChatRepository chatRepository;
|
||||
final SettingsRepository settingsRepository;
|
||||
int? diaryId;
|
||||
int _fetchGeneration = 0;
|
||||
|
||||
DiaryCubit({
|
||||
required this.chatRepository,
|
||||
required this.diaryRepository,
|
||||
@@ -61,14 +64,21 @@ class DiaryCubit extends Cubit<DiaryState> {
|
||||
selectedDay = date;
|
||||
}
|
||||
|
||||
bool _isCurrentFetch(int generation) => generation == _fetchGeneration;
|
||||
|
||||
Future<bool> setSelectedDay(DateTime day) async {
|
||||
final prevDay = selectedDay;
|
||||
final prevMeal = selectedMeal;
|
||||
selectedDay = day;
|
||||
selectedMeal = 1;
|
||||
final canSelect = await fetchDiaryV2(needLoading: true);
|
||||
final generation = ++_fetchGeneration;
|
||||
final canSelect = await fetchDiaryV2(needLoading: true, generation: generation);
|
||||
|
||||
if (!canSelect) {
|
||||
if (!_isCurrentFetch(generation)) {
|
||||
return false;
|
||||
}
|
||||
|
||||
if (!canSelect && state is! DiaryStateError) {
|
||||
selectedDay = prevDay;
|
||||
selectedMeal = prevMeal;
|
||||
}
|
||||
@@ -76,22 +86,33 @@ class DiaryCubit extends Cubit<DiaryState> {
|
||||
return canSelect;
|
||||
}
|
||||
|
||||
Future<bool> fetchDiaryV2({bool needLoading = false, int? diaryId}) async {
|
||||
Future<bool> fetchDiaryV2({bool needLoading = false, int? diaryId, int? generation}) async {
|
||||
final request = generation ?? ++_fetchGeneration;
|
||||
final requestedDay = selectedDay;
|
||||
final currentState = state;
|
||||
try {
|
||||
if (!_isCurrentFetch(request)) {
|
||||
return false;
|
||||
}
|
||||
if (needLoading) {
|
||||
emit(const DiaryState.loading());
|
||||
}
|
||||
if (diaryId != null) {
|
||||
final diaryDayById = await diaryRepository.getDiaryDay(diaryId);
|
||||
if (!_isCurrentFetch(request)) {
|
||||
return false;
|
||||
}
|
||||
final diaryEntity = diaryDayById.toEntity();
|
||||
if (diaryEntity != null) {
|
||||
setDiary(diaryDay: diaryEntity, diaryId: diaryId);
|
||||
return true;
|
||||
await setDiary(diaryDay: diaryEntity, diaryId: diaryId, generation: request);
|
||||
return _isCurrentFetch(request);
|
||||
}
|
||||
}
|
||||
|
||||
final diaryDay = await getDiary();
|
||||
final diaryDay = await getDiary(day: requestedDay);
|
||||
if (!_isCurrentFetch(request)) {
|
||||
return false;
|
||||
}
|
||||
if (diaryDay == null) {
|
||||
emit(const DiaryState.error(errorMessage: 'Diary not found'));
|
||||
return true;
|
||||
@@ -99,16 +120,26 @@ class DiaryCubit extends Cubit<DiaryState> {
|
||||
|
||||
final diaryEntity = diaryDay.toEntity();
|
||||
if (diaryEntity != null) {
|
||||
setDiary(diaryDay: diaryEntity, diaryId: diaryId);
|
||||
return true;
|
||||
await setDiary(diaryDay: diaryEntity, diaryId: diaryId, generation: request);
|
||||
return _isCurrentFetch(request);
|
||||
}
|
||||
|
||||
if (_isUnsavedDietPreview(diaryDay)) {
|
||||
return await setDiaryForDietOnly(diaryDay.toDiaryFutureDayEntity());
|
||||
final shown = await setDiaryForDietOnly(diaryDay.toDiaryFutureDayEntity(), generation: request);
|
||||
if (!_isCurrentFetch(request)) {
|
||||
return false;
|
||||
}
|
||||
if (!shown && state is DiaryStateLoading) {
|
||||
emit(currentState);
|
||||
}
|
||||
return shown;
|
||||
}
|
||||
emit(currentState);
|
||||
return false;
|
||||
} catch (e, st) {
|
||||
if (!_isCurrentFetch(request)) {
|
||||
return false;
|
||||
}
|
||||
await reportFrom(e, st, this);
|
||||
log(e.toString(), stackTrace: st);
|
||||
emit(DiaryState.error(errorMessage: e.toString()));
|
||||
@@ -129,17 +160,18 @@ class DiaryCubit extends Cubit<DiaryState> {
|
||||
}
|
||||
}
|
||||
|
||||
Future<DiaryDayModel?> getDiary() async {
|
||||
Future<DiaryDayModel?> getDiary({DateTime? day}) async {
|
||||
final requestedDay = (day ?? selectedDay).toISO8601WithTimeZoneOffset();
|
||||
try {
|
||||
await diaryRepository.createDiaryDay(day: selectedDay.toISO8601WithTimeZoneOffset());
|
||||
final diaryDay = await diaryRepository.getDiaryDayV2(day: selectedDay.toISO8601WithTimeZoneOffset());
|
||||
await diaryRepository.createDiaryDay(day: requestedDay);
|
||||
final diaryDay = await diaryRepository.getDiaryDayV2(day: requestedDay);
|
||||
return diaryDay;
|
||||
} catch (e, st) {
|
||||
await reportFrom(e, st, this);
|
||||
log(e.toString(), stackTrace: st);
|
||||
if (e is DioException) {
|
||||
if (e.response?.statusCode == 422) {
|
||||
final diaryDay = await diaryRepository.getDiaryDayV2(day: selectedDay.toISO8601WithTimeZoneOffset());
|
||||
final diaryDay = await diaryRepository.getDiaryDayV2(day: requestedDay);
|
||||
return diaryDay;
|
||||
}
|
||||
}
|
||||
@@ -163,30 +195,24 @@ class DiaryCubit extends Cubit<DiaryState> {
|
||||
return diaryDay.typeOfDiary.hasChosenDiet && dayNotStarted;
|
||||
}
|
||||
|
||||
Future<bool> setDiaryForDietOnly(DiaryFutureDietDayEntity diaryDay) async {
|
||||
Future<bool> setDiaryForDietOnly(DiaryFutureDietDayEntity diaryDay, {int? generation}) async {
|
||||
final dietId = diaryDay.diet?.id;
|
||||
final dayOfChosenDiet = diaryDay.dayOfChosenDiet;
|
||||
if (!diaryDay.typeOfDiary.hasChosenDiet || dietId == null || dayOfChosenDiet == null) {
|
||||
return false;
|
||||
}
|
||||
if (generation != null && !_isCurrentFetch(generation)) {
|
||||
return false;
|
||||
}
|
||||
emit(const DiaryState.loading());
|
||||
try {
|
||||
final diet = await dietRepository.getDiet(dietId);
|
||||
if (generation != null && !_isCurrentFetch(generation)) {
|
||||
return false;
|
||||
}
|
||||
final meals = diet.dailySchedule[dayOfChosenDiet];
|
||||
List<PortionModel> portionsOfMeal(int mealNumber) {
|
||||
return meals?[mealNumber]?.values
|
||||
.map(
|
||||
(elem) => PortionModel(
|
||||
id: 0,
|
||||
productName: elem.name,
|
||||
quantity: elem.quantity,
|
||||
portion: elem.portion.getValue(),
|
||||
fromDiet: true,
|
||||
portionState: PortionState.filledDiet,
|
||||
),
|
||||
)
|
||||
.toList() ??
|
||||
[];
|
||||
return meals?[mealNumber]?.values.map(_portionFromDiet).toList() ?? [];
|
||||
}
|
||||
|
||||
MealModel meal(int mealNumber) {
|
||||
@@ -202,13 +228,44 @@ class DiaryCubit extends Cubit<DiaryState> {
|
||||
);
|
||||
return true;
|
||||
} catch (e, st) {
|
||||
if (generation != null && !_isCurrentFetch(generation)) {
|
||||
return false;
|
||||
}
|
||||
await reportFrom(e, st, this);
|
||||
emit(DiaryState.error(errorMessage: e.toString()));
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
Future<void> setDiary({int? diaryId, required DiaryDayEntity diaryDay}) async {
|
||||
PortionModel _portionFromDiet(DailySchedule elem) {
|
||||
final nutrition = elem.dailyNutrition;
|
||||
final per100 = elem.portion == Portion.grams && elem.quantity > 0 ? 100 / elem.quantity : 1.0;
|
||||
return PortionModel(
|
||||
id: 0,
|
||||
productNutritionalValueId: elem.productNutritionalValueId,
|
||||
productCaloriesInfo: nutrition == null
|
||||
? null
|
||||
: ProductCaloriesInfoModel(
|
||||
id: elem.productNutritionalValueId ?? 0,
|
||||
productName: elem.name,
|
||||
calories: nutrition.energy * per100,
|
||||
proteins: nutrition.proteins * per100,
|
||||
fats: nutrition.fats * per100,
|
||||
carbohydrates: nutrition.carbohydrates * per100,
|
||||
energyOnPortion: nutrition.energy,
|
||||
proteinsOnPortion: nutrition.proteins,
|
||||
fatsOnPortion: nutrition.fats,
|
||||
carbohydratesOnPortion: nutrition.carbohydrates,
|
||||
),
|
||||
productName: elem.name,
|
||||
quantity: elem.quantity,
|
||||
portion: elem.portion.getValue(),
|
||||
fromDiet: true,
|
||||
portionState: PortionState.filledDiet,
|
||||
);
|
||||
}
|
||||
|
||||
Future<void> setDiary({int? diaryId, required DiaryDayEntity diaryDay, int? generation}) async {
|
||||
this.diaryId ??= diaryId;
|
||||
final isConsultantView = this.diaryId != null;
|
||||
try {
|
||||
@@ -236,6 +293,9 @@ class DiaryCubit extends Cubit<DiaryState> {
|
||||
currentPlanDay = consultantReview.currentPlanDay;
|
||||
}
|
||||
final nutrition = await getNutrition(diaryDay.id);
|
||||
if (generation != null && !_isCurrentFetch(generation)) {
|
||||
return;
|
||||
}
|
||||
|
||||
final isDiaryFinished = diaryDay.typeOfDiary.diaryState == DiaryStateEnum.finished || diaryDay.typeOfDiary.diaryState == DiaryStateEnum.lastDayFinished;
|
||||
|
||||
@@ -261,6 +321,9 @@ class DiaryCubit extends Cubit<DiaryState> {
|
||||
),
|
||||
);
|
||||
} catch (e, st) {
|
||||
if (generation != null && !_isCurrentFetch(generation)) {
|
||||
return;
|
||||
}
|
||||
await reportFrom(e, st, this);
|
||||
log(e.toString(), stackTrace: st);
|
||||
emit(DiaryState.error(errorMessage: e.toString()));
|
||||
|
||||
@@ -22,12 +22,26 @@ class _CalendarWidgetState extends State<CalendarWidget> {
|
||||
CalendarFormat _calendarFormat = CalendarFormat.week;
|
||||
DateTime _focusedDay = DateTime.now();
|
||||
DateTime _selectedDay = DateTime.now();
|
||||
DateTime? _dayFromState(DiaryState state) {
|
||||
if (state is DiaryStateLoaded) {
|
||||
return state.selectedDay;
|
||||
}
|
||||
if (state is DiaryStateLoadedTomorrowWithDiet) {
|
||||
return state.selectedDay;
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
@override
|
||||
void initState() {
|
||||
super.initState();
|
||||
final selected = _dayFromState(context.read<DiaryCubit>().state);
|
||||
if (widget.date != null) {
|
||||
_selectedDay = widget.date!;
|
||||
_focusedDay = widget.date!;
|
||||
} else if (selected != null) {
|
||||
_selectedDay = selected;
|
||||
_focusedDay = selected;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -47,9 +61,11 @@ class _CalendarWidgetState extends State<CalendarWidget> {
|
||||
final daysOfWeekHeight = _scaledDaysOfWeekHeight(context);
|
||||
return BlocConsumer<DiaryCubit, DiaryState>(
|
||||
listener: (BuildContext context, DiaryState state) {
|
||||
if (state is DiaryStateLoaded) {
|
||||
final selected = _dayFromState(state);
|
||||
if (selected != null) {
|
||||
setState(() {
|
||||
_selectedDay = state.selectedDay;
|
||||
_selectedDay = selected;
|
||||
_focusedDay = selected;
|
||||
});
|
||||
}
|
||||
},
|
||||
@@ -77,8 +93,12 @@ class _CalendarWidgetState extends State<CalendarWidget> {
|
||||
_selectedDay = selectedDay;
|
||||
_focusedDay = focusedDay;
|
||||
});
|
||||
final canOpenNextDay = await context.read<DiaryCubit>().setSelectedDay(selectedDay);
|
||||
if (!canOpenNextDay && context.mounted) {
|
||||
final cubit = context.read<DiaryCubit>();
|
||||
final canOpenNextDay = await cubit.setSelectedDay(selectedDay);
|
||||
if (!context.mounted || cubit.state is DiaryStateError) {
|
||||
return;
|
||||
}
|
||||
if (!canOpenNextDay) {
|
||||
showErrorDialog(context, title: s.want_to_see_tomorrow, description: s.can_not_see_next_day);
|
||||
setState(() {
|
||||
_selectedDay = previousSelectedDay;
|
||||
|
||||
Reference in New Issue
Block a user