From d3573583417f7b5b6b9be7a70e80466b549df435 Mon Sep 17 00:00:00 2001 From: dab246 Date: Wed, 10 May 2023 18:00:46 +0700 Subject: [PATCH] TF-1810 Implement store detailed email to cache (cherry picked from commit 6be6d69ad8e5fb05d839e2649b1f444613eea6d1) --- .../caching/utils/caching_constants.dart | 8 ++--- .../presentation/composer_bindings.dart | 2 ++ .../data/datasource/email_datasource.dart | 4 ++- .../email_datasource_impl.dart | 7 +++- .../email_hive_cache_datasource_impl.dart | 19 ++++++++--- .../repository/email_repository_impl.dart | 7 +++- .../extensions/detailed_email_extension.dart | 2 +- .../domain/repository/email_repository.dart | 2 ++ .../state/get_detailed_email_by_id_state.dart | 12 ++++--- .../get_detailed_email_by_id_interator.dart | 13 +++++--- ...ore_detailed_email_to_cache_interator.dart | 13 ++++++-- .../email/presentation/email_bindings.dart | 2 ++ .../bindings/mailbox_dashboard_bindings.dart | 1 + .../manager/detailed_email_cache_manager.dart | 8 ++--- ...receive_email_from_notification_state.dart | 2 +- ...ve_email_from_notification_interactor.dart | 2 +- .../bindings/fcm_interactor_bindings.dart | 4 +++ .../listener/email_change_listener.dart | 32 ++++++++++++++++--- .../data/local/email_cache_manager.dart | 7 ++++ lib/main/utils/app_constants.dart | 1 - 20 files changed, 111 insertions(+), 37 deletions(-) diff --git a/lib/features/caching/utils/caching_constants.dart b/lib/features/caching/utils/caching_constants.dart index 76f9182b9..2b662890d 100644 --- a/lib/features/caching/utils/caching_constants.dart +++ b/lib/features/caching/utils/caching_constants.dart @@ -1,6 +1,4 @@ -import 'package:tmail_ui_user/main/utils/app_constants.dart'; - class CachingConstants { static const int MAILBOX_CACHE_IDENTIFY = 1; static const int MAILBOX_RIGHTS_CACHE_IDENTIFY = 2; @@ -22,9 +20,7 @@ class CachingConstants { static const String fcmCacheBoxName = 'fcm_cache_box'; static const String detailedEmailCacheBoxName = 'detailed_email_cache_box'; + static const String emailContentFolderName = 'email_content'; - static const int maxNumberRecentEmails = 10; - - static const String appFolderName = AppConstants.applicationName; - static const String emailContentFolderName = 'EmailContent'; + static const int maxNumberNewEmailsForOffline = 10; } \ No newline at end of file diff --git a/lib/features/composer/presentation/composer_bindings.dart b/lib/features/composer/presentation/composer_bindings.dart index 9ab90086a..005c16c48 100644 --- a/lib/features/composer/presentation/composer_bindings.dart +++ b/lib/features/composer/presentation/composer_bindings.dart @@ -46,6 +46,7 @@ import 'package:tmail_ui_user/features/manage_account/domain/usecases/get_all_id import 'package:tmail_ui_user/features/manage_account/presentation/profiles/identities/identity_interactors_bindings.dart'; import 'package:tmail_ui_user/features/offline_mode/manager/detailed_email_cache_manager.dart'; import 'package:tmail_ui_user/features/offline_mode/manager/detailed_email_cache_worker_queue.dart'; +import 'package:tmail_ui_user/features/thread/data/local/email_cache_manager.dart'; import 'package:tmail_ui_user/features/upload/data/datasource/attachment_upload_datasource.dart'; import 'package:tmail_ui_user/features/upload/data/datasource_impl/attachment_upload_datasource_impl.dart'; import 'package:tmail_ui_user/features/upload/data/network/file_uploader.dart'; @@ -96,6 +97,7 @@ class ComposerBindings extends BaseBindings { Get.lazyPut(() => EmailHiveCacheDataSourceImpl( Get.find(), Get.find(), + Get.find(), Get.find(), Get.find())); } diff --git a/lib/features/email/data/datasource/email_datasource.dart b/lib/features/email/data/datasource/email_datasource.dart index e7c7ad79b..4b59b302d 100644 --- a/lib/features/email/data/datasource/email_datasource.dart +++ b/lib/features/email/data/datasource/email_datasource.dart @@ -74,7 +74,9 @@ abstract class EmailDataSource { Future deleteEmailPermanently(Session session, AccountId accountId, EmailId emailId); - Future storeDetailedEmailToCache(Session session, AccountId accountId, DetailedEmail detailedEmail); + Future storeDetailedEmail(Session session, AccountId accountId, DetailedEmail detailedEmail); Future getDetailedEmailById(Session session, AccountId accountId, EmailId emailId); + + Future storeEmail(Session session, AccountId accountId, Email email); } \ No newline at end of file diff --git a/lib/features/email/data/datasource_impl/email_datasource_impl.dart b/lib/features/email/data/datasource_impl/email_datasource_impl.dart index ed2a44028..9f88f3e72 100644 --- a/lib/features/email/data/datasource_impl/email_datasource_impl.dart +++ b/lib/features/email/data/datasource_impl/email_datasource_impl.dart @@ -151,7 +151,7 @@ class EmailDataSourceImpl extends EmailDataSource { } @override - Future storeDetailedEmailToCache(Session session, AccountId accountId, DetailedEmail detailedEmail) { + Future storeDetailedEmail(Session session, AccountId accountId, DetailedEmail detailedEmail) { throw UnimplementedError(); } @@ -161,4 +161,9 @@ class EmailDataSourceImpl extends EmailDataSource { return await emailAPI.getDetailedEmailById(session, accountId, emailId); }).catchError(_exceptionThrower.throwException); } + + @override + Future storeEmail(Session session, AccountId accountId, Email email) { + throw UnimplementedError(); + } } \ No newline at end of file diff --git a/lib/features/email/data/datasource_impl/email_hive_cache_datasource_impl.dart b/lib/features/email/data/datasource_impl/email_hive_cache_datasource_impl.dart index 44022a05e..6f81579e7 100644 --- a/lib/features/email/data/datasource_impl/email_hive_cache_datasource_impl.dart +++ b/lib/features/email/data/datasource_impl/email_hive_cache_datasource_impl.dart @@ -28,18 +28,22 @@ import 'package:tmail_ui_user/features/mailbox/domain/model/create_new_mailbox_r import 'package:tmail_ui_user/features/offline_mode/manager/detailed_email_cache_manager.dart'; import 'package:tmail_ui_user/features/offline_mode/manager/detailed_email_cache_worker_queue.dart'; import 'package:tmail_ui_user/features/offline_mode/worker/hive_task.dart'; +import 'package:tmail_ui_user/features/thread/data/extensions/email_extension.dart'; +import 'package:tmail_ui_user/features/thread/data/local/email_cache_manager.dart'; import 'package:tmail_ui_user/main/exceptions/exception_thrower.dart'; class EmailHiveCacheDataSourceImpl extends EmailDataSource { - final DetailedEmailCacheManager _emailCacheManager; + final DetailedEmailCacheManager _detailedEmailCacheManager; final DetailedEmailCacheWorkerQueue _cacheWorkerQueue; + final EmailCacheManager _emailCacheManager; final FileUtils _fileUtils; final ExceptionThrower _exceptionThrower; EmailHiveCacheDataSourceImpl( - this._emailCacheManager, + this._detailedEmailCacheManager, this._cacheWorkerQueue, + this._emailCacheManager, this._fileUtils, this._exceptionThrower ); @@ -105,7 +109,7 @@ class EmailHiveCacheDataSourceImpl extends EmailDataSource { } @override - Future storeDetailedEmailToCache(Session session, AccountId accountId, DetailedEmail detailedEmail) { + Future storeDetailedEmail(Session session, AccountId accountId, DetailedEmail detailedEmail) { return Future.sync(() async { final task = HiveTask( runnable: () async { @@ -118,7 +122,7 @@ class EmailHiveCacheDataSourceImpl extends EmailDataSource { log('EmailHiveCacheDataSourceImpl::storeDetailedEmailToCache():fileSavedPath: ${fileSaved.path}'); final detailedEmailSaved = detailedEmail.fromEmailContentPath(fileSaved.path); - final detailedEmailCache = await _emailCacheManager.handleStoreDetailedEmailToCache( + final detailedEmailCache = await _detailedEmailCacheManager.handleStoreDetailedEmail( accountId, session.username, detailedEmailSaved.toHiveCache()); @@ -138,4 +142,11 @@ class EmailHiveCacheDataSourceImpl extends EmailDataSource { Future getDetailedEmailById(Session session, AccountId accountId, EmailId emailId) { throw UnimplementedError(); } + + @override + Future storeEmail(Session session, AccountId accountId, Email email) { + return Future.sync(() async { + return await _emailCacheManager.storeEmail(accountId, session.username, email.toEmailCache()); + }).catchError(_exceptionThrower.throwException); + } } \ No newline at end of file diff --git a/lib/features/email/data/repository/email_repository_impl.dart b/lib/features/email/data/repository/email_repository_impl.dart index 6d95d8679..1217701ce 100644 --- a/lib/features/email/data/repository/email_repository_impl.dart +++ b/lib/features/email/data/repository/email_repository_impl.dart @@ -186,11 +186,16 @@ class EmailRepositoryImpl extends EmailRepository { @override Future storeDetailedEmailToCache(Session session, AccountId accountId, DetailedEmail detailedEmail) { - return emailDataSource[DataSourceType.hiveCache]!.storeDetailedEmailToCache(session, accountId, detailedEmail); + return emailDataSource[DataSourceType.hiveCache]!.storeDetailedEmail(session, accountId, detailedEmail); } @override Future getDetailedEmailById(Session session, AccountId accountId, EmailId emailId) { return emailDataSource[DataSourceType.network]!.getDetailedEmailById(session, accountId, emailId); } + + @override + Future storeEmailToCache(Session session, AccountId accountId, Email email) { + return emailDataSource[DataSourceType.hiveCache]!.storeEmail(session, accountId, email); + } } \ No newline at end of file diff --git a/lib/features/email/domain/extensions/detailed_email_extension.dart b/lib/features/email/domain/extensions/detailed_email_extension.dart index c0c5d16a8..0af1d50ec 100644 --- a/lib/features/email/domain/extensions/detailed_email_extension.dart +++ b/lib/features/email/domain/extensions/detailed_email_extension.dart @@ -17,7 +17,7 @@ extension DetailedEmailExtension on DetailedEmail { ); } - String get folderPath => '${CachingConstants.appFolderName}/${CachingConstants.emailContentFolderName}'; + String get folderPath => CachingConstants.emailContentFolderName; DetailedEmail fromEmailContentPath(String path) { return DetailedEmail( diff --git a/lib/features/email/domain/repository/email_repository.dart b/lib/features/email/domain/repository/email_repository.dart index 4fbe490da..b6f4ae20b 100644 --- a/lib/features/email/domain/repository/email_repository.dart +++ b/lib/features/email/domain/repository/email_repository.dart @@ -91,4 +91,6 @@ abstract class EmailRepository { Future storeDetailedEmailToCache(Session session, AccountId accountId, DetailedEmail detailedEmail); Future getDetailedEmailById(Session session, AccountId accountId, EmailId emailId); + + Future storeEmailToCache(Session session, AccountId accountId, Email email); } \ No newline at end of file diff --git a/lib/features/email/domain/state/get_detailed_email_by_id_state.dart b/lib/features/email/domain/state/get_detailed_email_by_id_state.dart index a9a28d9cd..16925532b 100644 --- a/lib/features/email/domain/state/get_detailed_email_by_id_state.dart +++ b/lib/features/email/domain/state/get_detailed_email_by_id_state.dart @@ -1,19 +1,23 @@ import 'package:core/presentation/state/failure.dart'; import 'package:core/presentation/state/success.dart'; -import 'package:model/email/presentation_email.dart'; +import 'package:jmap_dart_client/jmap/account_id.dart'; +import 'package:jmap_dart_client/jmap/core/session/session.dart'; +import 'package:jmap_dart_client/jmap/mail/email/email.dart'; import 'package:tmail_ui_user/features/email/domain/model/detailed_email.dart'; class GetDetailedEmailByIdLoading extends UIState {} class GetDetailedEmailByIdSuccess extends UIState { - final PresentationEmail presentationEmail; + final Email email; final DetailedEmail detailedEmail; + final AccountId accountId; + final Session session; - GetDetailedEmailByIdSuccess(this.presentationEmail, this.detailedEmail); + GetDetailedEmailByIdSuccess(this.email, this.detailedEmail, this.accountId, this.session); @override - List get props => [presentationEmail, detailedEmail]; + List get props => [email, detailedEmail, accountId, session]; } class GetDetailedEmailByIdFailure extends FeatureFailure { diff --git a/lib/features/email/domain/usecases/get_detailed_email_by_id_interator.dart b/lib/features/email/domain/usecases/get_detailed_email_by_id_interator.dart index 71f98fea8..7d436d58a 100644 --- a/lib/features/email/domain/usecases/get_detailed_email_by_id_interator.dart +++ b/lib/features/email/domain/usecases/get_detailed_email_by_id_interator.dart @@ -4,7 +4,6 @@ import 'package:dartz/dartz.dart'; import 'package:jmap_dart_client/jmap/account_id.dart'; import 'package:jmap_dart_client/jmap/core/session/session.dart'; import 'package:jmap_dart_client/jmap/mail/email/email.dart'; -import 'package:model/email/presentation_email.dart'; import 'package:model/extensions/email_extension.dart'; import 'package:model/extensions/list_attachment_extension.dart'; import 'package:model/extensions/list_email_content_extension.dart'; @@ -31,13 +30,18 @@ class GetDetailedEmailByIdInteractor { final parsedEmail = await _parsingEmailToDetailedEmail(accountId, email, baseDownloadUrl); - yield Right(GetDetailedEmailByIdSuccess(parsedEmail.value1, parsedEmail.value2)); + yield Right(GetDetailedEmailByIdSuccess( + parsedEmail.value1, + parsedEmail.value2, + accountId, + session, + )); } catch (e) { yield Left(GetDetailedEmailByIdFailure(e)); } } - Future> _parsingEmailToDetailedEmail( + Future> _parsingEmailToDetailedEmail( AccountId accountId, Email email, String? baseDownloadUrl @@ -56,8 +60,7 @@ class GetDetailedEmailByIdInteractor { } final detailedEmail = email.toDetailedEmail(htmlEmailContent: htmlEmailContent); - final presentationEmail = email.toPresentationEmail(); - return Tuple2(presentationEmail, detailedEmail); + return Tuple2(email, detailedEmail); } } \ No newline at end of file diff --git a/lib/features/email/domain/usecases/store_detailed_email_to_cache_interator.dart b/lib/features/email/domain/usecases/store_detailed_email_to_cache_interator.dart index 10c570d5b..27bdd6e93 100644 --- a/lib/features/email/domain/usecases/store_detailed_email_to_cache_interator.dart +++ b/lib/features/email/domain/usecases/store_detailed_email_to_cache_interator.dart @@ -3,6 +3,7 @@ import 'package:core/presentation/state/success.dart'; import 'package:dartz/dartz.dart'; import 'package:jmap_dart_client/jmap/account_id.dart'; import 'package:jmap_dart_client/jmap/core/session/session.dart'; +import 'package:jmap_dart_client/jmap/mail/email/email.dart'; import 'package:tmail_ui_user/features/email/domain/model/detailed_email.dart'; import 'package:tmail_ui_user/features/email/domain/repository/email_repository.dart'; import 'package:tmail_ui_user/features/email/domain/state/store_detailed_email_to_cache_state.dart'; @@ -12,10 +13,18 @@ class StoreDetailedEmailToCacheInteractor { StoreDetailedEmailToCacheInteractor(this._emailRepository); - Stream> execute(Session session, AccountId accountId, DetailedEmail detailedEmail) async* { + Stream> execute( + Session session, + AccountId accountId, + Email email, + DetailedEmail detailedEmail + ) async* { try { yield Right(StoreDetailedEmailToCacheLoading()); - await _emailRepository.storeDetailedEmailToCache(session, accountId, detailedEmail); + await Future.wait([ + _emailRepository.storeEmailToCache(session, accountId, email), + _emailRepository.storeDetailedEmailToCache(session, accountId, detailedEmail), + ]); yield Right(StoreDetailedEmailToCacheSuccess()); } catch (e) { yield Left(StoreDetailedEmailToCacheFailure(e)); diff --git a/lib/features/email/presentation/email_bindings.dart b/lib/features/email/presentation/email_bindings.dart index 7108dd775..c07017128 100644 --- a/lib/features/email/presentation/email_bindings.dart +++ b/lib/features/email/presentation/email_bindings.dart @@ -44,6 +44,7 @@ import 'package:tmail_ui_user/features/manage_account/domain/usecases/get_all_id import 'package:tmail_ui_user/features/manage_account/presentation/profiles/identities/identity_interactors_bindings.dart'; import 'package:tmail_ui_user/features/offline_mode/manager/detailed_email_cache_manager.dart'; import 'package:tmail_ui_user/features/offline_mode/manager/detailed_email_cache_worker_queue.dart'; +import 'package:tmail_ui_user/features/thread/data/local/email_cache_manager.dart'; import 'package:tmail_ui_user/main/exceptions/cache_exception_thrower.dart'; import 'package:tmail_ui_user/main/exceptions/remote_exception_thrower.dart'; @@ -97,6 +98,7 @@ class EmailBindings extends BaseBindings { Get.lazyPut(() => EmailHiveCacheDataSourceImpl( Get.find(), Get.find(), + Get.find(), Get.find(), Get.find())); } diff --git a/lib/features/mailbox_dashboard/presentation/bindings/mailbox_dashboard_bindings.dart b/lib/features/mailbox_dashboard/presentation/bindings/mailbox_dashboard_bindings.dart index 4664f4ec0..205176229 100644 --- a/lib/features/mailbox_dashboard/presentation/bindings/mailbox_dashboard_bindings.dart +++ b/lib/features/mailbox_dashboard/presentation/bindings/mailbox_dashboard_bindings.dart @@ -234,6 +234,7 @@ class MailboxDashBoardBindings extends BaseBindings { Get.lazyPut(() => EmailHiveCacheDataSourceImpl( Get.find(), Get.find(), + Get.find(), Get.find(), Get.find())); } diff --git a/lib/features/offline_mode/manager/detailed_email_cache_manager.dart b/lib/features/offline_mode/manager/detailed_email_cache_manager.dart index 1a4eae5a7..f80c15bd4 100644 --- a/lib/features/offline_mode/manager/detailed_email_cache_manager.dart +++ b/lib/features/offline_mode/manager/detailed_email_cache_manager.dart @@ -15,16 +15,16 @@ class DetailedEmailCacheManager { DetailedEmailCacheManager(this._cacheClient); - Future handleStoreDetailedEmailToCache( + Future handleStoreDetailedEmail( AccountId accountId, UserName userName, DetailedEmailHiveCache detailedEmailCache ) async { final listDetailedEmails = await getAllDetailedEmails(accountId, userName); - if (listDetailedEmails.length >= CachingConstants.maxNumberRecentEmails) { + if (listDetailedEmails.length >= CachingConstants.maxNumberNewEmailsForOffline) { final latestEmail = listDetailedEmails.last; - log('DetailedEmailCacheManager::handleStoreDetailedEmailToCache():latestEmail: $latestEmail'); + log('DetailedEmailCacheManager::handleStoreDetailedEmail():latestEmail: $latestEmail'); await removeDetailedEmail(accountId, userName, latestEmail.emailId); } await insertDetailedEmail(accountId, userName, detailedEmailCache); @@ -38,7 +38,7 @@ class DetailedEmailCacheManager { DetailedEmailHiveCache detailedEmailCache ) { final keyCache = TupleKey(detailedEmailCache.emailId, accountId.asString, userName.value).encodeKey; - log('DetailedEmailCacheManager::storeDetailedEmail(): $keyCache'); + log('DetailedEmailCacheManager::insertDetailedEmail(): $keyCache'); return _cacheClient.insertItem(keyCache, detailedEmailCache); } diff --git a/lib/features/push_notification/domain/state/get_new_receive_email_from_notification_state.dart b/lib/features/push_notification/domain/state/get_new_receive_email_from_notification_state.dart index 10d1f6e6c..61fd251c4 100644 --- a/lib/features/push_notification/domain/state/get_new_receive_email_from_notification_state.dart +++ b/lib/features/push_notification/domain/state/get_new_receive_email_from_notification_state.dart @@ -9,7 +9,7 @@ class GetNewReceiveEmailFromNotificationLoading extends UIState {} class GetNewReceiveEmailFromNotificationSuccess extends UIState { - final List emailIds; + final Set emailIds; final AccountId accountId; final Session? session; diff --git a/lib/features/push_notification/domain/usecases/get_new_receive_email_from_notification_interactor.dart b/lib/features/push_notification/domain/usecases/get_new_receive_email_from_notification_interactor.dart index 2c0ae2370..6af280620 100644 --- a/lib/features/push_notification/domain/usecases/get_new_receive_email_from_notification_interactor.dart +++ b/lib/features/push_notification/domain/usecases/get_new_receive_email_from_notification_interactor.dart @@ -32,7 +32,7 @@ class GetNewReceiveEmailFromNotificationInteractor { accountId, currentState); - yield Right(GetNewReceiveEmailFromNotificationSuccess(accountId, session, listEmailIds)); + yield Right(GetNewReceiveEmailFromNotificationSuccess(accountId, session, listEmailIds.toSet())); } else { yield Left(GetNewReceiveEmailFromNotificationFailure(EmailStateNoChangeException())); } diff --git a/lib/features/push_notification/presentation/bindings/fcm_interactor_bindings.dart b/lib/features/push_notification/presentation/bindings/fcm_interactor_bindings.dart index 95c486974..eb8441e31 100644 --- a/lib/features/push_notification/presentation/bindings/fcm_interactor_bindings.dart +++ b/lib/features/push_notification/presentation/bindings/fcm_interactor_bindings.dart @@ -14,6 +14,7 @@ import 'package:tmail_ui_user/features/email/data/network/email_api.dart'; import 'package:tmail_ui_user/features/email/data/repository/email_repository_impl.dart'; import 'package:tmail_ui_user/features/email/domain/repository/email_repository.dart'; import 'package:tmail_ui_user/features/email/domain/usecases/get_detailed_email_by_id_interator.dart'; +import 'package:tmail_ui_user/features/email/domain/usecases/store_detailed_email_to_cache_interator.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/datasource_impl/mailbox_cache_datasource_impl.dart'; @@ -49,6 +50,7 @@ import 'package:tmail_ui_user/features/push_notification/domain/usecases/store_m import 'package:tmail_ui_user/features/push_notification/domain/usecases/store_subscription_interator.dart'; import 'package:tmail_ui_user/features/thread/data/datasource/thread_datasource.dart'; import 'package:tmail_ui_user/features/thread/data/datasource_impl/thread_datasource_impl.dart'; +import 'package:tmail_ui_user/features/thread/data/local/email_cache_manager.dart'; import 'package:tmail_ui_user/features/thread/data/network/thread_api.dart'; import 'package:tmail_ui_user/features/thread/data/network/thread_isolate_worker.dart'; import 'package:tmail_ui_user/main/exceptions/cache_exception_thrower.dart'; @@ -101,6 +103,7 @@ class FcmInteractorBindings extends InteractorsBindings { Get.lazyPut(() => EmailHiveCacheDataSourceImpl( Get.find(), Get.find(), + Get.find(), Get.find(), Get.find())); } @@ -128,6 +131,7 @@ class FcmInteractorBindings extends InteractorsBindings { Get.find(), Get.find())); Get.lazyPut(() => GetDetailedEmailByIdInteractor(Get.find())); + Get.lazyPut(() => StoreDetailedEmailToCacheInteractor(Get.find())); } @override diff --git a/lib/features/push_notification/presentation/listener/email_change_listener.dart b/lib/features/push_notification/presentation/listener/email_change_listener.dart index 46133c819..4f81194df 100644 --- a/lib/features/push_notification/presentation/listener/email_change_listener.dart +++ b/lib/features/push_notification/presentation/listener/email_change_listener.dart @@ -24,6 +24,7 @@ import 'package:tmail_ui_user/features/email/domain/state/get_detailed_email_by_ import 'package:tmail_ui_user/features/email/domain/state/get_stored_state_email_state.dart'; import 'package:tmail_ui_user/features/email/domain/usecases/get_detailed_email_by_id_interator.dart'; import 'package:tmail_ui_user/features/email/domain/usecases/get_stored_email_state_interactor.dart'; +import 'package:tmail_ui_user/features/email/domain/usecases/store_detailed_email_to_cache_interator.dart'; import 'package:tmail_ui_user/features/email/presentation/action/email_ui_action.dart'; import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/controller/mailbox_dashboard_controller.dart'; import 'package:tmail_ui_user/features/push_notification/domain/exceptions/fcm_exception.dart'; @@ -61,6 +62,7 @@ class EmailChangeListener extends ChangeListener { GetNewReceiveEmailFromNotificationInteractor? _getNewReceiveEmailFromNotificationInteractor; GetDetailedEmailByIdInteractor? _getDetailedEmailByIdInteractor; DynamicUrlInterceptors? _dynamicUrlInterceptors; + StoreDetailedEmailToCacheInteractor? _storeDetailedEmailToCacheInteractor; jmap.State? _newStateEmailDelivery; AccountId? _accountId; @@ -81,6 +83,7 @@ class EmailChangeListener extends ChangeListener { _getNewReceiveEmailFromNotificationInteractor = getBinding(); _getDetailedEmailByIdInteractor = getBinding(); _dynamicUrlInterceptors = getBinding(); + _storeDetailedEmailToCacheInteractor = getBinding(); } catch (e) { logError('EmailChangeListener::_internal(): IS NOT REGISTERED: ${e.toString()}'); } @@ -99,7 +102,9 @@ class EmailChangeListener extends ChangeListener { _handleRemoveNotificationWhenEmailMarkAsRead(action.newState, action.accountId, action.session); } _synchronizeEmailOnForegroundAction(action.newState); - _getNewReceiveEmailFromNotificationAction(action.session, action.accountId, action.newState); + if (!BuildUtils.isWeb) { + _getNewReceiveEmailFromNotificationAction(action.session, action.accountId, action.newState); + } } else if (action is PushNotificationAction) { _pushNotificationAction(action.newState, action.accountId, action.userName, action.session); } else if (action is StoreEmailStateToRefreshAction) { @@ -240,7 +245,11 @@ class EmailChangeListener extends ChangeListener { } else if (success is GetNewReceiveEmailFromNotificationSuccess) { _handleGetNewReceiveEmailFromNotificationSuccess(success.session, success.accountId, success.emailIds); } else if (success is GetDetailedEmailByIdSuccess) { - _handleGetDetailedEmailByIdActionSuccess(success.presentationEmail, success.detailedEmail); + _handleGetDetailedEmailByIdActionSuccess( + success.session, + success.accountId, + success.email, + success.detailedEmail); } } @@ -307,7 +316,7 @@ class EmailChangeListener extends ChangeListener { } } - void _handleGetNewReceiveEmailFromNotificationSuccess(Session? session, AccountId accountId, List emailIds) { + void _handleGetNewReceiveEmailFromNotificationSuccess(Session? session, AccountId accountId, Set emailIds) { log('EmailChangeListener::_handleGetNewReceiveEmailFromNotificationSuccess():emailIds: $emailIds'); for (var emailId in emailIds) { _getDetailedEmailByIdAction(session, accountId, emailId); @@ -328,7 +337,20 @@ class EmailChangeListener extends ChangeListener { } } - void _handleGetDetailedEmailByIdActionSuccess(PresentationEmail presentationEmail, DetailedEmail detailedEmail) { - log('EmailChangeListener::_handleGetDetailedEmailByIdActionSuccess():emailID: ${presentationEmail.id} | Content: ${detailedEmail.htmlEmailContent}'); + void _handleGetDetailedEmailByIdActionSuccess( + Session session, + AccountId accountId, + Email email, + DetailedEmail detailedEmail + ) { + log('EmailChangeListener::_handleGetDetailedEmailByIdActionSuccess():emailId: ${email.id}'); + if (_storeDetailedEmailToCacheInteractor != null) { + consumeState(_storeDetailedEmailToCacheInteractor!.execute( + session, + accountId, + email, + detailedEmail + )); + } } } \ No newline at end of file diff --git a/lib/features/thread/data/local/email_cache_manager.dart b/lib/features/thread/data/local/email_cache_manager.dart index 9b789fd6b..d6fd3647d 100644 --- a/lib/features/thread/data/local/email_cache_manager.dart +++ b/lib/features/thread/data/local/email_cache_manager.dart @@ -5,6 +5,7 @@ import 'package:model/model.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/caching/clients/email_cache_client.dart'; +import 'package:tmail_ui_user/features/caching/utils/cache_utils.dart'; import 'package:tmail_ui_user/features/cleanup/domain/model/email_cleanup_rule.dart'; import 'package:tmail_ui_user/features/thread/data/extensions/email_cache_extension.dart'; import 'package:tmail_ui_user/features/thread/data/extensions/email_extension.dart'; @@ -12,6 +13,7 @@ import 'package:tmail_ui_user/features/thread/data/extensions/list_email_cache_e import 'package:tmail_ui_user/features/thread/data/extensions/list_email_extension.dart'; import 'package:tmail_ui_user/features/thread/data/extensions/list_email_id_extension.dart'; import 'package:jmap_dart_client/jmap/core/sort/comparator.dart'; +import 'package:tmail_ui_user/features/thread/data/model/email_cache.dart'; import 'package:tmail_ui_user/features/thread/domain/model/filter_message_option.dart'; class EmailCacheManager { @@ -89,4 +91,9 @@ class EmailCacheManager { await _emailCacheClient.deleteMultipleItem(listEmailIdCacheExpire); } } + + Future storeEmail(AccountId accountId, UserName userName, EmailCache emailCache) { + final keyCache = TupleKey(emailCache.id, accountId.asString, userName.value).encodeKey; + return _emailCacheClient.insertItem(keyCache, emailCache); + } } \ No newline at end of file diff --git a/lib/main/utils/app_constants.dart b/lib/main/utils/app_constants.dart index 3be1be58b..c4b8fc78a 100644 --- a/lib/main/utils/app_constants.dart +++ b/lib/main/utils/app_constants.dart @@ -1,5 +1,4 @@ class AppConstants { static const int limitCharToStartSearch = 3; - static const String applicationName = 'TeamMail'; } \ No newline at end of file