Cleaner index syntax, don't index messageid twice

3 files changed, 25 insertions, 8 deletions

diff --git a/common/domain/mail.cpp b/common/domain/mail.cpp
index f9a20d7..9f120cc 100644
--- a/common/domain/mail.cpp
+++ b/common/domain/mail.cpp
@@ -36,17 +36,15 @@ using namespace Sink::ApplicationDomain;
 
 void TypeImplementation<Mail>::configure(TypeIndex &index)
 {
-    index.addProperty<QByteArray>(Mail::Uid::name);
-    index.addProperty<QByteArray>(Mail::Sender::name);
+    index.addProperty<Mail::Uid>();
+    // index.addProperty<Mail::Sender>();
     /* index.addProperty<QByteArray>(Mail::SenderName::name); */
     /* index->addProperty<QString>(Mail::Subject::name); */
     /* index->addFulltextProperty<QString>(Mail::Subject::name); */
-    index.addProperty<QDateTime>(Mail::Date::name);
-    index.addProperty<QByteArray>(Mail::Folder::name);
-    index.addPropertyWithSorting<QByteArray, QDateTime>(Mail::Folder::name, Mail::Date::name);
-    index.addProperty<QByteArray>(Mail::MessageId::name);
-    index.addProperty<QByteArray>(Mail::ParentMessageId::name);
-
+    index.addProperty<Mail::Date>();
+    index.addProperty<Mail::Folder>();
+    index.addPropertyWithSorting<Mail::Folder, Mail::Date>();
+    index.addProperty<Mail::ParentMessageId>();
     index.addProperty<Mail::MessageId>();
 
     index.addSecondaryPropertyIndexer<Mail::MessageId, Mail::ThreadId, ThreadIndexer>();
diff --git a/common/typeindex.cpp b/common/typeindex.cpp
index 077bfa1..a65c676 100644
--- a/common/typeindex.cpp
+++ b/common/typeindex.cpp
@@ -103,6 +103,12 @@ void TypeIndex::addProperty<QDateTime>(const QByteArray &property)
 }
 
 template <>
+void TypeIndex::addProperty<ApplicationDomain::Reference>(const QByteArray &property)
+{
+    addProperty<QByteArray>(property);
+}
+
+template <>
 void TypeIndex::addPropertyWithSorting<QByteArray, QDateTime>(const QByteArray &property, const QByteArray &sortProperty)
 {
     auto indexer = [=](const QByteArray &identifier, const QVariant &value, const QVariant &sortValue, Sink::Storage::DataStore::Transaction &transaction) {
@@ -114,8 +120,15 @@ void TypeIndex::addPropertyWithSorting<QByteArray, QDateTime>(const QByteArray &
     mSortedProperties.insert(property, sortProperty);
 }
 
+template <>
+void TypeIndex::addPropertyWithSorting<ApplicationDomain::Reference, QDateTime>(const QByteArray &property, const QByteArray &sortProperty)
+{
+    addPropertyWithSorting<QByteArray, QDateTime>(property, sortProperty);
+}
+
 void TypeIndex::add(const QByteArray &identifier, const Sink::ApplicationDomain::ApplicationDomainType &entity, Sink::Storage::DataStore::Transaction &transaction)
 {
+    SinkTrace() << "add " << identifier;
     for (const auto &property : mProperties) {
         const auto value = entity.getProperty(property);
         auto indexer = mIndexer.value(property);
diff --git a/common/typeindex.h b/common/typeindex.h
index 626959e..7ff2029 100644
--- a/common/typeindex.h
+++ b/common/typeindex.h
@@ -41,6 +41,12 @@ public:
     template <typename T, typename S>
     void addPropertyWithSorting(const QByteArray &property, const QByteArray &sortProperty);
 
+    template <typename T, typename S>
+    void addPropertyWithSorting()
+    {
+        addPropertyWithSorting<typename T::Type, typename S::Type>(T::name, S::name);
+    }
+
     template <typename T>
     void addProperty()
     {