From 0ed292d3ccf93c889734960676a321d1166d3f66 Mon Sep 17 00:00:00 2001
From: Raquel Medina <raquel.medina@konsulko.com>
Date: Wed, 18 Mar 2020 23:56:31 +0100
Subject: rework message hierarchy

Rework message hierarchy with the final objective
of splitting libqtappfw into several libraries.
This commit carries the following changes:
- Simplify message hierarchy, keeping abstract
Message class, adding specialization for call and
event messages, keeping ResponseMessage, and
removing all module specific specializations.
- Add MessageFactory class to create message
objects.
- Change messages life cycle: using smart pointers
and removing QObject from message hierarchy (a
Message is not a QObject anymore and thus
'deleteLater()' is not available).
- Adapt all modules to use new message hierarchy.
- Keep ResponseMessage original constructor to
avoid breaking TaskManager.
- Message constructors have been kept public, but
will go private on a follow-up patch (once
TaskManager class has been modified to use new
MessageFactory).

Bug-AGL: SPEC-3112
Signed-off-by: Raquel Medina <raquel.medina@konsulko.com>
Change-Id: I3a7a6325209ddeca2293f1ac745371861a947bfb
---
 weather/CMakeLists.txt |  4 ++--
 weather/weather.cpp    | 46 ++++++++++++++++++++++++++++------------------
 weather/weather.h      |  5 ++---
 3 files changed, 32 insertions(+), 23 deletions(-)

(limited to 'weather')

diff --git a/weather/CMakeLists.txt b/weather/CMakeLists.txt
index 44b4d4d..bd94755 100644
--- a/weather/CMakeLists.txt
+++ b/weather/CMakeLists.txt
@@ -1,2 +1,2 @@
-add_headers(weather.h weathermessage.h)
-add_sources(weather.cpp weathermessage.cpp)
+add_headers(weather.h)
+add_sources(weather.cpp)
diff --git a/weather/weather.cpp b/weather/weather.cpp
index d4992d4..298f32c 100644
--- a/weather/weather.cpp
+++ b/weather/weather.cpp
@@ -17,8 +17,9 @@
 #include <QDebug>
 #include <QJsonArray>
 
-#include "message.h"
-#include "weathermessage.h"
+#include "callmessage.h"
+#include "eventmessage.h"
+#include "messagefactory.h"
 #include "messageengine.h"
 #include "weather.h"
 
@@ -40,32 +41,41 @@ Weather::~Weather()
 
 void Weather::onConnected()
 {
-	WeatherMessage *tmsg = new WeatherMessage();
-	tmsg->createRequest("subscribe", "weather");
-	m_mloop->sendMessage(tmsg);
-	delete tmsg;
+	std::unique_ptr<Message> msg = MessageFactory::getInstance().createOutboundMessage(MessageId::Call);
+	if (!msg)
+		return;
+
+	CallMessage *tmsg = static_cast<CallMessage*>(msg.get());
+	tmsg->createRequest("weather", "subscribe", "weather");
+	m_mloop->sendMessage(std::move(msg));
 }
 
 void Weather::onDisconnected()
 {
-	WeatherMessage *tmsg = new WeatherMessage();
-	tmsg->createRequest("unsubscribe", "weather");
-	m_mloop->sendMessage(tmsg);
-	delete tmsg;
+	std::unique_ptr<Message> msg = MessageFactory::getInstance().createOutboundMessage(MessageId::Call);
+	if (!msg)
+		return;
+
+	CallMessage *tmsg = static_cast<CallMessage*>(msg.get());
+	tmsg->createRequest("weater", "unsubscribe", "weather");
+	m_mloop->sendMessage(std::move(msg));
 }
 
-void Weather::onMessageReceived(MessageType type, Message *message)
+void Weather::onMessageReceived(std::shared_ptr<Message> msg)
 {
-	if (type == MessageType::WeatherEventMessage) {
-		WeatherMessage *tmsg = qobject_cast<WeatherMessage*>(message);
+	if (!msg)
+		return;
+
+	if (msg->isEvent()) {
+		std::shared_ptr<EventMessage> emsg = std::static_pointer_cast<EventMessage>(msg);
+		if (emsg->eventApi() != "weather")
+			return;
 
-		if (tmsg->isEvent()) {
-			m_temperature = tmsg->temperature();
-			m_condition = tmsg->condition();
+		QJsonObject data = emsg->eventData();
+		m_temperature = QString::number(data.value("main").toObject().value("temp").toDouble());
+		m_condition = data.value("weather").toArray().at(0).toObject().value("description").toString();
 
 			emit temperatureChanged(m_temperature);
 			emit conditionChanged(m_condition);
 		}
-	}
-	message->deleteLater();
 }
diff --git a/weather/weather.h b/weather/weather.h
index 6d33a15..75054d5 100644
--- a/weather/weather.h
+++ b/weather/weather.h
@@ -17,13 +17,12 @@
 #ifndef WEATHER_H
 #define WEATHER_H
 
+#include <memory>
 #include <QObject>
 
 class MessageEngine;
 class Message;
 
-enum class MessageType;
-
 class Weather : public QObject
 {
 	Q_OBJECT
@@ -48,7 +47,7 @@ class Weather : public QObject
 
 		void onConnected();
 		void onDisconnected();
-		void onMessageReceived(MessageType, Message*);
+		void onMessageReceived(std::shared_ptr<Message>);
 };
 
 #endif // WEATHER_H
-- 
cgit 1.2.3-korg