4 files changed, 70 insertions, 2 deletions

diff --git a/common/domain/applicationdomaintype.h b/common/domain/applicationdomaintype.h
index 72ac480..12a9e56 100644
--- a/common/domain/applicationdomaintype.h
+++ b/common/domain/applicationdomaintype.h
@@ -210,6 +210,7 @@ struct SINK_EXPORT Mail : public Entity {
     SINK_REFERENCE_PROPERTY(Folder, Folder, folder);
     SINK_BLOB_PROPERTY(MimeMessage, mimeMessage);
     SINK_PROPERTY(bool, Draft, draft);
+    SINK_PROPERTY(bool, Trash, trash);
 };
 
 /**
diff --git a/common/domain/mail.fbs b/common/domain/mail.fbs
index addc7c4..3a84ca1 100644
--- a/common/domain/mail.fbs
+++ b/common/domain/mail.fbs
@@ -11,6 +11,7 @@ table Mail {
   important:bool = false;
   mimeMessage:string;
   draft:bool = false;
+  trash:bool = false;
 }
 
 root_type Mail;
diff --git a/tests/mailtest.cpp b/tests/mailtest.cpp
index 4e36517..6dfe901 100644
--- a/tests/mailtest.cpp
+++ b/tests/mailtest.cpp
@@ -402,6 +402,70 @@ void MailTest::testModifyMailToDraft()
     VERIFYEXEC(Store::create(mail));
     VERIFYEXEC(ResourceControl::flushMessageQueue(QByteArrayList() << mResourceInstanceIdentifier));
 
+    auto modifiedMail = Store::readOne<ApplicationDomain::Mail>(Query::IdentityFilter(mail).request<Mail::MimeMessage>().request<Mail::Folder>());
+    // ApplicationDomain::Mail modifiedMail;
+    // {
+    //     auto job = Store::fetchOne<ApplicationDomain::Mail>(Query::IdentityFilter(mail.identifier()) + Query::RequestedProperties(QByteArrayList() << Mail::MimeMessage::name << Mail::Folder::name))
+    //         .then<void, ApplicationDomain::Mail>([&](const ApplicationDomain::Mail &mail) {
+    //                 modifiedMail = mail;
+    //         });
+    //     VERIFYEXEC(job);
+    // }
+    modifiedMail.setDraft(true);
+    VERIFYEXEC(Store::modify(modifiedMail));
+    VERIFYEXEC(ResourceControl::flushMessageQueue(QByteArrayList() << mResourceInstanceIdentifier));
+    VERIFYEXEC(ResourceControl::flushReplayQueue(QByteArrayList() << mResourceInstanceIdentifier));
+
+    QByteArray folderIdentifier;
+    auto job = Store::fetchOne<ApplicationDomain::Mail>(Query::IdentityFilter(mail.identifier()) + Query::RequestedProperties(QByteArrayList() << Mail::MimeMessage::name << Mail::Folder::name))
+        .then<void, ApplicationDomain::Mail>([&](const ApplicationDomain::Mail &mail) {
+            folderIdentifier = mail.getProperty("folder").toByteArray();
+            QVERIFY(!folderIdentifier.isEmpty());
+        });
+    VERIFYEXEC(job);
+
+    //Ensure the folder is also existing
+    {
+        ApplicationDomain::Folder folder;
+        Query query;
+        query.ids << folderIdentifier;
+        query.request<Folder::SpecialPurpose>();
+        auto job = Store::fetchAll<ApplicationDomain::Folder>(Query::IdentityFilter(folderIdentifier))
+            .then<void, QList<ApplicationDomain::Folder::Ptr> >([&](const QList<ApplicationDomain::Folder::Ptr> &folders) {
+                QCOMPARE(folders.size(), 1);
+                folder = *folders.first();
+                QVERIFY(folder.getSpecialPurpose().contains("drafts"));
+            });
+        VERIFYEXEC(job);
+        VERIFYEXEC(ResourceControl::inspect<ApplicationDomain::Folder>(ResourceControl::Inspection::ExistenceInspection(folder, true)));
+    }
+    VERIFYEXEC(ResourceControl::inspect<ApplicationDomain::Mail>(ResourceControl::Inspection::ExistenceInspection(mail, true)));
+}
+
+void MailTest::testModifyMailToTrash()
+{
+    if (!mCapabilities.contains(ResourceCapabilities::Mail::trash)) {
+        QSKIP("Resource doesn't have the trash capability");
+    }
+
+    auto folder = Folder::create(mResourceInstanceIdentifier);
+    folder.setName("sdljldskjf");
+    VERIFYEXEC(Store::create(folder));
+
+    auto message = KMime::Message::Ptr::create();
+    message->subject(true)->fromUnicodeString(QString::fromLatin1("Foobar"), "utf8");
+    message->assemble();
+
+    auto mail = ApplicationDomain::Mail::create(mResourceInstanceIdentifier);
+    mail.setMimeMessage(message->encodedContent());
+    mail.setTrash(false);
+    mail.setFolder(folder);
+
+    VERIFYEXEC(Store::create(mail));
+    VERIFYEXEC(ResourceControl::flushMessageQueue(QByteArrayList() << mResourceInstanceIdentifier));
+
+    // auto modifiedMail = Store::read<ApplicationDomain::Mail>(Query::IdentityFilter(mail).request<Mail::MimeMessage>().request<Mail::Folder>()).value();
+
     ApplicationDomain::Mail modifiedMail;
     {
         auto job = Store::fetchOne<ApplicationDomain::Mail>(Query::IdentityFilter(mail.identifier()) + Query::RequestedProperties(QByteArrayList() << Mail::MimeMessage::name << Mail::Folder::name))
@@ -410,7 +474,7 @@ void MailTest::testModifyMailToDraft()
             });
         VERIFYEXEC(job);
     }
-    modifiedMail.setDraft(true);
+    modifiedMail.setTrash(true);
     VERIFYEXEC(Store::modify(modifiedMail));
     VERIFYEXEC(ResourceControl::flushMessageQueue(QByteArrayList() << mResourceInstanceIdentifier));
     VERIFYEXEC(ResourceControl::flushReplayQueue(QByteArrayList() << mResourceInstanceIdentifier));
@@ -433,7 +497,7 @@ void MailTest::testModifyMailToDraft()
             .then<void, QList<ApplicationDomain::Folder::Ptr> >([&](const QList<ApplicationDomain::Folder::Ptr> &folders) {
                 QCOMPARE(folders.size(), 1);
                 folder = *folders.first();
-                QVERIFY(folder.getSpecialPurpose().contains("drafts"));
+                QVERIFY(folder.getSpecialPurpose().contains("trash"));
             });
         VERIFYEXEC(job);
         VERIFYEXEC(ResourceControl::inspect<ApplicationDomain::Folder>(ResourceControl::Inspection::ExistenceInspection(folder, true)));
diff --git a/tests/mailtest.h b/tests/mailtest.h
index 3de5e1f..16d5d73 100644
--- a/tests/mailtest.h
+++ b/tests/mailtest.h
@@ -69,6 +69,8 @@ private slots:
 
     void testCreateDraft();
     void testModifyMailToDraft();
+
+    void testModifyMailToTrash();
 };
 
 }