From 1945e7e002077a7d756412ab49343e196048e028 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Fischer?= Date: Thu, 28 Nov 2019 15:49:49 +0100 Subject: [PATCH] finished prepere data, but not hadling new tokens --- src/colnod/data.h | 8 +++++ src/colnod/syncmanager.cpp | 61 +++++++++++++++++++------------------- 2 files changed, 38 insertions(+), 31 deletions(-) diff --git a/src/colnod/data.h b/src/colnod/data.h index 5ef4827..cd6d512 100644 --- a/src/colnod/data.h +++ b/src/colnod/data.h @@ -39,6 +39,14 @@ public: struct PreparedData { +public: + PreparedData() = default; + PreparedData(std::shared_ptr database, std::shared_ptr colnod) + :databaseData(database), colnodData(colnod) + { + } + + // TODO: make unique_ptr ( neeed because of ColnodAPI ) std::shared_ptr databaseData; std::shared_ptr colnodData; diff --git a/src/colnod/syncmanager.cpp b/src/colnod/syncmanager.cpp index 4d7ed4d..1529509 100644 --- a/src/colnod/syncmanager.cpp +++ b/src/colnod/syncmanager.cpp @@ -49,7 +49,7 @@ bool SyncManager::startSynchronization() qInfo(syncmanager) << equals; qInfo(syncmanager) << "SYNCHRONIZATION BEGIN"; - // TODO: check error + // TODO: solve this in prepare data database->initNewTokens(); @@ -63,8 +63,8 @@ bool SyncManager::startSynchronization() colnod->downloadData(Timestamp(syncBegin)); - connect(colnod.get(), &ColnodAPI::downloadDataFinished, [=](std::shared_ptr data) { - if (!data) { + connect(colnod.get(), &ColnodAPI::downloadDataFinished, [=](std::shared_ptr colnodData) { + if (!colnodData) { qCritical(syncmanager) << "Not possible to get correct data from colnod"; QCoreApplication::exit(-1); return; @@ -73,7 +73,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" << data->updatedTokens.count(); + qDebug(syncmanager) << "updated token count" << colnodData->updatedTokens.count(); std::unique_ptr preparedData = prepareDataNew(databaseData, colnodData); if (!preparedData) { @@ -88,11 +88,6 @@ bool SyncManager::startSynchronization() return true; //downloadData(); - auto colnodDataFinished = [=](std::shared_ptr data) { - Q_UNUSED(data) - qDebug() << "Now I can check that I have all data I need"; - }; - //connect(this, &SyncManager::dataReady, processDownloadedData); @@ -131,8 +126,8 @@ bool SyncManager::startSynchronization() std::unique_ptr SyncManager::prepareDataNew(const std::shared_ptr &databaseData, const std::shared_ptr &colnodData) { - auto preperedColnodData = std::make_shared(); - auto preperedDatabaseData = std::make_shared(); + auto preparedColnodData = std::make_shared(); + auto preparedDatabaseData = std::make_shared(); QList conflicts; QList alreadySynced; @@ -141,13 +136,13 @@ std::unique_ptr SyncManager::prepareDataNew(const std::shared_ptr< // not conflict so add to prepered tokens if (!databaseData->updatedTokens.contains(colnodToken->id())) { - preperedColnodData->updatedTokens.insert(colnodToken->id(), colnodToken); + preparedColnodData->updatedTokens.insert(colnodToken->id(), colnodToken); continue; } // change in colnod is newer if (databaseData->updatedTokens.value(colnodToken->id()) < colnodToken) { - preperedColnodData->updatedTokens.insert(colnodToken->id(), colnodToken); + preparedColnodData->updatedTokens.insert(colnodToken->id(), colnodToken); } else { conflicts.append(colnodToken->id()); @@ -162,42 +157,46 @@ std::unique_ptr SyncManager::prepareDataNew(const std::shared_ptr< for (const auto &id : colnodData->deletedTokens) { if (!database->isAlreadyDeleted(id)) { - preperedColnodData->deletedTokens.append(id); + preparedColnodData->deletedTokens.append(id); } } qInfo(syncmanager) << tab << "-> COLNOD DATA - CHANGES:"; - qInfo(syncmanager) << tab << tab << conflicts.size() << "TOKENS WERE ADDED/UPDATED IN DATABASE TOO"; + qInfo(syncmanager) << tab << tab << conflicts.size() << "TOKENS WERE ADDED/UPDATED IN DATABASE AFTER"; qInfo(syncmanager) << tab << tab << alreadySynced.size() << "TOKENS WERE ALREADY SYNCED"; - qInfo(syncmanager) << tab << tab << colnodData->updatedTokens.size() - preperedColnodData->deletedTokens.size() << "TOKENS WERE ALREADY DELETED"; + qInfo(syncmanager) << tab << tab << colnodData->deletedTokens.size() - preparedColnodData->deletedTokens.size() << "TOKENS WERE ALREADY DELETED"; qInfo(syncmanager) << dash; for (const auto &databaseToken : databaseData->updatedTokens) { + + // restriction cauesed by colnod rest api + if (databaseToken->description() != "mobile") { + qCritical(syncmanager) << "Token:" << databaseToken->id() << "doesn't have 'mobile' in description, can't be "; + continue; + } + + // no conflict if (!colnodData->updatedTokens.contains(databaseToken->id())) { - preperedDatabaseData->updatedTokens.insert(databaseToken->id(), databaseToken); - } - if (databaseToken < colnodData->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()); - } + preparedDatabaseData->updatedTokens.insert(databaseToken->id(), databaseToken); + continue; } + + // database change is newer + if (databaseToken > colnodData->updatedTokens.value(databaseToken->id())) { + preparedDatabaseData->updatedTokens.insert(databaseToken->id(), databaseToken); + } } - for (const auto &id : conflicts) - colnodData->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) << tab << tab << databaseData->updatedTokens.size() - preparedColnodData->updatedTokens.size() << "TOKENS WERE ADDED/UPDATED IN COLNOD AFTER"; qInfo(syncmanager) << dash; qInfo(syncmanager) << "PREPARING DATA -> FINISHED"; qInfo(syncmanager) << equals; - return nullptr; + + auto preparedData = std::make_unique(preparedDatabaseData, preparedColnodData); + return preparedData; } bool SyncManager::downloadData()