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

Change time of deleting to time of sync begin

Browse Source
This commit is contained in:
Ondřej Fischer 2019-10-30 15:59:30 +01:00
parent 31183087c2
commit 8d6dc6714c
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/colnod/databasemanager.cpp
View File

@ -120,13 +120,13 @@ void DatabaseManager::saveSubjectAttributes(Subject *subject, const QString& tab
} }
// "delete" tokens from DB -> set deleted true // "delete" tokens from DB -> set deleted true
void DatabaseManager::setDeleted(const QString& id, const QString& table) void DatabaseManager::setDeleted(const QString& id, const QString& table, quint64 time)
{ {
quint64 now = getNow(); //quint64 now = getNow();
QString nowString = QDateTime::fromMSecsSinceEpoch(now).toString("yyyy-MM-dd hh:mm:ss.zzz"); //QString nowString = QDateTime::fromMSecsSinceEpoch(now).toString("yyyy-MM-dd hh:mm:ss.zzz");
query.prepare(QString("UPDATE %1 SET deleted = true, last_update = :now, last_modified = :now WHERE id = :id").arg(table)); query.prepare(QString("UPDATE %1 SET deleted = true, last_update = :now, last_modified = :now WHERE id = :id").arg(table));
query.bindValue(":id", id); query.bindValue(":id", id);
query.bindValue(":now", nowString); query.bindValue(":now", time);
executeQuery(query); executeQuery(query);
} }

2
src/colnod/databasemanager.h
View File

@ -22,7 +22,7 @@ public:
int saveSubject(Subject* subject, const QString& table); int saveSubject(Subject* subject, const QString& table);
int saveToken(Token* token, const QString& table); int saveToken(Token* token, const QString& table);
void saveSubjectAttributes(Subject* subject, const QString& table); void saveSubjectAttributes(Subject* subject, const QString& table);
void setDeleted(const QString& id, const QString& table); void setDeleted(const QString& id, const QString& table, quint64 time);
void dropTables(); void dropTables();
void createTables(); void createTables();

4
src/colnod/datamanager.cpp
View File

@ -204,7 +204,7 @@ void DataManager::deleteSubjectsFromDB()
} }
for (const auto& subjectId : subjectsFromColnodToDeleteFromDB) for (const auto& subjectId : subjectsFromColnodToDeleteFromDB)
{ {
db->setDeleted(subjectId, "colnod_subject"); db->setDeleted(subjectId, "colnod_subject", nextLastSync);
Logger::logToDb(Logger::makeSubjectMsg(subjectId, "deleted", "DB")); Logger::logToDb(Logger::makeSubjectMsg(subjectId, "deleted", "DB"));
} }
qInfo() << "DB:" << subjectsFromColnodToDeleteFromDB.size() << " subject deleted"; qInfo() << "DB:" << subjectsFromColnodToDeleteFromDB.size() << " subject deleted";
@ -222,7 +222,7 @@ void DataManager::setDeletedToTokensFromDB()
for (const auto& tokenId : tokensFromColnodToDeleteFromDB) for (const auto& tokenId : tokensFromColnodToDeleteFromDB)
{ {
if (!db->checkDeletedToken(tokenId)){ if (!db->checkDeletedToken(tokenId)){
db->setDeleted(tokenId, "colnod_token"); db->setDeleted(tokenId, "colnod_token", nextLastSync);
Logger::logToDb(Logger::makeTokenMsg(tokenId, "deleted", "DB")); Logger::logToDb(Logger::makeTokenMsg(tokenId, "deleted", "DB"));
} }
else else