2 files changed, 53 insertions, 8 deletions

diff --git a/common/datastorequery.cpp b/common/datastorequery.cpp
index fd910f8..4c25710 100644
--- a/common/datastorequery.cpp
+++ b/common/datastorequery.cpp
@@ -361,10 +361,6 @@ public:
 
                         auto oldSelectionResult = mSelectedValues.take(reductionValueBa);
                         SinkTraceCtx(mDatastore->mLogCtx) << "Old selection result: " << oldSelectionResult << " New selection result: " << selectionResult.selection;
-                        //If mSelectedValues did not containthe value, oldSelectionResult will be empty.(Happens if entites have been filtered)
-                        if (oldSelectionResult.isEmpty()) {
-                            return;
-                        }
                         if (oldSelectionResult == selectionResult.selection) {
                             mSelectedValues.insert(reductionValueBa, selectionResult.selection);
                             Q_ASSERT(!selectionResult.selection.isEmpty());
@@ -373,10 +369,12 @@ public:
                             });
                         } else {
                             //remove old result
-                            Q_ASSERT(!oldSelectionResult.isEmpty());
-                            readEntity(oldSelectionResult, [&](const Sink::ApplicationDomain::ApplicationDomainType &entity, Sink::Operation) {
-                                callback({entity, Sink::Operation_Removal});
-                            });
+                            //If mSelectedValues did not containthe value, oldSelectionResult will be empty.(Happens if entites have been filtered)
+                            if (!oldSelectionResult.isEmpty()) {
+                                readEntity(oldSelectionResult, [&](const Sink::ApplicationDomain::ApplicationDomainType &entity, Sink::Operation) {
+                                    callback({entity, Sink::Operation_Removal});
+                                });
+                            }
 
                             //If the last item has been removed, then there's nothing to add
                             if (!selectionResult.selection.isEmpty()) {
diff --git a/tests/querytest.cpp b/tests/querytest.cpp
index 7685086..f320d57 100644
--- a/tests/querytest.cpp
+++ b/tests/querytest.cpp
@@ -1008,6 +1008,53 @@ private slots:
         QTRY_COMPARE(model->rowCount(), 1);
     }
 
+    /*
+     * Two messages in the same thread. The first get's filtered, the second one makes it.
+     */
+    void testFilteredReductionUpdateInSameThread()
+    {
+        // 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));
+
+        // Ensure all local data is processed
+        VERIFYEXEC(Sink::ResourceControl::flushMessageQueue("sink.dummy.instance1"));
+
+        Query query;
+        query.setId("testFilteredReductionUpdate");
+        query.setFlags(Query::LiveQuery);
+        query.filter<Mail::Folder>(folder1);
+        query.reduce<Mail::MessageId>(Query::Reduce::Selector::max<Mail::Date>());
+
+        auto model = Sink::Store::loadModel<Mail>(query);
+        QTRY_VERIFY(model->data(QModelIndex(), Sink::Store::ChildrenFetchedRole).toBool());
+        QCOMPARE(model->rowCount(), 0);
+
+        //The first message will be filtered (but would be aggreagted together with the message that passes)
+        {
+            auto mail = Mail::createEntity<Mail>("sink.dummy.instance1");
+            mail.setExtractedMessageId("aggregatedId");
+            mail.setFolder(folder2);
+            VERIFYEXEC(Sink::Store::create(mail));
+        }
+
+        VERIFYEXEC(Sink::ResourceControl::flushMessageQueue("sink.dummy.instance1"));
+        QCOMPARE(model->rowCount(), 0);
+
+        //Ensure the non-filtered still gets through.
+        {
+            auto mail = Mail::createEntity<Mail>("sink.dummy.instance1");
+            mail.setExtractedMessageId("aggregatedId");
+            mail.setFolder(folder1);
+            VERIFYEXEC(Sink::Store::create(mail));
+        }
+        VERIFYEXEC(Sink::ResourceControl::flushMessageQueue("sink.dummy.instance1"));
+        QTRY_COMPARE(model->rowCount(), 1);
+    }
+
     void testBloom()
     {
         // Setup