fix: issue-1141

This commit is contained in:
misha
2026-11-18 14:38:15 +03:00
parent 87d383152d
commit b05d3b891b
14 changed files with 3983 additions and 2592 deletions

View File

@@ -30,6 +30,7 @@ import 'package:eatvio_app/features/chat/utils/chat_counterpart_utils.dart';
import 'package:eatvio_app/features/consultations/utils/consultation_progress_mapper.dart';
import 'package:eatvio_app/features/order_info/presentation/info_by_order_screen.dart';
import 'package:eatvio_app/features/plans/enums/chosen_plan_state_enum.dart';
import 'package:eatvio_app/features/plans/models/chosen_plan_model.dart';
import 'package:eatvio_app/features/user_details/presentation/user_details_screen.dart';
import 'package:eatvio_app/features/video_calls/managers/video_call_manager.dart';
import 'package:eatvio_app/features/video_calls/presentation/pages/video_call_screen.dart';
@@ -72,6 +73,10 @@ class _ChatScreenState extends State<ChatScreen> {
String? get conversationUuid => _effectiveUuid ?? widget.uuid;
bool _canStartVideoCall(ChosenPlanModel? chosenPlan) {
return chosenPlan?.chosenPlanState.allowsVideoCall ?? false;
}
void _onHide() {
chatRoomCubit.cancelTimer();
}
@@ -205,6 +210,7 @@ class _ChatScreenState extends State<ChatScreen> {
chosenPlan != null &&
chosenPlan.chosenPlanState !=
ChosenPlanStateEnum.stateCanceledByTheInitiator;
final showVideoCallButton = _canStartVideoCall(chosenPlan);
return Scaffold(
resizeToAvoidBottomInset: true,
@@ -300,12 +306,14 @@ class _ChatScreenState extends State<ChatScreen> {
),
),
actions: [
Padding(
padding: const EdgeInsetsDirectional.only(end: 8),
child: _ChatHeaderVideoCallButton(
onPressed: () => _openVideoCall(context, state, chatCounterpart),
if (showVideoCallButton)
Padding(
padding: const EdgeInsetsDirectional.only(end: 8),
child: _ChatHeaderVideoCallButton(
onPressed: () =>
_openVideoCall(context, state, chatCounterpart),
),
),
),
],
),
body: SafeArea(
@@ -324,8 +332,7 @@ class _ChatScreenState extends State<ChatScreen> {
InfoByOrderScreen.path,
extra: {
'planId': chosenPlan?.id,
'customerSlug':
state.chatRoom.users.receiver.slug,
'customerSlug': state.chatRoom.users.receiver.slug,
},
);
return;
@@ -1018,7 +1025,8 @@ class _ChatScreenState extends State<ChatScreen> {
required bool? amIConsultant,
}) {
if (message.type == ChatMessageType.videoCallStarted &&
!isCurrentUserAuthor) {
!isCurrentUserAuthor &&
_canStartVideoCall(state.chatRoom.chosenPlan)) {
return VideoCallChatMessageWidget(
text: message.data.trim(),
sendTime: message.updatedAt,

View File

@@ -102,9 +102,9 @@ class DiaryCubit extends Cubit<DiaryState> {
setDiary(diaryDay: diaryEntity, diaryId: diaryId);
return true;
}
if (diaryDay.typeOfDiary.hasChosenDiet == true && diaryDay.typeOfDiary.diaryState == null) {
setDiaryForDietOnly(diaryDay.toDiaryFutureDayEntity());
return true;
if (_isUnsavedDietPreview(diaryDay)) {
return await setDiaryForDietOnly(diaryDay.toDiaryFutureDayEntity());
}
emit(currentState);
return false;
@@ -157,84 +157,50 @@ class DiaryCubit extends Cubit<DiaryState> {
}
}
bool _isUnsavedDietPreview(DiaryDayModel diaryDay) {
final diaryState = diaryDay.typeOfDiary.diaryState;
final dayNotStarted = diaryState == null || diaryState == DiaryStateEnum.init;
return diaryDay.typeOfDiary.hasChosenDiet && dayNotStarted;
}
Future<bool> setDiaryForDietOnly(DiaryFutureDietDayEntity diaryDay) async {
if (!diaryDay.typeOfDiary.hasChosenDiet) {
final dietId = diaryDay.diet?.id;
final dayOfChosenDiet = diaryDay.dayOfChosenDiet;
if (!diaryDay.typeOfDiary.hasChosenDiet || dietId == null || dayOfChosenDiet == null) {
return false;
}
emit(const DiaryState.loading());
try {
if (diaryDay.diet?.id != null && diaryDay.dayOfChosenDiet != null) {
final diet = await dietRepository.getDiet((diaryDay.diet?.id)!);
final meals = diet.dailySchedule[diaryDay.dayOfChosenDiet];
final firstMealPortions = meals?[1]?.values.map((elem) {
return PortionModel(
id: 0,
productName: elem.name,
quantity: elem.quantity,
portion: elem.portion.getValue(),
fromDiet: true,
portionState: PortionState.filledDiet,
);
}).toList();
final diet = await dietRepository.getDiet(dietId);
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() ??
[];
}
final secondMealPortions = meals?[2]?.values.map((elem) {
return PortionModel(
id: 0,
productName: elem.name,
quantity: elem.quantity,
portion: elem.portion.getValue(),
fromDiet: true,
portionState: PortionState.filledDiet,
);
}).toList();
MealModel meal(int mealNumber) {
return MealModel(id: 0, time: '0', typeNumber: mealNumber, satiety: 0, mood: 0, portions: portionsOfMeal(mealNumber), photos: []);
}
final thirdMealPortions = meals?[3]?.values.map((elem) {
return PortionModel(
id: 0,
productName: elem.name,
quantity: elem.quantity,
portion: elem.portion.getValue(),
fromDiet: true,
portionState: PortionState.filledDiet,
);
}).toList();
final fourthMealPortions = meals?[4]?.values.map((elem) {
return PortionModel(
id: 0,
productName: elem.name,
quantity: elem.quantity,
portion: elem.portion.getValue(),
fromDiet: true,
portionState: PortionState.filledDiet,
);
}).toList();
final fifthMealPortions = meals?[5]?.values.map((elem) {
return PortionModel(
id: 0,
productName: elem.name,
quantity: elem.quantity,
portion: elem.portion.getValue(),
fromDiet: true,
portionState: PortionState.filledDiet,
);
}).toList();
final firstMeal = MealModel(id: 0, time: '0', typeNumber: 1, satiety: 0, mood: 0, portions: firstMealPortions ?? [], photos: []);
final secondMeal = MealModel(id: 0, time: '0', typeNumber: 2, satiety: 0, mood: 0, portions: secondMealPortions ?? [], photos: []);
final thirdMeal = MealModel(id: 0, time: '0', typeNumber: 3, satiety: 0, mood: 0, portions: thirdMealPortions ?? [], photos: []);
final fourthMeal = MealModel(id: 0, time: '0', typeNumber: 4, satiety: 0, mood: 0, portions: fourthMealPortions ?? [], photos: []);
final fifthMeal = MealModel(id: 0, time: '0', typeNumber: 5, satiety: 0, mood: 0, portions: fifthMealPortions ?? [], photos: []);
emit(
DiaryState.loadedTomorrowWithDiet(
diary: diaryDay.copyWith(meals: [firstMeal, secondMeal, thirdMeal, fourthMeal, fifthMeal]),
diary: diaryDay.copyWith(meals: [meal(1), meal(2), meal(3), meal(4), meal(5)]),
selectedDay: selectedDay,
selectedMeal: selectedMeal,
),
);
return true;
}
return false;
return true;
} catch (e, st) {
await reportFrom(e, st, this);
emit(DiaryState.error(errorMessage: e.toString()));

View File

@@ -88,6 +88,18 @@ enum ChosenPlanStateEnum {
}
}
bool get allowsVideoCall {
switch (this) {
case ChosenPlanStateEnum.stateCanceledByTheInitiator:
case ChosenPlanStateEnum.statePaymentFailed:
case ChosenPlanStateEnum.stateDone:
case ChosenPlanStateEnum.stateChargeWasCollected:
return false;
default:
return true;
}
}
static List<ChosenPlanStateEnum> getActiveStates() {
return [
ChosenPlanStateEnum.statePaid,

View File

@@ -170,14 +170,29 @@ class _VideoCallRecordingsViewState extends State<_VideoCallRecordingsView> {
}
if (state.recordings.isEmpty) {
return Center(
child: Padding(
padding: const EdgeInsets.all(24),
child: Text(
s.video_call_recordings_empty,
textAlign: TextAlign.center,
style: TextStyles.textMMedium.copyWith(color: appTheme.blueGray400),
),
return RefreshIndicator(
onRefresh: () => context.read<VideoCallRecordingsCubit>().load(refresh: true),
child: LayoutBuilder(
builder: (context, constraints) {
return ListView(
physics: const AlwaysScrollableScrollPhysics(),
children: [
SizedBox(
height: constraints.maxHeight,
child: Center(
child: Padding(
padding: const EdgeInsets.all(24),
child: Text(
s.video_call_recordings_empty,
textAlign: TextAlign.center,
style: TextStyles.textMMedium.copyWith(color: appTheme.blueGray400),
),
),
),
),
],
);
},
),
);
}
@@ -186,6 +201,7 @@ class _VideoCallRecordingsViewState extends State<_VideoCallRecordingsView> {
onRefresh: () => context.read<VideoCallRecordingsCubit>().load(refresh: true),
child: ListView.separated(
controller: _scrollController,
physics: const AlwaysScrollableScrollPhysics(),
padding: const EdgeInsets.fromLTRB(16, 0, 16, 24),
itemCount: state.recordings.length + (state.isLoadingMore ? 1 : 0),
separatorBuilder: (_, _) => const SizedBox(height: 16),

View File

@@ -8,7 +8,7 @@ class PublicDownloadsSaver {
const PublicDownloadsSaver();
/// Имя папки приложения в Загрузках / Files.
static const appFolderName = 'Itvio';
static const appFolderName = 'Eatvio';
Future<String> saveToDownloads({
required String sourcePath,

View File

@@ -11,7 +11,6 @@
import 'dart:async';
import 'package:flutter/foundation.dart';
import 'package:intl/intl.dart';
import 'package:intl/message_lookup_by_library.dart';
import 'package:intl/src/intl_helpers.dart';
@@ -21,8 +20,8 @@ import 'messages_ru.dart' as messages_ru;
typedef Future<dynamic> LibraryLoader();
Map<String, LibraryLoader> _deferredLibraries = {
'en': () => new SynchronousFuture(null),
'ru': () => new SynchronousFuture(null),
'en': () => new Future.value(null),
'ru': () => new Future.value(null),
};
MessageLookupByLibrary? _findExact(String localeName) {
@@ -37,20 +36,18 @@ MessageLookupByLibrary? _findExact(String localeName) {
}
/// User programs should call this before using [localeName] for messages.
Future<bool> initializeMessages(String localeName) {
Future<bool> initializeMessages(String localeName) async {
var availableLocale = Intl.verifiedLocale(
localeName,
(locale) => _deferredLibraries[locale] != null,
onFailure: (_) => null,
);
localeName, (locale) => _deferredLibraries[locale] != null,
onFailure: (_) => null);
if (availableLocale == null) {
return new SynchronousFuture(false);
return new Future.value(false);
}
var lib = _deferredLibraries[availableLocale];
lib == null ? new SynchronousFuture(false) : lib();
await (lib == null ? new Future.value(false) : lib());
initializeInternalMessageLookup(() => new CompositeMessageLookup());
messageLookup.addLocale(availableLocale, _findGeneratedMessagesFor);
return new SynchronousFuture(true);
return new Future.value(true);
}
bool _messagesExistFor(String locale) {
@@ -62,11 +59,8 @@ bool _messagesExistFor(String locale) {
}
MessageLookupByLibrary? _findGeneratedMessagesFor(String locale) {
var actualLocale = Intl.verifiedLocale(
locale,
_messagesExistFor,
onFailure: (_) => null,
);
var actualLocale =
Intl.verifiedLocale(locale, _messagesExistFor, onFailure: (_) => null);
if (actualLocale == null) return null;
return _findExact(actualLocale);
}

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@@ -1,6 +1,6 @@
name: eatvio_app
description: A new Flutter project.
version: 1.3.72+161
version: 1.3.73+162
publish_to: 'none'
environment:

View File

@@ -12,6 +12,12 @@ import 'package:eatvio_app/features/chat/presentation/bloc/chat_room_cubit/chat_
import 'package:eatvio_app/features/chat/presentation/bloc/chats_cubit/chats_cubit.dart';
import 'package:eatvio_app/features/chat/presentation/bloc/chats_cubit/chats_state.dart';
import 'package:eatvio_app/features/chat/presentation/pages/chat_screen.dart';
import 'package:eatvio_app/features/chat/presentation/widgets/video_call_chat_message_widget.dart';
import 'package:eatvio_app/features/feed/models/diets_pagination_model.dart';
import 'package:eatvio_app/features/feed/models/plan_pagination_model.dart';
import 'package:eatvio_app/features/plans/enums/chosen_plan_state_enum.dart';
import 'package:eatvio_app/features/plans/models/chosen_plan_model.dart';
import 'package:eatvio_app/generated/l10n.dart';
import 'package:material_ui/material_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:flutter_dotenv/flutter_dotenv.dart';
@@ -55,13 +61,57 @@ void main() {
final fakeBundle = _FakeAssetBundle({
'assets/icons/error_icon.svg': fakeSvg,
'assets/icons/video_call/vc_control_enter.svg': fakeSvg,
});
const plan = PlanModel(
id: 1,
slug: 'test-plan',
name: 'Test Plan',
image: 'https://example.com/image.jpg',
duration: 30,
state: 'active',
type: PlanType(fit: true, slim: false, behavior: false, wellness: false),
details: 'Test details',
packetsCount: 3,
author: Author(
authorSlug: 'author',
authorName: 'Author Name',
authorProfileIcon: 'https://example.com/icon.jpg',
authorIsMe: false,
),
totalLikes: 10,
totalViews: 100,
totalComments: 5,
isFavorite: false,
minPriceOfOptions: 1000,
maxPriceOfOptions: 2000,
wasLikedByMe: false,
);
ChosenPlanModel chosenPlan(ChosenPlanStateEnum state) {
return ChosenPlanModel(
id: 7,
optionType: 'options1',
startDate: DateTime(2025, 1, 1),
chosenPlanState: state,
chatId: '1',
consultantId: 2,
plan: plan,
);
}
Widget wrap(Widget child, ChatsCubit chatsCubit) {
return DefaultAssetBundle(
bundle: fakeBundle,
child: MaterialApp(
theme: ThemeHelper().themeData(),
locale: const Locale('ru'),
localizationsDelegates: const [
S.delegate,
...GlobalMaterialLocalizations.delegates,
],
supportedLocales: S.delegate.supportedLocales,
home: BlocProvider<ChatsCubit>.value(value: chatsCubit, child: child),
),
);
@@ -202,9 +252,133 @@ void main() {
expect(find.text('sending...'), findsOneWidget);
expect(find.text('tap to retry'), findsOneWidget);
expect(find.text('file.pdf'), findsOneWidget);
expect(find.byIcon(Icons.videocam_rounded), findsNothing);
VisibilityDetectorController.instance.notifyNow();
await tester.pump();
});
Future<void> pumpLoadedChat(
WidgetTester tester, {
ChosenPlanModel? plan,
List<ChatMessageModel> messages = const [],
}) async {
final chatRoomCubit = MockChatRoomCubit();
final chatsCubit = MockChatsCubit();
const chatRoom = ChatRoomModel(
id: '1',
chatRoomSettings: ChatRoomSettingsModel(name: 'room', state: 'active'),
users: Users(
sender: ChatUserModel(
id: 1,
name: 'Me',
slug: 'me',
profilePhotoUrl: null,
),
receiver: ChatUserModel(
id: 2,
name: 'User Two',
slug: 'user-two',
profilePhotoUrl: null,
),
),
chosenPlanId: 7,
chosenPlan: null,
);
final state = ChatRoomState.loaded(
chatRoom: chatRoom.copyWith(chosenPlan: plan),
chatMessages: messages,
hasCard: false,
isTyping: false,
isLoading: false,
);
when(chatRoomCubit.state).thenReturn(state);
when(
chatRoomCubit.stream,
).thenAnswer((_) => const Stream<ChatRoomState>.empty());
when(chatRoomCubit.close()).thenAnswer((_) async => Future<void>.value());
when(
chatRoomCubit.initChat(
any,
sendInitialMessage: anyNamed('sendInitialMessage'),
orderId: anyNamed('orderId'),
),
).thenAnswer((_) async => 'uuid');
when(chatRoomCubit.setTimer()).thenReturn(null);
when(chatRoomCubit.refreshChat()).thenAnswer((_) async {});
if (sl.isRegistered<ChatRoomCubit>()) {
sl.unregister<ChatRoomCubit>();
}
sl.registerFactory<ChatRoomCubit>(() => chatRoomCubit);
when(chatsCubit.state).thenReturn(ChatsState());
when(chatsCubit.stream).thenAnswer((_) => const Stream.empty());
when(chatsCubit.close()).thenAnswer((_) async => Future<void>.value());
await tester.pumpWidget(
wrap(
const ChatScreen(uuid: 'uuid', sendInitialMessage: false),
chatsCubit,
),
);
await tester.pump();
await tester.pump(const Duration(milliseconds: 200));
}
ChatMessageModel incomingCallMessage() {
return ChatMessageModel(
id: 9,
data: 'Видеозвонок',
mediaData: const [],
authorId: 2,
updatedAt: DateTime(2025, 1, 2, 11),
isRead: true,
isCurrentUserAuthor: false,
roomId: '1',
type: ChatMessageType.videoCallStarted,
messageState: MessageState.sent,
uuid: 'call',
);
}
testWidgets('shows the call button for an active consultation', (
tester,
) async {
await pumpLoadedChat(
tester,
plan: chosenPlan(ChosenPlanStateEnum.stateInProgress),
messages: [incomingCallMessage()],
);
expect(find.byIcon(Icons.videocam_rounded), findsOneWidget);
expect(find.byType(VideoCallChatMessageWidget), findsOneWidget);
});
testWidgets('hides the call button for a finished consultation', (
tester,
) async {
await pumpLoadedChat(
tester,
plan: chosenPlan(ChosenPlanStateEnum.stateDone),
messages: [incomingCallMessage()],
);
expect(find.byIcon(Icons.videocam_rounded), findsNothing);
expect(find.byType(VideoCallChatMessageWidget), findsNothing);
expect(find.text('Видеозвонок'), findsOneWidget);
});
testWidgets('hides the call button for a canceled consultation', (
tester,
) async {
await pumpLoadedChat(
tester,
plan: chosenPlan(ChosenPlanStateEnum.stateCanceledByTheInitiator),
);
expect(find.byIcon(Icons.videocam_rounded), findsNothing);
});
});
}

File diff suppressed because it is too large Load Diff

View File

@@ -5,22 +5,70 @@ void main() {
group('ChosenPlanStateEnum', () {
test('has all expected values', () {
expect(ChosenPlanStateEnum.values.length, 16);
expect(ChosenPlanStateEnum.values, contains(ChosenPlanStateEnum.stateInited));
expect(ChosenPlanStateEnum.values, contains(ChosenPlanStateEnum.stateStartDateHasBeenSet));
expect(ChosenPlanStateEnum.values, contains(ChosenPlanStateEnum.stateInCoordination));
expect(ChosenPlanStateEnum.values, contains(ChosenPlanStateEnum.stateStarted));
expect(ChosenPlanStateEnum.values, contains(ChosenPlanStateEnum.stateInProgress));
expect(ChosenPlanStateEnum.values, contains(ChosenPlanStateEnum.statePendingPayment));
expect(ChosenPlanStateEnum.values, contains(ChosenPlanStateEnum.stateConfirmedByConsultant));
expect(ChosenPlanStateEnum.values, contains(ChosenPlanStateEnum.statePaid));
expect(ChosenPlanStateEnum.values, contains(ChosenPlanStateEnum.stateCanceledByTheInitiator));
expect(ChosenPlanStateEnum.values, contains(ChosenPlanStateEnum.stateLastDayStarted));
expect(ChosenPlanStateEnum.values, contains(ChosenPlanStateEnum.stateLastDayFinished));
expect(ChosenPlanStateEnum.values, contains(ChosenPlanStateEnum.stateComplained));
expect(ChosenPlanStateEnum.values, contains(ChosenPlanStateEnum.stateDone));
expect(ChosenPlanStateEnum.values, contains(ChosenPlanStateEnum.personalDietSet));
expect(ChosenPlanStateEnum.values, contains(ChosenPlanStateEnum.stateChargeWasCollected));
expect(ChosenPlanStateEnum.values, contains(ChosenPlanStateEnum.statePaymentFailed));
expect(
ChosenPlanStateEnum.values,
contains(ChosenPlanStateEnum.stateInited),
);
expect(
ChosenPlanStateEnum.values,
contains(ChosenPlanStateEnum.stateStartDateHasBeenSet),
);
expect(
ChosenPlanStateEnum.values,
contains(ChosenPlanStateEnum.stateInCoordination),
);
expect(
ChosenPlanStateEnum.values,
contains(ChosenPlanStateEnum.stateStarted),
);
expect(
ChosenPlanStateEnum.values,
contains(ChosenPlanStateEnum.stateInProgress),
);
expect(
ChosenPlanStateEnum.values,
contains(ChosenPlanStateEnum.statePendingPayment),
);
expect(
ChosenPlanStateEnum.values,
contains(ChosenPlanStateEnum.stateConfirmedByConsultant),
);
expect(
ChosenPlanStateEnum.values,
contains(ChosenPlanStateEnum.statePaid),
);
expect(
ChosenPlanStateEnum.values,
contains(ChosenPlanStateEnum.stateCanceledByTheInitiator),
);
expect(
ChosenPlanStateEnum.values,
contains(ChosenPlanStateEnum.stateLastDayStarted),
);
expect(
ChosenPlanStateEnum.values,
contains(ChosenPlanStateEnum.stateLastDayFinished),
);
expect(
ChosenPlanStateEnum.values,
contains(ChosenPlanStateEnum.stateComplained),
);
expect(
ChosenPlanStateEnum.values,
contains(ChosenPlanStateEnum.stateDone),
);
expect(
ChosenPlanStateEnum.values,
contains(ChosenPlanStateEnum.personalDietSet),
);
expect(
ChosenPlanStateEnum.values,
contains(ChosenPlanStateEnum.stateChargeWasCollected),
);
expect(
ChosenPlanStateEnum.values,
contains(ChosenPlanStateEnum.statePaymentFailed),
);
});
test('getShowableChatBadgeStates returns correct states', () {
@@ -40,32 +88,77 @@ void main() {
});
test('isStateAfterPaidState returns false for states before paid', () {
expect(ChosenPlanStateEnum.stateCanceledByTheInitiator.isStateAfterPaidState(), isFalse);
expect(
ChosenPlanStateEnum.stateCanceledByTheInitiator.isStateAfterPaidState(),
isFalse,
);
expect(ChosenPlanStateEnum.stateInited.isStateAfterPaidState(), isFalse);
expect(ChosenPlanStateEnum.stateInCoordination.isStateAfterPaidState(), isFalse);
expect(ChosenPlanStateEnum.stateStartDateHasBeenSet.isStateAfterPaidState(), isFalse);
expect(ChosenPlanStateEnum.statePendingPayment.isStateAfterPaidState(), isFalse);
expect(ChosenPlanStateEnum.statePaymentFailed.isStateAfterPaidState(), isFalse);
expect(
ChosenPlanStateEnum.stateInCoordination.isStateAfterPaidState(),
isFalse,
);
expect(
ChosenPlanStateEnum.stateStartDateHasBeenSet.isStateAfterPaidState(),
isFalse,
);
expect(
ChosenPlanStateEnum.statePendingPayment.isStateAfterPaidState(),
isFalse,
);
expect(
ChosenPlanStateEnum.statePaymentFailed.isStateAfterPaidState(),
isFalse,
);
});
test('isStateAfterPaidState returns true for states after paid', () {
expect(ChosenPlanStateEnum.statePaid.isStateAfterPaidState(), isTrue);
expect(ChosenPlanStateEnum.stateStarted.isStateAfterPaidState(), isTrue);
expect(ChosenPlanStateEnum.stateInProgress.isStateAfterPaidState(), isTrue);
expect(ChosenPlanStateEnum.stateLastDayStarted.isStateAfterPaidState(), isTrue);
expect(ChosenPlanStateEnum.stateLastDayFinished.isStateAfterPaidState(), isTrue);
expect(ChosenPlanStateEnum.stateComplained.isStateAfterPaidState(), isTrue);
expect(
ChosenPlanStateEnum.stateInProgress.isStateAfterPaidState(),
isTrue,
);
expect(
ChosenPlanStateEnum.stateLastDayStarted.isStateAfterPaidState(),
isTrue,
);
expect(
ChosenPlanStateEnum.stateLastDayFinished.isStateAfterPaidState(),
isTrue,
);
expect(
ChosenPlanStateEnum.stateComplained.isStateAfterPaidState(),
isTrue,
);
expect(ChosenPlanStateEnum.stateDone.isStateAfterPaidState(), isTrue);
expect(ChosenPlanStateEnum.personalDietSet.isStateAfterPaidState(), isTrue);
expect(ChosenPlanStateEnum.stateChargeWasCollected.isStateAfterPaidState(), isTrue);
expect(ChosenPlanStateEnum.stateConfirmedByConsultant.isStateAfterPaidState(), isTrue);
expect(
ChosenPlanStateEnum.personalDietSet.isStateAfterPaidState(),
isTrue,
);
expect(
ChosenPlanStateEnum.stateChargeWasCollected.isStateAfterPaidState(),
isTrue,
);
expect(
ChosenPlanStateEnum.stateConfirmedByConsultant.isStateAfterPaidState(),
isTrue,
);
});
test('canShowCancelAction returns true for cancellable states', () {
expect(ChosenPlanStateEnum.stateInited.canShowCancelAction, isTrue);
expect(ChosenPlanStateEnum.stateInCoordination.canShowCancelAction, isTrue);
expect(ChosenPlanStateEnum.stateStartDateHasBeenSet.canShowCancelAction, isTrue);
expect(ChosenPlanStateEnum.statePendingPayment.canShowCancelAction, isTrue);
expect(
ChosenPlanStateEnum.stateInCoordination.canShowCancelAction,
isTrue,
);
expect(
ChosenPlanStateEnum.stateStartDateHasBeenSet.canShowCancelAction,
isTrue,
);
expect(
ChosenPlanStateEnum.statePendingPayment.canShowCancelAction,
isTrue,
);
expect(ChosenPlanStateEnum.statePaid.canShowCancelAction, isTrue);
expect(ChosenPlanStateEnum.stateStarted.canShowCancelAction, isTrue);
expect(ChosenPlanStateEnum.stateInProgress.canShowCancelAction, isTrue);
@@ -73,33 +166,129 @@ void main() {
test('canShowCancelAction returns false for non-cancellable states', () {
expect(ChosenPlanStateEnum.personalDietSet.canShowCancelAction, isFalse);
expect(ChosenPlanStateEnum.stateLastDayStarted.canShowCancelAction, isFalse);
expect(ChosenPlanStateEnum.stateLastDayFinished.canShowCancelAction, isFalse);
expect(
ChosenPlanStateEnum.stateLastDayStarted.canShowCancelAction,
isFalse,
);
expect(
ChosenPlanStateEnum.stateLastDayFinished.canShowCancelAction,
isFalse,
);
expect(ChosenPlanStateEnum.stateComplained.canShowCancelAction, isFalse);
expect(ChosenPlanStateEnum.stateDone.canShowCancelAction, isFalse);
expect(ChosenPlanStateEnum.stateChargeWasCollected.canShowCancelAction, isFalse);
expect(ChosenPlanStateEnum.stateCanceledByTheInitiator.canShowCancelAction, isFalse);
expect(ChosenPlanStateEnum.statePaymentFailed.canShowCancelAction, isFalse);
expect(ChosenPlanStateEnum.stateConfirmedByConsultant.canShowCancelAction, isFalse);
expect(
ChosenPlanStateEnum.stateChargeWasCollected.canShowCancelAction,
isFalse,
);
expect(
ChosenPlanStateEnum.stateCanceledByTheInitiator.canShowCancelAction,
isFalse,
);
expect(
ChosenPlanStateEnum.statePaymentFailed.canShowCancelAction,
isFalse,
);
expect(
ChosenPlanStateEnum.stateConfirmedByConsultant.canShowCancelAction,
isFalse,
);
});
test('isCancelAfterPaidState returns true only for post-paid cancellable states', () {
expect(ChosenPlanStateEnum.statePaid.isCancelAfterPaidState, isTrue);
expect(ChosenPlanStateEnum.stateStarted.isCancelAfterPaidState, isTrue);
expect(ChosenPlanStateEnum.stateInProgress.isCancelAfterPaidState, isTrue);
expect(ChosenPlanStateEnum.stateInited.isCancelAfterPaidState, isFalse);
expect(ChosenPlanStateEnum.stateInCoordination.isCancelAfterPaidState, isFalse);
expect(ChosenPlanStateEnum.stateStartDateHasBeenSet.isCancelAfterPaidState, isFalse);
expect(ChosenPlanStateEnum.statePendingPayment.isCancelAfterPaidState, isFalse);
expect(ChosenPlanStateEnum.statePaymentFailed.isCancelAfterPaidState, isFalse);
expect(ChosenPlanStateEnum.stateConfirmedByConsultant.isCancelAfterPaidState, isFalse);
expect(ChosenPlanStateEnum.personalDietSet.isCancelAfterPaidState, isFalse);
expect(ChosenPlanStateEnum.stateLastDayStarted.isCancelAfterPaidState, isFalse);
expect(ChosenPlanStateEnum.stateLastDayFinished.isCancelAfterPaidState, isFalse);
expect(ChosenPlanStateEnum.stateComplained.isCancelAfterPaidState, isFalse);
expect(ChosenPlanStateEnum.stateDone.isCancelAfterPaidState, isFalse);
expect(ChosenPlanStateEnum.stateChargeWasCollected.isCancelAfterPaidState, isFalse);
expect(ChosenPlanStateEnum.stateCanceledByTheInitiator.isCancelAfterPaidState, isFalse);
test(
'isCancelAfterPaidState returns true only for post-paid cancellable states',
() {
expect(ChosenPlanStateEnum.statePaid.isCancelAfterPaidState, isTrue);
expect(ChosenPlanStateEnum.stateStarted.isCancelAfterPaidState, isTrue);
expect(
ChosenPlanStateEnum.stateInProgress.isCancelAfterPaidState,
isTrue,
);
expect(ChosenPlanStateEnum.stateInited.isCancelAfterPaidState, isFalse);
expect(
ChosenPlanStateEnum.stateInCoordination.isCancelAfterPaidState,
isFalse,
);
expect(
ChosenPlanStateEnum.stateStartDateHasBeenSet.isCancelAfterPaidState,
isFalse,
);
expect(
ChosenPlanStateEnum.statePendingPayment.isCancelAfterPaidState,
isFalse,
);
expect(
ChosenPlanStateEnum.statePaymentFailed.isCancelAfterPaidState,
isFalse,
);
expect(
ChosenPlanStateEnum.stateConfirmedByConsultant.isCancelAfterPaidState,
isFalse,
);
expect(
ChosenPlanStateEnum.personalDietSet.isCancelAfterPaidState,
isFalse,
);
expect(
ChosenPlanStateEnum.stateLastDayStarted.isCancelAfterPaidState,
isFalse,
);
expect(
ChosenPlanStateEnum.stateLastDayFinished.isCancelAfterPaidState,
isFalse,
);
expect(
ChosenPlanStateEnum.stateComplained.isCancelAfterPaidState,
isFalse,
);
expect(ChosenPlanStateEnum.stateDone.isCancelAfterPaidState, isFalse);
expect(
ChosenPlanStateEnum.stateChargeWasCollected.isCancelAfterPaidState,
isFalse,
);
expect(
ChosenPlanStateEnum
.stateCanceledByTheInitiator
.isCancelAfterPaidState,
isFalse,
);
},
);
test(
'allowsVideoCall is false for finished and canceled consultations',
() {
expect(
ChosenPlanStateEnum.stateCanceledByTheInitiator.allowsVideoCall,
isFalse,
);
expect(ChosenPlanStateEnum.statePaymentFailed.allowsVideoCall, isFalse);
expect(ChosenPlanStateEnum.stateDone.allowsVideoCall, isFalse);
expect(
ChosenPlanStateEnum.stateChargeWasCollected.allowsVideoCall,
isFalse,
);
},
);
test('allowsVideoCall is true while the consultation is not finished', () {
expect(ChosenPlanStateEnum.stateInited.allowsVideoCall, isTrue);
expect(ChosenPlanStateEnum.stateInCoordination.allowsVideoCall, isTrue);
expect(
ChosenPlanStateEnum.stateStartDateHasBeenSet.allowsVideoCall,
isTrue,
);
expect(ChosenPlanStateEnum.statePendingPayment.allowsVideoCall, isTrue);
expect(
ChosenPlanStateEnum.stateConfirmedByConsultant.allowsVideoCall,
isTrue,
);
expect(ChosenPlanStateEnum.statePaid.allowsVideoCall, isTrue);
expect(ChosenPlanStateEnum.personalDietSet.allowsVideoCall, isTrue);
expect(ChosenPlanStateEnum.stateStarted.allowsVideoCall, isTrue);
expect(ChosenPlanStateEnum.stateInProgress.allowsVideoCall, isTrue);
expect(ChosenPlanStateEnum.stateLastDayStarted.allowsVideoCall, isTrue);
expect(ChosenPlanStateEnum.stateLastDayFinished.allowsVideoCall, isTrue);
expect(ChosenPlanStateEnum.stateComplained.allowsVideoCall, isTrue);
});
test('getActiveStates returns correct states', () {
@@ -114,8 +303,10 @@ void main() {
expect(activeStates, contains(ChosenPlanStateEnum.stateComplained));
expect(activeStates, contains(ChosenPlanStateEnum.stateDone));
expect(activeStates, contains(ChosenPlanStateEnum.personalDietSet));
expect(activeStates, isNot(contains(ChosenPlanStateEnum.statePaymentFailed)));
expect(
activeStates,
isNot(contains(ChosenPlanStateEnum.statePaymentFailed)),
);
});
});
}

View File

@@ -0,0 +1,114 @@
import 'package:eatvio_app/core/locator_service.dart';
import 'package:eatvio_app/core/models/pagination_model.dart';
import 'package:eatvio_app/core/theme/theme_helper.dart';
import 'package:eatvio_app/features/video_calls/recordings/models/recording_status.dart';
import 'package:eatvio_app/features/video_calls/recordings/models/video_call_recording_model.dart';
import 'package:eatvio_app/features/video_calls/recordings/presentation/cubit/video_call_recordings_cubit.dart';
import 'package:eatvio_app/features/video_calls/recordings/presentation/pages/video_call_recordings_screen.dart';
import 'package:eatvio_app/features/video_calls/recordings/repositories/video_call_recordings_repository.dart';
import 'package:eatvio_app/generated/l10n.dart';
import 'package:material_ui/material_ui.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:mocktail/mocktail.dart';
import 'package:network_image_mock/network_image_mock.dart';
class _MockRecordingsRepository extends Mock implements VideoCallRecordingsRepository {}
void main() {
late _MockRecordingsRepository repository;
VideoCallRecordingsPagination page(List<VideoCallRecordingModel> data) {
return VideoCallRecordingsPagination(
data: data,
links: const Links(
first: 'https://example.com?page=1',
last: 'https://example.com?page=1',
prev: null,
next: null,
),
meta: Meta(
currentPage: 1,
from: data.isEmpty ? null : 1,
lastPage: 1,
links: const [],
perPage: 20,
to: data.isEmpty ? null : data.length,
total: data.length,
),
);
}
VideoCallRecordingModel recording(int id) {
return VideoCallRecordingModel(
id: id,
status: RecordingStatus.ready,
durationSeconds: 60,
createdAt: DateTime.utc(2026, 9, 21, 10),
previewUrl: 'https://example.com/preview.jpg',
fileUrl: 'https://example.com/file.mp4',
counterpart: const VideoCallRecordingCounterpartModel(name: 'Сидни', slug: 'sydney'),
);
}
setUp(() async {
await sl.reset();
repository = _MockRecordingsRepository();
sl.registerFactory<VideoCallRecordingsCubit>(
() => VideoCallRecordingsCubit(repository: repository),
);
});
tearDown(() async {
await sl.reset();
});
Widget wrap(Widget child) {
return MaterialApp(
theme: ThemeHelper().themeData(),
localizationsDelegates: const [S.delegate, ...GlobalMaterialLocalizations.delegates],
supportedLocales: const [Locale('ru')],
home: child,
);
}
testWidgets('short list can be pulled to refresh', (tester) async {
await mockNetworkImagesFor(() async {
when(() => repository.getRecordings(page: 1, period: null)).thenAnswer(
(_) async => page([recording(1)]),
);
await tester.pumpWidget(wrap(const VideoCallRecordingsScreen()));
await tester.pumpAndSettle();
final list = tester.widget<ListView>(find.byType(ListView));
expect(list.physics, isA<AlwaysScrollableScrollPhysics>());
await tester.fling(find.byType(ListView), const Offset(0, 400), 1200);
await tester.pump();
await tester.pump(const Duration(seconds: 1));
await tester.pumpAndSettle();
verify(() => repository.getRecordings(page: 1, period: null)).called(2);
});
});
testWidgets('empty list can be pulled to refresh', (tester) async {
when(() => repository.getRecordings(page: 1, period: null)).thenAnswer(
(_) async => page(const []),
);
await tester.pumpWidget(wrap(const VideoCallRecordingsScreen()));
await tester.pumpAndSettle();
expect(find.text('Пока нет видеоконсультаций'), findsOneWidget);
final list = tester.widget<ListView>(find.byType(ListView));
expect(list.physics, isA<AlwaysScrollableScrollPhysics>());
await tester.fling(find.text('Пока нет видеоконсультаций'), const Offset(0, 400), 1200);
await tester.pump();
await tester.pump(const Duration(seconds: 1));
await tester.pumpAndSettle();
verify(() => repository.getRecordings(page: 1, period: null)).called(2);
});
}