TF-189 Update use-case: Do no split mailbox list into 2 default and folder
This commit is contained in:
committed by
Dat H. Pham
parent
17499e70db
commit
25337069b2
@@ -3,18 +3,16 @@ import 'package:jmap_dart_client/jmap/core/state.dart';
|
|||||||
import 'package:model/mailbox/presentation_mailbox.dart';
|
import 'package:model/mailbox/presentation_mailbox.dart';
|
||||||
|
|
||||||
class GetAllMailboxSuccess extends UIState {
|
class GetAllMailboxSuccess extends UIState {
|
||||||
final List<PresentationMailbox> defaultMailboxList;
|
final List<PresentationMailbox> mailboxList;
|
||||||
final List<PresentationMailbox> folderMailboxList;
|
|
||||||
final State? currentMailboxState;
|
final State? currentMailboxState;
|
||||||
|
|
||||||
GetAllMailboxSuccess({
|
GetAllMailboxSuccess({
|
||||||
required this.defaultMailboxList,
|
required this.mailboxList,
|
||||||
required this.folderMailboxList,
|
|
||||||
required this.currentMailboxState
|
required this.currentMailboxState
|
||||||
});
|
});
|
||||||
|
|
||||||
@override
|
@override
|
||||||
List<Object?> get props => [defaultMailboxList, folderMailboxList, currentMailboxState];
|
List<Object?> get props => [mailboxList, currentMailboxState];
|
||||||
}
|
}
|
||||||
|
|
||||||
class GetAllMailboxFailure extends FeatureFailure {
|
class GetAllMailboxFailure extends FeatureFailure {
|
||||||
|
|||||||
@@ -4,7 +4,6 @@ import 'package:jmap_dart_client/jmap/account_id.dart';
|
|||||||
import 'package:jmap_dart_client/jmap/core/properties/properties.dart';
|
import 'package:jmap_dart_client/jmap/core/properties/properties.dart';
|
||||||
import 'package:model/model.dart';
|
import 'package:model/model.dart';
|
||||||
import 'package:tmail_ui_user/features/mailbox/domain/model/mailbox_response.dart';
|
import 'package:tmail_ui_user/features/mailbox/domain/model/mailbox_response.dart';
|
||||||
import 'package:tmail_ui_user/features/mailbox/domain/extensions/list_mailbox_extension.dart';
|
|
||||||
import 'package:tmail_ui_user/features/mailbox/domain/repository/mailbox_repository.dart';
|
import 'package:tmail_ui_user/features/mailbox/domain/repository/mailbox_repository.dart';
|
||||||
import 'package:tmail_ui_user/features/mailbox/domain/state/get_all_mailboxes_state.dart';
|
import 'package:tmail_ui_user/features/mailbox/domain/state/get_all_mailboxes_state.dart';
|
||||||
|
|
||||||
@@ -26,12 +25,12 @@ class GetAllMailboxInteractor {
|
|||||||
}
|
}
|
||||||
|
|
||||||
Either<Failure, Success> _toGetMailboxState(MailboxResponse mailboxResponse) {
|
Either<Failure, Success> _toGetMailboxState(MailboxResponse mailboxResponse) {
|
||||||
final tupleList = mailboxResponse.mailboxes
|
final mailboxList = mailboxResponse.mailboxes
|
||||||
?.splitMailboxList((mailbox) => mailbox.hasRole()) ?? Tuple2([], []);
|
?.map((mailbox) => mailbox.toPresentationMailbox()).toList()
|
||||||
|
?? List<PresentationMailbox>.empty();
|
||||||
|
|
||||||
return Right<Failure, Success>(GetAllMailboxSuccess(
|
return Right<Failure, Success>(GetAllMailboxSuccess(
|
||||||
defaultMailboxList: tupleList.value1,
|
mailboxList: mailboxList,
|
||||||
folderMailboxList: tupleList.value2,
|
|
||||||
currentMailboxState: mailboxResponse.state)
|
currentMailboxState: mailboxResponse.state)
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,12 +1,11 @@
|
|||||||
import 'package:core/core.dart';
|
import 'package:core/core.dart';
|
||||||
import 'package:dartz/dartz.dart';
|
import 'package:dartz/dartz.dart';
|
||||||
import 'package:jmap_dart_client/jmap/account_id.dart';
|
import 'package:jmap_dart_client/jmap/account_id.dart';
|
||||||
|
import 'package:jmap_dart_client/jmap/core/state.dart' as jmapState;
|
||||||
|
import 'package:model/model.dart';
|
||||||
import 'package:tmail_ui_user/features/mailbox/domain/model/mailbox_response.dart';
|
import 'package:tmail_ui_user/features/mailbox/domain/model/mailbox_response.dart';
|
||||||
import 'package:tmail_ui_user/features/mailbox/domain/repository/mailbox_repository.dart';
|
import 'package:tmail_ui_user/features/mailbox/domain/repository/mailbox_repository.dart';
|
||||||
import 'package:tmail_ui_user/features/mailbox/domain/state/get_all_mailboxes_state.dart';
|
import 'package:tmail_ui_user/features/mailbox/domain/state/get_all_mailboxes_state.dart';
|
||||||
import 'package:tmail_ui_user/features/mailbox/domain/extensions/list_mailbox_extension.dart';
|
|
||||||
import 'package:model/model.dart';
|
|
||||||
import 'package:jmap_dart_client/jmap/core/state.dart' as jmapState;
|
|
||||||
|
|
||||||
class RefreshAllMailboxInteractor {
|
class RefreshAllMailboxInteractor {
|
||||||
final MailboxRepository _mailboxRepository;
|
final MailboxRepository _mailboxRepository;
|
||||||
@@ -26,12 +25,13 @@ class RefreshAllMailboxInteractor {
|
|||||||
}
|
}
|
||||||
|
|
||||||
Either<Failure, Success> _toGetMailboxState(MailboxResponse mailboxResponse) {
|
Either<Failure, Success> _toGetMailboxState(MailboxResponse mailboxResponse) {
|
||||||
final tupleList = mailboxResponse.mailboxes
|
final mailboxList = mailboxResponse.mailboxes
|
||||||
?.splitMailboxList((mailbox) => mailbox.hasRole()) ?? Tuple2([], []);
|
?.map((mailbox) => mailbox.toPresentationMailbox()).toList()
|
||||||
|
?? List<PresentationMailbox>.empty();
|
||||||
|
|
||||||
return Right<Failure, Success>(GetAllMailboxSuccess(
|
return Right<Failure, Success>(GetAllMailboxSuccess(
|
||||||
defaultMailboxList: tupleList.value1,
|
mailboxList: mailboxList,
|
||||||
folderMailboxList: tupleList.value2,
|
currentMailboxState: mailboxResponse.state)
|
||||||
currentMailboxState: mailboxResponse.state));
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1,79 +0,0 @@
|
|||||||
import 'dart:async';
|
|
||||||
|
|
||||||
import 'package:core/core.dart';
|
|
||||||
import 'package:dartz/dartz.dart';
|
|
||||||
import 'package:flutter_test/flutter_test.dart';
|
|
||||||
import 'package:jmap_dart_client/jmap/core/state.dart' as jmap;
|
|
||||||
import 'package:mockito/annotations.dart';
|
|
||||||
import 'package:mockito/mockito.dart';
|
|
||||||
import 'package:model/extensions/mailbox_extension.dart';
|
|
||||||
import 'package:tmail_ui_user/features/mailbox/domain/model/mailbox_response.dart';
|
|
||||||
import 'package:tmail_ui_user/features/mailbox/domain/repository/mailbox_repository.dart';
|
|
||||||
import 'package:tmail_ui_user/features/mailbox/domain/state/get_all_mailboxes_state.dart';
|
|
||||||
import 'package:tmail_ui_user/features/mailbox/domain/usecases/get_all_mailbox_interactor.dart';
|
|
||||||
|
|
||||||
import '../../../../fixtures/account_fixtures.dart';
|
|
||||||
import '../../../../fixtures/mailbox_fixtures.dart';
|
|
||||||
import 'get_all_mailbox_interactor_test.mocks.dart';
|
|
||||||
|
|
||||||
@GenerateMocks([MailboxRepository])
|
|
||||||
void main() {
|
|
||||||
late MailboxRepository mailboxRepository;
|
|
||||||
late GetAllMailboxInteractor getAllMailboxInteractor;
|
|
||||||
|
|
||||||
group('[GetAllMailboxInteractor]', () {
|
|
||||||
|
|
||||||
setUp(() {
|
|
||||||
mailboxRepository = MockMailboxRepository();
|
|
||||||
getAllMailboxInteractor = GetAllMailboxInteractor(mailboxRepository);
|
|
||||||
});
|
|
||||||
|
|
||||||
test('getAllMailboxInteractor should execute to get all mailbox from cache and network', () async {
|
|
||||||
when(mailboxRepository.getAllMailbox(AccountFixtures.aliceAccountId))
|
|
||||||
.thenAnswer((_) => Stream.fromIterable({
|
|
||||||
MailboxResponse(
|
|
||||||
mailboxes: {
|
|
||||||
MailboxFixtures.inboxMailbox,
|
|
||||||
MailboxFixtures.sentMailbox
|
|
||||||
}.toList(),
|
|
||||||
state: jmap.State('s1')),
|
|
||||||
MailboxResponse(
|
|
||||||
mailboxes: {
|
|
||||||
MailboxFixtures.inboxMailbox,
|
|
||||||
MailboxFixtures.sentMailbox,
|
|
||||||
MailboxFixtures.folder1,
|
|
||||||
MailboxFixtures.folder1_1
|
|
||||||
}.toList(),
|
|
||||||
state: jmap.State('s1'))
|
|
||||||
}));
|
|
||||||
|
|
||||||
final streamStates = getAllMailboxInteractor.execute(AccountFixtures.aliceAccountId);
|
|
||||||
|
|
||||||
final states = await streamStates.toList();
|
|
||||||
|
|
||||||
expect(states.length, equals(3));
|
|
||||||
expect(states, containsAllInOrder({
|
|
||||||
Right(LoadingState()),
|
|
||||||
Right(GetAllMailboxSuccess(
|
|
||||||
defaultMailboxList: {
|
|
||||||
MailboxFixtures.inboxMailbox.toPresentationMailbox(),
|
|
||||||
MailboxFixtures.sentMailbox.toPresentationMailbox()
|
|
||||||
}.toList(),
|
|
||||||
folderMailboxList: List.empty(),
|
|
||||||
currentMailboxState: jmap.State('s1'))
|
|
||||||
),
|
|
||||||
Right(GetAllMailboxSuccess(
|
|
||||||
defaultMailboxList: {
|
|
||||||
MailboxFixtures.inboxMailbox.toPresentationMailbox(),
|
|
||||||
MailboxFixtures.sentMailbox.toPresentationMailbox()
|
|
||||||
}.toList(),
|
|
||||||
folderMailboxList: {
|
|
||||||
MailboxFixtures.folder1.toPresentationMailbox(),
|
|
||||||
MailboxFixtures.folder1_1.toPresentationMailbox()
|
|
||||||
}.toList(),
|
|
||||||
currentMailboxState: jmap.State('s1'))
|
|
||||||
)
|
|
||||||
}));
|
|
||||||
});
|
|
||||||
});
|
|
||||||
}
|
|
||||||
@@ -1,66 +0,0 @@
|
|||||||
import 'dart:async';
|
|
||||||
|
|
||||||
import 'package:core/core.dart';
|
|
||||||
import 'package:dartz/dartz.dart';
|
|
||||||
import 'package:flutter_test/flutter_test.dart';
|
|
||||||
import 'package:jmap_dart_client/jmap/core/state.dart' as jmap;
|
|
||||||
import 'package:mockito/annotations.dart';
|
|
||||||
import 'package:mockito/mockito.dart';
|
|
||||||
import 'package:model/extensions/mailbox_extension.dart';
|
|
||||||
import 'package:tmail_ui_user/features/mailbox/domain/model/mailbox_response.dart';
|
|
||||||
import 'package:tmail_ui_user/features/mailbox/domain/repository/mailbox_repository.dart';
|
|
||||||
import 'package:tmail_ui_user/features/mailbox/domain/state/get_all_mailboxes_state.dart';
|
|
||||||
import 'package:tmail_ui_user/features/mailbox/domain/usecases/refresh_all_mailbox_interactor.dart';
|
|
||||||
|
|
||||||
import '../../../../fixtures/account_fixtures.dart';
|
|
||||||
import '../../../../fixtures/mailbox_fixtures.dart';
|
|
||||||
import '../../../../fixtures/state_fixtures.dart';
|
|
||||||
import 'refresh_all_mailbox_interactor_test.mocks.dart';
|
|
||||||
|
|
||||||
@GenerateMocks([MailboxRepository])
|
|
||||||
void main() {
|
|
||||||
late MailboxRepository mailboxRepository;
|
|
||||||
late RefreshAllMailboxInteractor refreshAllMailboxInteractor;
|
|
||||||
|
|
||||||
group('[RefreshAllMailboxInteractor]', () {
|
|
||||||
|
|
||||||
setUp(() {
|
|
||||||
mailboxRepository = MockMailboxRepository();
|
|
||||||
refreshAllMailboxInteractor = RefreshAllMailboxInteractor(mailboxRepository);
|
|
||||||
});
|
|
||||||
|
|
||||||
test('refreshAllMailboxInteractor should execute to get all mailbox from cache and combine with network changed', () async {
|
|
||||||
when(mailboxRepository.refresh(AccountFixtures.aliceAccountId, StateFixtures.currentMailboxState))
|
|
||||||
.thenAnswer((_) => Stream.fromIterable({
|
|
||||||
MailboxResponse(
|
|
||||||
mailboxes: {
|
|
||||||
MailboxFixtures.inboxMailbox,
|
|
||||||
MailboxFixtures.sentMailbox,
|
|
||||||
MailboxFixtures.folder1,
|
|
||||||
MailboxFixtures.folder1_1
|
|
||||||
}.toList(),
|
|
||||||
state: jmap.State('s1'))
|
|
||||||
}));
|
|
||||||
|
|
||||||
final streamStates = refreshAllMailboxInteractor.execute(AccountFixtures.aliceAccountId, StateFixtures.currentMailboxState);
|
|
||||||
|
|
||||||
final states = await streamStates.toList();
|
|
||||||
|
|
||||||
expect(states.length, equals(2));
|
|
||||||
expect(states, containsAllInOrder({
|
|
||||||
Right(RefreshingState()),
|
|
||||||
Right(GetAllMailboxSuccess(
|
|
||||||
defaultMailboxList: {
|
|
||||||
MailboxFixtures.inboxMailbox.toPresentationMailbox(),
|
|
||||||
MailboxFixtures.sentMailbox.toPresentationMailbox()
|
|
||||||
}.toList(),
|
|
||||||
folderMailboxList: {
|
|
||||||
MailboxFixtures.folder1.toPresentationMailbox(),
|
|
||||||
MailboxFixtures.folder1_1.toPresentationMailbox()
|
|
||||||
}.toList(),
|
|
||||||
currentMailboxState: jmap.State('s1'))
|
|
||||||
)
|
|
||||||
}));
|
|
||||||
});
|
|
||||||
});
|
|
||||||
}
|
|
||||||
Reference in New Issue
Block a user