2 files changed, 30 insertions, 3 deletions

diff --git a/common/domain/folder.cpp b/common/domain/folder.cpp
index 50f73c2..82f6c1f 100644
--- a/common/domain/folder.cpp
+++ b/common/domain/folder.cpp
@@ -37,15 +37,43 @@ using namespace Akonadi2::ApplicationDomain;
 ResultSet TypeImplementation<Folder>::queryIndexes(const Akonadi2::Query &query, const QByteArray &resourceInstanceIdentifier, QSet<QByteArray> &appliedFilters, Akonadi2::Storage::Transaction &transaction)
 {
     QVector<QByteArray> keys;
+    if (query.propertyFilter.contains("parent")) {
+        Index index("folder.index.parent", transaction);
+        auto lookupKey = query.propertyFilter.value("parent").toByteArray();
+        if (lookupKey.isEmpty()) {
+            lookupKey = "toplevel";
+        }
+        index.lookup(lookupKey, [&](const QByteArray &value) {
+            keys << value;
+        },
+        [](const Index::Error &error) {
+            Warning() << "Error in uid index: " <<  error.message;
+        });
+        appliedFilters << "parent";
+    }
+    Trace() << "Index lookup found " << keys.size() << " keys.";
     return ResultSet(keys);
 }
 
 void TypeImplementation<Folder>::index(const QByteArray &identifier, const BufferAdaptor &bufferAdaptor, Akonadi2::Storage::Transaction &transaction)
 {
+    const auto parent = bufferAdaptor.getProperty("parent");
+    Trace() << "indexing " << identifier << " with parent " << parent.toByteArray();
+    if (parent.isValid()) {
+        Index("folder.index.parent", transaction).add(parent.toByteArray(), identifier);
+    } else {
+        Index("folder.index.parent", transaction).add("toplevel", identifier);
+    }
 }
 
 void TypeImplementation<Folder>::removeIndex(const QByteArray &identifier, const BufferAdaptor &bufferAdaptor, Akonadi2::Storage::Transaction &transaction)
 {
+    const auto parent = bufferAdaptor.getProperty("parent");
+    if (parent.isValid()) {
+        Index("folder.index.parent", transaction).remove(parent.toByteArray(), identifier);
+    } else {
+        Index("folder.index.parent", transaction).remove("toplevel", identifier);
+    }
 }
 
 QSharedPointer<ReadPropertyMapper<TypeImplementation<Folder>::Buffer> > TypeImplementation<Folder>::initializeReadPropertyMapper()
diff --git a/common/modelresult.h b/common/modelresult.h
index eabb868..8ca6daa 100644
--- a/common/modelresult.h
+++ b/common/modelresult.h
@@ -116,7 +116,7 @@ public:
             return;
         }
         auto parent = createIndexFromId(id);
-        qDebug() << "Added entity " << childId;
+        qDebug() << "Added entity " << childId << value->identifier();
         const auto keys = mTree[id];
         int index = 0;
         for (; index < keys.size(); index++) {
@@ -166,7 +166,6 @@ public:
 
     void fetchEntities(const QModelIndex &parent)
     {
-        qDebug() << "Fetching entities";
         const auto id = getIdentifier(parent);
         mEntityChildrenFetched[id] = true;
         QByteArray parentIdentifier;
@@ -178,7 +177,7 @@ public:
             Q_ASSERT(object);
             parentIdentifier = object->identifier();
         }
-        Trace() << "Loading entities";
+        Trace() << "Loading child entities of: " << parentIdentifier;
         loadEntities(parentIdentifier);
     }