Validate subject and mime message

2 files changed, 54 insertions, 5 deletions

diff --git a/examples/imapresource/imapresource.cpp b/examples/imapresource/imapresource.cpp
index 6adfeb3..61031d8 100644
--- a/examples/imapresource/imapresource.cpp
+++ b/examples/imapresource/imapresource.cpp
@@ -51,6 +51,53 @@
 
 using namespace Imap;
 
+class FolderUpdater : public Sink::Preprocessor
+{
+public:
+    FolderUpdater(const QByteArray &drafts) {}
+
+    void updatedIndexedProperties(Sink::ApplicationDomain::BufferAdaptor &newEntity)
+    {
+        const auto mimeMessagePath = newEntity.getProperty("mimeMessage").toString();
+        QFile f(mimeMessagePath);
+        if (!f.open(QIODevice::ReadOnly)) {
+            Warning() << "Failed to open the file: " << mimeMessagePath;
+            return;
+        }
+        auto mapped = f.map(0, qMin((qint64)8000, f.size()));
+        if (!mapped) {
+            Warning() << "Failed to map file";
+            return;
+        }
+
+        KMime::Message *msg = new KMime::Message;
+        msg->setHead(KMime::CRLFtoLF(QByteArray::fromRawData(reinterpret_cast<const char*>(mapped), f.size())));
+        msg->parse();
+
+        newEntity.setProperty("subject", msg->subject(true)->asUnicodeString());
+        newEntity.setProperty("sender", msg->from(true)->asUnicodeString());
+        newEntity.setProperty("senderName", msg->from(true)->asUnicodeString());
+        newEntity.setProperty("date", msg->date(true)->dateTime());
+    }
+
+    void newEntity(const QByteArray &uid, qint64 revision, Sink::ApplicationDomain::BufferAdaptor &newEntity, Sink::Storage::Transaction &transaction) Q_DECL_OVERRIDE
+    {
+        updatedIndexedProperties(newEntity);
+    }
+
+    void modifiedEntity(const QByteArray &uid, qint64 revision, const Sink::ApplicationDomain::BufferAdaptor &oldEntity, Sink::ApplicationDomain::BufferAdaptor &newEntity,
+        Sink::Storage::Transaction &transaction) Q_DECL_OVERRIDE
+    {
+        updatedIndexedProperties(newEntity);
+    }
+
+    void deletedEntity(const QByteArray &uid, qint64 revision, const Sink::ApplicationDomain::BufferAdaptor &oldEntity, Sink::Storage::Transaction &transaction) Q_DECL_OVERRIDE
+    {
+    }
+
+    QSharedPointer<ImapFolderAdaptorFactory> mFolderAdaptorFactory;
+};
+
 ImapResource::ImapResource(const QByteArray &instanceIdentifier, const QSharedPointer<Sink::Pipeline> &pipeline)
     : Sink::GenericResource(instanceIdentifier, pipeline),
     mMailAdaptorFactory(QSharedPointer<ImapMailAdaptorFactory>::create()),
@@ -62,9 +109,11 @@ ImapResource::ImapResource(const QByteArray &instanceIdentifier, const QSharedPo
     mUser = config.value("user").toString();
     mPassword = config.value("password").toString();
 
-    // auto folderUpdater = new FolderUpdater(QByteArray());
+    auto folderUpdater = new FolderUpdater(QByteArray());
+    folderUpdater->mFolderAdaptorFactory = mFolderAdaptorFactory;
+
     addType(ENTITY_TYPE_MAIL, mMailAdaptorFactory,
-            QVector<Sink::Preprocessor*>() << new DefaultIndexUpdater<Sink::ApplicationDomain::Mail>);
+            QVector<Sink::Preprocessor*>() << folderUpdater << new DefaultIndexUpdater<Sink::ApplicationDomain::Mail>);
     addType(ENTITY_TYPE_FOLDER, mFolderAdaptorFactory,
             QVector<Sink::Preprocessor*>() << new DefaultIndexUpdater<Sink::ApplicationDomain::Folder>);
 }
diff --git a/tests/mailtest.cpp b/tests/mailtest.cpp
index c3b33bc..3ca8eaa 100644
--- a/tests/mailtest.cpp
+++ b/tests/mailtest.cpp
@@ -153,13 +153,13 @@ void MailTest::testCreateModifyDeleteMail()
     VERIFYEXEC(Store::create(mail));
     VERIFYEXEC(ResourceControl::flushMessageQueue(query.resources));
     {
-        auto job = Store::fetchAll<Mail>(Query::RequestedProperties(QByteArrayList() << Mail::Folder::name << Mail::Subject::name))
+        auto job = Store::fetchAll<Mail>(Query::RequestedProperties(QByteArrayList() << Mail::Folder::name << Mail::Subject::name << Mail::MimeMessage::name))
             .then<void, QList<Mail::Ptr>>([=](const QList<Mail::Ptr> &mails) {
                 QCOMPARE(mails.size(), 1);
                 auto mail = *mails.first();
-                // QCOMPARE(mail.getSubject(), subject);
+                QCOMPARE(mail.getSubject(), subject);
                 QCOMPARE(mail.getFolder(), folder.identifier());
-                // TODO test access to mime message
+                QVERIFY(QFile(mail.getMimeMessagePath()).exists());
 
                 // return Store::remove(*mail)
                 //     .then(ResourceControl::flushReplayQueue(query.resources)) // The change needs to be replayed already