Added unit tests.

[situare] / src / engine / engine.cpp

diff --git a/src/engine/engine.cpp b/src/engine/engine.cpp
index 0d8aef1..d4064c7 100644 (file)
--- a/src/engine/engine.cpp
+++ b/src/engine/engine.cpp
@@ -79,7 +79,8 @@ SituareEngine::SituareEngine()
     m_gps = new GPSPosition(this);
 
     // build SituareService
-    m_situareService = new SituareService(this);
+    m_situareService = new SituareService(m_networkAccessManager,
+                                          new ImageFetcher(m_networkAccessManager, this), this);
 
     // build FacebookAuthenticator
     m_facebookAuthenticator = new FacebookAuthentication(this);
@@ -494,6 +495,18 @@ void SituareEngine::requestInterestingPeople()
                                                      GeoCoordinate(topRightSceneCoordinate));
 }
 
+void SituareEngine::requestSendMessage(const QString &receiverId, const QString &message,
+                                bool addCoordinates)
+{
+    qDebug() << __PRETTY_FUNCTION__;
+
+    if (addCoordinates)
+        m_situareService->sendMessage(receiverId, message, m_mapEngine->centerGeoCoordinate());
+    else
+        m_situareService->sendMessage(receiverId, message);
+}
+
+
 void SituareEngine::routeParsed(Route &route)
 {
     qDebug() << __PRETTY_FUNCTION__;
@@ -595,8 +608,15 @@ void SituareEngine::showContactDialog(const QString &facebookId)
     if (!guid.isEmpty())
         m_ui->showContactDialog(guid);
     else
-        m_ui->buildInformationBox(tr("Unable to find contact.\nYou must have Facebook "
-                                     "chat account to be able to open contact dialog."), true);
+        m_ui->buildInformationBox(tr("Unable to find contact.\nAdd Facebook IM "
+                                     "account from Conversations to use this feature."), true);
+}
+
+void SituareEngine::showMessageDialog(const QPair<QString, QString> &receiver)
+{
+    qDebug() << __PRETTY_FUNCTION__;
+
+    m_ui->showMessageDialog(receiver);
 }
 
 void SituareEngine::signalsFromFacebookAuthenticator()
@@ -700,6 +720,12 @@ void SituareEngine::signalsFromMainWindow()
     connect(m_ui, SIGNAL(enableAutomaticLocationUpdate(bool, int)),
             this, SLOT(enableAutomaticLocationUpdate(bool, int)));
 
+    connect(m_ui, SIGNAL(addTags(QStringList)),
+            m_situareService, SLOT(addTags(QStringList)));
+
+    connect(m_ui, SIGNAL(removeTags(QStringList)),
+            m_situareService, SLOT(removeTags(QStringList)));
+
     // signals from user info tab
     connect(m_ui, SIGNAL(refreshUserData()),
             this, SLOT(refreshUserData()));
@@ -707,6 +733,9 @@ void SituareEngine::signalsFromMainWindow()
     connect(m_ui, SIGNAL(centerToCoordinates(GeoCoordinate)),
             m_mapEngine, SLOT(centerToCoordinates(GeoCoordinate)));
 
+    connect(m_ui, SIGNAL(requestPopularTags()),
+            m_situareService, SLOT(fetchPopularTags()));
+
     // routing signal from friend list tab & search location tab
     connect(m_ui, SIGNAL(routeTo(const GeoCoordinate&)),
             this, SLOT(routeTo(const GeoCoordinate&)));
@@ -737,17 +766,29 @@ void SituareEngine::signalsFromMainWindow()
     connect(m_ui, SIGNAL(draggingModeTriggered()),
             this, SLOT(draggingModeTriggered()));
 
-    // signal from search location dialog
+    // signal from search search dialogs
     connect(m_ui, SIGNAL(searchForLocation(QString)),
             this, SLOT(locationSearch(QString)));
 
+    connect(m_ui, SIGNAL(requestSearchPeopleByTag(QString)),
+            m_situareService, SLOT(searchPeopleByTag(QString)));
+
     // signals from meet people panel
     connect(m_ui, SIGNAL(requestInterestingPeople()),
             this, SLOT(requestInterestingPeople()));
 
-    // signal from friend list panel
-    connect(m_ui, SIGNAL(requestContactDialog(const QString &)),
-            this, SLOT(showContactDialog(const QString &)));
+    connect(m_ui, SIGNAL(requestMessageDialog(QPair<QString, QString>)),
+            this, SLOT(showMessageDialog(QPair<QString, QString>)));
+
+    connect(m_ui, SIGNAL(sendMessage(QString,QString,bool)),
+            this, SLOT(requestSendMessage(QString,QString,bool)));
+
+    // signals from message panel
+    connect(m_ui, SIGNAL(requestMessages()),
+            m_situareService, SLOT(fetchMessages()));
+
+    connect(m_ui, SIGNAL(requestRemoveMessage(QString)),
+            m_situareService, SLOT(removeMessage(QString)));
 }
 
 void SituareEngine::signalsFromMapEngine()
@@ -815,17 +856,20 @@ void SituareEngine::signalsFromSituareService()
     connect(m_situareService, SIGNAL(userDataChanged(User*, QList<User*>&)),
             this, SLOT(userDataChanged(User*, QList<User*>&)));
 
-    connect(m_situareService, SIGNAL(updateWasSuccessful()),
-            this, SLOT(updateWasSuccessful()));
+    connect(m_situareService, SIGNAL(updateWasSuccessful(SituareService::SuccessfulMethod)),
+            this, SLOT(updateWasSuccessful(SituareService::SuccessfulMethod)));
 
-    connect(m_situareService, SIGNAL(updateWasSuccessful()),
+    connect(m_situareService, SIGNAL(updateWasSuccessful(SituareService::SuccessfulMethod)),
             m_ui, SIGNAL(clearUpdateLocationDialogData()));
 
-    connect(m_situareService, SIGNAL(interestingPeopleReceived(QList<User>&)),
-            m_ui, SIGNAL(interestingPeopleReceived(QList<User>&)));
+    connect(m_situareService, SIGNAL(interestingPeopleReceived(QList<User>&,QList<User>&)),
+            m_ui, SIGNAL(interestingPeopleReceived(QList<User>&,QList<User>&)));
 
-    connect(m_situareService, SIGNAL(notificationsReceived(QList<Notification*>&)),
-            m_ui, SIGNAL(notificationsReceived(QList<Notification*>&)));
+    connect(m_situareService, SIGNAL(messagesReceived(QList<Message>&, QList<Message> &)),
+            m_ui, SIGNAL(messagesReceived(QList<Message>&, QList<Message>&)));
+
+    connect(m_situareService, SIGNAL(popularTagsReceived(QHash<QString,QString>&)),
+            m_ui, SIGNAL(popularTagsReceived(QHash<QString,QString>&)));
 }
 
 void SituareEngine::startAutomaticUpdate()
@@ -843,14 +887,22 @@ void SituareEngine::topmostWindowChanged(bool isMainWindow)
     setPowerSaving(!isMainWindow);
 }
 
-void SituareEngine::updateWasSuccessful()
+void SituareEngine::updateWasSuccessful(SituareService::SuccessfulMethod successfulMethod)
 {
-    qDebug() << __PRETTY_FUNCTION__;
+    qWarning() << __PRETTY_FUNCTION__;
 
-    if (m_networkAccessManager->isConnected())
-        m_situareService->fetchLocations();
-    else
+    if (m_networkAccessManager->isConnected()) {
+        if (successfulMethod == SituareService::SuccessfulUpdateLocation)
+            m_situareService->fetchLocations();
+        else  if ((successfulMethod == SituareService::SuccessfulRemoveMessage) ||
+                  (successfulMethod == SituareService::SuccessfulSendMessage))
+            m_situareService->fetchMessages();
+        else if ((successfulMethod == SituareService::SuccessfulAddTags) ||
+                 (successfulMethod == SituareService::SuccessfulRemoveTags))
+            m_situareService->fetchLocations();
+    } else {
         error(ErrorContext::NETWORK, QNetworkReply::UnknownNetworkError);
+    }
 }
 
 void SituareEngine::userDataChanged(User *user, QList<User *> &friendsList)