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

Change ifndef to pragma once

Browse Source
This commit is contained in:
Ondřej Fischer 2019-10-23 15:43:03 +02:00
parent 520a45d912
commit 7b21c1f9a7
13 changed files with 36 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/app/main.cpp
View File

@ -7,28 +7,16 @@ int main(int argc, char *argv[])
{
QCoreApplication a(argc, argv);
auto *api = new ColnodAPI();
/*api->downloadData(); // this will start downloading data
QObject::connect(api, &ColnodAPI::dataDownloaded, [=](){
qDebug() << "now I have all data";
api->syncDataToColnod();
QCoreApplication::quit();
});*/
// bool syncChanged = false;
// api->downloadChangedDataFromColnod();
// QObject::connect(api, &ColnodAPI::downloadData, [&](){
// qDebug() << "Data ready.";
// api->syncChangedDataFromColnod();
// if (!syncChanged)
// {
// api->syncChangedDataToColnod();
// syncChanged = true;
// }
// });
api->loadDataFromColnod();
api->loadDataFromDB();
api->loadDataFromColnod();
QObject::connect(api, &ColnodAPI::dataDownloaded, [=](){
qDebug() << "All items are loaded to data manager.";
api->syncDataFromColnodToDB();
api->syncDataFromDBToColnod();
QObject::connect(api, &ColnodAPI::syncFinished, [=](){
QCoreApplication::exit();
});
});
return QCoreApplication::exec();

4
src/colnod/colnodapi.cpp
View File

@ -70,7 +70,7 @@ void ColnodAPI::loadDataFromDB()
dataMan->fillTokensToUpdateDB();
}
void ColnodAPI::syncDataFromColnod()
void ColnodAPI::syncDataFromColnodToDB()
{
dataMan->filterTokensColnod();
syncUpdatedDataFromColnodToDB();
@ -105,7 +105,7 @@ void ColnodAPI::syncDataFromDBToColnod()
connect(this, &ColnodAPI::dataUpdatedToColnod, dataMan, &DataManager::clear);
connect(this, &ColnodAPI::dataUpdatedToColnod, dataMan, &DataManager::setLastSync);
connect(this, &ColnodAPI::dataUpdatedToColnod, [=](){
auto resp = reqMan->getTokensUpdated(dataMan->getActualSync());
auto resp = reqMan->getTokensUpdated(dataMan->getCurrentSync());
connect(resp, &Response::ready, [=](){
dataMan->fillTokensToUpdateColnod(resp->getJson());
dataMan->setLastUpdate();

9
src/colnod/colnodapi.h
View File

@ -1,12 +1,8 @@
#ifndef COLNODAPI_H
#define COLNODAPI_H
#pragma once
#include "requestmanager.h"
#include "datamanager.h"
class ColnodAPI : public QObject
{
Q_OBJECT
@ -15,7 +11,7 @@ public:
ColnodAPI(bool debugMode = false);
void syncDataFromColnod();
void syncDataFromColnodToDB();
void syncDataFromDBToColnod();
void prepareDatabase();
@ -56,4 +52,3 @@ private:
bool deleteFinished = false;
};
#endif // COLNODAPI_H

20
src/colnod/databasemanager.cpp
View File

@ -33,7 +33,7 @@ void DatabaseManager::saveSubject(Subject* subject, const QString& table)
query.bindValue(":name", subject->getName());
query.bindValue(":last_update", QDateTime::fromMSecsSinceEpoch(subject->getLastUpdate()).toString("yyyy-MM-dd hh:mm:ss.zzz"));
query.bindValue(":pin", subject->getPin());
query.exec();
executeQuery(query);
}
else
{
@ -44,7 +44,7 @@ void DatabaseManager::saveSubject(Subject* subject, const QString& table)
query.bindValue(":last_update", QDateTime::fromMSecsSinceEpoch(subject->getLastUpdate()).toString("yyyy-MM-dd hh:mm:ss.zzz"));
query.bindValue(":name", subject->getName());
query.bindValue(":pin", subject->getPin());
query.exec();
executeQuery(query);
}
}
@ -69,7 +69,7 @@ void DatabaseManager::saveToken(Token* token, const QString& table)
query.bindValue(":subject_id", token->subjectIdToStringWithoutBraces());
query.bindValue(":last_modified", QDateTime::fromMSecsSinceEpoch(token->getLastUpdate()).toString("yyyy-MM-dd hh:mm:ss.zzz"));
query.bindValue(":deleted", token->getDeleted());
query.exec();
executeQuery(query);
}
else
{
@ -89,7 +89,7 @@ void DatabaseManager::saveToken(Token* token, const QString& table)
query.bindValue(":subject_id", token->subjectIdToStringWithoutBraces());
query.bindValue(":last_modified", QDateTime::fromMSecsSinceEpoch(token->getLastUpdate()).toString("yyyy-MM-dd hh:mm:ss.zzz"));
query.bindValue(":deleted", token->getDeleted());
query.exec();
executeQuery(query);
}
}
@ -106,7 +106,7 @@ void DatabaseManager::saveSubjectAttributes(Subject *subject, const QString& tab
query.bindValue(":key", attribute.first);
query.bindValue(":value", attribute.second);
query.bindValue(":subject_id", subject->idToStringWithoutBraces());
query.exec();
executeQuery(query);
}
else{
query.prepare(QString("INSERT INTO %1 (id, attribute_key, attribute_value, subject_id)"
@ -115,7 +115,7 @@ void DatabaseManager::saveSubjectAttributes(Subject *subject, const QString& tab
query.bindValue(":key", attribute.first);
query.bindValue(":value", attribute.second);
query.bindValue(":subject_id", subject->idToStringWithoutBraces());
query.exec();
executeQuery(query);
}
}
}
@ -128,14 +128,14 @@ void DatabaseManager::setDeleted(const QString& id, const QString& 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(":now", nowString);
query.exec();
executeQuery(query);
}
bool DatabaseManager::checkIfExists(const QString& id, const QString& table)
{
query.prepare(QString("SELECT EXISTS(SELECT 1 FROM %1 WHERE id = :id)").arg(table));
query.bindValue(":id", id);
query.exec();
executeQuery(query);
query.first();
return query.value(0).toBool();
}
@ -199,7 +199,7 @@ void DatabaseManager::updateLastSync(quint64 lastSync)
{
query.prepare("UPDATE config SET last_sync = :last_sync");
query.bindValue(":last_sync", lastSync);
query.exec();
executeQuery(query);
}
@ -238,6 +238,6 @@ void DatabaseManager::setLastUpdate(const QString& id, quint64 lastUpdate)
query.prepare("UPDATE colnod_token SET last_update = :lastUpdate WHERE id = :id");
query.bindValue(":id", id);
query.bindValue(":lastUpdate", lastUpdate);
query.exec();
executeQuery(query);
}

6
src/colnod/databasemanager.h
View File

@ -1,5 +1,5 @@
#ifndef DATABASEMANAGER_H
#define DATABASEMANAGER_H
#pragma once
#include <QSql>
#include <QSqlDatabase>
#include <QSqlQuery>
@ -43,5 +43,3 @@ private:
QSqlDatabase db;
QSqlQuery query;
};
#endif // DATABASEMANAGER_H

7
src/colnod/datamanager.h
View File

@ -1,5 +1,4 @@
#ifndef DATAMANAGER_H
#define DATAMANAGER_H
#pragma once
#include "token.h"
#include "subject.h"
@ -48,7 +47,7 @@ public:
QList<QString> getTokensToDeleteDB() {return tokensFromDBToDeleteFromColnod;}
const quint64 &getLastSync() {return lastSync;}
const quint64 &getActualSync() {return nextLastSync;}
const quint64 &getCurrentSync() {return nextLastSync;}
public slots:
void clear();
@ -73,5 +72,3 @@ private:
QList<QString> tokensFromDBToDeleteFromColnod;
};
#endif // DATAMANAGER_H

3
src/colnod/entity.cpp
View File

@ -35,7 +35,8 @@ void Entity::setLastUpdate(quint64 lastUpdate) {
QString Entity::idToStringWithoutBraces()
{
return id.toString().mid(1,36);
const qint8 lengthOfUuid = 36;
return id.toString().mid(1, lengthOfUuid);
}
void Entity::fromJSON(const QJsonObject &json) {

7
src/colnod/entity.h
View File

@ -1,5 +1,4 @@
#ifndef COLNOD_CONNECTOR_ENTITY_H
#define COLNOD_CONNECTOR_ENTITY_H
#pragma once
#include <QtCore/QObject>
#include <QtCore/QUuid>
@ -33,7 +32,3 @@ private:
QString description;
qint64 lastUpdate{};
};
#endif //COLNOD_CONNECTOR_ENTITY_H

5
src/colnod/requestmanager.h
View File

@ -1,5 +1,4 @@
#ifndef REQUESTMANAGER_H
#define REQUESTMANAGER_H
#pragma once
#include <QObject>
#include <QNetworkReply>
@ -93,5 +92,3 @@ private:
bool loginStatus;
};
#endif // REQUESTMANAGER_H

5
src/colnod/response.h
View File

@ -1,5 +1,4 @@
#ifndef RESPONSE_H
#define RESPONSE_H
#pragma once
#include <QObject>
#include <qnetworkreply.h>
@ -31,5 +30,3 @@ private:
QString json;
QNetworkReply *reply = nullptr;
};
#endif // RESPONSE_H

6
src/colnod/subject.h
View File

@ -1,5 +1,4 @@
#ifndef COLNOD_CONNECTOR_SUBJECT_H
#define COLNOD_CONNECTOR_SUBJECT_H
#pragma once
#include <QSet>
@ -43,6 +42,3 @@ private:
const std::array<QString, 6> attributeTypes = {"Jmeno", "Prijmeni", "ProfilParking", "Spolecnost", "Profil", "spz"};
};
#endif //COLNOD_CONNECTOR_SUBJECT_H

8
src/colnod/token.h
View File

@ -1,13 +1,10 @@
#ifndef COLNOD_CONNECTOR_TOKEN_H
#define COLNOD_CONNECTOR_TOKEN_H
#pragma once
#include "entity.h"
#include <QSet>
#include <qsqlquery.h>
#include <QVariant>
class Token : public Entity {
public:
// using Entity::Entity;
@ -65,6 +62,3 @@ private:
quint64 lastModified{};
bool deleted{};
};
#endif //COLNOD_CONNECTOR_TOKEN_H

5
test/unitTests/complextest.cpp
View File

@ -120,7 +120,7 @@ void ComplexTest::fullSync()
api->loadDataFromColnod();
QSignalSpy spy(api, &ColnodAPI::dataDownloaded);
spy.wait(timeout);
api->syncDataFromColnod();
api->syncDataFromColnodToDB();
// api->syncDataToColnod();
}
@ -130,14 +130,13 @@ void ComplexTest::syncLastUpdated()
QSignalSpy spy(api, &ColnodAPI::dataDownloaded);
spy.wait(timeout);
api->loadDataFromDB();
api->syncDataFromColnod();
api->syncDataFromColnodToDB();
api->syncDataFromDBToColnod();
QSignalSpy processSpy(api, &ColnodAPI::dataUpdatedToColnod);
processSpy.wait(timeout);
QSignalSpy finish(api, &ColnodAPI::syncFinished);
finish.wait(timeout);
qDebug() << "All right, at least should be.";
}
void ComplexTest::testingStuff()