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

Merge branch 'finalizing' into 'master'

Browse Source 
fix output for deleting subject

See merge request spaceti-app/integrations/acs/colnod-connector!35
This commit is contained in:
Ondřej Fischer 2020-02-10 09:56:11 +00:00
commit 9784c31174
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/app/main.cpp
View File

@ -22,7 +22,7 @@ int main(int argc, char *argv[])
parser.setApplicationDescription("Colnod sync"); parser.setApplicationDescription("Colnod sync");
QCommandLineOption dryModeOption("dryMode", "ColnodAPI", "Read-only mode, prints changes which would normally be made"); 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 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(dryModeOption);
parser.addOption(dropTablesOption); parser.addOption(dropTablesOption);
parser.addOption(createTablesOption); parser.addOption(createTablesOption);
@ -40,7 +40,6 @@ int main(int argc, char *argv[])
QLoggingCategory::setFilterRules(filters.join(QStringLiteral("\n"))); QLoggingCategory::setFilterRules(filters.join(QStringLiteral("\n")));
SyncManager syncManager(parser.isSet(dryModeOption)); SyncManager syncManager(parser.isSet(dryModeOption));
// Initialize database and colnod API // Initialize database and colnod API

4
src/colnod/databaseapi.cpp
View File

@ -81,7 +81,7 @@ bool DatabaseAPI::processData(const std::shared_ptr<Data> &data)
qInfo(database) << Message::massageTemplate("Updated", "subject", "database", subject->name()); qInfo(database) << Message::massageTemplate("Updated", "subject", "database", subject->name());
} }
for (const auto &id : data->deletedSubjects) { 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() || if (!data->updatedTokens.isEmpty() || !data->deletedTokens.isEmpty() ||
!data->updatedSubjects.isEmpty() || !data->deletedSubjects.isEmpty()) { !data->updatedSubjects.isEmpty() || !data->deletedSubjects.isEmpty()) {
@ -292,7 +292,7 @@ int DatabaseAPI::exists(const QString &id, const QString &tableName)
qint16 DatabaseAPI::getNumOfTokensOfSubject(const QString &id) qint16 DatabaseAPI::getNumOfTokensOfSubject(const QString &id)
{ {
auto query = mDbMan->createQuery(); 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); query.bindValue(":id", id);
if (!executeQuery(query)) { if (!executeQuery(query)) {
qCritical(database) << "ERROR during accessing existing tokens. EXIT(1)"; qCritical(database) << "ERROR during accessing existing tokens. EXIT(1)";

2
test/auto/colnod/tst_colnodapi.cpp
View File

@ -55,7 +55,7 @@ void ColnodTest::download_data_test()
QVERIFY(data); QVERIFY(data);
QVERIFY(! data->updatedTokens.isEmpty()); QVERIFY(! data->updatedTokens.isEmpty());
QVERIFY(data->updatedTokens.contains("5e2f1260-da1c-441f-9644-24dfe3b97b2a")); QVERIFY(data->updatedTokens.contains("d3a83bea-2587-4687-946d-ee847eccf477"));
} }
void ColnodTest::download_data_test_now() void ColnodTest::download_data_test_now()