A better resource filter api

1 files changed, 7 insertions, 17 deletions

diff --git a/common/store.cpp b/common/store.cpp
index c015ef6..0ecdcd2 100644
--- a/common/store.cpp
+++ b/common/store.cpp
@@ -59,25 +59,15 @@ QString Store::getTemporaryFilePath()
  */
 static QMap<QByteArray, QByteArray> getResources(const Sink::Query &query, const QByteArray &type = QByteArray())
 {
-    const QList<QByteArray> resourceFilter = query.resources;
-    const QList<QByteArray> accountFilter = query.accounts;
+    const QList<QByteArray> resourceFilter = query.getResourceFilter().ids;
 
-    auto resourceComparator = query.getFilter(Sink::ApplicationDomain::Entity::Resource::name);
 
     const auto filterResource = [&](const QByteArray &res) {
         const auto configuration = ResourceConfig::getConfiguration(res);
-        if (!accountFilter.isEmpty() && !accountFilter.contains(configuration.value(ApplicationDomain::SinkResource::Account::name).toByteArray())) {
-            return true;
-        }
-        //Subquery for the resource
-        if (resourceComparator.value.canConvert<Query>()) {
-            const auto subquery = resourceComparator.value.value<Query>();
-            const auto baseFilters = subquery.getBaseFilters();
-            for (const auto &filterProperty : baseFilters.keys()) {
-                const auto filter = baseFilters.value(filterProperty);
-                if (!filter.matches(configuration.value(filterProperty))) {
-                    return true;
-                }
+        for (const auto &filterProperty : query.getResourceFilter().propertyFilter.keys()) {
+            const auto filter = query.getResourceFilter().propertyFilter.value(filterProperty);
+            if (!filter.matches(configuration.value(filterProperty))) {
+                return true;
             }
         }
         return false;
@@ -159,7 +149,7 @@ QSharedPointer<QAbstractItemModel> Store::loadModel(Query query)
     auto aggregatingEmitter = AggregatingResultEmitter<typename DomainType::Ptr>::Ptr::create();
     model->setEmitter(aggregatingEmitter);
 
-    if (query.liveQuery && query.resources.isEmpty() && !ApplicationDomain::isGlobalType(ApplicationDomain::getTypeName<DomainType>())) {
+    if (query.liveQuery && query.getResourceFilter().ids.isEmpty() && !ApplicationDomain::isGlobalType(ApplicationDomain::getTypeName<DomainType>())) {
         SinkTrace() << "Listening for new resources";
         auto facade = FacadeFactory::instance().getFacade<ApplicationDomain::SinkResource>("", "");
         Q_ASSERT(facade);
@@ -267,8 +257,8 @@ KAsync::Job<void> Store::removeDataFromDisk(const QByteArray &identifier)
 
 KAsync::Job<void> Store::synchronize(const Sink::Query &query)
 {
-    SinkTrace() << "synchronize" << query.resources;
     auto resources = getResources(query).keys();
+    SinkTrace() << "synchronize" << resources;
     //FIXME only necessary because each doesn't propagate errors
     auto errorFlag = new bool;
     return KAsync::value(resources)