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

model/lib/email/email_action_type.dart

@@ -6,9 +6,9 @@ enum EmailActionType {
   compose,
   markAsRead,
   markAsUnread,
-  markAsStar,
-  markAsUnStar,
-  move,
+  markAsStarred,
+  unMarkAsStarred,
+  moveToMailbox,
   edit,
   composeFromEmailAddress,
   moveToTrash,

model/lib/email/filter_message_option.dart

@@ -17,11 +17,11 @@ extension FilterMessageOptionExtension on FilterMessageOption {
       case FilterMessageOption.all:
         return true;
       case FilterMessageOption.unread:
-        return email.isUnReadEmail();
+        return !email.hasRead;
       case FilterMessageOption.attachments:
         return email.withAttachments;
       case FilterMessageOption.starred:
-        return email.isFlaggedEmail();
+        return email.hasStarred;
     }
   }
 
@@ -30,11 +30,11 @@ extension FilterMessageOptionExtension on FilterMessageOption {
       case FilterMessageOption.all:
         return true;
       case FilterMessageOption.unread:
-        return email.isUnReadEmail();
+        return !email.hasRead;
       case FilterMessageOption.attachments:
         return email.withAttachments;
       case FilterMessageOption.starred:
-        return email.isFlaggedEmail();
+        return email.hasStarred;
     }
   }
 }

model/lib/email/move_action.dart

@@ -1,6 +0,0 @@
-
-enum MoveAction {
-  moveTo,
-  moveToTrash,
-  undo
-}

model/lib/email/presentation_email.dart

@@ -80,11 +80,9 @@ class PresentationEmail with EquatableMixin {
 
   String getPartialContent() => preview ?? '';
 
-  bool isUnReadEmail() => !(keywords?.containsKey(KeyWordIdentifier.emailSeen) == true);
+  bool get hasRead => keywords?.containsKey(KeyWordIdentifier.emailSeen) == true;
 
-  bool isReadEmail() => keywords?.containsKey(KeyWordIdentifier.emailSeen) == true;
-
-  bool isFlaggedEmail() => keywords?.containsKey(KeyWordIdentifier.emailFlagged) == true;
+  bool get hasStarred => keywords?.containsKey(KeyWordIdentifier.emailFlagged) == true;
 
   bool get withAttachments => hasAttachment == true;
 

model/lib/extensions/email_extension.dart

@@ -8,11 +8,9 @@ import 'package:model/model.dart';
 
 extension EmailExtension on Email {
 
-  bool isUnReadEmail() => !(keywords?.containsKey(KeyWordIdentifier.emailSeen) == true);
+  bool get hasRead => keywords?.containsKey(KeyWordIdentifier.emailSeen) == true;
 
-  bool isReadEmail() => keywords?.containsKey(KeyWordIdentifier.emailSeen) == true;
-
-  bool isFlaggedEmail() => keywords?.containsKey(KeyWordIdentifier.emailFlagged) == true;
+  bool get hasStarred => keywords?.containsKey(KeyWordIdentifier.emailFlagged) == true;
 
   bool get withAttachments => hasAttachment == true;
 

model/lib/extensions/list_email_id_extension.dart

@@ -32,4 +32,12 @@ extension ListEmailIdExtension on List<EmailId> {
     });
     return maps;
   }
+
+  Map<Id, PatchObject> generateMapUpdateObjectMarkAsSpam(MailboxId spamMailboxId) {
+    final Map<Id, PatchObject> maps = {};
+    forEach((emailId) {
+      maps[emailId.id] = spamMailboxId.generateActionPath();
+    });
+    return maps;
+  }
 }

model/lib/extensions/list_presentation_email_extension.dart

@@ -3,11 +3,11 @@ import 'package:jmap_dart_client/jmap/mail/email/email.dart';
 import 'package:model/model.dart';
 
 extension ListPresentationEmailExtension on List<PresentationEmail> {
-  bool get isAllEmailRead => every((email) => email.isReadEmail());
+  bool get isAllEmailRead => every((email) => email.hasRead);
 
-  bool get isAllEmailStarred => every((email) => email.isFlaggedEmail());
+  bool get isAllEmailStarred => every((email) => email.hasStarred);
 
-  List<PresentationEmail> get allEmailUnread => where((email) => email.isUnReadEmail()).toList();
+  List<PresentationEmail> get allEmailUnread => where((email) => !email.hasRead).toList();
 
   PresentationEmail? findEmail(EmailId emailId) {
     try {

model/lib/extensions/mailbox_id_extension.dart

@@ -12,4 +12,10 @@ extension MailboxIdExtension on MailboxId {
       destinationMailboxId.generatePath(): true
     });
   }
+
+  PatchObject generateActionPath() {
+    return PatchObject({
+      generatePath():  true,
+    });
+  }
 }

model/lib/mailbox/presentation_mailbox.dart

@@ -11,6 +11,7 @@ class PresentationMailbox with EquatableMixin {
   static final roleTemplates = Role('templates');
   static final roleOutbox = Role('outbox');
   static final roleDrafts = Role('drafts');
+  static final roleSpam = Role('spam');
 
   final MailboxId id;
   final MailboxName? name;
@@ -56,6 +57,8 @@ class PresentationMailbox with EquatableMixin {
     return unreadEmails!.value.value <= 999 ? '${unreadEmails!.value.value}' : '999+';
   }
 
+  bool get isSpam => role == roleSpam;
+
   @override
   List<Object?> get props => [
     id,

model/lib/model.dart

@@ -25,7 +25,6 @@ export 'email/presentation_email_address.dart';
 export 'email/email_address_cache.dart';
 export 'email/read_actions.dart';
 export 'email/attachment.dart';
-export 'email/move_action.dart';
 export 'email/mark_star_action.dart';
 export 'email/email_property.dart';
 export 'email/email_filter.dart';