From 8d6dc6714c72947f6dc15f5b0f756f98d54ca93f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Fischer?= <ondrej.fischer@spaceti.com>
Date: Wed, 30 Oct 2019 15:59:30 +0100
Subject: [PATCH] Change time of deleting to time of sync begin

---
 src/colnod/databasemanager.cpp | 8 ++++----
 src/colnod/databasemanager.h   | 2 +-
 src/colnod/datamanager.cpp     | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/colnod/databasemanager.cpp b/src/colnod/databasemanager.cpp
index 74ca21d..787b0af 100644
--- a/src/colnod/databasemanager.cpp
+++ b/src/colnod/databasemanager.cpp
@@ -120,13 +120,13 @@ void DatabaseManager::saveSubjectAttributes(Subject *subject, const QString& tab
 }
 
 // "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();
-    QString nowString = QDateTime::fromMSecsSinceEpoch(now).toString("yyyy-MM-dd hh:mm:ss.zzz");
+    //quint64 now = getNow();
+    //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.bindValue(":id", id);
-    query.bindValue(":now", nowString);
+    query.bindValue(":now", time);
     executeQuery(query);
 }
 
diff --git a/src/colnod/databasemanager.h b/src/colnod/databasemanager.h
index 0e259f3..e3f96e3 100644
--- a/src/colnod/databasemanager.h
+++ b/src/colnod/databasemanager.h
@@ -22,7 +22,7 @@ public:
     int saveSubject(Subject* subject, const QString& table);
     int saveToken(Token* token, 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 createTables();
diff --git a/src/colnod/datamanager.cpp b/src/colnod/datamanager.cpp
index 355d997..afa882a 100644
--- a/src/colnod/datamanager.cpp
+++ b/src/colnod/datamanager.cpp
@@ -204,7 +204,7 @@ void DataManager::deleteSubjectsFromDB()
     }
     for (const auto& subjectId : subjectsFromColnodToDeleteFromDB)
     {
-        db->setDeleted(subjectId, "colnod_subject");
+        db->setDeleted(subjectId, "colnod_subject", nextLastSync);
         Logger::logToDb(Logger::makeSubjectMsg(subjectId, "deleted", "DB"));
     }
     qInfo() << "DB:" << subjectsFromColnodToDeleteFromDB.size() << " subject deleted";
@@ -222,7 +222,7 @@ void DataManager::setDeletedToTokensFromDB()
     for (const auto& tokenId : tokensFromColnodToDeleteFromDB)
     {
         if (!db->checkDeletedToken(tokenId)){
-            db->setDeleted(tokenId, "colnod_token");
+            db->setDeleted(tokenId, "colnod_token", nextLastSync);
             Logger::logToDb(Logger::makeTokenMsg(tokenId, "deleted", "DB"));
         }
         else