6 files changed, 227 insertions, 12 deletions

diff --git a/common/domain/applicationdomaintype.cpp b/common/domain/applicationdomaintype.cpp
index df10327..462585e 100644
--- a/common/domain/applicationdomaintype.cpp
+++ b/common/domain/applicationdomaintype.cpp
@@ -141,6 +141,11 @@ SinkResource::~SinkResource()
 
 }
 
+SinkAccount::~SinkAccount()
+{
+
+}
+
 template<>
 QByteArray getTypeName<Event>()
 {
@@ -160,6 +165,12 @@ QByteArray getTypeName<SinkResource>()
 }
 
 template<>
+QByteArray getTypeName<SinkAccount>()
+{
+    return "sinkaccount";
+}
+
+template<>
 QByteArray getTypeName<Mail>()
 {
     return "mail";
diff --git a/common/domain/applicationdomaintype.h b/common/domain/applicationdomaintype.h
index 32d8999..d17ad75 100644
--- a/common/domain/applicationdomaintype.h
+++ b/common/domain/applicationdomaintype.h
@@ -135,7 +135,7 @@ struct SINK_EXPORT Folder : public Entity {
 
 /**
  * Represents an sink resource.
- * 
+ *
  * This type is used for configuration of resources,
  * and for creating and removing resource instances.
  */
@@ -145,6 +145,12 @@ struct SINK_EXPORT SinkResource : public ApplicationDomainType {
     virtual ~SinkResource();
 };
 
+struct SINK_EXPORT SinkAccount : public ApplicationDomainType {
+    typedef QSharedPointer<SinkAccount> Ptr;
+    using ApplicationDomainType::ApplicationDomainType;
+    virtual ~SinkAccount();
+};
+
 /**
  * All types need to be registered here an MUST return a different name.
  *
@@ -163,6 +169,9 @@ template<>
 QByteArray SINK_EXPORT getTypeName<SinkResource>();
 
 template<>
+QByteArray SINK_EXPORT getTypeName<SinkAccount>();
+
+template<>
 QByteArray SINK_EXPORT getTypeName<Mail>();
 
 template<>
@@ -192,3 +201,5 @@ Q_DECLARE_METATYPE(Sink::ApplicationDomain::Folder)
 Q_DECLARE_METATYPE(Sink::ApplicationDomain::Folder::Ptr)
 Q_DECLARE_METATYPE(Sink::ApplicationDomain::SinkResource)
 Q_DECLARE_METATYPE(Sink::ApplicationDomain::SinkResource::Ptr)
+Q_DECLARE_METATYPE(Sink::ApplicationDomain::SinkAccount)
+Q_DECLARE_METATYPE(Sink::ApplicationDomain::SinkAccount::Ptr)
diff --git a/common/resourceconfig.cpp b/common/resourceconfig.cpp
index b988718..4b33990 100644
--- a/common/resourceconfig.cpp
+++ b/common/resourceconfig.cpp
@@ -23,19 +23,20 @@
 #include <QStandardPaths>
 #include <QFile>
 
-static QSharedPointer<QSettings> getSettings()
+static QSharedPointer<QSettings> getConfig(const QByteArray &identifier)
 {
-    return QSharedPointer<QSettings>::create(QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) + "/sink/resources.ini", QSettings::IniFormat);
+    return QSharedPointer<QSettings>::create(QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) + "/sink/" + identifier + ".ini", QSettings::IniFormat);
 }
 
-static QSharedPointer<QSettings> getResourceConfig(const QByteArray &identifier)
+static QSharedPointer<QSettings> getSettings()
 {
-    return QSharedPointer<QSettings>::create(QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) + "/sink/" + identifier, QSettings::IniFormat);
+    return getConfig("resources");
 }
 
+
 QByteArray ResourceConfig::newIdentifier(const QByteArray &type)
 {
-    auto settings = getSettings();
+    auto settings = getConfig("resources");
     const auto counter = settings->value("instanceCounter", 0).toInt() + 1;
     const QByteArray identifier = type + ".instance" + QByteArray::number(counter);
     settings->setValue("instanceCounter", counter);
@@ -45,7 +46,7 @@ QByteArray ResourceConfig::newIdentifier(const QByteArray &type)
 
 void ResourceConfig::addResource(const QByteArray &identifier, const QByteArray &type)
 {
-    auto settings = getSettings();
+    auto settings = getConfig("resources");
     settings->beginGroup(QString::fromLatin1(identifier));
     settings->setValue("type", type);
     settings->endGroup();
@@ -54,18 +55,18 @@ void ResourceConfig::addResource(const QByteArray &identifier, const QByteArray
 
 void ResourceConfig::removeResource(const QByteArray &identifier)
 {
-    auto settings = getSettings();
+    auto settings = getConfig("resources");
     settings->beginGroup(QString::fromLatin1(identifier));
     settings->remove("");
     settings->endGroup();
     settings->sync();
-    QFile::remove(getResourceConfig(identifier)->fileName());
+    QFile::remove(getConfig(identifier)->fileName());
 }
 
 QMap<QByteArray, QByteArray> ResourceConfig::getResources()
 {
     QMap<QByteArray, QByteArray> resources;
-    auto settings = getSettings();
+    auto settings = getConfig("resources");
     for (const auto &identifier : settings->childGroups()) {
         settings->beginGroup(identifier);
         const auto type = settings->value("type").toByteArray();
@@ -84,7 +85,7 @@ void ResourceConfig::clear()
 
 void ResourceConfig::configureResource(const QByteArray &identifier, const QMap<QByteArray, QVariant> &configuration)
 {
-    auto config = getResourceConfig(identifier);
+    auto config = getConfig(identifier);
     config->clear();
     for (const auto &key : configuration.keys()) {
         config->setValue(key, configuration.value(key));
@@ -95,7 +96,77 @@ void ResourceConfig::configureResource(const QByteArray &identifier, const QMap<
 QMap<QByteArray, QVariant> ResourceConfig::getConfiguration(const QByteArray &identifier)
 {
     QMap<QByteArray, QVariant> configuration;
-    auto config = getResourceConfig(identifier);
+    auto config = getConfig(identifier);
+    for (const auto &key : config->allKeys()) {
+        configuration.insert(key.toLatin1(), config->value(key));
+    }
+    return configuration;
+}
+
+
+QByteArray AccountConfig::newIdentifier(const QByteArray &type)
+{
+    auto settings = getConfig("accounts");
+    const auto counter = settings->value("instanceCounter", 0).toInt() + 1;
+    const QByteArray identifier = type + ".instance" + QByteArray::number(counter);
+    settings->setValue("instanceCounter", counter);
+    settings->sync();
+    return identifier;
+}
+
+void AccountConfig::addAccount(const QByteArray &identifier, const QByteArray &type)
+{
+    auto settings = getConfig("accounts");
+    settings->beginGroup(QString::fromLatin1(identifier));
+    settings->setValue("type", type);
+    settings->endGroup();
+    settings->sync();
+}
+
+void AccountConfig::removeAccount(const QByteArray &identifier)
+{
+    auto settings = getConfig("accounts");
+    settings->beginGroup(QString::fromLatin1(identifier));
+    settings->remove("");
+    settings->endGroup();
+    settings->sync();
+    QFile::remove(getConfig(identifier)->fileName());
+}
+
+QMap<QByteArray, QByteArray> AccountConfig::getAccounts()
+{
+    QMap<QByteArray, QByteArray> accounts;
+    auto settings = getConfig("accounts");
+    for (const auto &identifier : settings->childGroups()) {
+        settings->beginGroup(identifier);
+        const auto type = settings->value("type").toByteArray();
+        accounts.insert(identifier.toLatin1(), type);
+        settings->endGroup();
+    }
+    return accounts;
+}
+
+void AccountConfig::clear()
+{
+    auto settings = getSettings();
+    settings->clear();
+    settings->sync();
+}
+
+void AccountConfig::configureAccount(const QByteArray &identifier, const QMap<QByteArray, QVariant> &configuration)
+{
+    auto config = getConfig(identifier);
+    config->clear();
+    for (const auto &key : configuration.keys()) {
+        config->setValue(key, configuration.value(key));
+    }
+    config->sync();
+}
+
+QMap<QByteArray, QVariant> AccountConfig::getConfiguration(const QByteArray &identifier)
+{
+    QMap<QByteArray, QVariant> configuration;
+    auto config = getConfig(identifier);
     for (const auto &key : config->allKeys()) {
         configuration.insert(key.toLatin1(), config->value(key));
     }
diff --git a/common/resourceconfig.h b/common/resourceconfig.h
index 2108caa..505b5ec 100644
--- a/common/resourceconfig.h
+++ b/common/resourceconfig.h
@@ -36,3 +36,15 @@ public:
     static void configureResource(const QByteArray &identifier, const QMap<QByteArray, QVariant> &configuration);
     static QMap<QByteArray, QVariant> getConfiguration(const QByteArray &identifier);
 };
+
+class SINK_EXPORT AccountConfig
+{
+public:
+    static QMap<QByteArray, QByteArray> getAccounts();
+    static QByteArray newIdentifier(const QByteArray &type);
+    static void addAccount(const QByteArray &identifier, const QByteArray &type);
+    static void removeAccount(const QByteArray &identifier);
+    static void clear();
+    static void configureAccount(const QByteArray &identifier, const QMap<QByteArray, QVariant> &configuration);
+    static QMap<QByteArray, QVariant> getConfiguration(const QByteArray &identifier);
+};
diff --git a/common/resourcefacade.cpp b/common/resourcefacade.cpp
index 3095c2e..d91c974 100644
--- a/common/resourcefacade.cpp
+++ b/common/resourcefacade.cpp
@@ -126,3 +126,102 @@ QPair<KAsync::Job<void>, typename Sink::ResultEmitter<Sink::ApplicationDomain::S
     });
     return qMakePair(job, emitter);
 }
+
+
+AccountFacade::AccountFacade(const QByteArray &) : Sink::StoreFacade<Sink::ApplicationDomain::SinkAccount>()
+{
+}
+
+AccountFacade::~AccountFacade()
+{
+}
+
+KAsync::Job<void> AccountFacade::create(const Sink::ApplicationDomain::SinkAccount &account)
+{
+    return KAsync::start<void>([account, this]() {
+        const QByteArray type = account.getProperty("type").toByteArray();
+        const QByteArray providedIdentifier = account.getProperty("identifier").toByteArray();
+        // It is currently a requirement that the account starts with the type
+        const QByteArray identifier = providedIdentifier.isEmpty() ? AccountConfig::newIdentifier(type) : providedIdentifier;
+        AccountConfig::addAccount(identifier, type);
+        auto changedProperties = account.changedProperties();
+        changedProperties.removeOne("identifier");
+        changedProperties.removeOne("type");
+        if (!changedProperties.isEmpty()) {
+            // We have some configuration values
+            QMap<QByteArray, QVariant> configurationValues;
+            for (const auto &property : changedProperties) {
+                configurationValues.insert(property, account.getProperty(property));
+            }
+            AccountConfig::configureAccount(identifier, configurationValues);
+        }
+    });
+}
+
+KAsync::Job<void> AccountFacade::modify(const Sink::ApplicationDomain::SinkAccount &account)
+{
+    return KAsync::start<void>([account, this]() {
+        const QByteArray identifier = account.identifier();
+        if (identifier.isEmpty()) {
+            Warning() << "We need an \"identifier\" property to identify the account to configure.";
+            return;
+        }
+        auto changedProperties = account.changedProperties();
+        changedProperties.removeOne("identifier");
+        changedProperties.removeOne("type");
+        if (!changedProperties.isEmpty()) {
+            // We have some configuration values
+            QMap<QByteArray, QVariant> configurationValues;
+            for (const auto &property : changedProperties) {
+                configurationValues.insert(property, account.getProperty(property));
+            }
+            AccountConfig::configureAccount(identifier, configurationValues);
+        }
+    });
+}
+
+KAsync::Job<void> AccountFacade::remove(const Sink::ApplicationDomain::SinkAccount &account)
+{
+    return KAsync::start<void>([account, this]() {
+        const QByteArray identifier = account.identifier();
+        if (identifier.isEmpty()) {
+            Warning() << "We need an \"identifier\" property to identify the account to configure";
+            return;
+        }
+        AccountConfig::removeAccount(identifier);
+    });
+}
+
+QPair<KAsync::Job<void>, typename Sink::ResultEmitter<Sink::ApplicationDomain::SinkAccount::Ptr>::Ptr> AccountFacade::load(const Sink::Query &query)
+{
+    auto resultProvider = new Sink::ResultProvider<typename Sink::ApplicationDomain::SinkAccount::Ptr>();
+    auto emitter = resultProvider->emitter();
+    resultProvider->setFetcher([](const QSharedPointer<Sink::ApplicationDomain::SinkAccount> &) {});
+    resultProvider->onDone([resultProvider]() { delete resultProvider; });
+    auto job = KAsync::start<void>([query, resultProvider]() {
+        const auto configuredAccounts = AccountConfig::getAccounts();
+        for (const auto &res : configuredAccounts.keys()) {
+            const auto type = configuredAccounts.value(res);
+            if (query.propertyFilter.contains("type") && query.propertyFilter.value("type").toByteArray() != type) {
+                continue;
+            }
+            if (!query.ids.isEmpty() && !query.ids.contains(res)) {
+                continue;
+            }
+
+            auto account = Sink::ApplicationDomain::SinkAccount::Ptr::create("", res, 0, QSharedPointer<Sink::ApplicationDomain::MemoryBufferAdaptor>::create());
+            account->setProperty("type", type);
+
+            const auto configurationValues = AccountConfig::getConfiguration(res);
+            for (auto it = configurationValues.constBegin(); it != configurationValues.constEnd(); it++) {
+                account->setProperty(it.key(), it.value());
+            }
+
+            resultProvider->add(account);
+        }
+        // TODO initialResultSetComplete should be implicit
+        resultProvider->initialResultSetComplete(Sink::ApplicationDomain::SinkAccount::Ptr());
+        resultProvider->complete();
+    });
+    return qMakePair(job, emitter);
+}
diff --git a/common/resourcefacade.h b/common/resourcefacade.h
index 3de0e25..48ff2a5 100644
--- a/common/resourcefacade.h
+++ b/common/resourcefacade.h
@@ -40,3 +40,14 @@ public:
     KAsync::Job<void> remove(const Sink::ApplicationDomain::SinkResource &resource) Q_DECL_OVERRIDE;
     QPair<KAsync::Job<void>, typename Sink::ResultEmitter<Sink::ApplicationDomain::SinkResource::Ptr>::Ptr> load(const Sink::Query &query) Q_DECL_OVERRIDE;
 };
+
+class AccountFacade : public Sink::StoreFacade<Sink::ApplicationDomain::SinkAccount>
+{
+public:
+    AccountFacade(const QByteArray &instanceIdentifier);
+    virtual ~AccountFacade();
+    KAsync::Job<void> create(const Sink::ApplicationDomain::SinkAccount &resource) Q_DECL_OVERRIDE;
+    KAsync::Job<void> modify(const Sink::ApplicationDomain::SinkAccount &resource) Q_DECL_OVERRIDE;
+    KAsync::Job<void> remove(const Sink::ApplicationDomain::SinkAccount &resource) Q_DECL_OVERRIDE;
+    QPair<KAsync::Job<void>, typename Sink::ResultEmitter<Sink::ApplicationDomain::SinkAccount::Ptr>::Ptr> load(const Sink::Query &query) Q_DECL_OVERRIDE;
+};