From fe0954edf1fa50e7f8de991743bb9db8450e8db2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Fischer?= Date: Wed, 4 Dec 2019 16:51:38 +0100 Subject: [PATCH] delete useless stuff --- src/colnod/colnodapi.cpp | 20 ++------------------ src/colnod/colnodapi.h | 9 --------- src/colnod/databaseapi.cpp | 38 -------------------------------------- src/colnod/databaseapi.h | 3 --- 4 files changed, 2 insertions(+), 68 deletions(-) diff --git a/src/colnod/colnodapi.cpp b/src/colnod/colnodapi.cpp index 863b283..7946161 100644 --- a/src/colnod/colnodapi.cpp +++ b/src/colnod/colnodapi.cpp @@ -188,7 +188,7 @@ std::shared_ptr ColnodAPI::setTokens(const QHashresponseData())) { emit partOfDataProcessFinished(); @@ -210,7 +210,7 @@ std::shared_ptr ColnodAPI::deleteTokens(const QList connect(request.get(), &serversdk::Request::finished, [=](){ if (!checkRequest(request)) { qCritical(colnod) << "ERROR during calling /TokenManager/deleteTokens, request unsuccessful. EXIT"; - emit error(); + emit error(); // TODO: return nullptr and check it } if (checkResponse(request->responseData())) { emit partOfDataProcessFinished(); @@ -250,17 +250,6 @@ void ColnodAPI::setPassword(const QString &password) mPassword = password; } -qint64 ColnodAPI::lastSync() const -{ - return mLastSync.timestamp(); -} - -void ColnodAPI::setlastSync(const qint64 &lastSync) -{ - mLastSync.setTimestamp(lastSync); -} - - QString ColnodAPI::userName() const { return mUserName; @@ -322,11 +311,6 @@ void ColnodAPI::saveDeletedSubjects(const std::shared_ptr& data, const QBy } } -void ColnodAPI::newData() -{ - mData = std::make_shared(); -} - bool ColnodAPI::checkResponse(const QByteArray &responseData) { QJsonDocument doc = QJsonDocument::fromJson(responseData); diff --git a/src/colnod/colnodapi.h b/src/colnod/colnodapi.h index 859f2fc..7d87e79 100644 --- a/src/colnod/colnodapi.h +++ b/src/colnod/colnodapi.h @@ -46,10 +46,8 @@ public: void downloadData(const qint64 &time); void processData(const std::shared_ptr &data); - // New approach std::shared_ptr requestLogin(); - std::shared_ptr getTokensUpdated(const Timestamp &time); std::shared_ptr getTokensDeleted(const Timestamp &time); std::shared_ptr getSubjectsUpdated(const Timestamp &time); @@ -63,8 +61,6 @@ public: void setUserName(const QString &userName); QString password() const; void setPassword(const QString &password); - qint64 lastSync() const; - void setlastSync(const qint64 &lastSync); bool isValid(); @@ -78,11 +74,8 @@ private: void saveDeletedTokens(const std::shared_ptr& data, const QByteArray &responseData); void saveDeletedSubjects(const std::shared_ptr& data, const QByteArray &responseData); - void newData(); - bool checkResponse(const QByteArray &responseData); - QByteArray getTimestampJson(const qint64 &time); std::shared_ptr composeRequest(const QString &endpoint, const QByteArray &data); bool checkRequest(const std::shared_ptr &request); @@ -105,8 +98,6 @@ private: bool mDryMode = false; bool mValid = true; - std::shared_ptr mData; - QString authToken; qint16 amountData = 0; qint16 amountProccessesFinished = 0; diff --git a/src/colnod/databaseapi.cpp b/src/colnod/databaseapi.cpp index 549332d..039b135 100644 --- a/src/colnod/databaseapi.cpp +++ b/src/colnod/databaseapi.cpp @@ -118,24 +118,6 @@ void DatabaseAPI::setLastSync(qint64 timestamp) } } -void DatabaseAPI::reupdateUpdated(const QHash> &tokens) -{ - auto query = mDbMan->createQuery(); - for (const auto &token : tokens){ - query.prepare("UPDATE colnod_token SET last_update = :last_update WHERE id = :id"); - query.bindValue(":last_update", token->lastUpdate()); - query.bindValue(":id", token->id()); - if (!executeQuery(query)) { - qWarning(database) << "ERROR during updating last update of token:" << token->name() << ", it will be synced from Colnod to db in next sync. Last modified will be invalid"; - } - } - - qInfo(database) << equals; - qInfo(database) << "Synchronize last update in database with colnod"; - qInfo(database) << equals; -} - - void DatabaseAPI::reupdateDeleted(const QList& ids) { auto query = mDbMan->createQuery(); @@ -164,26 +146,6 @@ qint64 DatabaseAPI::getNow() return query.value(0).toLongLong(); } -void DatabaseAPI::initNewTokens() -{ - auto query = mDbMan->createQuery(); - if (!executeQuery(query, "SELECT * FROM colnod_token WHERE name IS NULL")) { - qWarning(database) << "ERROR during getting uninitialized tokens"; - } - QHash> tokensToInit; - auto list = utils->tableFromQuery(query); - for (const auto &token : list) { - qint16 num = getNumOfTokensOfSubject(token->subjectId()); - token->setName(getSubjectNameByTokenId(token->id()) + "_mobile_" + QString::number(num + 1)); - token->setDescription("mobile"); - token->setTokenData(token->tokenData().toUpper()); - tokensToInit.insert(token->id(), token); - - qInfo(database).noquote() << Message::massageTemplate("Inicializing new", "token", "database", token->name()); - } - uploadTokens(tokensToInit); -} - bool DatabaseAPI::uploadTokens(const QHash> &tokens, const QSet &filters) { // TODO: first check if OK, then message diff --git a/src/colnod/databaseapi.h b/src/colnod/databaseapi.h index 3e8ab84..474a9f5 100644 --- a/src/colnod/databaseapi.h +++ b/src/colnod/databaseapi.h @@ -31,11 +31,9 @@ public: bool processData(const std::shared_ptr &data); qint64 getLastSync(); void setLastSync(qint64 timestamp); - void reupdateUpdated(const QHash > &tokens); void reupdateDeleted(const QList& ids); qint64 getNow(); - void initNewTokens(); // process data bool uploadTokens(const QHash > &tokens, const QSet &filters = {}); @@ -54,7 +52,6 @@ public: private: int exists(const QString &id, const QString &tableName); - QSqlQuery getUpdatedTokens(); std::shared_ptr composeData(const QSqlQuery &updatedQuery, QSqlQuery &deletedQuery); signals: