From 3219aedc70040de7ecd483d310ed7c99c265e7ed Mon Sep 17 00:00:00 2001 From: dab246 Date: Tue, 14 Sep 2021 10:26:54 +0700 Subject: [PATCH] TF-78 Implement automatically marked as read when open one email --- .../data/datasource/email_datasource.dart | 2 ++ .../email_datasource_impl.dart | 9 ++++++ .../email/data/network/email_api.dart | 30 +++++++++++++++++++ .../repository/email_repository_impl.dart | 5 ++++ .../domain/repository/email_repository.dart | 2 ++ .../state/mark_as_email_read_state.dart | 18 +++++++++++ .../mark_as_email_read_interactor.dart | 21 +++++++++++++ .../email/presentation/email_bindings.dart | 6 +++- .../email/presentation/email_controller.dart | 13 +++++++- .../keyword_identifier_extension.dart | 8 +++++ model/lib/model.dart | 1 + 11 files changed, 113 insertions(+), 2 deletions(-) create mode 100644 lib/features/email/domain/state/mark_as_email_read_state.dart create mode 100644 lib/features/email/domain/usecases/mark_as_email_read_interactor.dart create mode 100644 model/lib/extensions/keyword_identifier_extension.dart diff --git a/lib/features/email/data/datasource/email_datasource.dart b/lib/features/email/data/datasource/email_datasource.dart index 70478c27a..eae1d9c21 100644 --- a/lib/features/email/data/datasource/email_datasource.dart +++ b/lib/features/email/data/datasource/email_datasource.dart @@ -6,4 +6,6 @@ abstract class EmailDataSource { Future getEmailContent(AccountId accountId, EmailId emailId); Future sendEmail(AccountId accountId, EmailRequest emailRequest); + + Future markAsRead(AccountId accountId, EmailId emailId, bool unread); } \ No newline at end of file diff --git a/lib/features/email/data/datasource_impl/email_datasource_impl.dart b/lib/features/email/data/datasource_impl/email_datasource_impl.dart index 1b70de051..62028b998 100644 --- a/lib/features/email/data/datasource_impl/email_datasource_impl.dart +++ b/lib/features/email/data/datasource_impl/email_datasource_impl.dart @@ -27,4 +27,13 @@ class EmailDataSourceImpl extends EmailDataSource { throw error; }); } + + @override + Future markAsRead(AccountId accountId, EmailId emailId, bool unread) { + return Future.sync(() async { + return await emailAPI.markAsRead(accountId, emailId, unread); + }).catchError((error) { + throw error; + }); + } } \ No newline at end of file diff --git a/lib/features/email/data/network/email_api.dart b/lib/features/email/data/network/email_api.dart index a6ebc3d96..1f4123fed 100644 --- a/lib/features/email/data/network/email_api.dart +++ b/lib/features/email/data/network/email_api.dart @@ -10,6 +10,7 @@ import 'package:jmap_dart_client/jmap/jmap_request.dart'; import 'package:jmap_dart_client/jmap/mail/email/email.dart'; import 'package:jmap_dart_client/jmap/mail/email/get/get_email_method.dart'; import 'package:jmap_dart_client/jmap/mail/email/get/get_email_response.dart'; +import 'package:jmap_dart_client/jmap/mail/email/keyword_identifier.dart'; import 'package:jmap_dart_client/jmap/mail/email/set/set_email_method.dart'; import 'package:jmap_dart_client/jmap/mail/email/set/set_email_response.dart'; import 'package:jmap_dart_client/jmap/mail/email/submission/address.dart'; @@ -103,4 +104,33 @@ class EmailAPI { throw error; }); } + + Future markAsRead(AccountId accountId, EmailId emailId, bool unread) async { + final setEmailMethod = SetEmailMethod(accountId) + ..addUpdates({ + emailId.id: PatchObject({ + KeyWordIdentifier.emailSeen.generatePath() : unread ? null : true + }) + }); + + final requestBuilder = JmapRequestBuilder(httpClient, ProcessingInvocation()); + + final setEmailInvocation = requestBuilder.invocation(setEmailMethod); + + final response = await (requestBuilder + ..usings(setEmailMethod.requiredCapabilities)) + .build() + .execute(); + + final setEmailResponse = response.parse( + setEmailInvocation.methodCallId, + SetEmailResponse.deserialize); + + return Future.sync(() async { + final emailUpdated = setEmailResponse!.updated![emailId.id]; + return emailUpdated == null; + }).catchError((error) { + throw error; + }); + } } \ No newline at end of file diff --git a/lib/features/email/data/repository/email_repository_impl.dart b/lib/features/email/data/repository/email_repository_impl.dart index c40a9800c..7397a3aa1 100644 --- a/lib/features/email/data/repository/email_repository_impl.dart +++ b/lib/features/email/data/repository/email_repository_impl.dart @@ -20,4 +20,9 @@ class EmailRepositoryImpl extends EmailRepository { Future sendEmail(AccountId accountId, EmailRequest emailRequest) { return emailDataSource.sendEmail(accountId, emailRequest); } + + @override + Future markAsRead(AccountId accountId, EmailId emailId, bool unread) { + return emailDataSource.markAsRead(accountId, emailId, unread); + } } \ No newline at end of file diff --git a/lib/features/email/domain/repository/email_repository.dart b/lib/features/email/domain/repository/email_repository.dart index a0d55049d..c3ed30245 100644 --- a/lib/features/email/domain/repository/email_repository.dart +++ b/lib/features/email/domain/repository/email_repository.dart @@ -6,4 +6,6 @@ abstract class EmailRepository { Future getEmailContent(AccountId accountId, EmailId emailId); Future sendEmail(AccountId accountId, EmailRequest emailRequest); + + Future markAsRead(AccountId accountId, EmailId emailId, bool unread); } \ No newline at end of file diff --git a/lib/features/email/domain/state/mark_as_email_read_state.dart b/lib/features/email/domain/state/mark_as_email_read_state.dart new file mode 100644 index 000000000..68993137a --- /dev/null +++ b/lib/features/email/domain/state/mark_as_email_read_state.dart @@ -0,0 +1,18 @@ +import 'package:core/core.dart'; + +class MarkAsEmailReadSuccess extends UIState { + + MarkAsEmailReadSuccess(); + + @override + List get props => []; +} + +class MarkAsEmailReadFailure extends FeatureFailure { + final exception; + + MarkAsEmailReadFailure(this.exception); + + @override + List get props => [exception]; +} \ No newline at end of file diff --git a/lib/features/email/domain/usecases/mark_as_email_read_interactor.dart b/lib/features/email/domain/usecases/mark_as_email_read_interactor.dart new file mode 100644 index 000000000..202d2ba4f --- /dev/null +++ b/lib/features/email/domain/usecases/mark_as_email_read_interactor.dart @@ -0,0 +1,21 @@ +import 'package:core/core.dart'; +import 'package:dartz/dartz.dart'; +import 'package:jmap_dart_client/jmap/account_id.dart'; +import 'package:jmap_dart_client/jmap/mail/email/email.dart'; +import 'package:tmail_ui_user/features/email/domain/repository/email_repository.dart'; +import 'package:tmail_ui_user/features/email/domain/state/mark_as_email_read_state.dart'; + +class MarkAsEmailReadInteractor { + final EmailRepository emailRepository; + + MarkAsEmailReadInteractor(this.emailRepository); + + Future> execute(AccountId accountId, EmailId emailId, bool unread) async { + try { + final result = await emailRepository.markAsRead(accountId, emailId, unread); + return result ? Right(MarkAsEmailReadSuccess()) : Left(MarkAsEmailReadFailure(null)); + } catch (e) { + return Left(MarkAsEmailReadFailure(e)); + } + } +} \ No newline at end of file diff --git a/lib/features/email/presentation/email_bindings.dart b/lib/features/email/presentation/email_bindings.dart index ad656f115..574067c74 100644 --- a/lib/features/email/presentation/email_bindings.dart +++ b/lib/features/email/presentation/email_bindings.dart @@ -5,6 +5,7 @@ import 'package:tmail_ui_user/features/email/data/network/email_api.dart'; import 'package:tmail_ui_user/features/email/data/repository/email_repository_impl.dart'; import 'package:tmail_ui_user/features/email/domain/repository/email_repository.dart'; import 'package:tmail_ui_user/features/email/domain/usecases/get_email_content_interactor.dart'; +import 'package:tmail_ui_user/features/email/domain/usecases/mark_as_email_read_interactor.dart'; import 'package:tmail_ui_user/features/email/presentation/email_controller.dart'; class EmailBindings extends Bindings { @@ -15,6 +16,9 @@ class EmailBindings extends Bindings { Get.lazyPut(() => EmailRepositoryImpl(Get.find())); Get.lazyPut(() => Get.find()); Get.lazyPut(() => GetEmailContentInteractor(Get.find())); - Get.put(EmailController(Get.find())); + Get.lazyPut(() => MarkAsEmailReadInteractor(Get.find())); + Get.put(EmailController( + Get.find(), + Get.find())); } } \ No newline at end of file diff --git a/lib/features/email/presentation/email_controller.dart b/lib/features/email/presentation/email_controller.dart index ca5e88093..22481b335 100644 --- a/lib/features/email/presentation/email_controller.dart +++ b/lib/features/email/presentation/email_controller.dart @@ -9,6 +9,7 @@ import 'package:model/model.dart'; import 'package:tmail_ui_user/features/base/base_controller.dart'; import 'package:tmail_ui_user/features/email/domain/state/get_email_content_state.dart'; import 'package:tmail_ui_user/features/email/domain/usecases/get_email_content_interactor.dart'; +import 'package:tmail_ui_user/features/email/domain/usecases/mark_as_email_read_interactor.dart'; import 'package:tmail_ui_user/features/email/presentation/model/composer_arguments.dart'; import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/mailbox_dashboard_controller.dart'; import 'package:tmail_ui_user/main/routes/app_routes.dart'; @@ -17,11 +18,12 @@ class EmailController extends BaseController { final mailboxDashBoardController = Get.find(); final GetEmailContentInteractor _getEmailContentInteractor; + final MarkAsEmailReadInteractor _markAsEmailReadInteractor; final emailAddressExpandMode = ExpandMode.COLLAPSE.obs; EmailContent? emailContent; - EmailController(this._getEmailContentInteractor); + EmailController(this._getEmailContentInteractor, this._markAsEmailReadInteractor); @override void onReady() { @@ -31,6 +33,7 @@ class EmailController extends BaseController { final accountId = mailboxDashBoardController.accountId.value; if (accountId != null && presentationEmail != null) { _getEmailContentAction(accountId, presentationEmail.id); + markAsEmailRead(unread: false); } }); } @@ -67,6 +70,14 @@ class EmailController extends BaseController { emailAddressExpandMode.value = expandMode; } + void markAsEmailRead({required bool unread}) async { + final accountId = mailboxDashBoardController.accountId.value; + final presentationEmail = mailboxDashBoardController.selectedEmail.value; + if (accountId != null && presentationEmail != null) { + _markAsEmailReadInteractor.execute(accountId, presentationEmail.id, unread); + } + } + bool canComposeEmail() => mailboxDashBoardController.sessionCurrent != null && mailboxDashBoardController.userProfile.value != null && mailboxDashBoardController.mapMailboxId.containsKey(PresentationMailbox.roleOutbox) diff --git a/model/lib/extensions/keyword_identifier_extension.dart b/model/lib/extensions/keyword_identifier_extension.dart new file mode 100644 index 000000000..14e47d00d --- /dev/null +++ b/model/lib/extensions/keyword_identifier_extension.dart @@ -0,0 +1,8 @@ +import 'package:jmap_dart_client/jmap/core/patch_object.dart'; +import 'package:jmap_dart_client/jmap/mail/email/keyword_identifier.dart'; + +extension KeyWordIdentifierExtension on KeyWordIdentifier { + String generatePath() { + return '${PatchObject.keywordsProperty}/$value'; + } +} \ No newline at end of file diff --git a/model/lib/model.dart b/model/lib/model.dart index f6171a331..0917e302f 100644 --- a/model/lib/model.dart +++ b/model/lib/model.dart @@ -37,6 +37,7 @@ export 'extensions/email_extension.dart'; export 'extensions/presentation_account_extension.dart'; export 'extensions/user_profile_extension.dart'; export 'extensions/presentation_email_extension.dart'; +export 'extensions/keyword_identifier_extension.dart'; // Converter export 'converter/avatar_id_converter.dart';