eduvia/workavia-mail-front
11
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

TF-1923 Fix logic store opened email

Browse Source 
(cherry picked from commit 8d9c8d3ee8ea519e683d5a7cbb5b080d2f78e292)
This commit is contained in:
dab246
2023-06-20 23:32:53 +07:00
committed by Dat H. Pham
parent 002a543865
commit 4ea620cc2b
11 changed files with 86 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/features/composer/presentation/composer_controller.dart
+4 -4
View File
@@ -1135,8 +1135,8 @@ class ComposerController extends BaseController {
_emailContents = arguments.emailContents;
emailContentsViewState.value = Right(
GetEmailContentSuccess(
emailContents: _emailContents!,
emailContentsDisplayed: [],
emailContent: _emailContents!,
emailContentDisplayed: '',
attachments: [],
emailCurrent: arguments.presentationEmail?.toEmail()
)
@@ -1166,7 +1166,7 @@ class ComposerController extends BaseController {
success.attachments.listAttachmentsDisplayedOutSide);
}
emailContentsViewState.value = Right(success);
_emailContents = success.emailContentString;
_emailContents = success.emailContent;
}
void _getEmailContentSuccess(GetEmailContentSuccess success) {
@@ -1176,7 +1176,7 @@ class ComposerController extends BaseController {
success.attachments.listAttachmentsDisplayedOutSide);
}
emailContentsViewState.value = Right(success);
_emailContents = success.emailContents;
_emailContents = success.emailContent;
}
String getEmailAddressSender() {
lib/features/composer/presentation/composer_view.dart
+1 -1
View File
@@ -282,7 +282,7 @@ class ComposerView extends BaseComposerView {
child: loadingWidget,
);
} else if (success is GetEmailContentSuccess) {
var contentHtml = success.emailContents;
var contentHtml = success.emailContent;
if (contentHtml.isEmpty == true) {
contentHtml = HtmlExtension.editorStartTags;
}
lib/features/composer/presentation/composer_view_web.dart
+1 -1
View File
@@ -400,7 +400,7 @@ class ComposerView extends BaseComposerView {
child: loadingWidget,
);
} else if (success is GetEmailContentSuccess) {
var contentHtml = success.emailContents;
var contentHtml = success.emailContent;
if (contentHtml.isEmpty == true) {
contentHtml = HtmlExtension.editorStartTags;
}
lib/features/email/data/datasource_impl/email_hive_cache_datasource_impl.dart
-6
View File
@@ -173,12 +173,6 @@ class EmailHiveCacheDataSourceImpl extends EmailDataSource {
return Future.sync(() async {
final task = HiveTask(
runnable: () async {
final detailedEmailExisted = await _openedEmailCacheManager.isOpenedEmailAlreadyStored(accountId, session.username, detailedEmail.emailId);
if (detailedEmailExisted) {
return Future.value();
}
final fileSaved = await _fileUtils.saveToFile(
nameFile: detailedEmail.emailId.asString,
content: detailedEmail.htmlEmailContent ?? '',
lib/features/email/domain/exceptions/email_cache_exceptions.dart
+3 -1
View File
@@ -3,4 +3,6 @@ class NotFoundStoredOpenedEmailException implements Exception {}
class NotFoundStoredNewEmailException implements Exception {}
class NotFoundStoredEmailException implements Exception {}
class NotFoundStoredEmailException implements Exception {}
class OpenedEmailAlreadyStoredException implements Exception {}
lib/features/email/domain/state/get_email_content_state.dart
+9 -10
View File
@@ -2,46 +2,45 @@ import 'package:core/presentation/state/failure.dart';
import 'package:core/presentation/state/success.dart';
import 'package:jmap_dart_client/jmap/mail/email/email.dart';
import 'package:model/email/attachment.dart';
import 'package:model/email/email_content.dart';
class GetEmailContentLoading extends LoadingState {}
class GetEmailContentSuccess extends UIState {
final String emailContents;
final List<EmailContent> emailContentsDisplayed;
final String emailContent;
final String emailContentDisplayed;
final List<Attachment> attachments;
final Email? emailCurrent;
GetEmailContentSuccess({
required this.emailContents,
required this.emailContentsDisplayed,
required this.emailContent,
required this.emailContentDisplayed,
required this.attachments,
required this.emailCurrent
});
@override
List<Object?> get props => [
emailContents,
emailContentsDisplayed,
emailContent,
emailContentDisplayed,
attachments,
emailCurrent
];
}
class GetEmailContentFromCacheSuccess extends UIState {
final String emailContentString;
final String emailContent;
final List<Attachment> attachments;
final Email? emailCurrent;
GetEmailContentFromCacheSuccess({
required this.emailContentString,
required this.emailContent,
required this.attachments,
this.emailCurrent
});
@override
List<Object?> get props => [
emailContentString,
emailContent,
attachments,
emailCurrent,
];
lib/features/email/domain/usecases/get_email_content_interactor.dart
+6 -6
View File
@@ -67,15 +67,15 @@ class GetEmailContentInteractor {
: newEmailContents;
yield Right<Failure, Success>(GetEmailContentSuccess(
emailContents: newEmailContents.asHtmlString,
emailContentsDisplayed: newEmailContentsDisplayed,
emailContent: newEmailContents.asHtmlString,
emailContentDisplayed: newEmailContentsDisplayed.asHtmlString,
attachments: email.allAttachments,
emailCurrent: email
));
} else {
yield Right<Failure, Success>(GetEmailContentSuccess(
emailContents: '',
emailContentsDisplayed: [],
emailContent: '',
emailContentDisplayed: '',
attachments: email.allAttachments,
emailCurrent: email
));
@@ -99,7 +99,7 @@ class GetEmailContentInteractor {
try {
final detailedEmail = await emailRepository.getStoredOpenedEmail(session, accountId, emailId);
yield Right<Failure, Success>(GetEmailContentFromCacheSuccess(
emailContentString: detailedEmail.htmlEmailContent ?? "",
emailContent: detailedEmail.htmlEmailContent ?? "",
attachments: detailedEmail.attachments ?? [],
emailCurrent: Email(
id: emailId,
@@ -132,7 +132,7 @@ class GetEmailContentInteractor {
try {
final detailedEmail = await emailRepository.getStoredNewEmail(session, accountId, emailId);
yield Right<Failure, Success>(GetEmailContentFromCacheSuccess(
emailContentString: detailedEmail.htmlEmailContent ?? "",
emailContent: detailedEmail.htmlEmailContent ?? "",
attachments: detailedEmail.attachments ?? [],
emailCurrent: Email(
id: emailId,
lib/features/email/domain/usecases/store_opened_email_interactor.dart
+21 -2
View File
@@ -1,8 +1,10 @@
import 'package:core/presentation/state/failure.dart';
import 'package:core/presentation/state/success.dart';
import 'package:core/utils/app_logger.dart';
import 'package:dartz/dartz.dart';
import 'package:jmap_dart_client/jmap/account_id.dart';
import 'package:jmap_dart_client/jmap/core/session/session.dart';
import 'package:tmail_ui_user/features/email/domain/exceptions/email_cache_exceptions.dart';
import 'package:tmail_ui_user/features/email/domain/model/detailed_email.dart';
import 'package:tmail_ui_user/features/email/domain/repository/email_repository.dart';
import 'package:tmail_ui_user/features/email/domain/state/store_opened_email_state.dart';
@@ -19,10 +21,27 @@ class StoreOpenedEmailInteractor {
) async* {
try {
yield Right<Failure, Success>(StoreOpenedEmailLoading());
await _emailRepository.storeOpenedEmail(session, accountId, detailedEmail);
yield Right<Failure, Success>(StoreOpenedEmailSuccess());
final isOpenedEmailExist = await _isOpenedEmailAlreadyStored(session, accountId, detailedEmail);
log('StoreOpenedEmailInteractor::execute():isOpenedEmailExist: $isOpenedEmailExist');
if (!isOpenedEmailExist) {
await _emailRepository.storeOpenedEmail(session, accountId, detailedEmail);
yield Right<Failure, Success>(StoreOpenedEmailSuccess());
} else {
yield Left<Failure, Success>(StoreOpenedEmailFailure(OpenedEmailAlreadyStoredException()));
}
} catch (e) {
yield Left<Failure, Success>(StoreOpenedEmailFailure(e));
}
}
Future<bool> _isOpenedEmailAlreadyStored(Session session, AccountId accountId, DetailedEmail detailedEmail) async {
try {
final storedOpenEmail = await _emailRepository.getStoredOpenedEmail(session, accountId, detailedEmail.emailId);
log('StoreOpenedEmailInteractor::isOpenedEmailAlreadyStored():storedOpenEmail: $storedOpenEmail');
return true;
} catch (err) {
logError('StoreOpenedEmailInteractor::isOpenedEmailAlreadyStored():EXCEPTION: $err');
return false;
}
}
}
lib/features/email/presentation/controller/single_email_controller.dart
+34 -15
View File
@@ -151,7 +151,7 @@ class SingleEmailController extends BaseController with AppLoaderMixin {
if (success is GetEmailContentSuccess) {
_getEmailContentSuccess(success);
} else if (success is GetEmailContentFromCacheSuccess) {
_getEmailContentOffLineSuccess(success);
_getEmailContentOfflineSuccess(success);
} else if (success is MarkAsEmailReadSuccess) {
_markAsEmailReadSuccess(success);
} else if (success is ExportAttachmentSuccess) {
@@ -350,8 +350,8 @@ class SingleEmailController extends BaseController with AppLoaderMixin {
await Future.delayed(const Duration(milliseconds: 300));
consumeState(Stream.value(Right<Failure, Success>(
GetEmailContentSuccess(
emailContents: emailLoaded.emailContents,
emailContentsDisplayed: emailLoaded.emailContentsDisplayed,
emailContent: emailLoaded.emailContent,
emailContentDisplayed: emailLoaded.emailContentDisplayed,
attachments: emailLoaded.attachments,
emailCurrent: emailLoaded.emailCurrent
)
@@ -361,28 +361,47 @@ class SingleEmailController extends BaseController with AppLoaderMixin {
}
}
void _getEmailContentOffLineSuccess(GetEmailContentFromCacheSuccess success) {
emailContents.value = success.emailContentString;
attachments.value = success.attachments;
initialEmailContents = success.emailContentString;
}
void _getEmailContentSuccess(GetEmailContentSuccess success) {
if(emailSupervisorController.presentationEmailsLoaded.length > ThreadConstants.defaultLimit.value.toInt()) {
void _getEmailContentOfflineSuccess(GetEmailContentFromCacheSuccess success) {
if (emailSupervisorController.presentationEmailsLoaded.length > ThreadConstants.defaultLimit.value.toInt()) {
emailSupervisorController.popFirstEmailQueue();
}
emailSupervisorController.popEmailQueue(success.emailCurrent?.id);
emailSupervisorController.pushEmailQueue(EmailLoaded(
success.emailContents,
success.emailContentsDisplayed.toList(),
success.emailContent,
success.emailContent,
success.attachments.toList(),
success.emailCurrent,
));
if (success.emailCurrent?.id == currentEmail?.id) {
emailContents.value = success.emailContentsDisplayed.asHtmlString;
initialEmailContents = success.emailContents;
emailContents.value = success.emailContent;
initialEmailContents = success.emailContent;
attachments.value = success.attachments;
final isShowMessageReadReceipt = success.emailCurrent?.hasReadReceipt(mailboxDashBoardController.mapMailboxById) == true;
if (isShowMessageReadReceipt) {
_handleReadReceipt();
}
}
}
void _getEmailContentSuccess(GetEmailContentSuccess success) {
if (emailSupervisorController.presentationEmailsLoaded.length > ThreadConstants.defaultLimit.value.toInt()) {
emailSupervisorController.popFirstEmailQueue();
}
emailSupervisorController.popEmailQueue(success.emailCurrent?.id);
emailSupervisorController.pushEmailQueue(EmailLoaded(
success.emailContent,
success.emailContentDisplayed,
success.attachments.toList(),
success.emailCurrent,
));
if (success.emailCurrent?.id == currentEmail?.id) {
emailContents.value = success.emailContentDisplayed;
initialEmailContents = success.emailContent;
attachments.value = success.attachments;
if (PlatformInfo.isMobile) {
lib/features/email/presentation/model/email_loaded.dart
+7 -7
View File
@@ -1,24 +1,24 @@
import 'package:equatable/equatable.dart';
import 'package:jmap_dart_client/jmap/mail/email/email.dart';
import 'package:model/model.dart';
import 'package:model/email/attachment.dart';
class EmailLoaded with EquatableMixin {
final String emailContents;
final List<EmailContent> emailContentsDisplayed;
final String emailContent;
final String emailContentDisplayed;
final List<Attachment> attachments;
final Email? emailCurrent;
EmailLoaded(
this.emailContents,
this.emailContentsDisplayed,
this.emailContent,
this.emailContentDisplayed,
this.attachments,
this.emailCurrent,
);
@override
List<Object?> get props => [
emailContents,
emailContentsDisplayed,
emailContent,
emailContentDisplayed,
attachments,
emailCurrent
];
lib/features/offline_mode/manager/opened_email_cache_manager.dart
-17
View File
@@ -69,23 +69,6 @@ class OpenedEmailCacheManager {
return detailedEmailCache;
}
Future<bool> isOpenedEmailAlreadyStored(
AccountId accountId,
UserName userName,
EmailId emailId
) async {
final listResult = await Future.wait([
getStoredOpenedEmail(accountId, userName, emailId),
_fileUtils.isFileExisted(
nameFile: emailId.asString,
folderPath: CachingConstants.openedEmailContentFolderName)
], eagerError: true);
final emailContentPathExists = listResult.last as bool;
return emailContentPathExists;
}
Future<DetailedEmailHiveCache> getStoredOpenedEmail(
AccountId accountId,
UserName userName,