From 91da3090c993f74045c9b3899740805e31d6a510 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Fischer?= Date: Wed, 5 Feb 2020 13:55:41 +0100 Subject: [PATCH 1/4] fix output for deleting subject --- src/colnod/databaseapi.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/colnod/databaseapi.cpp b/src/colnod/databaseapi.cpp index 5b75ab5..254deda 100644 --- a/src/colnod/databaseapi.cpp +++ b/src/colnod/databaseapi.cpp @@ -81,7 +81,7 @@ bool DatabaseAPI::processData(const std::shared_ptr &data) qInfo(database) << Message::massageTemplate("Updated", "subject", "database", subject->name()); } for (const auto &id : data->deletedSubjects) { - qInfo(database) << Message::massageTemplate("Deleted", "token", "database", id); + qInfo(database) << Message::massageTemplate("Deleted", "subject", "database", id); } if (!data->updatedTokens.isEmpty() || !data->deletedTokens.isEmpty() || !data->updatedSubjects.isEmpty() || !data->deletedSubjects.isEmpty()) { @@ -178,7 +178,7 @@ qint64 DatabaseAPI::getNow() // All tokens which are pushed to Colnad are update back to db, because of diffrent last_update and init of new tokens bool DatabaseAPI::uploadTokens(const QHash> &tokens, const QSet &filters) { - auto query = mDbMan->createQuery(); + QSqlQuery query; for (const auto &token : tokens) { if (exists(token->id(), "colnod_token")) { query = utils->updateTable(token.get(), "colnod_token", filters); @@ -197,7 +197,7 @@ bool DatabaseAPI::uploadTokens(const QHash> &tok bool DatabaseAPI::uploadSubjects(const QHash> &subjects) { - auto query = mDbMan->createQuery(); + QSqlQuery query; for (const auto &subject : subjects) { for (const auto &attribute : subject->getAttributes()) { From 3c68cd64f20d380ff21536f766a6b1d757a403ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Fischer?= Date: Wed, 5 Feb 2020 16:38:50 +0100 Subject: [PATCH 2/4] back to working code --- src/colnod/databaseapi.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/colnod/databaseapi.cpp b/src/colnod/databaseapi.cpp index 254deda..d1757b3 100644 --- a/src/colnod/databaseapi.cpp +++ b/src/colnod/databaseapi.cpp @@ -178,7 +178,7 @@ qint64 DatabaseAPI::getNow() // All tokens which are pushed to Colnad are update back to db, because of diffrent last_update and init of new tokens bool DatabaseAPI::uploadTokens(const QHash> &tokens, const QSet &filters) { - QSqlQuery query; + auto query = mDbMan->createQuery(); for (const auto &token : tokens) { if (exists(token->id(), "colnod_token")) { query = utils->updateTable(token.get(), "colnod_token", filters); @@ -197,7 +197,7 @@ bool DatabaseAPI::uploadTokens(const QHash> &tok bool DatabaseAPI::uploadSubjects(const QHash> &subjects) { - QSqlQuery query; + auto query = mDbMan->createQuery(); for (const auto &subject : subjects) { for (const auto &attribute : subject->getAttributes()) { From 96b32c222cae8ce350c3fa742da53722d3d5b10f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Fischer?= Date: Mon, 10 Feb 2020 10:35:35 +0100 Subject: [PATCH 3/4] fix unittest --- src/app/main.cpp | 3 +-- src/colnod/databaseapi.cpp | 2 +- test/auto/colnod/tst_colnodapi.cpp | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/app/main.cpp b/src/app/main.cpp index a39418a..3a63727 100644 --- a/src/app/main.cpp +++ b/src/app/main.cpp @@ -22,7 +22,7 @@ int main(int argc, char *argv[]) parser.setApplicationDescription("Colnod sync"); QCommandLineOption dryModeOption("dryMode", "ColnodAPI", "Read-only mode, prints changes which would normally be made"); QCommandLineOption dropTablesOption("dropTables", "ColnodAPI", "Delete tables with datas from Colnod"); - QCommandLineOption createTablesOption("createTables", "ColnodAPI", "Create tables to saving data from Colnod"); + QCommandLineOption createTablesOption("createTables", "ColnodAPI", "Create tables for saving data from Colnod"); parser.addOption(dryModeOption); parser.addOption(dropTablesOption); parser.addOption(createTablesOption); @@ -40,7 +40,6 @@ int main(int argc, char *argv[]) QLoggingCategory::setFilterRules(filters.join(QStringLiteral("\n"))); - SyncManager syncManager(parser.isSet(dryModeOption)); // Initialize database and colnod API diff --git a/src/colnod/databaseapi.cpp b/src/colnod/databaseapi.cpp index d1757b3..cb3b667 100644 --- a/src/colnod/databaseapi.cpp +++ b/src/colnod/databaseapi.cpp @@ -292,7 +292,7 @@ int DatabaseAPI::exists(const QString &id, const QString &tableName) qint16 DatabaseAPI::getNumOfTokensOfSubject(const QString &id) { auto query = mDbMan->createQuery(); - query.prepare("SELECT 1 FROM colnod_token WHERE subject_id = :id AND deleted = false"); + query.prepare("SELECT 1 FROM colnod_token WHERE subject_id = :id AND description = 'mobile'"); query.bindValue(":id", id); if (!executeQuery(query)) { qCritical(database) << "ERROR during accessing existing tokens. EXIT(1)"; diff --git a/test/auto/colnod/tst_colnodapi.cpp b/test/auto/colnod/tst_colnodapi.cpp index 902e06f..93eade4 100644 --- a/test/auto/colnod/tst_colnodapi.cpp +++ b/test/auto/colnod/tst_colnodapi.cpp @@ -55,7 +55,7 @@ void ColnodTest::download_data_test() QVERIFY(data); QVERIFY(! data->updatedTokens.isEmpty()); - QVERIFY(data->updatedTokens.contains("5e2f1260-da1c-441f-9644-24dfe3b97b2a")); + QVERIFY(data->updatedTokens.contains("6c907a42-0401-4403-8af4-9d58eb35cddc")); } void ColnodTest::download_data_test_now() From c1a8c80cfa89ed39947f6c8973054438eb72d667 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Fischer?= Date: Mon, 10 Feb 2020 10:48:10 +0100 Subject: [PATCH 4/4] Fix one more Uuid --- test/auto/colnod/tst_colnodapi.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/auto/colnod/tst_colnodapi.cpp b/test/auto/colnod/tst_colnodapi.cpp index 93eade4..50196b1 100644 --- a/test/auto/colnod/tst_colnodapi.cpp +++ b/test/auto/colnod/tst_colnodapi.cpp @@ -55,7 +55,7 @@ void ColnodTest::download_data_test() QVERIFY(data); QVERIFY(! data->updatedTokens.isEmpty()); - QVERIFY(data->updatedTokens.contains("6c907a42-0401-4403-8af4-9d58eb35cddc")); + QVERIFY(data->updatedTokens.contains("d3a83bea-2587-4687-946d-ee847eccf477")); } void ColnodTest::download_data_test_now()