Adapted to new query api

1 files changed, 11 insertions, 12 deletions

diff --git a/framework/domain/folderlistmodel.cpp b/framework/domain/folderlistmodel.cpp
index 000dd263..98453ce9 100644
--- a/framework/domain/folderlistmodel.cpp
+++ b/framework/domain/folderlistmodel.cpp
@@ -72,19 +72,18 @@ void FolderListModel::runQuery(const Sink::Query &query)
 
 void FolderListModel::setAccountId(const QVariant &accountId)
 {
+    using namespace Sink::ApplicationDomain;
     const auto account = accountId.toString().toUtf8();
-    Sink::Store::fetchAll<Sink::ApplicationDomain::SinkResource>(Sink::Query::PropertyFilter("account", QVariant::fromValue(account)))
-        .syncThen<void, QList<Sink::ApplicationDomain::SinkResource::Ptr>>([this, account](const QList<Sink::ApplicationDomain::SinkResource::Ptr> &resources) {
-            Sink::Query query;
-            query.liveQuery = true;
-            query.requestedProperties << "name" << "icon" << "parent";
-            query.parentProperty = "parent";
-            for (const auto &r : resources) {
-                qDebug() << "Found resources for account: " << r->identifier() << account;
-                query.resources << r->identifier();
-            }
-            runQuery(query);
-        }).exec();
+
+    //Get all folders of an account
+    auto query = Sink::Query();
+    query.filter(SinkAccount(account));
+    query.liveQuery = true;
+    query.request<Folder::Name>()
+         .request<Folder::Icon>()
+         .request<Folder::Parent>();
+    query.parentProperty = Folder::Parent::name;
+    runQuery(query);
 }
 
 QVariant FolderListModel::accountId() const