2 files changed, 20 insertions, 3 deletions

diff --git a/common/domain/typeimplementations.cpp b/common/domain/typeimplementations.cpp
index e65c998..a8f4baf 100644
--- a/common/domain/typeimplementations.cpp
+++ b/common/domain/typeimplementations.cpp
@@ -38,7 +38,7 @@ using namespace Sink::ApplicationDomain;
     MAPPER.addMapping<ENTITYTYPE::PROPERTY, Sink::ApplicationDomain::Buffer::ENTITYTYPE, Sink::ApplicationDomain::Buffer::ENTITYTYPE##Builder>(&Sink::ApplicationDomain::Buffer::ENTITYTYPE::LOWERCASEPROPERTY, &Sink::ApplicationDomain::Buffer::ENTITYTYPE##Builder::add_##LOWERCASEPROPERTY);
 
 typedef IndexConfig<Mail,
-        ValueIndex<Mail::Date>,
+        SortedIndex<Mail::Date>,
         ValueIndex<Mail::Folder>,
         ValueIndex<Mail::ParentMessageId>,
         ValueIndex<Mail::MessageId>,
@@ -64,7 +64,8 @@ typedef IndexConfig<Addressbook,
     > AddressbookIndexConfig;
 
 typedef IndexConfig<Event,
-        ValueIndex<Event::Uid>
+        ValueIndex<Event::Uid>,
+        SortedIndex<Event::StartTime>
     > EventIndexConfig;
 
 typedef IndexConfig<Todo,
diff --git a/common/domain/typeimplementations_p.h b/common/domain/typeimplementations_p.h
index 6f77a2d..fc08048 100644
--- a/common/domain/typeimplementations_p.h
+++ b/common/domain/typeimplementations_p.h
@@ -62,7 +62,7 @@ public:
 };
 
 
-template <typename Property, typename SortProperty>
+template <typename Property, typename SortProperty = void>
 class SortedIndex
 {
 public:
@@ -78,6 +78,22 @@ public:
     }
 };
 
+template <typename SortProperty>
+class SortedIndex<SortProperty, void>
+{
+public:
+    static void configure(TypeIndex &index)
+    {
+        index.addSortedProperty<SortProperty>();
+    }
+
+    template <typename EntityType>
+    static QMap<QByteArray, int> databases()
+    {
+        return {{QByteArray{EntityType::name} +".index." + SortProperty::name + ".sorted", 1}};
+    }
+};
+
 template <typename Property, typename SecondaryProperty>
 class SecondaryIndex
 {