michalks/colnod-connector
1
0
Fork 0
forked from ondra/colnod-connector
Code Issues Pull Requests Projects Releases Wiki Activity

finished prepere data, but not hadling new tokens

Browse Source
This commit is contained in:
Ondřej Fischer 2019-11-28 15:49:49 +01:00
parent 53015d839a
commit 1945e7e002
2 changed files with 38 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/colnod/data.h
View File

@ -39,6 +39,14 @@ public:
struct PreparedData struct PreparedData
{ {
public:
PreparedData() = default;
PreparedData(std::shared_ptr<Data> database, std::shared_ptr<Data> colnod)
:databaseData(database), colnodData(colnod)
{
}
// TODO: make unique_ptr ( neeed because of ColnodAPI ) // TODO: make unique_ptr ( neeed because of ColnodAPI )
std::shared_ptr<Data> databaseData; std::shared_ptr<Data> databaseData;
std::shared_ptr<Data> colnodData; std::shared_ptr<Data> colnodData;

61
src/colnod/syncmanager.cpp
View File

@ -49,7 +49,7 @@ bool SyncManager::startSynchronization()
qInfo(syncmanager) << equals; qInfo(syncmanager) << equals;
qInfo(syncmanager) << "SYNCHRONIZATION BEGIN"; qInfo(syncmanager) << "SYNCHRONIZATION BEGIN";
// TODO: check error // TODO: solve this in prepare data
database->initNewTokens(); database->initNewTokens();
@ -63,8 +63,8 @@ bool SyncManager::startSynchronization()
colnod->downloadData(Timestamp(syncBegin)); colnod->downloadData(Timestamp(syncBegin));
connect(colnod.get(), &ColnodAPI::downloadDataFinished, [=](std::shared_ptr<Data> data) { connect(colnod.get(), &ColnodAPI::downloadDataFinished, [=](std::shared_ptr<Data> colnodData) {
if (!data) { if (!colnodData) {
qCritical(syncmanager) << "Not possible to get correct data from colnod"; qCritical(syncmanager) << "Not possible to get correct data from colnod";
QCoreApplication::exit(-1); QCoreApplication::exit(-1);
return; return;
@ -73,7 +73,7 @@ bool SyncManager::startSynchronization()
// NOW I SHOULD HAVE VALID DATA FROM COLNOD // NOW I SHOULD HAVE VALID DATA FROM COLNOD
// I can process data // I can process data
qDebug(syncmanager) << "I have colnod and database 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> preparedData = prepareDataNew(databaseData, colnodData); std::unique_ptr<PreparedData> preparedData = prepareDataNew(databaseData, colnodData);
if (!preparedData) { if (!preparedData) {
@ -88,11 +88,6 @@ bool SyncManager::startSynchronization()
return true; return true;
//downloadData(); //downloadData();
auto colnodDataFinished = [=](std::shared_ptr<Data> data) {
Q_UNUSED(data)
qDebug() << "Now I can check that I have all data I need";
};
//connect(this, &SyncManager::dataReady, processDownloadedData); //connect(this, &SyncManager::dataReady, processDownloadedData);
@ -131,8 +126,8 @@ bool SyncManager::startSynchronization()
std::unique_ptr<PreparedData> SyncManager::prepareDataNew(const std::shared_ptr<Data> &databaseData, const std::shared_ptr<Data> &colnodData) std::unique_ptr<PreparedData> SyncManager::prepareDataNew(const std::shared_ptr<Data> &databaseData, const std::shared_ptr<Data> &colnodData)
{ {
auto preperedColnodData = std::make_shared<Data>(); auto preparedColnodData = std::make_shared<Data>();
auto preperedDatabaseData = std::make_shared<Data>(); auto preparedDatabaseData = std::make_shared<Data>();
QList<QString> conflicts; QList<QString> conflicts;
QList<QString> alreadySynced; QList<QString> alreadySynced;
@ -141,13 +136,13 @@ std::unique_ptr<PreparedData> SyncManager::prepareDataNew(const std::shared_ptr<
// not conflict so add to prepered tokens // not conflict so add to prepered tokens
if (!databaseData->updatedTokens.contains(colnodToken->id())) { if (!databaseData->updatedTokens.contains(colnodToken->id())) {
preperedColnodData->updatedTokens.insert(colnodToken->id(), colnodToken); preparedColnodData->updatedTokens.insert(colnodToken->id(), colnodToken);
continue; continue;
} }
// change in colnod is newer // change in colnod is newer
if (databaseData->updatedTokens.value(colnodToken->id()) < colnodToken) { if (databaseData->updatedTokens.value(colnodToken->id()) < colnodToken) {
preperedColnodData->updatedTokens.insert(colnodToken->id(), colnodToken); preparedColnodData->updatedTokens.insert(colnodToken->id(), colnodToken);
} }
else { else {
conflicts.append(colnodToken->id()); conflicts.append(colnodToken->id());
@ -162,42 +157,46 @@ std::unique_ptr<PreparedData> SyncManager::prepareDataNew(const std::shared_ptr<
for (const auto &id : colnodData->deletedTokens) { for (const auto &id : colnodData->deletedTokens) {
if (!database->isAlreadyDeleted(id)) { if (!database->isAlreadyDeleted(id)) {
preperedColnodData->deletedTokens.append(id); preparedColnodData->deletedTokens.append(id);
} }
} }
qInfo(syncmanager) << tab << "-> COLNOD DATA - CHANGES:"; 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 << 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; qInfo(syncmanager) << dash;
for (const auto &databaseToken : databaseData->updatedTokens) { 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())) { if (!colnodData->updatedTokens.contains(databaseToken->id())) {
preperedDatabaseData->updatedTokens.insert(databaseToken->id(), databaseToken); preparedDatabaseData->updatedTokens.insert(databaseToken->id(), databaseToken);
} continue;
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());
}
} }
// 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 << "-> 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) << dash;
qInfo(syncmanager) << "PREPARING DATA -> FINISHED"; qInfo(syncmanager) << "PREPARING DATA -> FINISHED";
qInfo(syncmanager) << equals; qInfo(syncmanager) << equals;
return nullptr;
auto preparedData = std::make_unique<PreparedData>(preparedDatabaseData, preparedColnodData);
return preparedData;
} }
bool SyncManager::downloadData() bool SyncManager::downloadData()