TF-1749 Handle delete old email after update draft email

(cherry picked from commit 1a1331a723e191e3cae8db138f2d0fec71b4c87a)

lib/features/composer/domain/usecases/update_email_drafts_interactor.dart

@@ -1,9 +1,11 @@
-import 'package:core/core.dart';
+import 'package:core/presentation/state/failure.dart';
+import 'package:core/presentation/state/success.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:jmap_dart_client/jmap/mail/email/email.dart';
 import 'package:tmail_ui_user/features/composer/domain/state/update_email_drafts_state.dart';
+import 'package:tmail_ui_user/features/email/domain/exceptions/email_exceptions.dart';
 import 'package:tmail_ui_user/features/email/domain/repository/email_repository.dart';
 import 'package:tmail_ui_user/features/mailbox/domain/repository/mailbox_repository.dart';
 
@@ -25,14 +27,19 @@ class UpdateEmailDraftsInteractor {
       final currentMailboxState = listState.first;
       final currentEmailState = listState.last;
 
-      final newEmailDrafts = await _emailRepository.updateEmailDrafts(session, accountId, newEmail, oldEmailId);
+      final newEmailDrafts = await _emailRepository.updateEmailDrafts(session, accountId, newEmail);
-      yield Right<Failure, Success>(
+      final emailDeleted = await _emailRepository.deleteEmailPermanently(session, accountId, oldEmailId);
-        UpdateEmailDraftsSuccess(
+      if (emailDeleted) {
-          newEmailDrafts,
+        yield Right<Failure, Success>(
-          currentEmailState: currentEmailState,
+          UpdateEmailDraftsSuccess(
-          currentMailboxState: currentMailboxState
+            newEmailDrafts,
-        )
+            currentEmailState: currentEmailState,
-      );
+            currentMailboxState: currentMailboxState
+          )
+        );
+      } else {
+        yield Left<Failure, Success>(UpdateEmailDraftsFailure(CannotDeleteOldEmailException()));
+      }
     } catch (e) {
       yield Left<Failure, Success>(UpdateEmailDraftsFailure(e));
     }

lib/features/email/data/datasource/email_datasource.dart

@@ -1,13 +1,19 @@
 import 'dart:async';
 import 'dart:typed_data';
 
-import 'package:core/core.dart';
+import 'package:core/data/network/download/downloaded_response.dart';
+import 'package:core/presentation/state/failure.dart';
+import 'package:core/presentation/state/success.dart';
 import 'package:dartz/dartz.dart';
 import 'package:dio/dio.dart';
 import 'package:jmap_dart_client/jmap/account_id.dart';
 import 'package:jmap_dart_client/jmap/core/session/session.dart';
 import 'package:jmap_dart_client/jmap/mail/email/email.dart';
-import 'package:model/model.dart';
+import 'package:model/account/account_request.dart';
+import 'package:model/download/download_task_id.dart';
+import 'package:model/email/attachment.dart';
+import 'package:model/email/mark_star_action.dart';
+import 'package:model/email/read_actions.dart';
 import 'package:tmail_ui_user/features/composer/domain/model/email_request.dart';
 import 'package:tmail_ui_user/features/email/domain/model/move_to_mailbox_request.dart';
 import 'package:tmail_ui_user/features/mailbox/domain/model/create_new_mailbox_request.dart';
@@ -61,7 +67,7 @@ abstract class EmailDataSource {
 
   Future<bool> removeEmailDrafts(Session session, AccountId accountId, EmailId emailId);
 
-  Future<Email> updateEmailDrafts(Session session, AccountId accountId, Email newEmail, EmailId oldEmailId);
+  Future<Email> updateEmailDrafts(Session session, AccountId accountId, Email newEmail);
 
   Future<List<EmailId>> deleteMultipleEmailsPermanently(Session session, AccountId accountId, List<EmailId> emailIds);
 

lib/features/email/data/datasource_impl/email_datasource_impl.dart

@@ -109,9 +109,9 @@ class EmailDataSourceImpl extends EmailDataSource {
   }
 
   @override
-  Future<Email> updateEmailDrafts(Session session, AccountId accountId, Email newEmail, EmailId oldEmailId) {
+  Future<Email> updateEmailDrafts(Session session, AccountId accountId, Email newEmail) {
     return Future.sync(() async {
-      return await emailAPI.updateEmailDrafts(session, accountId, newEmail, oldEmailId);
+      return await emailAPI.updateEmailDrafts(session, accountId, newEmail);
     }).catchError(_exceptionThrower.throwException);
   }
 

lib/features/email/data/network/email_api.dart

@@ -528,13 +528,11 @@ class EmailAPI with HandleSetErrorMixin {
   Future<Email> updateEmailDrafts(
     Session session,
     AccountId accountId,
-    Email newEmail,
+    Email newEmail
-    EmailId oldEmailId
   ) async {
     final idCreateMethod = Id(_uuid.v1());
     final setEmailMethod = SetEmailMethod(accountId)
-      ..addCreate(idCreateMethod, newEmail)
+      ..addCreate(idCreateMethod, newEmail);
-      ..addDestroy({oldEmailId.id});
 
     final requestBuilder = JmapRequestBuilder(_httpClient, ProcessingInvocation());
 
@@ -554,11 +552,10 @@ class EmailAPI with HandleSetErrorMixin {
     );
 
     final emailUpdated = setEmailResponse?.created?[idCreateMethod];
-    final isEmailDestroyedSuccess = setEmailResponse?.destroyed?.contains(oldEmailId.id) ?? false;
     final listEntriesErrors = _handleSetEmailResponse(response: setEmailResponse);
     final mapErrors = Map.fromEntries(listEntriesErrors);
 
-    if (emailUpdated != null && isEmailDestroyedSuccess && mapErrors.isEmpty) {
+    if (emailUpdated != null && mapErrors.isEmpty) {
       return emailUpdated;
     } else {
       throw SetEmailMethodException(mapErrors);

lib/features/email/data/repository/email_repository_impl.dart

@@ -131,8 +131,8 @@ class EmailRepositoryImpl extends EmailRepository {
   }
 
   @override
-  Future<Email> updateEmailDrafts(Session session, AccountId accountId, Email newEmail, EmailId oldEmailId) {
+  Future<Email> updateEmailDrafts(Session session, AccountId accountId, Email newEmail) {
-    return emailDataSource.updateEmailDrafts(session, accountId, newEmail, oldEmailId);
+    return emailDataSource.updateEmailDrafts(session, accountId, newEmail);
   }
 
   @override

lib/features/email/domain/exceptions/email_exceptions.dart

@@ -0,0 +1,2 @@
+
+class CannotDeleteOldEmailException implements Exception {}

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

@@ -1,14 +1,21 @@
 import 'dart:async';
 import 'dart:typed_data';
 
-import 'package:core/core.dart';
+import 'package:core/data/network/download/downloaded_response.dart';
+import 'package:core/presentation/state/failure.dart';
+import 'package:core/presentation/state/success.dart';
 import 'package:dartz/dartz.dart';
 import 'package:dio/dio.dart';
 import 'package:jmap_dart_client/jmap/account_id.dart';
 import 'package:jmap_dart_client/jmap/core/session/session.dart';
 import 'package:jmap_dart_client/jmap/mail/email/email.dart';
 import 'package:jmap_dart_client/jmap/core/state.dart' as jmap;
-import 'package:model/model.dart';
+import 'package:model/account/account_request.dart';
+import 'package:model/download/download_task_id.dart';
+import 'package:model/email/attachment.dart';
+import 'package:model/email/email_content.dart';
+import 'package:model/email/mark_star_action.dart';
+import 'package:model/email/read_actions.dart';
 import 'package:tmail_ui_user/features/composer/domain/model/email_request.dart';
 import 'package:tmail_ui_user/features/email/domain/model/move_to_mailbox_request.dart';
 import 'package:tmail_ui_user/features/mailbox/domain/model/create_new_mailbox_request.dart';
@@ -72,7 +79,7 @@ abstract class EmailRepository {
 
   Future<bool> removeEmailDrafts(Session session, AccountId accountId, EmailId emailId);
 
-  Future<Email> updateEmailDrafts(Session session, AccountId accountId, Email newEmail, EmailId oldEmailId);
+  Future<Email> updateEmailDrafts(Session session, AccountId accountId, Email newEmail);
 
   Future<List<EmailId>> deleteMultipleEmailsPermanently(Session session, AccountId accountId, List<EmailId> emailIds);