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

TF-1842: Handle error for _deleteSendingEmailAction and _sendEmailAction

Browse Source 
(cherry picked from commit 7b2ab3e85a778a6662ede7c81b3cdddcbd0e7204)
This commit is contained in:
HuyNguyen
2023-05-31 22:06:56 +07:00
committed by Dat Vu
parent 0556445f97
commit 9405fa60d9
17 changed files with 51 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/features/base/base_controller.dart
-3
View File
@@ -243,9 +243,6 @@ abstract class BaseController extends GetxController
FcmConfiguration.initialize();
FcmInteractorBindings().dependencies();
FcmMessageController.instance.initializeFromAccountId(accountId, session);
if (!BuildUtils.isWeb) {
LocalNotificationManager.instance.setUp();
}
} else {
throw NotSupportFCMException();
}
lib/features/composer/domain/model/sending_email.dart
+10 -7
View File
@@ -1,10 +1,12 @@
import 'dart:convert';
import 'package:core/domain/extensions/datetime_extension.dart';
import 'package:equatable/equatable.dart';
import 'package:flutter_date_range_picker/flutter_date_range_picker.dart';
import 'package:jmap_dart_client/http/converter/email_id_nullable_converter.dart';
import 'package:jmap_dart_client/http/converter/id_nullable_converter.dart';
import 'package:jmap_dart_client/http/converter/identities/identity_id_nullable_converter.dart';
import 'package:jmap_dart_client/http/converter/mailbox_id_nullable_converter.dart';
import 'package:jmap_dart_client/http/converter/mailbox_name_converter.dart';
import 'package:jmap_dart_client/jmap/core/id.dart';
import 'package:jmap_dart_client/jmap/identities/identity.dart';
import 'package:jmap_dart_client/jmap/mail/email/email.dart';
@@ -73,18 +75,19 @@ class SendingEmail with EquatableMixin {
sendingId: json['sendingId'] as String,
email: Email.fromJson(jsonDecode(json['email'])),
emailActionType: _getEmailActionType(json['emailActionType'] as String),
sentMailboxId: json['sentMailboxId'] != null ? const MailboxIdNullableConverter().fromJson(json['sentMailboxId'] as String?) : null,
emailIdDestroyed: json['emailIdDestroyed'] != null ? const EmailIdNullableConverter().fromJson(json['emailIdDestroyed'] as String?) : null,
emailIdAnsweredOrForwarded: json['emailIdAnsweredOrForwarded'] != null ? const EmailIdNullableConverter().fromJson(json['emailIdAnsweredOrForwarded'] as String?) : null,
identityId: json['identityId'] != null ? const IdentityIdNullableConverter().fromJson(json['identityId'] as String?) : null,
mailboxNameRequest: json['mailboxNameRequest'] != null ? MailboxName(json['mailboxNameRequest'] as String) : null,
creationIdRequest: json['creationIdRequest'] != null ? const IdNullableConverter().fromJson(json['creationIdRequest'] as String) : null,
createTime: DateTime.parse(json['createTime'] as String),
sentMailboxId: const MailboxIdNullableConverter().fromJson(json['sentMailboxId'] as String?),
emailIdDestroyed: const EmailIdNullableConverter().fromJson(json['emailIdDestroyed'] as String?),
emailIdAnsweredOrForwarded: const EmailIdNullableConverter().fromJson(json['emailIdAnsweredOrForwarded'] as String?),
identityId: const IdentityIdNullableConverter().fromJson(json['identityId'] as String?),
mailboxNameRequest: const MailboxNameConverter().fromJson(json['mailboxNameRequest'] as String?),
creationIdRequest: const IdNullableConverter().fromJson(json['creationIdRequest'] as String?),
);
}
static EmailActionType _getEmailActionType(String value) {
return EmailActionType.values.firstWhere(
(type) => type.toString().split('.').last == value,
(type) => type.name == value,
orElse: () => throw ArgumentError('Invalid email action type: $value'),
);
}
lib/features/email/data/datasource/email_datasource.dart
+1 -1
View File
@@ -94,5 +94,5 @@ abstract class EmailDataSource {
Future<List<SendingEmail>> getAllSendingEmails(AccountId accountId, UserName userName);
Future<void> deleteSendingEmail(AccountId accountId, UserName userName, EmailId emailId);
Future<void> deleteSendingEmail(AccountId accountId, UserName userName, String sendingId);
}
lib/features/email/data/datasource_impl/email_datasource_impl.dart
+1 -1
View File
@@ -200,7 +200,7 @@ class EmailDataSourceImpl extends EmailDataSource {
}
@override
Future<void> deleteSendingEmail(AccountId accountId, UserName userName, EmailId emailId) {
Future<void> deleteSendingEmail(AccountId accountId, UserName userName, String sendingId) {
throw UnimplementedError();
}
}
lib/features/email/data/datasource_impl/email_hive_cache_datasource_impl.dart
+2 -3
View File
@@ -261,11 +261,10 @@ class EmailHiveCacheDataSourceImpl extends EmailDataSource {
}).catchError(_exceptionThrower.throwException);
}
@override
Future<void> deleteSendingEmail(AccountId accountId, UserName userName, EmailId emailId) {
Future<void> deleteSendingEmail(AccountId accountId, UserName userName, String sendingId) {
return Future.sync(() async {
return await _sendingEmailCacheManager.deleteSendingEmail(accountId, userName, emailId.id.value);
return await _sendingEmailCacheManager.deleteSendingEmail(accountId, userName, sendingId);
}).catchError(_exceptionThrower.throwException);
}
}
lib/features/email/data/repository/email_repository_impl.dart
+2 -2
View File
@@ -228,7 +228,7 @@ class EmailRepositoryImpl extends EmailRepository {
}
@override
Future<void> deleteSendingEmail(AccountId accountId, UserName userName, EmailId emailId) {
return emailDataSource[DataSourceType.hiveCache]!.deleteSendingEmail(accountId, userName, emailId);
Future<void> deleteSendingEmail(AccountId accountId, UserName userName, String sendingId) {
return emailDataSource[DataSourceType.hiveCache]!.deleteSendingEmail(accountId, userName, sendingId);
}
}
lib/features/email/domain/repository/email_repository.dart
+1 -1
View File
@@ -104,5 +104,5 @@ abstract class EmailRepository {
Future<void> storeSendingEmail(AccountId accountId, UserName userName, SendingEmail sendingEmail);
Future<void> deleteSendingEmail(AccountId accountId, UserName userName, EmailId emailId);
Future<void> deleteSendingEmail(AccountId accountId, UserName userName, String sendingId);
}
lib/features/email/domain/state/delete_sending_email_state.dart
+1 -5
View File
@@ -3,11 +3,7 @@ import 'package:core/presentation/state/success.dart';
class DeleteSendingEmailLoading extends UIState {}
class DeleteSendingEmailSuccess extends UIState {
@override
List<Object?> get props => [];
}
class DeleteSendingEmailSuccess extends UIState {}
class DeleteSendingEmailFailure extends FeatureFailure {
DeleteSendingEmailFailure(dynamic exception) : super(exception: exception);
lib/features/email/domain/usecases/delete_sending_email_interactor.dart
+2 -2
View File
@@ -12,10 +12,10 @@ class DeleteSendingEmailInteractor {
DeleteSendingEmailInteractor(this._emailRepository);
Stream<Either<Failure, Success>> execute(AccountId accountId, UserName userName, EmailId emailId) async* {
Stream<Either<Failure, Success>> execute(AccountId accountId, UserName userName, String sendingId) async* {
try {
yield Right<Failure, Success>(DeleteSendingEmailLoading());
await _emailRepository.deleteSendingEmail(accountId, userName, emailId);
await _emailRepository.deleteSendingEmail(accountId, userName, sendingId);
yield Right<Failure, Success>(DeleteSendingEmailSuccess());
} catch (e) {
yield Left<Failure, Success>(DeleteSendingEmailFailure(e));
lib/features/mailbox_dashboard/presentation/controller/mailbox_dashboard_controller.dart
+1 -1
View File
@@ -1533,7 +1533,7 @@ class MailboxDashBoardController extends ReloadableController {
void _handleMessageFromNotification(String? payload, {bool onForeground = true}) {
log('MailboxDashBoardController::_handleMessageFromNotification():payload: $payload');
if (payload == null) {
if (payload == null || payload.isEmpty) {
dispatchRoute(DashboardRoutes.thread);
return;
}
lib/features/offline_mode/controller/work_scheduler_controller.dart
+1 -1
View File
@@ -64,7 +64,7 @@ class WorkSchedulerController {
final matchedType = WorkerType.values.firstWhereOrNull((type) => type.name == workerType);
if (matchedType != null) {
await matchedType.usingObserver().bindDI(completer);
await matchedType.usingObserver().bindDI();
await matchedType.usingObserver().observe(taskName, dataObject, completer);
}
}
lib/features/offline_mode/exceptions/workmanager_exception.dart
+1
View File
@@ -0,0 +1 @@
class SendingEmailFromWorkmanagerException implements Exception {}
lib/features/offline_mode/manager/sending_email_cache_manager.dart
+2 -2
View File
@@ -34,9 +34,9 @@ class SendingEmailCacheManager {
Future<void> deleteSendingEmail(
AccountId accountId,
UserName userName,
String sendingEmailId
String sendingId
) {
final keyCache = TupleKey(sendingEmailId, accountId.asString, userName.value).encodeKey;
final keyCache = TupleKey(sendingId, accountId.asString, userName.value).encodeKey;
log('SendingEmailCacheManager::deleteSendingEmail():keyCache: $keyCache');
return _hiveCacheClient.deleteItem(keyCache);
}
lib/features/offline_mode/observer/sending_email_observer.dart
+19 -25
View File
@@ -1,16 +1,12 @@
import 'dart:async';
import 'package:core/data/network/config/dynamic_url_interceptors.dart';
import 'package:core/presentation/extensions/uri_extension.dart';
import 'package:core/presentation/resources/image_paths.dart';
import 'package:core/presentation/state/failure.dart';
import 'package:core/presentation/state/success.dart';
import 'package:core/presentation/utils/app_toast.dart';
import 'package:core/utils/app_logger.dart';
import 'package:jmap_dart_client/jmap/account_id.dart';
import 'package:jmap_dart_client/jmap/core/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/mail/email/email.dart';
import 'package:model/oidc/token_oidc.dart';
import 'package:tmail_ui_user/features/caching/config/hive_cache_config.dart';
import 'package:tmail_ui_user/features/composer/domain/extensions/sending_email_extension.dart';
@@ -28,11 +24,13 @@ import 'package:tmail_ui_user/features/login/domain/usecases/get_authenticated_a
import 'package:tmail_ui_user/features/mailbox/domain/model/create_new_mailbox_request.dart';
import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/bindings/mailbox_dashboard_bindings.dart';
import 'package:tmail_ui_user/features/offline_mode/biding/sending_email_biding.dart';
import 'package:tmail_ui_user/features/offline_mode/exceptions/workmanager_exception.dart';
import 'package:tmail_ui_user/features/offline_mode/observer/work_observer.dart';
import 'package:tmail_ui_user/features/push_notification/presentation/notification/local_notification_config.dart';
import 'package:tmail_ui_user/features/push_notification/presentation/notification/local_notification_manager.dart';
import 'package:tmail_ui_user/features/session/domain/state/get_session_state.dart';
import 'package:tmail_ui_user/features/session/domain/usecases/get_session_interactor.dart';
import 'package:tmail_ui_user/main/bindings/main_bindings.dart';
import 'package:tmail_ui_user/main/localizations/app_localizations.dart';
import 'package:tmail_ui_user/main/routes/route_navigation.dart';
class SendingEmailObserver extends WorkObserver {
@@ -41,10 +39,7 @@ class SendingEmailObserver extends WorkObserver {
Session? _currentSession;
UserName? _userName;
SendingEmail? _sendingEmail;
EmailId? _emailId;
AppToast? _appToast;
ImagePaths? _imagePaths;
SendEmailInteractor? _sendEmailInteractor;
GetAuthenticatedAccountInteractor? _getAuthenticatedAccountInteractor;
DynamicUrlInterceptors? _dynamicUrlInterceptors;
@@ -65,17 +60,15 @@ class SendingEmailObserver extends WorkObserver {
log('SendingEmailObserver::observe():taskId: $taskId | inputData: $inputData');
_completer = completer;
_sendingEmail = SendingEmail.fromJson(inputData);
_emailId = EmailId(Id(taskId));
log('SendingEmailObserver::observe():_sendingEmail: $_sendingEmail | EmailId: $_emailId');
log('SendingEmailObserver::observe():_sendingEmail: $_sendingEmail');
_getAuthenticatedAccount();
}
@override
Future<void> bindDI(Completer<bool> completer) async {
Future<void> bindDI() async {
return await _initialAppConfig();
}
Future<void> _initialAppConfig() async {
await Future.wait([
MainBindings().dependencies(),
@@ -97,7 +90,6 @@ class SendingEmailObserver extends WorkObserver {
log('SendingEmailObserver::_handleFailureViewState(): $failure');
}
@override
void handleSuccessViewState(Success success) {
if (success is GetAuthenticatedAccountSuccess) {
@@ -121,15 +113,12 @@ class SendingEmailObserver extends WorkObserver {
_dynamicUrlInterceptors = getBinding<DynamicUrlInterceptors>();
_authorizationInterceptors = getBinding<AuthorizationInterceptors>();
_getSessionInteractor = getBinding<GetSessionInteractor>();
_appToast = getBinding<AppToast>();
_imagePaths = getBinding<ImagePaths>();
_sendEmailInteractor = getBinding<SendEmailInteractor>();
_deleteSendingEmailInteractor = getBinding<DeleteSendingEmailInteractor>();
} catch (e) {
logError('SendingEmailObserver::_getInteractorBindings(): ${e.toString()}');
return _completer?.completeError(false);
}
return _completer?.complete(true);
}
void _handleGetAuthenticatedAccountSuccess(GetAuthenticatedAccountSuccess success) {
@@ -200,6 +189,7 @@ class SendingEmailObserver extends WorkObserver {
: null
));
} else {
_clearDataQueue();
logError('SendingEmailObserver::_sendEmailAction():_sendEmailInteractor is null');
}
}
@@ -219,33 +209,37 @@ class SendingEmailObserver extends WorkObserver {
void _handleSendEmailSuccess(SendEmailSuccess success) async {
log("SendingEmailObserver::_handleSendEmailSuccess()");
_deleteSendingEmailAction();
if (currentOverlayContext != null && currentContext != null) {
_appToast?.showToastSuccessMessage(
currentOverlayContext!,
AppLocalizations.of(currentContext!).messageHasBeenSentSuccessfully,
leadingSVGIcon: _imagePaths?.icSendSuccessToast);
}
}
void _deleteSendingEmailAction() {
if (_deleteSendingEmailInteractor != null && _currentSession != null && _currentAccountId != null && _emailId != null) {
if (_deleteSendingEmailInteractor != null && _currentSession != null && _currentAccountId != null && _sendingEmail != null) {
consumeState(_deleteSendingEmailInteractor!.execute(
_currentAccountId!,
_currentSession!.username,
_emailId!,
_sendingEmail!.sendingId,
));
} else {
_clearDataQueue();
logError('SendingEmailObserver::_deleteSendingEmailAction():_deleteSendingEmailInteractor is null');
}
}
void _handleDeleteSendingEmailSuccess() async {
log('SendingEmailObserver::_handleDeleteSendingEmailSuccess(): Success');
_showLocalNotification();
return _completer?.complete(true);
}
void _clearDataQueue() async {
_sendingEmail = null;
return _completer?.completeError(false);
_completer?.completeError(SendingEmailFromWorkmanagerException());
}
void _showLocalNotification() {
log('SendingEmailObserver::_showLocalNotification():SendingId: ${_sendingEmail?.sendingId}');
LocalNotificationManager.instance.showPushNotification(
id: _sendingEmail?.sendingId ?? '',
title: LocalNotificationConfig.messageHasBeenSentSuccessfully,
);
}
}
lib/features/offline_mode/observer/work_observer.dart
+1 -3
View File
@@ -1,13 +1,11 @@
import 'dart:async';
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';
abstract class WorkObserver {
Future<void> bindDI(Completer<bool> completer);
Future<void> bindDI();
Future<void> observe(String taskId, Map<String, dynamic> inputData, Completer<bool> completer);
lib/features/push_notification/presentation/notification/local_notification_config.dart
+1
View File
@@ -9,6 +9,7 @@ class LocalNotificationConfig {
static const _channelDescription = 'Team Mail notifications';
static const notificationTitle = 'Team Mail';
static const notificationMessage = 'You have new messages';
static const messageHasBeenSentSuccessfully = 'Message has been sent successfully.';
static const int groupNotificationId = 1995;
static const iosInitializationSettings = DarwinInitializationSettings();
lib/main.dart
+5 -2
View File
@@ -6,6 +6,7 @@ import 'package:flutter_localizations/flutter_localizations.dart';
import 'package:get/get.dart';
import 'package:tmail_ui_user/features/caching/config/hive_cache_config.dart';
import 'package:tmail_ui_user/features/offline_mode/config/work_manager_config.dart';
import 'package:tmail_ui_user/features/push_notification/presentation/notification/local_notification_manager.dart';
import 'package:tmail_ui_user/main/bindings/main_bindings.dart';
import 'package:tmail_ui_user/main/localizations/app_localizations.dart';
import 'package:tmail_ui_user/main/localizations/app_localizations_delegate.dart';
@@ -24,8 +25,10 @@ void main() async {
MainBindings().dependencies(),
HiveCacheConfig().setUp(),
Executor().warmUp(),
if (PlatformInfo.isMobile)
WorkManagerConfig().initialize(),
if (PlatformInfo.isMobile) ... [
WorkManagerConfig().initialize(),
LocalNotificationManager.instance.setUp(),
],
AppUtils.loadEnvFile()
]);
await HiveCacheConfig.initializeEncryptionKey();