diff --git a/lib/features/mailbox/data/datasource/mailbox_datasource.dart b/lib/features/mailbox/data/datasource/mailbox_datasource.dart index 805c0eff7..c068be34f 100644 --- a/lib/features/mailbox/data/datasource/mailbox_datasource.dart +++ b/lib/features/mailbox/data/datasource/mailbox_datasource.dart @@ -1,7 +1,13 @@ +import 'dart:async'; + +import 'package:core/presentation/state/failure.dart'; +import 'package:core/presentation/state/success.dart'; +import 'package:dartz/dartz.dart' as dartz; 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/session/session.dart'; import 'package:jmap_dart_client/jmap/core/state.dart'; +import 'package:jmap_dart_client/jmap/mail/email/email.dart'; import 'package:jmap_dart_client/jmap/mail/mailbox/mailbox.dart'; import 'package:tmail_ui_user/features/mailbox/data/model/mailbox_change_response.dart'; import 'package:tmail_ui_user/features/mailbox/domain/model/create_new_mailbox_request.dart'; @@ -25,4 +31,10 @@ abstract class MailboxDataSource { Future renameMailbox(AccountId accountId, RenameMailboxRequest request); Future moveMailbox(AccountId accountId, MoveMailboxRequest request); + + Future> markAsMailboxRead( + AccountId accountId, + MailboxId mailboxId, + int totalEmailUnread, + StreamController> onProgressController); } \ No newline at end of file diff --git a/lib/features/mailbox/data/datasource_impl/mailbox_cache_datasource_impl.dart b/lib/features/mailbox/data/datasource_impl/mailbox_cache_datasource_impl.dart index 05086467a..4c0c8ab18 100644 --- a/lib/features/mailbox/data/datasource_impl/mailbox_cache_datasource_impl.dart +++ b/lib/features/mailbox/data/datasource_impl/mailbox_cache_datasource_impl.dart @@ -1,7 +1,13 @@ +import 'dart:async'; + +import 'package:core/presentation/state/failure.dart'; +import 'package:core/presentation/state/success.dart'; +import 'package:dartz/dartz.dart' as dartz; 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/session/session.dart'; import 'package:jmap_dart_client/jmap/core/state.dart'; +import 'package:jmap_dart_client/jmap/mail/email/email.dart'; import 'package:jmap_dart_client/jmap/mail/mailbox/mailbox.dart'; import 'package:tmail_ui_user/features/mailbox/data/datasource/mailbox_datasource.dart'; import 'package:tmail_ui_user/features/mailbox/data/local/mailbox_cache_manager.dart'; @@ -65,4 +71,13 @@ class MailboxCacheDataSourceImpl extends MailboxDataSource { Future moveMailbox(AccountId accountId, MoveMailboxRequest request) { throw UnimplementedError(); } + + @override + Future> markAsMailboxRead( + AccountId accountId, + MailboxId mailboxId, + int totalEmailUnread, + StreamController> onProgressController) { + throw UnimplementedError(); + } } \ No newline at end of file diff --git a/lib/features/mailbox/data/datasource_impl/mailbox_datasource_impl.dart b/lib/features/mailbox/data/datasource_impl/mailbox_datasource_impl.dart index 14748acd2..4dbc7cdfc 100644 --- a/lib/features/mailbox/data/datasource_impl/mailbox_datasource_impl.dart +++ b/lib/features/mailbox/data/datasource_impl/mailbox_datasource_impl.dart @@ -1,11 +1,18 @@ +import 'dart:async'; + +import 'package:core/presentation/state/failure.dart'; +import 'package:core/presentation/state/success.dart'; +import 'package:dartz/dartz.dart' as dartz; 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/session/session.dart'; import 'package:jmap_dart_client/jmap/core/state.dart'; +import 'package:jmap_dart_client/jmap/mail/email/email.dart'; import 'package:jmap_dart_client/jmap/mail/mailbox/mailbox.dart'; import 'package:tmail_ui_user/features/mailbox/data/datasource/mailbox_datasource.dart'; import 'package:tmail_ui_user/features/mailbox/data/model/mailbox_change_response.dart'; import 'package:tmail_ui_user/features/mailbox/data/network/mailbox_api.dart'; +import 'package:tmail_ui_user/features/mailbox/data/network/mailbox_isolate_worker.dart'; import 'package:tmail_ui_user/features/mailbox/domain/model/create_new_mailbox_request.dart'; import 'package:tmail_ui_user/features/mailbox/domain/model/mailbox_response.dart'; import 'package:tmail_ui_user/features/mailbox/domain/model/move_mailbox_request.dart'; @@ -14,8 +21,9 @@ import 'package:tmail_ui_user/features/mailbox/domain/model/rename_mailbox_reque class MailboxDataSourceImpl extends MailboxDataSource { final MailboxAPI mailboxAPI; + final MailboxIsolateWorker _mailboxIsolateWorker; - MailboxDataSourceImpl(this.mailboxAPI); + MailboxDataSourceImpl(this.mailboxAPI, this._mailboxIsolateWorker); @override Future getAllMailbox(AccountId accountId, {Properties? properties}) { @@ -80,4 +88,21 @@ class MailboxDataSourceImpl extends MailboxDataSource { throw error; }); } + + @override + Future> markAsMailboxRead( + AccountId accountId, + MailboxId mailboxId, + int totalEmailUnread, + StreamController> onProgressController) { + return Future.sync(() async { + return await _mailboxIsolateWorker.markAsMailboxRead( + accountId, + mailboxId, + totalEmailUnread, + onProgressController); + }).catchError((error) { + throw error; + }); + } } \ No newline at end of file diff --git a/lib/features/mailbox/data/repository/mailbox_repository_impl.dart b/lib/features/mailbox/data/repository/mailbox_repository_impl.dart index 7f7247026..52b045b65 100644 --- a/lib/features/mailbox/data/repository/mailbox_repository_impl.dart +++ b/lib/features/mailbox/data/repository/mailbox_repository_impl.dart @@ -1,19 +1,17 @@ -import 'package:core/core.dart'; +import 'dart:async'; + +import 'package:core/data/model/source_type/data_source_type.dart'; +import 'package:core/presentation/state/failure.dart'; +import 'package:core/presentation/state/success.dart'; +import 'package:dartz/dartz.dart' as dartz; 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/session/session.dart'; import 'package:jmap_dart_client/jmap/core/state.dart'; -import 'package:jmap_dart_client/jmap/core/unsigned_int.dart'; -import 'package:jmap_dart_client/jmap/core/utc_date.dart'; import 'package:jmap_dart_client/jmap/mail/email/email.dart'; -import 'package:jmap_dart_client/jmap/mail/email/email_comparator.dart'; -import 'package:jmap_dart_client/jmap/mail/email/email_comparator_property.dart'; -import 'package:jmap_dart_client/jmap/mail/email/email_filter_condition.dart'; -import 'package:jmap_dart_client/jmap/mail/email/keyword_identifier.dart'; import 'package:jmap_dart_client/jmap/mail/mailbox/mailbox.dart'; -import 'package:jmap_dart_client/jmap/core/sort/comparator.dart'; -import 'package:model/model.dart'; -import 'package:tmail_ui_user/features/email/data/datasource/email_datasource.dart'; +import 'package:model/extensions/list_mailbox_extension.dart'; +import 'package:model/extensions/mailbox_extension.dart'; import 'package:tmail_ui_user/features/mailbox/data/datasource/mailbox_datasource.dart'; import 'package:tmail_ui_user/features/mailbox/data/datasource/state_datasource.dart'; import 'package:tmail_ui_user/features/mailbox/data/extensions/state_extension.dart'; @@ -23,21 +21,15 @@ import 'package:tmail_ui_user/features/mailbox/domain/model/mailbox_response.dar import 'package:tmail_ui_user/features/mailbox/domain/model/move_mailbox_request.dart'; import 'package:tmail_ui_user/features/mailbox/domain/model/rename_mailbox_request.dart'; import 'package:tmail_ui_user/features/mailbox/domain/repository/mailbox_repository.dart'; -import 'package:tmail_ui_user/features/thread/data/datasource/thread_datasource.dart'; -import 'package:tmail_ui_user/features/thread/domain/model/email_response.dart'; class MailboxRepositoryImpl extends MailboxRepository { final Map mapDataSource; final StateDataSource stateDataSource; - final ThreadDataSource threadDataSource; - final EmailDataSource emailDataSource; MailboxRepositoryImpl( this.mapDataSource, this.stateDataSource, - this.threadDataSource, - this.emailDataSource ); @override @@ -173,53 +165,16 @@ class MailboxRepositoryImpl extends MailboxRepository { } @override - Future markAsMailboxRead(AccountId accountId, MailboxId mailboxId, MailboxName mailboxName) async { - bool mailboxHasEmails = true; - UTCDate? lastReceivedDate; - EmailId? lastEmailId; - - while(mailboxHasEmails) { - final emailResponse = await threadDataSource.getAllEmail(accountId, - limit: UnsignedInt(20), - filter: EmailFilterCondition( - inMailbox: mailboxId, - notKeyword: KeyWordIdentifier.emailSeen.value, - before: lastReceivedDate), - sort: {} - ..add(EmailComparator(EmailComparatorProperty.receivedAt) - ..setIsAscending(false)), - properties: Properties({ - EmailProperty.id, - EmailProperty.keywords, - EmailProperty.receivedAt, - }) - ).then((response) { - var listEmails = response.emailList; - if (listEmails != null && listEmails.isNotEmpty && lastEmailId != null) { - listEmails = listEmails - .where((email) => email.id != lastEmailId) - .toList(); - } - return EmailsResponse(emailList: listEmails, state: response.state); - }); - log('MailboxRepositoryImpl::markAsMailboxRead(): listEmails: ${emailResponse.emailList?.length}'); - final listEmailUnread = emailResponse.emailList; - - if (listEmailUnread == null || listEmailUnread.isEmpty) { - mailboxHasEmails = false; - } else { - log('MailboxRepositoryImpl::markAsMailboxRead(): listEmailUnread: ${listEmailUnread.length}'); - final result = await emailDataSource.markAsRead(accountId, - listEmailUnread, ReadActions.markAsRead); - - if (result.length != listEmailUnread.length) { - mailboxHasEmails = false; - return false; - } - } - } - - return true; + Future> markAsMailboxRead( + AccountId accountId, + MailboxId mailboxId, + int totalEmailUnread, + StreamController> onProgressController) async { + return mapDataSource[DataSourceType.network]!.markAsMailboxRead( + accountId, + mailboxId, + totalEmailUnread, + onProgressController); } @override diff --git a/lib/features/mailbox/domain/repository/mailbox_repository.dart b/lib/features/mailbox/domain/repository/mailbox_repository.dart index 73520c42d..1542cdbd3 100644 --- a/lib/features/mailbox/domain/repository/mailbox_repository.dart +++ b/lib/features/mailbox/domain/repository/mailbox_repository.dart @@ -1,7 +1,13 @@ +import 'dart:async'; + +import 'package:core/presentation/state/failure.dart'; +import 'package:core/presentation/state/success.dart'; +import 'package:dartz/dartz.dart' as dartz; 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/session/session.dart'; import 'package:jmap_dart_client/jmap/core/state.dart'; +import 'package:jmap_dart_client/jmap/mail/email/email.dart'; import 'package:jmap_dart_client/jmap/mail/mailbox/mailbox.dart'; import 'package:tmail_ui_user/features/mailbox/domain/model/create_new_mailbox_request.dart'; import 'package:tmail_ui_user/features/mailbox/domain/model/mailbox_response.dart'; @@ -19,7 +25,11 @@ abstract class MailboxRepository { Future renameMailbox(AccountId accountId, RenameMailboxRequest request); - Future markAsMailboxRead(AccountId accountId, MailboxId mailboxId, MailboxName mailboxName); + Future> markAsMailboxRead( + AccountId accountId, + MailboxId mailboxId, + int totalEmailUnread, + StreamController> onProgressController); Future moveMailbox(AccountId accountId, MoveMailboxRequest request); } \ No newline at end of file diff --git a/lib/features/mailbox/domain/usecases/mark_as_mailbox_read_interactor.dart b/lib/features/mailbox/domain/usecases/mark_as_mailbox_read_interactor.dart new file mode 100644 index 000000000..efeab2115 --- /dev/null +++ b/lib/features/mailbox/domain/usecases/mark_as_mailbox_read_interactor.dart @@ -0,0 +1,43 @@ +import 'dart:async'; + +import 'package:core/core.dart'; +import 'package:dartz/dartz.dart'; +import 'package:jmap_dart_client/jmap/account_id.dart'; +import 'package:jmap_dart_client/jmap/mail/mailbox/mailbox.dart'; +import 'package:tmail_ui_user/features/mailbox/domain/repository/mailbox_repository.dart'; +import 'package:tmail_ui_user/features/mailbox/domain/state/mark_as_mailbox_read_state.dart'; + +class MarkAsMailboxReadInteractor { + final MailboxRepository _mailboxRepository; + + MarkAsMailboxReadInteractor(this._mailboxRepository); + + Stream> execute( + AccountId accountId, + MailboxId mailboxId, + MailboxName mailboxName, + int totalEmailUnread, + StreamController> onProgressController + ) async* { + try { + yield Right(MarkAsMailboxReadLoading()); + onProgressController.add(Right(MarkAsMailboxReadLoading())); + + final listEmails = await _mailboxRepository.markAsMailboxRead( + accountId, + mailboxId, + totalEmailUnread, + onProgressController); + + if (totalEmailUnread == listEmails.length) { + yield Right(MarkAsMailboxReadAllSuccess(mailboxName)); + } else if (listEmails.isNotEmpty) { + yield Right(MarkAsMailboxReadHasSomeEmailFailure(mailboxName, listEmails.length)); + } else { + yield Left(MarkAsMailboxReadAllFailure()); + } + } catch (e) { + yield Left(MarkAsMailboxReadFailure(e)); + } + } +} \ No newline at end of file