1 files changed, 10 insertions, 0 deletions

diff --git a/common/domain/mail.cpp b/common/domain/mail.cpp
index 8abe259..c1b0b34 100644
--- a/common/domain/mail.cpp
+++ b/common/domain/mail.cpp
@@ -27,6 +27,7 @@
 #include "entitybuffer.h"
 #include "entity_generated.h"
 #include "mail/threadindexer.h"
+#include "domainadaptor.h"
 
 #include "mail_generated.h"
 
@@ -53,6 +54,15 @@ void TypeImplementation<Mail>::configure(TypeIndex &index)
     index.addSecondaryProperty<Mail::ThreadId, Mail::MessageId>();
 }
 
+void TypeImplementation<Mail>::configure(IndexPropertyMapper &indexPropertyMapper)
+{
+    indexPropertyMapper.addIndexLookupProperty<Mail::ThreadId>([](TypeIndex &index, const ApplicationDomain::BufferAdaptor &entity) {
+            auto messageId = entity.getProperty(Mail::MessageId::name);
+            auto thread = index.secondaryLookup<Mail::MessageId, Mail::ThreadId>(messageId);
+            Q_ASSERT(!thread.isEmpty());
+            return thread.first();
+        });
+}
 
 void TypeImplementation<Mail>::configure(ReadPropertyMapper<Buffer> &propertyMapper)
 {