diff --git a/src/colnod/databaseapi.cpp b/src/colnod/databaseapi.cpp index 7c4b695..05928d7 100644 --- a/src/colnod/databaseapi.cpp +++ b/src/colnod/databaseapi.cpp @@ -118,7 +118,7 @@ void DatabaseAPI::setLastSync(qint64 timestamp) } } -void DatabaseAPI::setLastUpdate(const QHash> &tokens) +void DatabaseAPI::reupdateUpdated(const QHash> &tokens) { auto query = mDbMan->createQuery(); for (const auto &token : tokens){ @@ -135,7 +135,7 @@ void DatabaseAPI::setLastUpdate(const QHash> &to qInfo(database) << equals; } -void DatabaseAPI::setLastUpdate(const QList ids) +void DatabaseAPI::reupdateDeleted(const QList ids) { auto query = mDbMan->createQuery(); for (const auto &id : ids){ @@ -193,14 +193,6 @@ bool DatabaseAPI::uploadTokens(const QHash> &tok for (const auto &token : tokens) { // Get token - QSqlQuery query; - - - - - - - if (exists(token->id(), "colnod_token")) { query = utils->updateTable(token.get(), "colnod_token"); qInfo(database).noquote() << Message::massageTemplate("Updating", "token", "database", token->name()); diff --git a/src/colnod/databaseapi.h b/src/colnod/databaseapi.h index 8668b2f..9a0efeb 100644 --- a/src/colnod/databaseapi.h +++ b/src/colnod/databaseapi.h @@ -31,8 +31,8 @@ public: bool processData(const std::shared_ptr &data); qint64 getLastSync(); void setLastSync(qint64 timestamp); - void setLastUpdate(const QHash > &tokens); - void setLastUpdate(const QList ids); + void reupdateUpdated(const QHash > &tokens); + void reupdateDeleted(const QList ids); qint64 getNow(); void initNewTokens(); diff --git a/src/colnod/syncmanager.cpp b/src/colnod/syncmanager.cpp index a1f172f..5194f23 100644 --- a/src/colnod/syncmanager.cpp +++ b/src/colnod/syncmanager.cpp @@ -13,9 +13,6 @@ SyncManager::SyncManager(bool dryMode) bool SyncManager::databaseInitialization() { database = std::make_shared(&dbMan, mDryMode); -// connect(database.get(), &DatabaseAPI::error, [=](){ -// QCoreApplication::exit(1); -// }); // Open database if (!database->open()) { @@ -49,6 +46,12 @@ bool SyncManager::startSynchronization() qInfo(syncmanager) << equals; qInfo(syncmanager) << "SYNCHRONIZATION BEGIN"; + qInfo(syncmanager) << equals; + qInfo(syncmanager) << "DOWNLOADING DATA -> BEGIN"; + qInfo(syncmanager) << dash; + qInfo(syncmanager).noquote() << "Modified data since last synchronization (" << mlastSync.toDateString() << "):"; + qInfo(syncmanager) << dash; + // GETTING DATA FROM DATABASE auto databaseData = database->downloadData(); if (!databaseData) { @@ -57,9 +60,11 @@ bool SyncManager::startSynchronization() } // NOW I HAVE DATA FROM DATABASE - colnod->downloadData(syncBegin); connect(colnod.get(), &ColnodAPI::downloadDataFinished, [=](std::shared_ptr colnodData) { + qInfo(syncmanager) << "DOWNLOADING DATA -> FINISHED"; + qInfo(syncmanager) << equals; + if (!colnodData) { qCritical(syncmanager) << "Not possible to get correct data from colnod"; QCoreApplication::exit(-1); @@ -67,9 +72,7 @@ bool SyncManager::startSynchronization() } // NOW I SHOULD HAVE VALID DATA FROM COLNOD - // I can process data - qDebug(syncmanager) << "I have colnod and database data"; - qDebug(syncmanager) << "updated token count" << colnodData->updatedTokens.count(); + std::unique_ptr preparedData = prepareDataNew(databaseData, colnodData); if (!preparedData) { @@ -78,51 +81,65 @@ bool SyncManager::startSynchronization() return; } - colnod->processData(preparedData->colnodData); - qCritical(syncmanager) << "Not possible to upload data to colnod"; + qInfo(syncmanager) << equals; + qInfo(syncmanager) << "PROCESSING DATA -> BEGIN"; + qInfo(syncmanager) << dash; + qInfo(syncmanager) << "Push changes to both Colnod and Database:"; + qInfo(syncmanager) << dash; if (!database->processData(preparedData->databaseData)) { qCritical(syncmanager) << "Not possible to upload data to database"; } - }); - - return true; - //downloadData(); - - //connect(this, &SyncManager::dataReady, processDownloadedData); - - - connect(this, &SyncManager::dataReady, [=](){ - prepareData(); - - connect(this, &SyncManager::dataProcessFinished, [=](){ + colnod->processData(preparedData->colnodData); + //qCritical(syncmanager) << "Not possible to upload data to colnod"; + // data is processed to other sides + connect(colnod.get(), &ColnodAPI::dataProcessFinished, [&](){ qInfo(syncmanager) << "PROCESSING DATA -> FINISHED"; qInfo(syncmanager) << equals; - updateLastUpdate(syncBegin); // TODO: change to update all attrinutes - connect(this, &SyncManager::syncFinished, [=](){ - if (database->isValid() && colnod->isValid()) { - database->setLastSync(syncBegin); + // REUPDATE tokens pushed from database to colnod (cause of lastUpdate time) + Timestamp time; + time.setTimestamp(syncBegin); + + database->reupdateDeleted(preparedData->databaseData->deletedTokens); + // download data changes in this sync + colnod->getTokensUpdated(time); + + // updated data are ready + connect(colnod.get(), &ColnodAPI::partOfDataReady, [=](const std::shared_ptr &uploadedData){ + if (!uploadedData) { + qCritical(syncmanager) << "Not possible to get correct data from colnod"; + QCoreApplication::exit(-1); + return; } - else { + if (!database->uploadTokens(uploadedData->updatedTokens)) { + qCritical(syncmanager) << "Not possible to upload data to database"; + } + database->reupdateDeleted(uploadedData->deletedTokens); + + if (!database->isValid() || !colnod->isValid()) { qWarning(syncmanager) << "Synchronization was unsuccessful, next run of sync will be with same last sync time, check warnings"; } + else { + database->setLastSync(syncBegin); + qInfo(syncmanager).noquote() << "Update last synchronization time to time of this sync (" + << QDateTime::fromMSecsSinceEpoch(syncBegin).toString("yyyy-MM-dd hh:mm:ss.zzz") + << ")"; + } - qInfo(syncmanager).noquote() << "Update last synchronization time to time of this sync (" - << QDateTime::fromMSecsSinceEpoch(syncBegin).toString("yyyy-MM-dd hh:mm:ss.zzz") - << ")"; qInfo(syncmanager) << equals; qInfo(syncmanager) << "SYNCHRONIZATION FINISHED"; qInfo(syncmanager) << equals; QCoreApplication::exit(); }); - }); - processData(); + }); }); + return true; + } std::unique_ptr SyncManager::prepareDataNew(const std::shared_ptr &databaseData, const std::shared_ptr &colnodData) @@ -133,6 +150,13 @@ std::unique_ptr SyncManager::prepareDataNew(const std::shared_ptr< QList conflicts; QList alreadySynced; + qInfo(syncmanager) << equals; + qInfo(syncmanager) << "PREPARING DATA -> BEGIN"; + qInfo(syncmanager) << dash; + qInfo(syncmanager) << "Resolve conflicts ( changes on same item on both Colnod and DB ):"; + qInfo(syncmanager) << dash; + + for (const auto &colnodToken : colnodData->updatedTokens) { // not conflict so add to prepered tokens @@ -215,8 +239,8 @@ void SyncManager::initNewToken(std::shared_ptr token) std::unique_ptr SyncManager::prepareDataUsindOld(const std::shared_ptr &databaseData, const std::shared_ptr &colnodData) { - Q_UNUSED(databaseData); - Q_UNUSED(colnodData); + Q_UNUSED(databaseData) + Q_UNUSED(colnodData) qInfo(syncmanager) << equals; qInfo(syncmanager) << "PREPARING DATA -> BEGIN"; @@ -311,160 +335,3 @@ std::unique_ptr SyncManager::prepareDataUsindOld(const std::shared return preparedData; } - -bool SyncManager::downloadData() -{ - bool res = true; - qInfo(syncmanager) << equals; - qInfo(syncmanager) << "DOWNLOADING DATA -> BEGIN"; - qInfo(syncmanager) << dash; - qInfo(syncmanager).noquote() << "Modified data since last synchronization (" << mlastSync.toDateString() << "):"; - qInfo(syncmanager) << dash; - - connect(colnod.get(), &ColnodAPI::downloadDataFinished, this, &SyncManager::saveColnodData); - //connect(database.get(), &DatabaseAPI::downloadDataFinished, this, &SyncManager::saveDatabaseData); - //database->downloadData(); - //colnod->downloadData(); - - return res; -} - -// finds conflicts -> changes on both sides (colnod and DB), apply newer change -bool SyncManager::prepareData() -{ - qInfo(syncmanager) << equals; - qInfo(syncmanager) << "PREPARING DATA -> BEGIN"; - qInfo(syncmanager) << dash; - qInfo(syncmanager) << "Resolve conflicts ( changes on same item on both Colnod and DB ):"; - qInfo(syncmanager) << dash; - - - Q_ASSERT(colnodData); - Q_ASSERT(databaseData); - - - // TODO: why copy data? - colnodDataToProcess = std::make_shared(*colnodData); - databaseDataToProcess = std::make_shared(*databaseData); - - QList conflicts; - QList alreadySynced; - - // check modifed tokens from colnod, dont want update token, if it was edited in db after or has been already synced - for (const auto &colnodToken : colnodDataToProcess->updatedTokens) { - if (databaseDataToProcess->updatedTokens.contains(colnodToken->id())) { - // updated in db later - if (databaseDataToProcess->updatedTokens.value(colnodToken->id()) > colnodToken) { - conflicts.append(colnodToken->id()); - } - continue; - } - auto token = database->getToken(colnodToken->id()); - if ( token ) - // alredy synced ( tokens are same ) - if (token == colnodToken) - alreadySynced.append(colnodToken->id()); - } - // remove tokens which should be not updated - for (const auto &id : conflicts) - colnodDataToProcess->updatedTokens.remove(id); - for (const auto &id : alreadySynced) - colnodDataToProcess->updatedTokens.remove(id); - - qInfo(syncmanager) << tab << "-> COLNOD DATA - CHANGES:"; - qInfo(syncmanager) << tab << tab << conflicts.size() << "TOKENS WERE ADDED/UPDATED IN DATABASE TOO"; - qInfo(syncmanager) << tab << tab << alreadySynced.size() << "TOKENS WERE ALREADY SYNCED"; - - - - conflicts.clear(); - - // chech for already deleted ( in previous synced tokens were deleted from colnod, so it come to this sync but we dont want to sync it again - for (const auto &id : colnodDataToProcess->deletedTokens) { - if (database->isAlreadyDeleted(id)) { - conflicts.append(id); - } - } - for (const auto &id : conflicts) { - colnodDataToProcess->deletedTokens.removeOne(id); - } - - qInfo(syncmanager) << tab << tab << conflicts.size() << "TOKENS WERE ALREADY DELETED"; - qInfo(syncmanager) << dash; - - conflicts.clear(); - - // chech modified from db, remove token if it was edited in colnod later - for (const auto &databaseToken : databaseDataToProcess->updatedTokens) { - if (colnodDataToProcess->updatedTokens.contains(databaseToken->id())) { - if (databaseToken < colnodDataToProcess->updatedTokens.value(databaseToken->id())) - conflicts.append(databaseToken->id()); - } - else { - // restriction cauesed by colnod rest api - if (databaseToken->description() != "mobile") { - qCritical(syncmanager) << "Token:" << databaseToken->id() << "doesn't have 'mobile' in description, can't be "; - conflicts.append(databaseToken->id()); - } - } - } - for (const auto &id : conflicts) - colnodDataToProcess->updatedTokens.remove(id); - - qInfo(syncmanager) << tab << "-> DATABASE DATA - CHANGES:"; - qInfo(syncmanager) << tab << tab << conflicts.size() << "TOKENS WERE ADDED/UPDATED IN IN COLNOD TOO"; - qInfo(syncmanager) << dash; - - qInfo(syncmanager) << "PREPARING DATA -> FINISHED"; - qInfo(syncmanager) << equals; - return true; -} - -bool SyncManager::processData() -{ - qInfo(syncmanager) << equals; - qInfo(syncmanager) << "PROCESSING DATA -> BEGIN"; - qInfo(syncmanager) << dash; - qInfo(syncmanager) << "Push changes to both Colnod and Database:"; - qInfo(syncmanager) << dash; - - database->processData(colnodDataToProcess); - connect(colnod.get(), &ColnodAPI::dataProcessFinished, this, &SyncManager::dataProcessFinished); - colnod->processData(databaseDataToProcess); - return true; -} - -void SyncManager::updateLastUpdate(qint64 syncBegin) -{ - Timestamp time; - time.setTimestamp(syncBegin); - colnod->getTokensUpdated(time); - database->setLastUpdate(databaseDataToProcess->deletedTokens); - connect(colnod.get(), &ColnodAPI::partOfDataReady, [=](const std::shared_ptr &data){ - database->setLastUpdate(data->updatedTokens); - emit syncFinished(); - }); -} - -void SyncManager::areDataReady() -{ - if (++dataAmount == 1) { - - qInfo(syncmanager) << "DOWNLOADING DATA -> FINISHED"; - qInfo(syncmanager) << equals; - - emit dataReady(); - } -} - -void SyncManager::saveColnodData(const std::shared_ptr &data) -{ - colnodData = data; - areDataReady(); -} - -void SyncManager::saveDatabaseData(const std::shared_ptr &data) -{ - databaseData = data; - areDataReady(); -} diff --git a/src/colnod/syncmanager.h b/src/colnod/syncmanager.h index 7b78bc0..93e16e7 100644 --- a/src/colnod/syncmanager.h +++ b/src/colnod/syncmanager.h @@ -26,23 +26,14 @@ private: * @todo rename when removed old aproach */ std::unique_ptr prepareDataNew(const std::shared_ptr &databaseData, const std::shared_ptr &colnodData); + std::unique_ptr prepareDataUsindOld(const std::shared_ptr &databaseData, const std::shared_ptr &colnodData); private: void initNewToken(std::shared_ptr token); - bool prepareData(); - bool processData(); void updateLastUpdate(qint64 syncBegin); - -private: - Q_SLOT void saveColnodData(const std::shared_ptr &data); - Q_SLOT void saveDatabaseData(const std::shared_ptr &data); - Q_SLOT void areDataReady(); - signals: - void dataReady(); - void dataProcessFinished(); void syncFinished(); void error(); @@ -54,8 +45,5 @@ private: serversdk::DatabaseManager dbMan; Timestamp mlastSync; - int dataAmount = 0; bool mDryMode; - - std::function onError = nullptr; }; diff --git a/test/auto/colnod/tst_colnodapi.cpp b/test/auto/colnod/tst_colnodapi.cpp index 24354b5..7e6142c 100644 --- a/test/auto/colnod/tst_colnodapi.cpp +++ b/test/auto/colnod/tst_colnodapi.cpp @@ -27,9 +27,6 @@ private: QString getLoginToken(ColnodAPI &colnod); }; - - - void ColnodTest::login() { serversdk::RequestManager reqMan; @@ -52,7 +49,8 @@ void ColnodTest::getTokens() QSignalSpy spy(login.get(), &serversdk::Request::finished); spy.wait(); QString token = getLoginToken(colnod); - Timestamp time(QDateTime::currentMSecsSinceEpoch()); + Timestamp time; + time.setTimestamp(QDateTime::currentMSecsSinceEpoch()); colnod.getTokensUpdated(time); } @@ -62,7 +60,7 @@ void ColnodTest::download_data_test() ColnodAPI colnod(&reqMan); { QSignalSpy spy(&colnod, &ColnodAPI::downloadDataFinished); - colnod.downloadData(Timestamp(1570190399259)); + colnod.downloadData(1570190399259); QVERIFY(spy.wait()); auto data = qvariant_cast>(spy.at(0).at(0)); @@ -72,8 +70,7 @@ void ColnodTest::download_data_test() QVERIFY(data->updatedTokens.contains("5e2f1260-da1c-441f-9644-24dfe3b97b2a")); } { - Timestamp time(QDateTime::currentMSecsSinceEpoch()); - colnod.downloadData(time); + colnod.downloadData(QDateTime::currentMSecsSinceEpoch()); QSignalSpy spy(&colnod, &ColnodAPI::downloadDataFinished); QVERIFY(spy.wait()); auto data = qvariant_cast>(spy.at(0).at(0)); @@ -88,17 +85,14 @@ void ColnodTest::download_data_fail_test() serversdk::RequestManager reqMan; ColnodAPI colnod(&reqMan, false, "spaceti", "wrong password"); - Timestamp time(0); QSignalSpy spy(&colnod, &ColnodAPI::downloadDataFinished); - colnod.downloadData(time); + colnod.downloadData(0); QVERIFY(spy.wait()); auto data = qvariant_cast>(spy.at(0).at(0)); QVERIFY(!data); - - } QString ColnodTest::getLoginToken(ColnodAPI &colnod)