3 files changed, 32 insertions, 23 deletions

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