TF-1923 Store list new email by ascending

(cherry picked from commit e2ad80e20bca3d72bf9799e957b995a24c0844c8)
This commit is contained in:
dab246
2023-06-21 03:23:30 +07:00
committed by Dat H. Pham
parent ad5136b117
commit 125f1a6f13
15 changed files with 109 additions and 80 deletions
@@ -8,6 +8,7 @@ import 'package:dartz/dartz.dart';
import 'package:dio/dio.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/core/sort/comparator.dart';
import 'package:jmap_dart_client/jmap/core/user_name.dart';
import 'package:jmap_dart_client/jmap/mail/email/email.dart';
import 'package:model/account/account_request.dart';
@@ -78,7 +79,7 @@ abstract class EmailDataSource {
Future<void> storeDetailedNewEmail(Session session, AccountId accountId, DetailedEmail detailedEmail);
Future<Email> getDetailedEmailById(Session session, AccountId accountId, EmailId emailId);
Future<List<Email>> getListDetailedEmailById(Session session, AccountId accountId, Set<EmailId> emailIds, {Set<Comparator>? sort});
Future<void> storeEmail(Session session, AccountId accountId, Email email);
@@ -8,6 +8,7 @@ import 'package:dartz/dartz.dart';
import 'package:dio/dio.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/core/sort/comparator.dart';
import 'package:jmap_dart_client/jmap/core/user_name.dart';
import 'package:jmap_dart_client/jmap/mail/email/email.dart';
import 'package:model/model.dart';
@@ -158,9 +159,9 @@ class EmailDataSourceImpl extends EmailDataSource {
}
@override
Future<Email> getDetailedEmailById(Session session, AccountId accountId, EmailId emailId) {
Future<List<Email>> getListDetailedEmailById(Session session, AccountId accountId, Set<EmailId> emailIds, {Set<Comparator>? sort}) {
return Future.sync(() async {
return await emailAPI.getDetailedEmailById(session, accountId, emailId);
return await emailAPI.getListDetailedEmailById(session, accountId, emailIds, sort: sort);
}).catchError(_exceptionThrower.throwException);
}
@@ -13,6 +13,7 @@ import 'package:dio/dio.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/core/user_name.dart';
import 'package:jmap_dart_client/jmap/core/sort/comparator.dart';
import 'package:jmap_dart_client/jmap/mail/email/email.dart';
import 'package:model/account/account_request.dart';
import 'package:model/download/download_task_id.dart';
@@ -159,7 +160,7 @@ class EmailHiveCacheDataSourceImpl extends EmailDataSource {
}
@override
Future<Email> getDetailedEmailById(Session session, AccountId accountId, EmailId emailId) {
Future<List<Email>> getListDetailedEmailById(Session session, AccountId accountId, Set<EmailId> emailIds, {Set<Comparator>? sort}) {
throw UnimplementedError();
}
+15 -3
View File
@@ -13,6 +13,7 @@ import 'package:jmap_dart_client/jmap/account_id.dart';
import 'package:jmap_dart_client/jmap/core/capability/capability_identifier.dart';
import 'package:jmap_dart_client/jmap/core/capability/core_capability.dart';
import 'package:jmap_dart_client/jmap/core/error/set_error.dart';
import 'package:jmap_dart_client/jmap/core/sort/comparator.dart';
import 'package:jmap_dart_client/jmap/core/id.dart';
import 'package:jmap_dart_client/jmap/core/method/response/set_response.dart';
import 'package:jmap_dart_client/jmap/core/patch_object.dart';
@@ -628,11 +629,16 @@ class EmailAPI with HandleSetErrorMixin {
return setEmailResponse?.destroyed?.contains(emailId.id) == true;
}
Future<Email> getDetailedEmailById(Session session, AccountId accountId, EmailId emailId) async {
Future<List<Email>> getListDetailedEmailById(
Session session,
AccountId accountId,
Set<EmailId> emailIds,
{Set<Comparator>? sort}
) async {
final jmapRequestBuilder = JmapRequestBuilder(_httpClient, ProcessingInvocation());
final getEmailMethod = GetEmailMethod(accountId)
..addIds({emailId.id})
..addIds(emailIds.map((emailId) => emailId.id).toSet())
..addProperties(ThreadConstants.propertiesGetDetailedEmail)
..addFetchHTMLBodyValues(true);
@@ -649,8 +655,14 @@ class EmailAPI with HandleSetErrorMixin {
getEmailInvocation.methodCallId,
GetEmailResponse.deserialize);
if (sort != null && resultList != null) {
for (var comparator in sort) {
resultList.sortEmails(comparator);
}
}
if (resultList?.list.isNotEmpty == true) {
return resultList!.list.first;
return resultList!.list;
} else {
throw NotFoundEmailException();
}
@@ -10,6 +10,7 @@ import 'package:dartz/dartz.dart';
import 'package:dio/dio.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/core/sort/comparator.dart';
import 'package:jmap_dart_client/jmap/core/state.dart' as jmap;
import 'package:jmap_dart_client/jmap/mail/email/email.dart';
import 'package:model/account/account_request.dart';
@@ -190,8 +191,8 @@ class EmailRepositoryImpl extends EmailRepository {
}
@override
Future<Email> getDetailedEmailById(Session session, AccountId accountId, EmailId emailId) {
return emailDataSource[DataSourceType.network]!.getDetailedEmailById(session, accountId, emailId);
Future<List<Email>> getListDetailedEmailById(Session session, AccountId accountId, Set<EmailId> emailIds, {Set<Comparator>? sort}) {
return emailDataSource[DataSourceType.network]!.getListDetailedEmailById(session, accountId, emailIds, sort: sort);
}
@override