Inherit folder id (we can't hardcode it)

2 files changed, 21 insertions, 13 deletions

diff --git a/tests/teststore.cpp b/tests/teststore.cpp
index ef243b14..d57c9e07 100644
--- a/tests/teststore.cpp
+++ b/tests/teststore.cpp
@@ -47,7 +47,7 @@ static QStringList toStringList(const QVariantList &list)
     return s;
 }
 
-static void createMail(const QVariantMap &object)
+static void createMail(const QVariantMap &object, const QByteArray &folder = {})
 {
     using namespace Sink::ApplicationDomain;
 
@@ -71,6 +71,9 @@ static void createMail(const QVariantMap &object)
 
     auto mail = ApplicationDomainType::createEntity<Mail>(object["resource"].toByteArray());
     mail.setMimeMessage(msg->encodedContent(true));
+    if (!folder.isEmpty()) {
+        mail.setFolder(folder);
+    }
     Sink::Store::create(mail).exec().waitForFinished();
 }
 
@@ -80,6 +83,10 @@ static void createFolder(const QVariantMap &object)
     auto folder = ApplicationDomainType::createEntity<Folder>(object["resource"].toByteArray());
     folder.setName(object["name"].toString());
     Sink::Store::create(folder).exec().waitForFinished();
+
+    iterateOverObjects(object.value("mails").toList(), [=](const QVariantMap &object) {
+        createMail(object, folder.identifier());
+    });
 }
 
 void TestStore::setup(const QVariantMap &map)
@@ -119,7 +126,9 @@ void TestStore::setup(const QVariantMap &map)
     });
 
     iterateOverObjects(map.value("folders").toList(), createFolder);
-    iterateOverObjects(map.value("mails").toList(), createMail);
+    iterateOverObjects(map.value("mails").toList(), [] (const QVariantMap &map) {
+        createMail(map);
+    });
 
     Sink::ResourceControl::flushMessageQueue(resources).exec().waitForFinished();
 }
diff --git a/views/conversation/main.qml b/views/conversation/main.qml
index 15360d22..10c25706 100644
--- a/views/conversation/main.qml
+++ b/views/conversation/main.qml
@@ -53,18 +53,17 @@ ApplicationWindow {
             folders: [{
                     id: "folder1",
                     resource: "resource1",
-                    name: "Folder 1"
+                    name: "Folder 1",
+                    mails: [{
+                            resource: "resource1",
+                            subject: "subject",
+                            body: "body",
+                            to: ["to@example.org"],
+                            cc: ["cc@example.org"],
+                            bcc: ["bcc@example.org"],
+                            draft: true
+                        }]
                 }],
-            mails: [{
-                    resource: "resource1",
-                    folder: "folder1",
-                    subject: "subject",
-                    body: "body",
-                    to: ["to@example.org"],
-                    cc: ["cc@example.org"],
-                    bcc: ["bcc@example.org"],
-                    draft: true
-                }]
         }
         TestStore.setup(initialState)
     }