TF-4282 Fix sort of web search suggestion (#4289)

lib/features/base/mixin/mail_api_mixin.dart

@@ -141,7 +141,7 @@ mixin MailAPIMixin on HandleSetErrorMixin {
 
     if (limit != null) queryEmailMethod.addLimit(limit);
 
-    if (position != null) queryEmailMethod.addPosition(position);
+    if (position != null && position > 0) queryEmailMethod.addPosition(position);
 
     if (sort != null) queryEmailMethod.addSorts(sort);
 

lib/features/mailbox_dashboard/presentation/controller/mailbox_dashboard_controller.dart

@@ -138,6 +138,7 @@ import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/extensions
 import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/extensions/labels/handle_logic_label_extension.dart';
 import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/extensions/notify_thread_detail_setting_updated.dart';
 import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/extensions/open_and_close_composer_extension.dart';
+import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/extensions/quick_search_emails_extension.dart';
 import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/extensions/reopen_composer_cache_extension.dart';
 import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/extensions/select_search_filter_action_extension.dart';
 import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/extensions/set_error_extension.dart';

lib/features/mailbox_dashboard/presentation/controller/search_controller.dart

@@ -5,26 +5,15 @@ import 'package:dartz/dartz.dart';
 import 'package:flutter/material.dart';
 import 'package:get/get.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/session/session.dart';
-import 'package:jmap_dart_client/jmap/core/sort/comparator.dart';
-import 'package:jmap_dart_client/jmap/core/unsigned_int.dart';
 import 'package:jmap_dart_client/jmap/core/user_name.dart';
 import 'package:jmap_dart_client/jmap/core/utc_date.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:labels/model/label.dart';
-import 'package:model/email/presentation_email.dart';
-import 'package:model/extensions/email_filter_condition_extension.dart';
 import 'package:model/mailbox/presentation_mailbox.dart';
 import 'package:tmail_ui_user/features/base/base_controller.dart';
 import 'package:tmail_ui_user/features/base/mixin/date_range_picker_mixin.dart';
-import 'package:tmail_ui_user/features/email/presentation/utils/email_utils.dart';
 import 'package:tmail_ui_user/features/mailbox_dashboard/domain/model/recent_search.dart';
 import 'package:tmail_ui_user/features/mailbox_dashboard/domain/state/get_all_recent_search_latest_state.dart';
-import 'package:tmail_ui_user/features/mailbox_dashboard/domain/state/quick_search_email_state.dart';
 import 'package:tmail_ui_user/features/mailbox_dashboard/domain/usecases/get_all_recent_search_latest_interactor.dart';
 import 'package:tmail_ui_user/features/mailbox_dashboard/domain/usecases/quick_search_email_interactor.dart';
 import 'package:tmail_ui_user/features/mailbox_dashboard/domain/usecases/save_recent_search_interactor.dart';
@@ -38,7 +27,7 @@ import 'package:tmail_ui_user/features/thread/presentation/model/search_state.da
 import 'package:tmail_ui_user/features/thread/presentation/model/search_status.dart';
 
 class SearchController extends BaseController with DateRangePickerMixin {
-  final QuickSearchEmailInteractor _quickSearchEmailInteractor;
+  final QuickSearchEmailInteractor quickSearchEmailInteractor;
   final SaveRecentSearchInteractor _saveRecentSearchInteractor;
   final GetAllRecentSearchLatestInteractor _getAllRecentSearchLatestInteractor;
 
@@ -58,7 +47,7 @@ class SearchController extends BaseController with DateRangePickerMixin {
   String currentSearchText = '';
 
   SearchController(
-    this._quickSearchEmailInteractor,
+    this.quickSearchEmailInteractor,
     this._saveRecentSearchInteractor,
     this._getAllRecentSearchLatestInteractor,
   );
@@ -108,59 +97,6 @@ class SearchController extends BaseController with DateRangePickerMixin {
     listFilterOnSuggestionForm.remove(searchFilter);
   }
 
-  Future<List<PresentationEmail>> quickSearchEmails({
-    required Session session,
-    required AccountId accountId,
-    required String ownEmailAddress,
-    required String query,
-  }) async {
-    currentSearchText = query;
-    return await _quickSearchEmailInteractor.execute(
-      session,
-      accountId,
-      limit: UnsignedInt(5),
-      sort: <Comparator>{}..add(
-        EmailComparator(EmailComparatorProperty.receivedAt)
-          ..setIsAscending(false)),
-      filter: _mappingToFilterOnSuggestionForm(
-        currentUserEmail: ownEmailAddress,
-        query: query,
-      ),
-      properties: EmailUtils.getPropertiesForEmailGetMethod(session, accountId),
-    ).then((result) => result.fold(
-      (failure) => <PresentationEmail>[],
-      (success) => success is QuickSearchEmailSuccess
-        ? success.emailList
-        : <PresentationEmail>[]
-    ));
-  }
-
-  Filter? _mappingToFilterOnSuggestionForm({required String query, required String currentUserEmail}) {
-    log('SearchController::_mappingToFilterOnSuggestionForm():query: $query');
-    final filterCondition = EmailFilterCondition(
-      text: query.isNotEmpty == true ? query : null,
-      after: listFilterOnSuggestionForm.contains(QuickSearchFilter.last7Days)
-        ? EmailReceiveTimeType.last7Days.toOldestUTCDate()
-        : null,
-      before: listFilterOnSuggestionForm.contains(QuickSearchFilter.last7Days)
-        ? EmailReceiveTimeType.last7Days.toLatestUTCDate()
-        : null,
-      hasAttachment: listFilterOnSuggestionForm.contains(QuickSearchFilter.hasAttachment)
-        ? true
-        : null,
-      from: listFilterOnSuggestionForm.contains(QuickSearchFilter.fromMe) && currentUserEmail.isNotEmpty
-        ? currentUserEmail
-        : null,
-      hasKeyword: listFilterOnSuggestionForm.contains(QuickSearchFilter.starred)
-        ? KeyWordIdentifier.emailFlagged.value
-        : null
-    );
-
-    return filterCondition.hasCondition
-      ? filterCondition
-      : null;
-  }
-
   void applyFilterSuggestionToSearchFilter(String currentUserEmail) {
     final receiveTime = listFilterOnSuggestionForm.contains(QuickSearchFilter.last7Days)
       ? EmailReceiveTimeType.last7Days

lib/features/mailbox_dashboard/presentation/extensions/quick_search_emails_extension.dart

@@ -0,0 +1,69 @@
+import 'package:core/utils/app_logger.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/session/session.dart';
+import 'package:jmap_dart_client/jmap/core/unsigned_int.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:model/email/presentation_email.dart';
+import 'package:model/extensions/email_filter_condition_extension.dart';
+import 'package:tmail_ui_user/features/email/presentation/utils/email_utils.dart';
+import 'package:tmail_ui_user/features/mailbox_dashboard/domain/state/quick_search_email_state.dart';
+import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/controller/search_controller.dart';
+import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/model/search/email_receive_time_type.dart';
+import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/model/search/quick_search_filter.dart';
+
+extension QuickSearchEmailsExtension on SearchController {
+  Future<List<PresentationEmail>> quickSearchEmails({
+    required Session session,
+    required AccountId accountId,
+    required String ownEmailAddress,
+    required String query,
+  }) async {
+    currentSearchText = query;
+    return await quickSearchEmailInteractor.execute(
+      session,
+      accountId,
+      limit: UnsignedInt(5),
+      sort: searchEmailFilter.value.sortOrderType
+                  .getSortOrder()
+                  .toNullable(),
+      filter: _mappingToFilterOnSuggestionForm(
+        currentUserEmail: ownEmailAddress,
+        query: query,
+      ),
+      properties: EmailUtils.getPropertiesForEmailGetMethod(session, accountId),
+    ).then((result) => result.fold(
+      (failure) => <PresentationEmail>[],
+      (success) => success is QuickSearchEmailSuccess
+        ? success.emailList
+        : <PresentationEmail>[]
+    ));
+  } 
+
+  Filter? _mappingToFilterOnSuggestionForm({required String query, required String currentUserEmail}) {
+    log('SearchController::_mappingToFilterOnSuggestionForm():query: $query');
+    final filterCondition = EmailFilterCondition(
+      text: query.isNotEmpty == true ? query : null,
+      after: listFilterOnSuggestionForm.contains(QuickSearchFilter.last7Days)
+        ? EmailReceiveTimeType.last7Days.toOldestUTCDate()
+        : null,
+      before: listFilterOnSuggestionForm.contains(QuickSearchFilter.last7Days)
+        ? EmailReceiveTimeType.last7Days.toLatestUTCDate()
+        : null,
+      hasAttachment: listFilterOnSuggestionForm.contains(QuickSearchFilter.hasAttachment)
+        ? true
+        : null,
+      from: listFilterOnSuggestionForm.contains(QuickSearchFilter.fromMe) && currentUserEmail.isNotEmpty
+        ? currentUserEmail
+        : null,
+      hasKeyword: listFilterOnSuggestionForm.contains(QuickSearchFilter.starred)
+        ? KeyWordIdentifier.emailFlagged.value
+        : null
+    );
+
+    return filterCondition.hasCondition
+      ? filterCondition
+      : null;
+  }
+}

lib/features/thread/data/network/thread_api.dart

@@ -81,7 +81,7 @@ class ThreadAPI with HandleSetErrorMixin, MailAPIMixin {
 
     if (limit != null) queryEmailMethod.addLimit(limit);
 
-    if (position != null) queryEmailMethod.addPosition(position);
+    if (position != null && position > 0) queryEmailMethod.addPosition(position);
 
     if (sort != null) queryEmailMethod.addSorts(sort);