3 files changed, 21 insertions, 12 deletions

diff --git a/common/resourcefacade.cpp b/common/resourcefacade.cpp
index ba04b2f..65ff05c 100644
--- a/common/resourcefacade.cpp
+++ b/common/resourcefacade.cpp
@@ -28,7 +28,7 @@ template <typename DomainType>
 ConfigNotifier LocalStorageFacade<DomainType>::sConfigNotifier;
 
 template <typename DomainType>
-LocalStorageFacade<DomainType>::LocalStorageFacade(const QByteArray &identifier) : Sink::StoreFacade<DomainType>(), mConfigStore(identifier)
+LocalStorageFacade<DomainType>::LocalStorageFacade(const QByteArray &identifier) : Sink::StoreFacade<DomainType>(), mConfigStore(identifier), mResourceInstanceIdentifier(identifier)
 {
 }
 
@@ -38,11 +38,11 @@ LocalStorageFacade<DomainType>::~LocalStorageFacade()
 }
 
 template <typename DomainType>
-typename DomainType::Ptr LocalStorageFacade<DomainType>::readFromConfig(const QByteArray &id, const QByteArray &type)
+typename DomainType::Ptr LocalStorageFacade<DomainType>::readFromConfig(ConfigStore &configStore, const QByteArray &id, const QByteArray &type)
 {
     auto object = DomainType::Ptr::create(id);
     object->setProperty("type", type);
-    const auto configurationValues = mConfigStore.get(id);
+    const auto configurationValues = configStore.get(id);
     for (auto it = configurationValues.constBegin(); it != configurationValues.constEnd(); it++) {
         object->setProperty(it.key(), it.value());
     }
@@ -50,6 +50,12 @@ typename DomainType::Ptr LocalStorageFacade<DomainType>::readFromConfig(const QB
 }
 
 template <typename DomainType>
+typename DomainType::Ptr LocalStorageFacade<DomainType>::readFromConfig(const QByteArray &id, const QByteArray &type)
+{
+    return readFromConfig(mConfigStore, id, type);
+}
+
+template <typename DomainType>
 KAsync::Job<void> LocalStorageFacade<DomainType>::create(const DomainType &domainObject)
 {
     return KAsync::start<void>([domainObject, this]() {
@@ -132,9 +138,9 @@ QPair<KAsync::Job<void>, typename Sink::ResultEmitter<typename DomainType::Ptr>:
     QObject *guard = new QObject;
     auto resultProvider = new Sink::ResultProvider<typename DomainType::Ptr>();
     auto emitter = resultProvider->emitter();
-    resultProvider->setFetcher([](const QSharedPointer<DomainType> &) {});
-    resultProvider->onDone([=]() { delete resultProvider; delete guard; });
-    auto job = KAsync::start<void>([=]() {
+    auto identifier = mResourceInstanceIdentifier;
+    resultProvider->setFetcher([identifier, query, guard, resultProvider](const QSharedPointer<DomainType> &) {
+        ConfigStore mConfigStore(identifier);
         const auto entries = mConfigStore.getEntries();
         for (const auto &res : entries.keys()) {
             const auto type = entries.value(res);
@@ -152,7 +158,7 @@ QPair<KAsync::Job<void>, typename Sink::ResultEmitter<typename DomainType::Ptr>:
                 continue;
             }
             Trace() << "Found match " << res;
-            resultProvider->add(readFromConfig(res, type));
+            resultProvider->add(readFromConfig(mConfigStore, res, type));
         }
         if (query.liveQuery) {
             QObject::connect(&sConfigNotifier, &ConfigNotifier::modified, guard, [resultProvider](const Sink::ApplicationDomain::ApplicationDomainType::Ptr &entry) {
@@ -169,7 +175,9 @@ QPair<KAsync::Job<void>, typename Sink::ResultEmitter<typename DomainType::Ptr>:
         resultProvider->initialResultSetComplete(typename DomainType::Ptr());
         resultProvider->complete();
     });
-    return qMakePair(job, emitter);
+    resultProvider->onDone([=]() { delete resultProvider; delete guard; });
+
+    return qMakePair(KAsync::null<void>(), emitter);
 }
 
 
diff --git a/common/resourcefacade.h b/common/resourcefacade.h
index 7c9fd13..989375d 100644
--- a/common/resourcefacade.h
+++ b/common/resourcefacade.h
@@ -67,9 +67,11 @@ public:
     virtual QPair<KAsync::Job<void>, typename Sink::ResultEmitter<typename DomainType::Ptr>::Ptr> load(const Sink::Query &query) Q_DECL_OVERRIDE;
 private:
     typename DomainType::Ptr readFromConfig(const QByteArray &id, const QByteArray &type);
+    static typename DomainType::Ptr readFromConfig(ConfigStore &store, const QByteArray &id, const QByteArray &type);
 
     ConfigStore mConfigStore;
     static ConfigNotifier sConfigNotifier;
+    QByteArray mResourceInstanceIdentifier;
 };
 
 class ResourceFacade : public LocalStorageFacade<Sink::ApplicationDomain::SinkResource>
diff --git a/tests/accountstest.cpp b/tests/accountstest.cpp
index 12e4685..5a63b31 100644
--- a/tests/accountstest.cpp
+++ b/tests/accountstest.cpp
@@ -101,20 +101,19 @@ private slots:
         Query query;
         query.liveQuery = true;
         auto model = Store::loadModel<SinkAccount>(query);
-        QSignalSpy spy(model.data(), &QAbstractItemModel::rowsInserted);
-        QTRY_COMPARE(spy.count(), 1);
+        QTRY_COMPARE(model->rowCount(QModelIndex()), 1);
 
         auto account2 = ApplicationDomainType::createEntity<SinkAccount>();
         account2.setProperty("type", "maildir");
         account2.setProperty("name", "name");
         Store::create(account2).exec().waitForFinished();
-        QTRY_COMPARE(spy.count(), 2);
+        QTRY_COMPARE(model->rowCount(QModelIndex()), 2);
 
         //Ensure the notifier only affects one type
         auto resource = ApplicationDomainType::createEntity<SinkResource>();
         resource.setProperty("type", "org.kde.mailtransport");
         Store::create(resource).exec().waitForFinished();
-        QTRY_COMPARE(spy.count(), 2);
+        QTRY_COMPARE(model->rowCount(QModelIndex()), 2);
     }
 
 };