Preparation to get useful notifications to Kube

4 files changed, 57 insertions, 14 deletions

diff --git a/common/notification.h b/common/notification.h
index 8224f2a..b67a84a 100644
--- a/common/notification.h
+++ b/common/notification.h
@@ -34,6 +34,7 @@ public:
     enum NoticationType {
         Shutdown,
         Status,
+        Info,
         Warning,
         Progress,
         Inspection,
diff --git a/common/notifier.cpp b/common/notifier.cpp
index 53db5be..28d56bf 100644
--- a/common/notifier.cpp
+++ b/common/notifier.cpp
@@ -24,6 +24,8 @@
 
 #include "resourceaccess.h"
 #include "resourceconfig.h"
+#include "query.h"
+#include "facadefactory.h"
 #include "log.h"
 
 using namespace Sink;
@@ -34,6 +36,18 @@ public:
     Private() : context(new QObject)
     {
     }
+
+    void listenForNotifications(const QSharedPointer<ResourceAccess> &access)
+    {
+        SinkWarningCtx(Sink::Log::Context{"foobar"}) << "Listening for notifications";
+        QObject::connect(access.data(), &ResourceAccess::notification, context.data(), [this](const Notification &notification) {
+            for (const auto &handler : handler) {
+                handler(notification);
+            }
+        });
+        resourceAccess << access;
+    }
+
     QList<QSharedPointer<ResourceAccess>> resourceAccess;
     QList<std::function<void(const Notification &)>> handler;
     QSharedPointer<QObject> context;
@@ -41,30 +55,46 @@ public:
 
 Notifier::Notifier(const QSharedPointer<ResourceAccess> &resourceAccess) : d(new Sink::Notifier::Private)
 {
-    QObject::connect(resourceAccess.data(), &ResourceAccess::notification, d->context.data(), [this](const Notification &notification) {
-        for (const auto &handler : d->handler) {
-            handler(notification);
-        }
-    });
-    d->resourceAccess << resourceAccess;
+    d->listenForNotifications(resourceAccess);
 }
 
 Notifier::Notifier(const QByteArray &instanceIdentifier, const QByteArray &resourceType) : d(new Sink::Notifier::Private)
 {
     auto resourceAccess = Sink::ResourceAccess::Ptr::create(instanceIdentifier, resourceType);
     resourceAccess->open();
-    QObject::connect(resourceAccess.data(), &ResourceAccess::notification, d->context.data(), [this](const Notification &notification) {
-        for (const auto &handler : d->handler) {
-            handler(notification);
-        }
-    });
-    d->resourceAccess << resourceAccess;
+    d->listenForNotifications(resourceAccess);
 }
 
 Notifier::Notifier(const QByteArray &instanceIdentifier) : Notifier(instanceIdentifier, ResourceConfig::getResourceType(instanceIdentifier))
 {
 }
 
+Notifier::Notifier(const Sink::Query &resourceQuery) : d(new Sink::Notifier::Private)
+{
+    Sink::Log::Context resourceCtx{"notifier"};
+    auto facade = FacadeFactory::instance().getFacade<ApplicationDomain::SinkResource>();
+    Q_ASSERT(facade);
+
+    auto result = facade->load(resourceQuery, resourceCtx);
+    auto emitter = result.second;
+    emitter->onAdded([=](const ApplicationDomain::SinkResource::Ptr &resource) {
+        auto resourceAccess = Sink::ResourceAccess::Ptr::create(resource->identifier(), ResourceConfig::getResourceType(resource->identifier()));
+        resourceAccess->open();
+        d->listenForNotifications(resourceAccess);
+    });
+    emitter->onModified([](const ApplicationDomain::SinkResource::Ptr &) {
+    });
+    emitter->onRemoved([](const ApplicationDomain::SinkResource::Ptr &) {
+    });
+    emitter->onInitialResultSetComplete([](const ApplicationDomain::SinkResource::Ptr &, bool) {
+    });
+    emitter->onComplete([resourceCtx]() {
+        SinkTraceCtx(resourceCtx) << "Resource query complete";
+    });
+    emitter->fetch({});
+    result.first.exec();
+}
+
 void Notifier::registerHandler(std::function<void(const Notification &)> handler)
 {
     d->handler << handler;
diff --git a/common/notifier.h b/common/notifier.h
index 290458a..b5d3dfa 100644
--- a/common/notifier.h
+++ b/common/notifier.h
@@ -23,14 +23,14 @@
 #include "sink_export.h"
 #include <QByteArray>
 #include <QSharedPointer>
-
-#include <KAsync/Async>
+#include <functional>
 
 class QAbstractItemModel;
 
 namespace Sink {
 class ResourceAccess;
 class Notification;
+class Query;
 
 class SINK_EXPORT Notifier
 {
@@ -38,6 +38,7 @@ public:
     Notifier(const QSharedPointer<ResourceAccess> &resourceAccess);
     Notifier(const QByteArray &resourceInstanceIdentifier);
     Notifier(const QByteArray &resourceInstanceIdentifier, const QByteArray &resourceType);
+    Notifier(const Sink::Query &resourceQuery);
     void registerHandler(std::function<void(const Notification &)>);
 
 private:
diff --git a/examples/mailtransportresource/mailtransportresource.cpp b/examples/mailtransportresource/mailtransportresource.cpp
index fa7eba4..cd7f4a7 100644
--- a/examples/mailtransportresource/mailtransportresource.cpp
+++ b/examples/mailtransportresource/mailtransportresource.cpp
@@ -81,7 +81,18 @@ public:
                 }
                 if (!MailTransport::sendMessage(msg, settings.server.toUtf8(), settings.username.toUtf8(), settings.password.toUtf8(), settings.cacert.toUtf8(), options)) {
                     SinkWarning() << "Failed to send message: " << mail;
+                    //Emit  failure notification
+                    Sink::Notification n;
+                    n.type = Notification::Warning;
+                    n.message = "Failed to send message.";
+                    emit notify(n);
                     return KAsync::error("Failed to send the message.");
+                } else {
+                    //Emit success notification
+                    Sink::Notification n;
+                    n.type = Notification::Info;
+                    n.message = "Message successfully sent.";
+                    emit notify(n);
                 }
             }
             syncStore().writeValue(mail.identifier(), "sent");