6 files changed, 26 insertions, 0 deletions

diff --git a/common/domain/event.cpp b/common/domain/event.cpp
index a8098b7..10c92bb 100644
--- a/common/domain/event.cpp
+++ b/common/domain/event.cpp
@@ -50,3 +50,8 @@ void TypeImplementation<Event>::configure(WritePropertyMapper<BufferBuilder> &pr
     propertyMapper.addMapping<Event::Uid>(&BufferBuilder::add_uid);
     propertyMapper.addMapping<Event::Attachment>(&BufferBuilder::add_attachment);
 }
+
+void TypeImplementation<Event>::configure(IndexPropertyMapper &)
+{
+
+}
diff --git a/common/domain/event.h b/common/domain/event.h
index d85b9b3..b683f5f 100644
--- a/common/domain/event.h
+++ b/common/domain/event.h
@@ -26,6 +26,7 @@ template<typename T>
 class ReadPropertyMapper;
 template<typename T>
 class WritePropertyMapper;
+class IndexPropertyMapper;
 
 class TypeIndex;
 
@@ -49,6 +50,7 @@ public:
     static void configure(TypeIndex &);
     static void configure(ReadPropertyMapper<Buffer> &);
     static void configure(WritePropertyMapper<BufferBuilder> &);
+    static void configure(IndexPropertyMapper &indexPropertyMapper);
 };
 
 }
diff --git a/common/domain/folder.cpp b/common/domain/folder.cpp
index e6701ac..4bc2efb 100644
--- a/common/domain/folder.cpp
+++ b/common/domain/folder.cpp
@@ -51,3 +51,8 @@ void TypeImplementation<Folder>::configure(WritePropertyMapper<BufferBuilder> &p
     propertyMapper.addMapping<Folder::Icon>(&BufferBuilder::add_icon);
     propertyMapper.addMapping<Folder::SpecialPurpose>(&BufferBuilder::add_specialpurpose);
 }
+
+void TypeImplementation<Folder>::configure(IndexPropertyMapper &)
+{
+
+}
diff --git a/common/domain/folder.h b/common/domain/folder.h
index 3c83794..f232ab5 100644
--- a/common/domain/folder.h
+++ b/common/domain/folder.h
@@ -24,6 +24,7 @@ template<typename T>
 class ReadPropertyMapper;
 template<typename T>
 class WritePropertyMapper;
+class IndexPropertyMapper;
 
 class TypeIndex;
 
@@ -43,6 +44,7 @@ public:
     static void configure(TypeIndex &);
     static void configure(ReadPropertyMapper<Buffer> &);
     static void configure(WritePropertyMapper<BufferBuilder> &);
+    static void configure(IndexPropertyMapper &indexPropertyMapper);
 };
 
 }
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)
 {
diff --git a/common/domain/mail.h b/common/domain/mail.h
index c12976a..e052448 100644
--- a/common/domain/mail.h
+++ b/common/domain/mail.h
@@ -26,6 +26,7 @@ template<typename T>
 class ReadPropertyMapper;
 template<typename T>
 class WritePropertyMapper;
+class IndexPropertyMapper;
 
 class TypeIndex;
 
@@ -44,6 +45,7 @@ public:
     static void configure(TypeIndex &index);
     static void configure(ReadPropertyMapper<Buffer> &propertyMapper);
     static void configure(WritePropertyMapper<BufferBuilder> &propertyMapper);
+    static void configure(IndexPropertyMapper &indexPropertyMapper);
 };
 
 }