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

Fix forward recipients error handling

Browse Source
This commit is contained in:
dab246
2025-08-26 00:50:03 +07:00
committed by Dat H. Pham
parent 5314116c76
commit cb9e38db44
15 changed files with 190 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/features/manage_account/data/datasource/forwarding_datasource.dart
+13 -3
View File
@@ -1,5 +1,6 @@
import 'package:forward/forward/tmail_forward.dart';
import 'package:jmap_dart_client/jmap/account_id.dart';
import 'package:tmail_ui_user/features/composer/domain/exceptions/set_method_exception.dart';
import 'package:tmail_ui_user/features/manage_account/domain/model/add_recipients_in_forwarding_request.dart';
import 'package:tmail_ui_user/features/manage_account/domain/model/delete_recipient_in_forwarding_request.dart';
import 'package:tmail_ui_user/features/manage_account/domain/model/edit_local_copy_in_forwarding_request.dart';
@@ -7,9 +8,18 @@ import 'package:tmail_ui_user/features/manage_account/domain/model/edit_local_co
abstract class ForwardingDataSource {
Future<TMailForward> getForward(AccountId accountId);
Future<TMailForward> deleteRecipientInForwarding(AccountId accountId, DeleteRecipientInForwardingRequest deleteRequest);
Future<(TMailForward, SetMethodException?)> deleteRecipientInForwarding(
AccountId accountId,
DeleteRecipientInForwardingRequest deleteRequest,
);
Future<TMailForward> addRecipientsInForwarding(AccountId accountId, AddRecipientInForwardingRequest addRequest);
Future<(TMailForward, SetMethodException?)> addRecipientsInForwarding(
AccountId accountId,
AddRecipientInForwardingRequest addRequest,
);
Future<TMailForward> editLocalCopyInForwarding(AccountId accountId, EditLocalCopyInForwardingRequest editRequest);
Future<(TMailForward, SetMethodException?)> editLocalCopyInForwarding(
AccountId accountId,
EditLocalCopyInForwardingRequest editRequest,
);
}
lib/features/manage_account/data/datasource_impl/forwarding_data_source_impl.dart
+25 -6
View File
@@ -1,5 +1,6 @@
import 'package:forward/forward/tmail_forward.dart';
import 'package:jmap_dart_client/jmap/account_id.dart';
import 'package:tmail_ui_user/features/composer/domain/exceptions/set_method_exception.dart';
import 'package:tmail_ui_user/features/manage_account/data/datasource/forwarding_datasource.dart';
import 'package:tmail_ui_user/features/manage_account/data/network/forwarding_api.dart';
import 'package:tmail_ui_user/features/manage_account/domain/model/add_recipients_in_forwarding_request.dart';
@@ -22,23 +23,41 @@ class ForwardingDataSourceImpl extends ForwardingDataSource {
}
@override
Future<TMailForward> deleteRecipientInForwarding(AccountId accountId, DeleteRecipientInForwardingRequest deleteRequest) {
Future<(TMailForward, SetMethodException?)> deleteRecipientInForwarding(
AccountId accountId,
DeleteRecipientInForwardingRequest deleteRequest,
) {
return Future.sync(() async {
return await _forwardingAPI.updateForward(accountId, deleteRequest.newTMailForward);
return await _forwardingAPI.updateForward(
accountId,
deleteRequest.newTMailForward,
);
}).catchError(_exceptionThrower.throwException);
}
@override
Future<TMailForward> addRecipientsInForwarding(AccountId accountId, AddRecipientInForwardingRequest addRequest) {
Future<(TMailForward, SetMethodException?)> addRecipientsInForwarding(
AccountId accountId,
AddRecipientInForwardingRequest addRequest,
) {
return Future.sync(() async {
return await _forwardingAPI.updateForward(accountId, addRequest.newTMailForward);
return await _forwardingAPI.updateForward(
accountId,
addRequest.newTMailForward,
);
}).catchError(_exceptionThrower.throwException);
}
@override
Future<TMailForward> editLocalCopyInForwarding(AccountId accountId, EditLocalCopyInForwardingRequest editRequest) {
Future<(TMailForward, SetMethodException?)> editLocalCopyInForwarding(
AccountId accountId,
EditLocalCopyInForwardingRequest editRequest,
) {
return Future.sync(() async {
return await _forwardingAPI.updateForward(accountId, editRequest.newTMailForward);
return await _forwardingAPI.updateForward(
accountId,
editRequest.newTMailForward,
);
}).catchError(_exceptionThrower.throwException);
}
}
lib/features/manage_account/data/network/forwarding_api.dart
+10 -12
View File
@@ -43,7 +43,10 @@ class ForwardingAPI with HandleSetErrorMixin {
return tMailForwardResult;
}
Future<TMailForward> updateForward(AccountId accountId, TMailForward forward) async {
Future<(TMailForward, SetMethodException?)> updateForward(
AccountId accountId,
TMailForward forward,
) async {
log('ForwardingAPI::updateForward: ${forward.toJson()}');
final setForwardMethod = SetForwardMethod(accountId)
..addUpdatesSingleton({
@@ -69,14 +72,9 @@ class ForwardingAPI with HandleSetErrorMixin {
);
final mapErrors = handleSetResponse([setForwardResponse]);
if (mapErrors.isNotEmpty) {
throw SetMethodException(mapErrors);
}
final updatedForward = setForwardResponse?.updated;
if (updatedForward?.isNotEmpty != true) {
throw UpdateForwardException();
}
final methodException = mapErrors.isNotEmpty
? SetMethodException(mapErrors)
: null;
final getForwardResponse = response.parse<GetForwardResponse>(
getForwardInvocation.methodCallId,
@@ -84,10 +82,10 @@ class ForwardingAPI with HandleSetErrorMixin {
);
final newForward = getForwardResponse?.list.firstOrNull;
if (newForward == null) {
throw NotFoundForwardException();
if (newForward != null) {
return (newForward, methodException);
}
return newForward;
throw methodException ?? NotFoundForwardException();
}
}
lib/features/manage_account/data/repository/forwarding_repository_impl.dart
+13 -3
View File
@@ -1,5 +1,6 @@
import 'package:forward/forward/tmail_forward.dart';
import 'package:jmap_dart_client/jmap/account_id.dart';
import 'package:tmail_ui_user/features/composer/domain/exceptions/set_method_exception.dart';
import 'package:tmail_ui_user/features/manage_account/data/datasource/forwarding_datasource.dart';
import 'package:tmail_ui_user/features/manage_account/domain/model/add_recipients_in_forwarding_request.dart';
import 'package:tmail_ui_user/features/manage_account/domain/model/delete_recipient_in_forwarding_request.dart';
@@ -12,17 +13,26 @@ class ForwardingRepositoryImpl extends ForwardingRepository {
ForwardingRepositoryImpl(this.dataSource);
@override
Future<TMailForward> addRecipientsInForwarding(AccountId accountId, AddRecipientInForwardingRequest addRequest) {
Future<(TMailForward, SetMethodException?)> addRecipientsInForwarding(
AccountId accountId,
AddRecipientInForwardingRequest addRequest,
) {
return dataSource.addRecipientsInForwarding(accountId, addRequest);
}
@override
Future<TMailForward> deleteRecipientInForwarding(AccountId accountId, DeleteRecipientInForwardingRequest deleteRequest) {
Future<(TMailForward, SetMethodException?)> deleteRecipientInForwarding(
AccountId accountId,
DeleteRecipientInForwardingRequest deleteRequest,
) {
return dataSource.deleteRecipientInForwarding(accountId, deleteRequest);
}
@override
Future<TMailForward> editLocalCopyInForwarding(AccountId accountId, EditLocalCopyInForwardingRequest editRequest) {
Future<(TMailForward, SetMethodException?)> editLocalCopyInForwarding(
AccountId accountId,
EditLocalCopyInForwardingRequest editRequest,
) {
return dataSource.editLocalCopyInForwarding(accountId, editRequest);
}