TF-153 Combine moveToMailbox and moveToTrash to moveToMailbox using EmailActionType object

lib/features/email/domain/model/move_action.dart

@@ -0,0 +1,5 @@
+
+enum MoveAction {
+  moving,
+  undo
+}

lib/features/email/domain/model/move_to_mailbox_request.dart

@@ -3,23 +3,24 @@ import 'package:equatable/equatable.dart';
 import 'package:jmap_dart_client/jmap/mail/email/email.dart';
 import 'package:jmap_dart_client/jmap/mail/mailbox/mailbox.dart';
 import 'package:model/model.dart';
+import 'package:tmail_ui_user/features/email/domain/model/move_action.dart';
 
-class MoveRequest with EquatableMixin {
+class MoveToMailboxRequest with EquatableMixin {
 
   final List<EmailId> emailIds;
   final MailboxId currentMailboxId;
   final MailboxId destinationMailboxId;
   final MoveAction moveAction;
+  final EmailActionType emailActionType;
   final String? destinationPath;
 
-  MoveRequest(
+  MoveToMailboxRequest(
     this.emailIds,
     this.currentMailboxId,
     this.destinationMailboxId,
     this.moveAction,
-    {
-      this.destinationPath,
-    }
+    this.emailActionType,
+    {this.destinationPath}
   );
 
   @override
@@ -28,6 +29,7 @@ class MoveRequest with EquatableMixin {
     currentMailboxId,
     destinationMailboxId,
     moveAction,
+    emailActionType,
     destinationPath,
   ];
 }

lib/features/email/domain/model/move_to_trash_request.dart

@@ -1,28 +0,0 @@
-
-import 'package:equatable/equatable.dart';
-import 'package:jmap_dart_client/jmap/mail/email/email.dart';
-import 'package:jmap_dart_client/jmap/mail/mailbox/mailbox.dart';
-import 'package:model/model.dart';
-
-class MoveToTrashRequest with EquatableMixin {
-
-  final List<EmailId> emailIds;
-  final MailboxId currentMailboxId;
-  final MailboxId trashMailboxId;
-  final MoveAction moveAction;
-
-  MoveToTrashRequest(
-    this.emailIds,
-    this.currentMailboxId,
-    this.trashMailboxId,
-    this.moveAction,
-  );
-
-  @override
-  List<Object?> get props => [
-    emailIds,
-    currentMailboxId,
-    trashMailboxId,
-    moveAction,
-  ];
-}

lib/features/email/domain/repository/email_repository.dart

@@ -3,8 +3,7 @@ import 'package:jmap_dart_client/jmap/account_id.dart';
 import 'package:jmap_dart_client/jmap/mail/email/email.dart';
 import 'package:model/model.dart';
 import 'package:tmail_ui_user/features/composer/domain/model/email_request.dart';
-import 'package:tmail_ui_user/features/email/domain/model/move_request.dart';
-import 'package:tmail_ui_user/features/email/domain/model/move_to_trash_request.dart';
+import 'package:tmail_ui_user/features/email/domain/model/move_to_mailbox_request.dart';
 
 abstract class EmailRepository {
   Future<Email> getEmailContent(AccountId accountId, EmailId emailId);
@@ -35,9 +34,7 @@ abstract class EmailRepository {
     AccountRequest accountRequest,
   );
 
-  Future<List<EmailId>> moveToMailbox(AccountId accountId, MoveRequest moveRequest);
-
-  Future<List<EmailId>> moveToTrash(AccountId accountId, MoveToTrashRequest moveRequest);
+  Future<List<EmailId>> moveToMailbox(AccountId accountId, MoveToMailboxRequest moveRequest);
 
   Future<List<Email>> markAsStar(
     AccountId accountId,

lib/features/email/domain/state/move_to_mailbox_state.dart

@@ -2,12 +2,14 @@ import 'package:core/core.dart';
 import 'package:jmap_dart_client/jmap/mail/email/email.dart';
 import 'package:jmap_dart_client/jmap/mail/mailbox/mailbox.dart';
 import 'package:model/model.dart';
+import 'package:tmail_ui_user/features/email/domain/model/move_action.dart';
 
 class MoveToMailboxSuccess extends UIState {
   final EmailId emailId;
   final MailboxId currentMailboxId;
   final MailboxId destinationMailboxId;
   final MoveAction moveAction;
+  final EmailActionType emailActionType;
   final String? destinationPath;
 
   MoveToMailboxSuccess(
@@ -15,7 +17,9 @@ class MoveToMailboxSuccess extends UIState {
     this.currentMailboxId,
     this.destinationMailboxId,
     this.moveAction,
-    this.destinationPath);
+    this.emailActionType,
+    {this.destinationPath}
+  );
 
   @override
   List<Object?> get props => [
@@ -23,14 +27,17 @@ class MoveToMailboxSuccess extends UIState {
     currentMailboxId,
     destinationMailboxId,
     moveAction,
-    destinationPath];
+    emailActionType,
+    destinationPath
+  ];
 }
 
 class MoveToMailboxFailure extends FeatureFailure {
+  final EmailActionType emailActionType;
   final exception;
 
-  MoveToMailboxFailure(this.exception);
+  MoveToMailboxFailure(this.emailActionType, this.exception);
 
   @override
-  List<Object> get props => [exception];
+  List<Object> get props => [emailActionType, exception];
 }

lib/features/email/domain/state/move_to_trash_state.dart

@@ -1,35 +0,0 @@
-import 'package:core/core.dart';
-import 'package:jmap_dart_client/jmap/mail/email/email.dart';
-import 'package:jmap_dart_client/jmap/mail/mailbox/mailbox.dart';
-import 'package:model/model.dart';
-
-class MoveToTrashSuccess extends UIState {
-  final EmailId emailId;
-  final MailboxId currentMailboxId;
-  final MailboxId trashMailboxId;
-  final MoveAction moveAction;
-
-  MoveToTrashSuccess(
-    this.emailId,
-    this.currentMailboxId,
-    this.trashMailboxId,
-    this.moveAction
-  );
-
-  @override
-  List<Object?> get props => [
-    emailId,
-    currentMailboxId,
-    trashMailboxId,
-    moveAction
-  ];
-}
-
-class MoveToTrashFailure extends FeatureFailure {
-  final exception;
-
-  MoveToTrashFailure(this.exception);
-
-  @override
-  List<Object> get props => [exception];
-}

lib/features/email/domain/usecases/move_to_mailbox_interactor.dart

@@ -1,7 +1,7 @@
 import 'package:core/core.dart';
 import 'package:dartz/dartz.dart';
 import 'package:jmap_dart_client/jmap/account_id.dart';
-import 'package:tmail_ui_user/features/email/domain/model/move_request.dart';
+import 'package:tmail_ui_user/features/email/domain/model/move_to_mailbox_request.dart';
 import 'package:tmail_ui_user/features/email/domain/repository/email_repository.dart';
 import 'package:tmail_ui_user/features/email/domain/state/move_to_mailbox_state.dart';
 
@@ -10,7 +10,7 @@ class MoveToMailboxInteractor {
 
   MoveToMailboxInteractor(this.emailRepository);
 
-  Stream<Either<Failure, Success>> execute(AccountId accountId, MoveRequest moveRequest) async* {
+  Stream<Either<Failure, Success>> execute(AccountId accountId, MoveToMailboxRequest moveRequest) async* {
     try {
       final result = await emailRepository.moveToMailbox(accountId, moveRequest);
       if (result.isNotEmpty) {
@@ -19,12 +19,13 @@ class MoveToMailboxInteractor {
           moveRequest.currentMailboxId,
           moveRequest.destinationMailboxId,
           moveRequest.moveAction,
-          moveRequest.destinationPath));
+          moveRequest.emailActionType,
+          destinationPath: moveRequest.destinationPath));
       } else {
-        yield Left(MoveToMailboxFailure(null));
+        yield Left(MoveToMailboxFailure(moveRequest.emailActionType, null));
       }
     } catch (e) {
-      yield Left(MoveToMailboxFailure(e));
+      yield Left(MoveToMailboxFailure(moveRequest.emailActionType, e));
     }
   }
 }

lib/features/email/domain/usecases/move_to_trash_interactor.dart

@@ -1,29 +0,0 @@
-import 'package:core/core.dart';
-import 'package:dartz/dartz.dart';
-import 'package:jmap_dart_client/jmap/account_id.dart';
-import 'package:tmail_ui_user/features/email/domain/model/move_to_trash_request.dart';
-import 'package:tmail_ui_user/features/email/domain/repository/email_repository.dart';
-import 'package:tmail_ui_user/features/email/domain/state/move_to_trash_state.dart';
-
-class MoveToTrashInteractor {
-  final EmailRepository emailRepository;
-
-  MoveToTrashInteractor(this.emailRepository);
-
-  Stream<Either<Failure, Success>> execute(AccountId accountId, MoveToTrashRequest moveRequest) async* {
-    try {
-      final result = await emailRepository.moveToTrash(accountId, moveRequest);
-      if (result.isNotEmpty) {
-        yield Right(MoveToTrashSuccess(
-          result.first,
-          moveRequest.currentMailboxId,
-          moveRequest.trashMailboxId,
-          moveRequest.moveAction));
-      } else {
-        yield Left(MoveToTrashFailure(null));
-      }
-    } catch (e) {
-      yield Left(MoveToTrashFailure(e));
-    }
-  }
-}