From 264fb692ccd122e53c7592a26447ed8281179c8b Mon Sep 17 00:00:00 2001
From: Christian Mollekopf <chrigi_1@fastmail.fm>
Date: Wed, 21 Oct 2015 14:10:07 +0200
Subject: Avoid hardcoding a made-up resource type for config that doesn't
 belong to a resource

---
 common/clientapi.h       | 13 +++++++++----
 common/facadefactory.cpp |  2 +-
 tests/clientapitest.cpp  |  3 ---
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/common/clientapi.h b/common/clientapi.h
index 6237cfb..c4125bd 100644
--- a/common/clientapi.h
+++ b/common/clientapi.h
@@ -62,14 +62,19 @@ public:
         return Akonadi2::resourceName(instanceIdentifier);
     }
 
-    static QList<QByteArray> getResources(const QList<QByteArray> &resourceFilter)
+    static QList<QByteArray> getResources(const QList<QByteArray> &resourceFilter, const QByteArray &type)
     {
+        //Return the global resource (signified by an empty name) for types that don't eblong to a specific resource
+        if (type == "akonadiresource") {
+            return QList<QByteArray>() << "";
+        }
         QList<QByteArray> resources;
         const auto configuredResources = ResourceConfig::getResources();
         if (resourceFilter.isEmpty()) {
             for (const auto &res : configuredResources) {
-                //TODO filter by type
-                resources << res;
+                if (configuredResources.value(res) == type) {
+                    resources << res;
+                }
             }
         } else {
             for (const auto &res : resourceFilter) {
@@ -100,7 +105,7 @@ public:
                 eventLoop.quit();
             });
             // Query all resources and aggregate results
-            KAsync::iterate(getResources(query.resources))
+            KAsync::iterate(getResources(query.resources, ApplicationDomain::getTypeName<DomainType>()))
             .template each<void, QByteArray>([query, resultSet](const QByteArray &resource, KAsync::Future<void> &future) {
                 auto facade = FacadeFactory::instance().getFacade<DomainType>(resourceName(resource), resource);
                 if (facade) {
diff --git a/common/facadefactory.cpp b/common/facadefactory.cpp
index f833b06..64a466d 100644
--- a/common/facadefactory.cpp
+++ b/common/facadefactory.cpp
@@ -54,7 +54,7 @@ void FacadeFactory::resetFactory()
 
 void FacadeFactory::registerStaticFacades()
 {
-    registerFacade<Akonadi2::ApplicationDomain::AkonadiResource, ResourceFacade>("resourceconfig");
+    registerFacade<Akonadi2::ApplicationDomain::AkonadiResource, ResourceFacade>(QByteArray());
 }
 
 std::shared_ptr<void> FacadeFactory::getFacade(const QByteArray &resource, const QByteArray &instanceIdentifier, const QByteArray &typeName)
diff --git a/tests/clientapitest.cpp b/tests/clientapitest.cpp
index 8779716..231e773 100644
--- a/tests/clientapitest.cpp
+++ b/tests/clientapitest.cpp
@@ -89,7 +89,6 @@ private Q_SLOTS:
     {
         ResourceConfig::clear();
         Akonadi2::FacadeFactory::instance().registerStaticFacades();
-        ResourceConfig::addResource("resourceconfig", "resourceconfig");
 
         Akonadi2::ApplicationDomain::AkonadiResource res;
         res.setProperty("identifier", "dummyresource.identifier1");
@@ -98,7 +97,6 @@ private Q_SLOTS:
         Akonadi2::Store::create(res).exec().waitForFinished();
         {
             Akonadi2::Query query;
-            query.resources << "resourceconfig";
             query.propertyFilter.insert("type", "dummyresource");
             async::SyncListResult<Akonadi2::ApplicationDomain::AkonadiResource::Ptr> result(Akonadi2::Store::load<Akonadi2::ApplicationDomain::AkonadiResource>(query));
             result.exec();
@@ -108,7 +106,6 @@ private Q_SLOTS:
         Akonadi2::Store::remove(res).exec().waitForFinished();
         {
             Akonadi2::Query query;
-            query.resources << "resourceconfig";
             query.propertyFilter.insert("type", "dummyresource");
             async::SyncListResult<Akonadi2::ApplicationDomain::AkonadiResource::Ptr> result(Akonadi2::Store::load<Akonadi2::ApplicationDomain::AkonadiResource>(query));
             result.exec();
-- 
cgit v1.2.3