Get all email cache by AccountId

(cherry picked from commit e9f172861d595549158feb829c74afc76dd7311e)

lib/features/caching/email_cache_client.dart

@@ -1,5 +1,4 @@
 
-import 'package:jmap_dart_client/jmap/mail/mailbox/mailbox.dart';
 import 'package:tmail_ui_user/features/caching/config/hive_cache_client.dart';
 import 'package:tmail_ui_user/features/thread/data/model/email_cache.dart';
 
@@ -7,17 +6,4 @@ class EmailCacheClient extends HiveCacheClient<EmailCache> {
 
   @override
   String get tableName => 'EmailCache';
-
-  Future<List<EmailCache>> getListEmailCacheByMailboxId(MailboxId mailboxId) {
-    return Future.sync(() async {
-      final boxEmail = await openBox();
-      return boxEmail.values.where((emailCache) {
-        return emailCache.mailboxIds != null
-          && emailCache.mailboxIds!.containsKey(mailboxId.id.value)
-          && emailCache.mailboxIds![mailboxId.id.value] == true;
-      }).toList();
-    }).catchError((error) {
-      throw error;
-    });
-  }
 }

lib/features/thread/data/datasource/thread_datasource.dart

@@ -36,7 +36,7 @@ abstract class ThreadDataSource {
     }
   );
 
-  Future<List<Email>> getAllEmailCache({MailboxId? inMailboxId, Set<Comparator>? sort, FilterMessageOption? filterOption, UnsignedInt? limit});
+  Future<List<Email>> getAllEmailCache(AccountId accountId, {MailboxId? inMailboxId, Set<Comparator>? sort, FilterMessageOption? filterOption, UnsignedInt? limit});
 
   Future<void> update(AccountId accountId, {List<Email>? updated, List<Email>? created, List<EmailId>? destroyed});
 

lib/features/thread/data/datasource_impl/local_thread_datasource_impl.dart

@@ -52,7 +52,8 @@ class LocalThreadDataSourceImpl extends ThreadDataSource {
   }
 
   @override
-  Future<List<Email>> getAllEmailCache({
+  Future<List<Email>> getAllEmailCache(
+    AccountId accountId, {
     MailboxId? inMailboxId,
     Set<Comparator>? sort,
     FilterMessageOption? filterOption,
@@ -60,6 +61,7 @@ class LocalThreadDataSourceImpl extends ThreadDataSource {
   }) {
     return Future.sync(() async {
       return await _emailCacheManager.getAllEmail(
+        accountId,
         inMailboxId: inMailboxId,
         sort: sort,
         filterOption: filterOption ?? FilterMessageOption.all,

lib/features/thread/data/datasource_impl/thread_datasource_impl.dart

@@ -74,7 +74,7 @@ class ThreadDataSourceImpl extends ThreadDataSource {
   }
 
   @override
-  Future<List<Email>> getAllEmailCache({MailboxId? inMailboxId, Set<Comparator>? sort, FilterMessageOption? filterOption, UnsignedInt? limit}) {
+  Future<List<Email>> getAllEmailCache(AccountId accountId, {MailboxId? inMailboxId, Set<Comparator>? sort, FilterMessageOption? filterOption, UnsignedInt? limit}) {
     throw UnimplementedError();
   }
 

lib/features/thread/data/extensions/email_extension.dart

@@ -1,4 +1,5 @@
 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/thread/data/model/email_cache.dart';
 import 'package:tmail_ui_user/features/thread/data/extensions/map_keywords_extension.dart';
 import 'package:tmail_ui_user/features/thread/data/extensions/email_address_extension.dart';
@@ -24,4 +25,10 @@ extension EmailExtension on Email {
       mailboxIds: mailboxIds?.toMapString(),
     );
   }
+
+  bool belongTo(MailboxId mailboxId) {
+    return mailboxIds != null
+      && mailboxIds!.containsKey(mailboxId)
+      && mailboxIds![mailboxId] == true;
+  }
 }

lib/features/thread/data/extensions/list_email_cache_extension.dart

@@ -1,8 +1,8 @@
 
+import 'package:jmap_dart_client/jmap/mail/email/email.dart';
+import 'package:tmail_ui_user/features/thread/data/extensions/email_cache_extension.dart';
 import 'package:tmail_ui_user/features/thread/data/model/email_cache.dart';
 
 extension ListEmailCacheExtension on List<EmailCache> {
-  Map<String, EmailCache> toMap() {
+  List<Email> toEmailList() => map((emailCache) => emailCache.toEmail()).toList();
-    return { for (var emailCache in this) emailCache.id : emailCache };
-  }
 }

lib/features/thread/data/local/email_cache_manager.dart

@@ -6,6 +6,8 @@ import 'package:jmap_dart_client/jmap/mail/mailbox/mailbox.dart';
 import 'package:tmail_ui_user/features/caching/email_cache_client.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';
+import 'package:tmail_ui_user/features/thread/data/extensions/list_email_cache_extension.dart';
 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';
@@ -17,19 +19,19 @@ class EmailCacheManager {
 
   EmailCacheManager(this._emailCacheClient);
 
-  Future<List<Email>> getAllEmail({
+  Future<List<Email>> getAllEmail(
+    AccountId accountId, {
     MailboxId? inMailboxId,
     Set<Comparator>? sort,
     UnsignedInt? limit,
     FilterMessageOption filterOption = FilterMessageOption.all
   }) async {
-    final emailCacheList = inMailboxId != null
+    final emailCacheList = await _emailCacheClient.getListByCollectionId(accountId.asString);
-      ? await _emailCacheClient.getListEmailCacheByMailboxId(inMailboxId)
-      : await _emailCacheClient.getAll();
     final emailList = emailCacheList
-        .map((emailCache) => emailCache.toEmail())
+      .toEmailList()
-        .where((email) => filterOption.filterEmail(email))
+      .where((email) => _filterEmailByMailbox(email, filterOption, inMailboxId))
-        .toList();
+      .toList();
+
     if (sort != null) {
       for (var comparator in sort) {
         emailList.sortBy(comparator);
@@ -42,6 +44,14 @@ class EmailCacheManager {
     return emailList;
   }
 
+  bool _filterEmailByMailbox(Email email, FilterMessageOption option, MailboxId? inMailboxId) {
+    if (inMailboxId != null) {
+      return email.belongTo(inMailboxId) && option.filterEmail(email);
+    } else {
+      return option.filterEmail(email);
+    }
+  }
+
   Future<void> update(
     AccountId accountId, {
     List<Email>? updated,

lib/features/thread/data/repository/thread_repository_impl.dart

@@ -46,6 +46,7 @@ class ThreadRepositoryImpl extends ThreadRepository {
     log('ThreadRepositoryImpl::getAllEmail(): filter = ${emailFilter?.mailboxId}');
     final localEmailResponse = await Future.wait([
       mapDataSource[DataSourceType.local]!.getAllEmailCache(
+          accountId,
           inMailboxId: emailFilter?.mailboxId,
           sort: sort,
           limit: limit,
@@ -104,10 +105,11 @@ class ThreadRepositoryImpl extends ThreadRepository {
 
     final newEmailResponse = await Future.wait([
       mapDataSource[DataSourceType.local]!.getAllEmailCache(
-          inMailboxId: emailFilter?.mailboxId,
+        accountId,
-          sort: sort,
+        inMailboxId: emailFilter?.mailboxId,
-          limit: limit,
+        sort: sort,
-          filterOption: emailFilter?.filterOption),
+        limit: limit,
+        filterOption: emailFilter?.filterOption),
       stateDataSource.getState(StateType.email)
     ]).then((List response) {
       return EmailsResponse(emailList: response.first, state: response.last);
@@ -216,7 +218,12 @@ class ThreadRepositoryImpl extends ThreadRepository {
     );
 
     final newEmailResponse = await Future.wait([
-      mapDataSource[DataSourceType.local]!.getAllEmailCache(inMailboxId: emailFilter?.mailboxId, sort: sort, filterOption: emailFilter?.filterOption),
+      mapDataSource[DataSourceType.local]!.getAllEmailCache(
+        accountId,
+        inMailboxId: emailFilter?.mailboxId,
+        sort: sort,
+        filterOption: emailFilter?.filterOption
+      ),
       stateDataSource.getState(StateType.email)
     ]).then((List response) {
       return EmailsResponse(emailList: response.first, state: response.last);
@@ -306,8 +313,7 @@ class ThreadRepositoryImpl extends ThreadRepository {
       Properties? propertiesUpdated,
     }
   ) async {
-    final localEmailList = await mapDataSource[DataSourceType.local]!
+    final localEmailList = await mapDataSource[DataSourceType.local]!.getAllEmailCache(accountId);
-        .getAllEmailCache();
 
     EmailChangeResponse? emailChangeResponse;
     bool hasMoreChanges = true;