From a9852b88c120330994fa73e8b2ca5a7888bb85a4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Fischer?= <ondrej.fischer@spaceti.com>
Date: Tue, 26 Nov 2019 11:13:19 +0100
Subject: [PATCH] fix bugs

---
 src/colnod/colnodapi.h         | 2 +-
 src/colnod/databaseapi.cpp     | 4 ++++
 src/colnod/syncmanager.cpp     | 6 +++---
 test/unitTests/complextest.cpp | 2 ++
 4 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/colnod/colnodapi.h b/src/colnod/colnodapi.h
index 72e07e5..f75abbe 100644
--- a/src/colnod/colnodapi.h
+++ b/src/colnod/colnodapi.h
@@ -96,7 +96,7 @@ private:
     QString mPassword;
     Timestamp mLastSync;
     bool mDryMode = false;
-    bool mValid = false;
+    bool mValid = true;
 
     std::shared_ptr<Data> mData;
 
diff --git a/src/colnod/databaseapi.cpp b/src/colnod/databaseapi.cpp
index 420f0da..9e146c0 100644
--- a/src/colnod/databaseapi.cpp
+++ b/src/colnod/databaseapi.cpp
@@ -255,6 +255,10 @@ std::shared_ptr<Token> DatabaseAPI::getToken(const QString &id)
 bool DatabaseAPI::isAlreadyDeleted(const QString &id)
 {
     auto token = getToken(id);
+    if (!token) {
+        qWarning(database) << "Token deleted in colnod doesn't exists in db, will be noted as already deleted in stats";
+        return true;
+    }
     if (token->deleted())
         return true;
     return false;
diff --git a/src/colnod/syncmanager.cpp b/src/colnod/syncmanager.cpp
index e73a6c9..59d30f5 100644
--- a/src/colnod/syncmanager.cpp
+++ b/src/colnod/syncmanager.cpp
@@ -16,14 +16,14 @@ bool SyncManager::init()
     connect(database.get(), &DatabaseAPI::error, [=](){
         QCoreApplication::exit(1);
     });
-    connect(colnod.get(), &ColnodAPI::error, [=](){
-        QCoreApplication::exit(1);
-    });
 
     if (database->open()){
         mlastSync.set_timestamp(database->getLastSync());
 
         colnod = std::make_shared<ColnodAPI>(&reqMan, mlastSync.timestamp(), mDryMode);
+        connect(colnod.get(), &ColnodAPI::error, [=](){
+            QCoreApplication::exit(1);
+        });
 
         // -1 --> some error with getting data from DB
         if (mlastSync.timestamp() >= 0){
diff --git a/test/unitTests/complextest.cpp b/test/unitTests/complextest.cpp
index b450688..3a46b50 100644
--- a/test/unitTests/complextest.cpp
+++ b/test/unitTests/complextest.cpp
@@ -173,6 +173,7 @@ int ComplexTest::getNumOfSubjects()
 //    subjectsRespSpy.wait(timeout);
 //    auto doc = getJsonDoc(subjectsResp->getJson());
 //    return doc.object()["items"].toArray().size();
+    return 0;
 }
 
 int ComplexTest::getNumOfTokens()
@@ -183,6 +184,7 @@ int ComplexTest::getNumOfTokens()
 //    tokensRespSpy.wait(timeout);
 //    auto doc = getJsonDoc(tokensResp->getJson());
 //    return doc.object()["items"].toArray().size();
+    return 0;
 }
 
 QJsonDocument ComplexTest::getJsonDoc(const QString &json)