TF-3372 Implement Thread repository with new Empty API

linagora · Dec 27, 2024 · adaee38 · adaee38
1 parent 2955cbb
commit adaee38
Show file tree

Hide file tree

Showing 7 changed files with 43 additions and 91 deletions.
diff --git a/lib/features/thread/data/datasource/thread_datasource.dart b/lib/features/thread/data/datasource/thread_datasource.dart
@@ -64,7 +64,7 @@ abstract class ThreadDataSource {
 
   Future<void> update(AccountId accountId, UserName userName, {List<Email>? updated, List<Email>? created, List<EmailId>? destroyed});
 
-  Future<List<EmailId>> emptyMailboxFolder(
+  Future<bool> emptyMailboxFolder(
     Session session,
     AccountId accountId,
     MailboxId mailboxId,

diff --git a/lib/features/thread/data/datasource_impl/local_thread_datasource_impl.dart b/lib/features/thread/data/datasource_impl/local_thread_datasource_impl.dart
@@ -108,7 +108,7 @@ class LocalThreadDataSourceImpl extends ThreadDataSource {
   }
 
   @override
-  Future<List<EmailId>> emptyMailboxFolder(
+  Future<bool> emptyMailboxFolder(
     Session session,
     AccountId accountId,
     MailboxId mailboxId,

diff --git a/lib/features/thread/data/datasource_impl/thread_datasource_impl.dart b/lib/features/thread/data/datasource_impl/thread_datasource_impl.dart
@@ -112,7 +112,7 @@ class ThreadDataSourceImpl extends ThreadDataSource {
   }
 
   @override
-  Future<List<EmailId>> emptyMailboxFolder(
+  Future<bool> emptyMailboxFolder(
     Session session,
     AccountId accountId,
     MailboxId mailboxId

diff --git a/lib/features/thread/data/network/thread_isolate_worker.dart b/lib/features/thread/data/network/thread_isolate_worker.dart
@@ -3,22 +3,17 @@ import 'dart:async';
 import 'package:core/utils/app_logger.dart';
 import 'package:core/utils/platform_info.dart';
 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/sort/comparator.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/mailbox/mailbox.dart';
-import 'package:model/email/email_property.dart';
-import 'package:model/extensions/list_email_extension.dart';
 import 'package:tmail_ui_user/features/base/isolate/background_isolate_binary_messenger/background_isolate_binary_messenger.dart';
 import 'package:tmail_ui_user/features/caching/config/hive_cache_config.dart';
 import 'package:tmail_ui_user/features/email/data/network/email_api.dart';
 import 'package:tmail_ui_user/features/thread/data/model/empty_mailbox_folder_arguments.dart';
 import 'package:tmail_ui_user/features/thread/data/network/thread_api.dart';
-import 'package:tmail_ui_user/features/thread/domain/exceptions/thread_exceptions.dart';
 import 'package:tmail_ui_user/main/exceptions/isolate_exception.dart';
 import 'package:worker_manager/worker_manager.dart';
 
@@ -29,7 +24,7 @@ class ThreadIsolateWorker {
 
   ThreadIsolateWorker(this._threadAPI, this._emailAPI, this._isolateExecutor);
 
-  Future<List<EmailId>> emptyMailboxFolder(
+  Future<bool> emptyMailboxFolder(
     Session session,
     AccountId accountId,
     MailboxId mailboxId,
@@ -54,15 +49,11 @@ class ThreadIsolateWorker {
         fun1: _emptyMailboxFolderAction
       );
 
-      if (result.isEmpty) {
-        throw NotFoundEmailsDeletedException();
-      } else {
-        return result;
-      }
+      return result;
     }
   }
 
-  static Future<List<EmailId>> _emptyMailboxFolderAction(
+  static Future<bool> _emptyMailboxFolderAction(
     EmptyMailboxFolderArguments args,
     TypeSendPort sendPort
   ) async {
@@ -71,91 +62,53 @@ class ThreadIsolateWorker {
       BackgroundIsolateBinaryMessenger.ensureInitialized(rootIsolateToken);
       await HiveCacheConfig.instance.setUp();
 
-      List<EmailId> emailListCompleted = List.empty(growable: true);
-
+      bool batchResult = true;
       var hasEmails = true;
-      Email? lastEmail;
 
       while (hasEmails) {
-        final emailsResponse = await args.threadAPI.getAllEmail(
-          args.session,
+        final emptyMailboxResponse = await args.threadAPI.deleteEmailsBaseOnQuery(
+          args.session, 
           args.accountId,
           sort: <Comparator>{}..add(
             EmailComparator(EmailComparatorProperty.receivedAt)
               ..setIsAscending(false)),
-          filter: EmailFilterCondition(inMailbox: args.mailboxId, before: lastEmail?.receivedAt),
-          properties: Properties({EmailProperty.id}));
-
-        var newEmailList = emailsResponse.emailList ?? <Email>[];
-        if (lastEmail != null) {
-          newEmailList = newEmailList.where((email) => email.id != lastEmail!.id).toList();
-        }
-
-        log('ThreadIsolateWorker::_emptyMailboxFolderAction(): ${newEmailList.length}');
-
-        if (newEmailList.isNotEmpty) {
-          lastEmail = newEmailList.last;
-          hasEmails = true;
-          final listEmailIdDeleted = await args.emailAPI.deleteMultipleEmailsPermanently(
-            args.session,
-            args.accountId,
-            newEmailList.listEmailIds);
-          emailListCompleted.addAll(listEmailIdDeleted);
-        } else {
-          hasEmails = false;
-        }
+          filter: EmailFilterCondition(inMailbox: args.mailboxId),
+        );
+        batchResult = !batchResult ? batchResult : emptyMailboxResponse.isSuccess;
+        hasEmails = emptyMailboxResponse.deletedCount > 0;
       }
-      log('ThreadIsolateWorker::_emptyMailboxFolderAction(): TOTAL_REMOVE: ${emailListCompleted.length}');
-      return emailListCompleted;
+      return batchResult;
     } catch (e) {
       logError('ThreadIsolateWorker::_emptyMailboxFolderAction(): ERROR: $e');
       rethrow;
     }
   }
 
-  Future<List<EmailId>> _emptyMailboxFolderOnWeb(
+  Future<bool> _emptyMailboxFolderOnWeb(
     Session session,
     AccountId accountId,
     MailboxId mailboxId,
   ) async {
-    List<EmailId> emailListCompleted = List.empty(growable: true);
+    bool batchResult = true;
     try {
       var hasEmails = true;
-      Email? lastEmail;
 
       while (hasEmails) {
-        final emailsResponse = await _threadAPI.getAllEmail(
-          session,
+        final emptyMailboxResponse = await _threadAPI.deleteEmailsBaseOnQuery(
+          session, 
           accountId,
           sort: <Comparator>{}..add(
             EmailComparator(EmailComparatorProperty.receivedAt)
               ..setIsAscending(false)),
-          filter: EmailFilterCondition(inMailbox: mailboxId, before: lastEmail?.receivedAt),
-          properties: Properties({EmailProperty.id}));
-
-        var newEmailList = emailsResponse.emailList ?? <Email>[];
-        if (lastEmail != null) {
-          newEmailList = newEmailList.where((email) => email.id != lastEmail!.id).toList();
-        }
-
-        log('ThreadIsolateWorker::_emptyMailboxFolderOnWeb(): ${newEmailList.length}');
-
-        if (newEmailList.isNotEmpty) {
-          lastEmail = newEmailList.last;
-          hasEmails = true;
-          final listEmailIdDeleted = await _emailAPI.deleteMultipleEmailsPermanently(
-            session,
-            accountId,
-            newEmailList.listEmailIds);
-          emailListCompleted.addAll(listEmailIdDeleted);
-        } else {
-          hasEmails = false;
-        }
+          filter: EmailFilterCondition(inMailbox: mailboxId),
+        );
+        batchResult = !batchResult ? batchResult : emptyMailboxResponse.isSuccess;
+        hasEmails = emptyMailboxResponse.deletedCount > 0;
       }
     } catch (e) {
+      batchResult = false;
       log('ThreadIsolateWorker::_emptyMailboxFolderOnWeb(): ERROR: $e');
     }
-    log('ThreadIsolateWorker::_emptyMailboxFolderOnWeb(): TOTAL_REMOVE: ${emailListCompleted.length}');
-    return emailListCompleted;
+    return batchResult;
   }
 }
diff --git a/lib/features/thread/data/repository/thread_repository_impl.dart b/lib/features/thread/data/repository/thread_repository_impl.dart
@@ -313,18 +313,11 @@ class ThreadRepositoryImpl extends ThreadRepository {
   }
 
   @override
-  Future<List<EmailId>> emptyTrashFolder(Session session, AccountId accountId, MailboxId trashMailboxId) async {
-    final listEmailIdDeleted = await mapDataSource[DataSourceType.network]!.emptyMailboxFolder(
+  Future<bool> emptyTrashFolder(Session session, AccountId accountId, MailboxId trashMailboxId) async {
+    return await mapDataSource[DataSourceType.network]!.emptyMailboxFolder(
       session,
       accountId,
       trashMailboxId);
-
-    await _updateEmailCache(
-      accountId,
-      session.username,
-      newDestroyed: listEmailIdDeleted);
-
-    return listEmailIdDeleted;
   }
 
   Future<void> _synchronizeCacheWithChanges(
@@ -396,17 +389,10 @@ class ThreadRepositoryImpl extends ThreadRepository {
   }
 
   @override
-  Future<List<EmailId>> emptySpamFolder(Session session, AccountId accountId, MailboxId spamMailboxId) async {
-    final listEmailIdDeleted = await mapDataSource[DataSourceType.network]!.emptyMailboxFolder(
+  Future<bool> emptySpamFolder(Session session, AccountId accountId, MailboxId spamMailboxId) async {
+    return await mapDataSource[DataSourceType.network]!.emptyMailboxFolder(
       session,
       accountId,
       spamMailboxId);
-
-    await _updateEmailCache(
-      accountId,
-      session.username,
-      newDestroyed: listEmailIdDeleted);
-
-    return listEmailIdDeleted;
   }
 }
diff --git a/lib/features/thread/domain/model/empty_mailbox_response.dart b/lib/features/thread/domain/model/empty_mailbox_response.dart
@@ -0,0 +1,13 @@
+import 'package:equatable/equatable.dart';
+
+class EmptyMailboxResponse with EquatableMixin {
+
+  final bool isSuccess;
+  final int deletedCount;
+
+  EmptyMailboxResponse(this.isSuccess, this.deletedCount);
+
+  @override
+  List<Object?> get props => [isSuccess, deletedCount];
+
+}
diff --git a/lib/features/thread/domain/repository/thread_repository.dart b/lib/features/thread/domain/repository/thread_repository.dart
@@ -55,7 +55,7 @@ abstract class ThreadRepository {
     }
   );
 
-  Future<List<EmailId>> emptyTrashFolder(
+  Future<bool> emptyTrashFolder(
     Session session,
     AccountId accountId,
     MailboxId trashMailboxId,
@@ -68,7 +68,7 @@ abstract class ThreadRepository {
     {Properties? properties}
   );
 
-  Future<List<EmailId>> emptySpamFolder(
+  Future<bool> emptySpamFolder(
     Session session,
     AccountId accountId,
     MailboxId spamMailboxId,