TF-138 Implement load more for search email

lib/features/thread/domain/state/search_more_email_state.dart

@@ -0,0 +1,30 @@
+
+import 'package:core/core.dart';
+import 'package:model/email/presentation_email.dart';
+
+class SearchingMoreState extends UIState {
+
+  SearchingMoreState();
+
+  @override
+  List<Object> get props => [];
+}
+
+
+class SearchMoreEmailSuccess extends UIState {
+  final List<PresentationEmail> emailList;
+
+  SearchMoreEmailSuccess(this.emailList);
+
+  @override
+  List<Object> get props => [emailList];
+}
+
+class SearchMoreEmailFailure extends FeatureFailure {
+  final exception;
+
+  SearchMoreEmailFailure(this.exception);
+
+  @override
+  List<Object> get props => [exception];
+}

lib/features/thread/domain/usecases/search_more_email_interactor.dart

@@ -0,0 +1,50 @@
+
+import 'package:core/core.dart';
+import 'package:jmap_dart_client/jmap/mail/email/email.dart';
+import 'package:model/model.dart';
+import 'package:dartz/dartz.dart';
+import 'package:jmap_dart_client/jmap/account_id.dart';
+import 'package:jmap_dart_client/jmap/core/filter/filter.dart';
+import 'package:jmap_dart_client/jmap/core/properties/properties.dart';
+import 'package:jmap_dart_client/jmap/core/unsigned_int.dart';
+import 'package:jmap_dart_client/jmap/core/sort/comparator.dart';
+import 'package:tmail_ui_user/features/thread/domain/repository/thread_repository.dart';
+import 'package:tmail_ui_user/features/thread/domain/state/search_more_email_state.dart';
+
+class SearchMoreEmailInteractor {
+
+  final ThreadRepository threadRepository;
+
+  SearchMoreEmailInteractor(this.threadRepository);
+
+  Stream<Either<Failure, Success>> execute(
+    AccountId accountId,
+    {
+      UnsignedInt? limit,
+      Set<Comparator>? sort,
+      Filter? filter,
+      Properties? properties,
+      EmailId? lastEmailId
+    }
+  ) async* {
+    try {
+      yield Right(SearchingMoreState());
+
+      final emailList = await threadRepository.searchEmails(
+        accountId,
+        limit: limit,
+        sort: sort,
+        filter: filter,
+        properties: properties);
+
+      final presentationEmailList = emailList
+        .where((email) => email.id != lastEmailId)
+        .map((email) => email.toPresentationEmail())
+        .toList();
+
+      yield Right(SearchMoreEmailSuccess(presentationEmailList));
+    } catch (e) {
+      yield Left(SearchMoreEmailFailure(e));
+    }
+  }
+}

lib/features/thread/presentation/thread_bindings.dart

@@ -30,6 +30,7 @@ import 'package:tmail_ui_user/features/thread/domain/usecases/move_multiple_emai
 import 'package:tmail_ui_user/features/thread/domain/usecases/mark_as_star_multiple_email_interactor.dart';
 import 'package:tmail_ui_user/features/thread/domain/usecases/refresh_changes_emails_in_mailbox_interactor.dart';
 import 'package:tmail_ui_user/features/thread/domain/usecases/search_email_interactor.dart';
+import 'package:tmail_ui_user/features/thread/domain/usecases/search_more_email_interactor.dart';
 import 'package:tmail_ui_user/features/thread/presentation/thread_controller.dart';
 
 class ThreadBindings extends Bindings {
@@ -69,6 +70,7 @@ class ThreadBindings extends Bindings {
     Get.lazyPut(() => RefreshChangesEmailsInMailboxInteractor(Get.find<ThreadRepository>()));
     Get.lazyPut(() => LoadMoreEmailsInMailboxInteractor(Get.find<ThreadRepository>()));
     Get.lazyPut(() => SearchEmailInteractor(Get.find<ThreadRepository>()));
+    Get.lazyPut(() => SearchMoreEmailInteractor(Get.find<ThreadRepository>()));
     Get.put(ThreadController(
       Get.find<ResponsiveUtils>(),
       Get.find<GetEmailsInMailboxInteractor>(),
@@ -81,6 +83,7 @@ class ThreadBindings extends Bindings {
       Get.find<RefreshChangesEmailsInMailboxInteractor>(),
       Get.find<LoadMoreEmailsInMailboxInteractor>(),
       Get.find<SearchEmailInteractor>(),
+      Get.find<SearchMoreEmailInteractor>(),
     ));
   }
 }

lib/features/thread/presentation/thread_controller.dart

@@ -28,6 +28,7 @@ import 'package:tmail_ui_user/features/thread/domain/state/mark_as_multiple_emai
 import 'package:tmail_ui_user/features/thread/domain/state/move_multiple_email_to_mailbox_state.dart';
 import 'package:tmail_ui_user/features/thread/domain/state/mark_as_star_multiple_email_state.dart';
 import 'package:tmail_ui_user/features/thread/domain/state/search_email_state.dart';
+import 'package:tmail_ui_user/features/thread/domain/state/search_more_email_state.dart';
 import 'package:tmail_ui_user/features/thread/domain/usecases/get_emails_in_mailbox_interactor.dart';
 import 'package:tmail_ui_user/features/thread/domain/usecases/load_more_emails_in_mailbox_interactor.dart';
 import 'package:tmail_ui_user/features/thread/domain/usecases/mark_as_multiple_email_read_interactor.dart';
@@ -35,6 +36,7 @@ import 'package:tmail_ui_user/features/thread/domain/usecases/move_multiple_emai
 import 'package:tmail_ui_user/features/thread/domain/usecases/mark_as_star_multiple_email_interactor.dart';
 import 'package:tmail_ui_user/features/thread/domain/usecases/refresh_changes_emails_in_mailbox_interactor.dart';
 import 'package:tmail_ui_user/features/thread/domain/usecases/search_email_interactor.dart';
+import 'package:tmail_ui_user/features/thread/domain/usecases/search_more_email_interactor.dart';
 import 'package:tmail_ui_user/main/localizations/app_localizations.dart';
 import 'package:tmail_ui_user/main/routes/app_routes.dart';
 import 'package:tmail_ui_user/main/routes/route_navigation.dart';
@@ -54,12 +56,14 @@ class ThreadController extends BaseController {
   final RefreshChangesEmailsInMailboxInteractor _refreshChangesEmailsInMailboxInteractor;
   final LoadMoreEmailsInMailboxInteractor _loadMoreEmailsInMailboxInteractor;
   final SearchEmailInteractor _searchEmailInteractor;
+  final SearchMoreEmailInteractor _searchMoreEmailInteractor;
 
   final emailList = <PresentationEmail>[].obs;
   final emailListSearch = <PresentationEmail>[].obs;
   final currentSelectMode = SelectMode.INACTIVE.obs;
 
   bool canLoadMore = true;
+  bool canSearchMore = true;
   MailboxId? _currentMailboxId;
   jmap.State? _currentEmailState;
 
@@ -86,6 +90,7 @@ class ThreadController extends BaseController {
     this._refreshChangesEmailsInMailboxInteractor,
     this._loadMoreEmailsInMailboxInteractor,
     this._searchEmailInteractor,
+    this._searchMoreEmailInteractor,
   );
 
   @override
@@ -135,9 +140,7 @@ class ThreadController extends BaseController {
     super.onData(newState);
     newState.fold(
       (failure) {
-        if (failure is LoadMoreEmailsFailure) {
+         if (failure is SearchEmailFailure) {
-          canLoadMore = false;
-        } else if (failure is SearchEmailFailure) {
           emailListSearch.clear();
         }
       },
@@ -148,6 +151,8 @@ class ThreadController extends BaseController {
           _loadMoreEmailsSuccess(success);
         } else if (success is SearchEmailSuccess) {
           _searchEmailsSuccess(success);
+        } else if (success is SearchMoreEmailSuccess) {
+          _searchMoreEmailsSuccess(success);
         }
       }
     );
@@ -236,20 +241,16 @@ class ThreadController extends BaseController {
   }
 
   void loadMoreEmails() {
-    if (isSearchActive()) {
+    if (canLoadMore && _accountId != null) {
-      return;
+      consumeState(_loadMoreEmailsInMailboxInteractor.execute(
-    } else {
+        _accountId!,
-      if (canLoadMore && _accountId != null) {
+        limit: ThreadConstants.defaultLimit,
-        consumeState(_loadMoreEmailsInMailboxInteractor.execute(
+        sort: _sortOrder,
-          _accountId!,
+        filter: EmailFilterCondition(
-          limit: ThreadConstants.defaultLimit,
+          inMailbox: mailboxDashBoardController.selectedMailbox.value?.id,
-          sort: _sortOrder,
+          before: emailList.last.receivedAt),
-          filter: EmailFilterCondition(
+        properties: ThreadConstants.propertiesDefault,
-            inMailbox: mailboxDashBoardController.selectedMailbox.value?.id,
+      ));
-            before: emailList.last.receivedAt),
-          properties: ThreadConstants.propertiesDefault,
-        ));
-      }
     }
   }
 
@@ -547,6 +548,33 @@ class ThreadController extends BaseController {
     emailListSearch.value = resultEmailSearchList;
   }
 
+  void searchMoreEmails() {
+    if (canSearchMore && _accountId != null) {
+      consumeState(_searchMoreEmailInteractor.execute(
+        _accountId!,
+        limit: ThreadConstants.defaultLimit,
+        sort: _sortOrder,
+        filter: EmailFilterCondition(
+            text: searchQuery!.value,
+            before: emailListSearch.last.receivedAt),
+        properties: ThreadConstants.propertiesDefault,
+        lastEmailId: emailListSearch.last.id
+      ));
+    }
+  }
+
+  void _searchMoreEmailsSuccess(SearchMoreEmailSuccess success) {
+    if (success.emailList.isNotEmpty) {
+      final resultEmailSearchList = success.emailList
+          .map((email) => email.toSearchPresentationEmail(mailboxDashBoardController.mapMailbox))
+          .where((email) => !emailListSearch.contains(email))
+          .toList();
+      emailListSearch.addAll(resultEmailSearchList);
+    } else {
+      canSearchMore = false;
+    }
+  }
+
   bool canComposeEmail() => mailboxDashBoardController.sessionCurrent != null
       && mailboxDashBoardController.userProfile.value != null
       && mailboxDashBoardController.mapDefaultMailboxId.containsKey(PresentationMailbox.roleOutbox);

lib/features/thread/presentation/thread_view.dart

@@ -6,6 +6,7 @@ import 'package:get/get.dart';
 import 'package:model/email/presentation_email.dart';
 import 'package:model/model.dart';
 import 'package:tmail_ui_user/features/thread/domain/state/search_email_state.dart';
+import 'package:tmail_ui_user/features/thread/domain/state/search_more_email_state.dart';
 import 'package:tmail_ui_user/features/thread/presentation/thread_controller.dart';
 import 'package:tmail_ui_user/features/thread/presentation/widgets/app_bar_thread_select_mode_active_builder.dart';
 import 'package:tmail_ui_user/features/thread/presentation/widgets/app_bar_thread_widget_builder.dart';
@@ -214,27 +215,53 @@ class ThreadView extends GetWidget<ThreadController> {
   Widget _buildLoadingView() {
     return Obx(() => controller.viewState.value.fold(
       (failure) => SizedBox.shrink(),
-      (success) => success is LoadingState || success is SearchingState
+      (success) {
-        ? Center(child: Padding(
+        if (controller.isSearchActive()) {
-            padding: EdgeInsets.only(top: 16, bottom: 16),
+          return success is SearchingState
-            child: SizedBox(
+              ? Center(child: Padding(
-              width: 24,
+                  padding: EdgeInsets.only(top: 16, bottom: 16),
-              height: 24,
+                  child: SizedBox(
-              child: CircularProgressIndicator(color: AppColor.primaryColor))))
+                      width: 24,
-        : SizedBox.shrink()));
+                      height: 24,
+                      child: CircularProgressIndicator(color: AppColor.primaryColor))))
+              : SizedBox.shrink();
+        } else {
+          return success is LoadingState
+            ? Center(child: Padding(
+                padding: EdgeInsets.only(top: 16, bottom: 16),
+                child: SizedBox(
+                    width: 24,
+                    height: 24,
+                    child: CircularProgressIndicator(color: AppColor.primaryColor))))
+            : SizedBox.shrink();
+        }
+      }));
   }
 
   Widget _buildLoadingViewLoadMore() {
     return Obx(() => controller.viewState.value.fold(
       (failure) => SizedBox.shrink(),
-      (success) => success is LoadingMoreState
+      (success) {
-        ? Center(child: Padding(
+        if (controller.isSearchActive()) {
-            padding: EdgeInsets.only(top: 16, bottom: 16),
+          return success is SearchingMoreState
-            child: SizedBox(
+            ? Center(child: Padding(
-                width: 24,
+                padding: EdgeInsets.only(top: 16, bottom: 16),
-                height: 24,
+                child: SizedBox(
-                child: CircularProgressIndicator(color: AppColor.primaryColor))))
+                    width: 24,
-        : SizedBox.shrink()));
+                    height: 24,
+                    child: CircularProgressIndicator(color: AppColor.primaryColor))))
+            : SizedBox.shrink();
+        } else {
+          return success is LoadingMoreState
+            ? Center(child: Padding(
+                padding: EdgeInsets.only(top: 16, bottom: 16),
+                child: SizedBox(
+                    width: 24,
+                    height: 24,
+                    child: CircularProgressIndicator(color: AppColor.primaryColor))))
+            : SizedBox.shrink();
+        }
+      }));
   }
 
   Widget _buildListEmail(BuildContext context) {
@@ -288,7 +315,11 @@ class ThreadView extends GetWidget<ThreadController> {
       onNotification: (ScrollNotification scrollInfo) {
         if (scrollInfo is ScrollEndNotification
             && scrollInfo.metrics.pixels == scrollInfo.metrics.maxScrollExtent) {
-          controller.loadMoreEmails();
+          if (controller.isSearchActive()) {
+            controller.searchMoreEmails();
+          } else {
+            controller.loadMoreEmails();
+          }
         }
         return false;
       },