2 files changed, 41 insertions, 1 deletions

diff --git a/common/datastorequery.cpp b/common/datastorequery.cpp
index 8bed015..82a396e 100644
--- a/common/datastorequery.cpp
+++ b/common/datastorequery.cpp
@@ -262,7 +262,7 @@ public:
                     }
 
                     readEntity(selectionResult, [&, this](const Sink::ApplicationDomain::ApplicationDomainType &entity, Sink::Operation operation) {
-                        callback({entity, Sink::Operation_Creation, aggregateValues});
+                        callback({entity, operation, aggregateValues});
                         foundValue = true;
                     });
                 }
diff --git a/tests/querytest.cpp b/tests/querytest.cpp
index 46181a6..92fc1f7 100644
--- a/tests/querytest.cpp
+++ b/tests/querytest.cpp
@@ -667,6 +667,46 @@ private slots:
         VERIFYEXEC(Sink::ResourceControl::flushMessageQueue("sink.dummy.instance1"));
         QTRY_COMPARE(model->rowCount(), 0);
     }
+
+    void testLivequeryModifcationUpdateInThread()
+    {
+        // Setup
+        auto folder1 = Folder::createEntity<Folder>("sink.dummy.instance1");
+        VERIFYEXEC(Sink::Store::create<Folder>(folder1));
+
+        auto folder2 = Folder::createEntity<Folder>("sink.dummy.instance1");
+        VERIFYEXEC(Sink::Store::create<Folder>(folder2));
+
+        auto mail1 = Mail::createEntity<Mail>("sink.dummy.instance1");
+        mail1.setUid("mail1");
+        mail1.setFolder(folder1);
+        mail1.setUnread(false);
+        VERIFYEXEC(Sink::Store::create(mail1));
+
+        // Ensure all local data is processed
+        VERIFYEXEC(Sink::ResourceControl::flushMessageQueue("sink.dummy.instance1"));
+
+        Query query;
+        query.setId("testLivequeryUnmatch");
+        query.filter<Mail::Folder>(folder1);
+        query.reduce<Mail::ThreadId>(Query::Reduce::Selector::max<Mail::Date>()).count("count").collect<Mail::Sender>("senders");
+        query.sort<Mail::Date>();
+        query.setFlags(Query::LiveQuery);
+        query.request<Mail::Unread>();
+
+        auto model = Sink::Store::loadModel<Mail>(query);
+        QTRY_COMPARE(model->rowCount(), 1);
+
+        //After the modifcation the mail should have vanished.
+        {
+            mail1.setUnread(true);
+            VERIFYEXEC(Sink::Store::modify(mail1));
+        }
+        VERIFYEXEC(Sink::ResourceControl::flushMessageQueue("sink.dummy.instance1"));
+        QTRY_COMPARE(model->rowCount(), 1);
+        auto mail = model->data(model->index(0, 0, QModelIndex{}), Sink::Store::DomainObjectRole).value<Mail::Ptr>();
+        QCOMPARE(mail->getUnread(), true);
+    }
 };
 
 QTEST_MAIN(QueryTest)