diff --git a/src/colnod/colnodapi.cpp b/src/colnod/colnodapi.cpp index 1433581..279b38f 100644 --- a/src/colnod/colnodapi.cpp +++ b/src/colnod/colnodapi.cpp @@ -39,7 +39,7 @@ void ColnodAPI::downloadData(const Timestamp &time) if (!checkRequest(request)) { qWarning(colnod) << "ERROR during calling" << request->url() << ", request unsuccessful"; mValid = false; - emit downloadDataFinished(nullptr); + emit downloadDataFinished(nullptr); // TODO: think about it, will the other if passed? } else if (!checkResponse(request->responseData())) { qWarning(colnod) << "Data from" << request->url() << "are invalid"; diff --git a/src/colnod/colnodapi.h b/src/colnod/colnodapi.h index 68ed360..f96d2f0 100644 --- a/src/colnod/colnodapi.h +++ b/src/colnod/colnodapi.h @@ -51,7 +51,7 @@ public: ColnodAPI(serversdk::RequestManager* reqManconst, const bool &dryMode = false, const QString &userName = "spaceti", const QString &password = "spaceti1"); void downloadData(const Timestamp &time); - void processData(const std::shared_ptr &data); + bool processData(const std::shared_ptr &data); // New approach std::shared_ptr requestLogin(); diff --git a/src/colnod/syncmanager.cpp b/src/colnod/syncmanager.cpp index cb537e1..6c2a823 100644 --- a/src/colnod/syncmanager.cpp +++ b/src/colnod/syncmanager.cpp @@ -49,10 +49,6 @@ bool SyncManager::startSynchronization() qInfo(syncmanager) << equals; qInfo(syncmanager) << "SYNCHRONIZATION BEGIN"; - // TODO: solve this in prepare data - database->initNewTokens(); - - // GETTING DATA FROM DATABASE auto databaseData = database->downloadData(); if (!databaseData) { @@ -82,7 +78,12 @@ bool SyncManager::startSynchronization() return; } - // NOT FINISHED scolnod->processData(preparedData->colnodData); + if (!colnod->processData(preparedData->colnodData)) { + qCritical(syncmanager) << "Not possible to upload data to colnod"; + } + if (!database->processData(preparedData->databaseData)) { + qCritical(syncmanager) << "Not possible to upload data to database"; + } }); return true; diff --git a/src/colnod/syncmanager.h b/src/colnod/syncmanager.h index 0d2719b..7b78bc0 100644 --- a/src/colnod/syncmanager.h +++ b/src/colnod/syncmanager.h @@ -30,7 +30,6 @@ private: private: void initNewToken(std::shared_ptr token); - bool downloadData(); bool prepareData(); bool processData(); void updateLastUpdate(qint64 syncBegin); @@ -55,12 +54,6 @@ private: serversdk::DatabaseManager dbMan; Timestamp mlastSync; - std::shared_ptr colnodData; - std::shared_ptr databaseData; - - std::shared_ptr colnodDataToProcess; - std::shared_ptr databaseDataToProcess; - int dataAmount = 0; bool mDryMode;