ondra/colnod-connector
1
0
Fork 1
mirror of https://gitlab.com/spaceti-app/integrations/acs/colnod-connector.git synced 2026-07-12 15:40:40 +02:00
Code Issues Projects Releases Wiki Activity

WIP: ColnodAPI::downloadData ( solving memory leaks )

Browse Source 
Problem with ASSERT: "dataCount < 5" in file /Users/fbucek/Documents/Spaceti/acs/colnod-connector/src/colnod/colnodapi.cpp, line 80
This commit is contained in:
Filip Bucek 2019-12-04 16:30:59 +01:00
parent a19126588b
commit 9f9ae6243c
6 changed files with 112 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

113
src/colnod/colnodapi.cpp
View File

@ -24,6 +24,7 @@ void ColnodAPI::downloadData(const qint64 &time)
{ {
// Have to get Login // Have to get Login
auto login = requestLogin(); auto login = requestLogin();
Q_ASSERT(login);
connect(login.get(), &serversdk::Request::finished, this, [=](){ connect(login.get(), &serversdk::Request::finished, this, [=](){
// Get login token // Get login token
if (login->status() != 200) { if (login->status() != 200) {
@ -46,19 +47,20 @@ void ColnodAPI::downloadData(const qint64 &time)
return; return;
} }
auto data = std::make_shared<Data>();
auto errorHandler = [=](const std::shared_ptr<serversdk::Request>& request){
if (!checkRequest(request)) { // NOTE: why?
qWarning(colnod) << "ERROR during calling" << request->url() << ", request unsuccessful"; // auto errorHandler = [=](const std::shared_ptr<serversdk::Request>& request){
mValid = false; // if (!checkRequest(request)) {
emit downloadDataFinished(nullptr); // TODO: think about it, will the other if passed? // qWarning(colnod) << "ERROR during calling" << request->url() << ", request unsuccessful";
} // mValid = false;
else if (!checkResponse(request->responseData())) { // emit downloadDataFinished(nullptr); // TODO: think about it, will the other if passed?
qWarning(colnod) << "Data from" << request->url() << "are invalid"; // }
mValid = false; // else if (!checkResponse(request->responseData())) {
} // qWarning(colnod) << "Data from" << request->url() << "are invalid";
}; // mValid = false;
// }
// };
// if I have all data emit downloadDataFinished // if I have all data emit downloadDataFinished
@ -67,32 +69,67 @@ void ColnodAPI::downloadData(const qint64 &time)
Timestamp timestamp; Timestamp timestamp;
timestamp.setTimestamp(time); timestamp.setTimestamp(time);
auto data = std::make_shared<Data>();
int dataCount = 0;
auto checkData = [&dataCount, &data, this]() {
qDebug() << "check data" << dataCount;
if (dataCount > 5) {
qCCritical(colnod) << "check data cannnot be higher then 4";
}
Q_ASSERT(dataCount < 5);
if (dataCount == 4)
emit downloadDataFinished(data);
};
auto tokensRequest = getTokensUpdated(timestamp); auto tokensRequest = getTokensUpdated(timestamp);
connect(tokensRequest.get(), &serversdk::Request::finished, errorHandler); // connect(tokensRequest.get(), &serversdk::Request::finished, errorHandler);
connect(tokensRequest.get(), &serversdk::Request::finished, [=](){ connect(tokensRequest.get(), &serversdk::Request::finished, [=, &dataCount](){
saveUpdatedTokens(data, tokensRequest->responseData()); qDebug(colnod) << "tokens finished";
emit partOfDataReady(data); if (!saveUpdatedTokens(data, tokensRequest->responseData())) {
emit downloadDataFinished(nullptr);
return;
}
++dataCount;
checkData();
//saveUpdatedTokens(data, tokensRequest->responseData());
//emit partOfDataReady(data);
}); });
auto deletedTokensRequest = getTokensDeleted(timestamp); auto deletedTokensRequest = getTokensDeleted(timestamp);
connect(deletedTokensRequest.get(), &serversdk::Request::finished, errorHandler); // connect(deletedTokensRequest.get(), &serversdk::Request::finished, errorHandler);
connect(deletedTokensRequest.get(), &serversdk::Request::finished, [=](){ connect(deletedTokensRequest.get(), &serversdk::Request::finished, [=, &dataCount](){
saveDeletedTokens(data, deletedTokensRequest->responseData()); qDebug(colnod) << "tokens finished";
emit partOfDataReady(data); if (!saveDeletedTokens(data, deletedTokensRequest->responseData())) {
emit downloadDataFinished(nullptr);
return;
}
++dataCount;
checkData();
//emit partOfDataReady(data);
}); });
auto subjectsRequest = getSubjectsUpdated(timestamp); auto subjectsRequest = getSubjectsUpdated(timestamp);
connect(subjectsRequest.get(), &serversdk::Request::finished, errorHandler); // connect(subjectsRequest.get(), &serversdk::Request::finished, errorHandler);
connect(subjectsRequest.get(), &serversdk::Request::finished, [=](){ connect(subjectsRequest.get(), &serversdk::Request::finished, [=, &dataCount](){
saveUpdatedSubjects(data, subjectsRequest->responseData()); qDebug(colnod) << "tokens finished";
emit partOfDataReady(data); if (!saveUpdatedSubjects(data, subjectsRequest->responseData())) {
emit downloadDataFinished(nullptr);
return;
}
++dataCount;
checkData();
}); });
auto deletedSubjectsRequest = getSubjectsDeleted(timestamp); auto deletedSubjectsRequest = getSubjectsDeleted(timestamp);
connect(deletedSubjectsRequest.get(), &serversdk::Request::finished, errorHandler); // connect(deletedSubjectsRequest.get(), &serversdk::Request::finished, errorHandler);
connect(deletedSubjectsRequest.get(), &serversdk::Request::finished, [=](){ connect(deletedSubjectsRequest.get(), &serversdk::Request::finished, [=, &dataCount](){
qDebug(colnod) << "tokens finished";
saveDeletedSubjects(data, deletedSubjectsRequest->responseData()); saveDeletedSubjects(data, deletedSubjectsRequest->responseData());
emit partOfDataReady(data); ++dataCount;
checkData();
// emit partOfDataReady(data);
}); });
}); });
} }
@ -294,32 +331,42 @@ void ColnodAPI::isDataProcessFinished()
} }
} }
void ColnodAPI::saveUpdatedTokens(const std::shared_ptr<Data>& data, const QByteArray &responseData) bool ColnodAPI::saveUpdatedTokens(const std::shared_ptr<Data>& data, const QByteArray &responseData)
{ {
data->loadTokensFromJson(responseData); Q_ASSERT(data);
return data->loadTokensFromJson(responseData);
} }
void ColnodAPI::saveDeletedTokens(const std::shared_ptr<Data>& data, const QByteArray &responseData) bool ColnodAPI::saveDeletedTokens(const std::shared_ptr<Data>& data, const QByteArray &responseData)
{ {
Q_ASSERT(data);
if (responseData.isEmpty())
return false;
QJsonDocument doc = QJsonDocument::fromJson(responseData); QJsonDocument doc = QJsonDocument::fromJson(responseData);
QJsonArray items = doc.object()["items"].toArray(); QJsonArray items = doc.object()["items"].toArray();
for (QJsonValueRef item : items) { for (QJsonValueRef item : items) {
data->deletedTokens.append(item.toString()); data->deletedTokens.append(item.toString());
} }
return true;
} }
void ColnodAPI::saveUpdatedSubjects(const std::shared_ptr<Data>& data, const QByteArray &responseData) bool ColnodAPI::saveUpdatedSubjects(const std::shared_ptr<Data>& data, const QByteArray &responseData)
{ {
data->loadSubjectsFormJson(responseData); Q_ASSERT(data);
return data->loadSubjectsFormJson(responseData);
} }
void ColnodAPI::saveDeletedSubjects(const std::shared_ptr<Data>& data, const QByteArray &responseData) bool ColnodAPI::saveDeletedSubjects(const std::shared_ptr<Data>& data, const QByteArray &responseData)
{ {
Q_ASSERT(data);
if (responseData.isEmpty())
return false;
QJsonDocument doc = QJsonDocument::fromJson(responseData); QJsonDocument doc = QJsonDocument::fromJson(responseData);
QJsonArray items = doc.object()["items"].toArray(); QJsonArray items = doc.object()["items"].toArray();
for (QJsonValueRef item : items) { for (QJsonValueRef item : items) {
data->deletedSubjects.append(item.toString()); data->deletedSubjects.append(item.toString());
} }
return true;
} }
void ColnodAPI::newData() void ColnodAPI::newData()

11
src/colnod/colnodapi.h
View File

@ -39,6 +39,7 @@ public:
class ColnodAPI: public QObject class ColnodAPI: public QObject
{ {
Q_OBJECT Q_OBJECT
friend class ColnodTest;
public: public:
ColnodAPI() = default; ColnodAPI() = default;
ColnodAPI(serversdk::RequestManager* reqManconst, const bool &dryMode = false, QString userName = "spaceti", QString password = "spaceti1"); ColnodAPI(serversdk::RequestManager* reqManconst, const bool &dryMode = false, QString userName = "spaceti", QString password = "spaceti1");
@ -73,10 +74,10 @@ private:
Q_SLOT void isDataProcessFinished(); Q_SLOT void isDataProcessFinished();
private: private:
void saveUpdatedTokens(const std::shared_ptr<Data>& data, const QByteArray &responseData); bool saveUpdatedTokens(const std::shared_ptr<Data>& data, const QByteArray &responseData);
void saveUpdatedSubjects(const std::shared_ptr<Data>& data, const QByteArray &responseData); bool saveUpdatedSubjects(const std::shared_ptr<Data>& data, const QByteArray &responseData);
void saveDeletedTokens(const std::shared_ptr<Data>& data, const QByteArray &responseData); bool saveDeletedTokens(const std::shared_ptr<Data>& data, const QByteArray &responseData);
void saveDeletedSubjects(const std::shared_ptr<Data>& data, const QByteArray &responseData); bool saveDeletedSubjects(const std::shared_ptr<Data>& data, const QByteArray &responseData);
void newData(); void newData();
@ -103,7 +104,7 @@ private:
QString mPassword; QString mPassword;
Timestamp mLastSync; Timestamp mLastSync;
bool mDryMode = false; bool mDryMode = false;
bool mValid = true; bool mValid = false;
std::shared_ptr<Data> mData; std::shared_ptr<Data> mData;

12
src/colnod/data.cpp
View File

@ -9,8 +9,11 @@ void Data::clear()
deletedSubjects.clear(); deletedSubjects.clear();
} }
void Data::loadTokensFromJson(const QByteArray &data) bool Data::loadTokensFromJson(const QByteArray &data)
{ {
if (data.isEmpty())
return false;
auto doc = QJsonDocument::fromJson(data); auto doc = QJsonDocument::fromJson(data);
auto items = doc.object()["items"].toArray(); auto items = doc.object()["items"].toArray();
for (auto item : items) { for (auto item : items) {
@ -19,10 +22,14 @@ void Data::loadTokensFromJson(const QByteArray &data)
token->fromJson(doc.toJson()); token->fromJson(doc.toJson());
updatedTokens.insert(token->id(), token); updatedTokens.insert(token->id(), token);
} }
return true;
} }
void Data::loadSubjectsFormJson(const QByteArray &data) bool Data::loadSubjectsFormJson(const QByteArray &data)
{ {
if (!data.isEmpty())
return false;
auto doc = QJsonDocument::fromJson(data); auto doc = QJsonDocument::fromJson(data);
auto items = doc.object()["items"].toArray(); auto items = doc.object()["items"].toArray();
for (auto item : items) { for (auto item : items) {
@ -31,4 +38,5 @@ void Data::loadSubjectsFormJson(const QByteArray &data)
subject->fromJson(doc.toJson()); subject->fromJson(doc.toJson());
updatedSubjects.insert(subject->id(), subject); updatedSubjects.insert(subject->id(), subject);
} }
return true;
} }

6
src/colnod/data.h
View File

@ -30,8 +30,8 @@ public:
void clear(); void clear();
void loadTokensFromJson(const QByteArray &data); bool loadTokensFromJson(const QByteArray &data);
void loadSubjectsFormJson(const QByteArray &data); bool loadSubjectsFormJson(const QByteArray &data);
QHash<QString, std::shared_ptr<Token>> updatedTokens; QHash<QString, std::shared_ptr<Token>> updatedTokens;
QList<QString> deletedTokens; QList<QString> deletedTokens;
@ -44,7 +44,7 @@ struct PreparedData
public: public:
PreparedData() = default; PreparedData() = default;
PreparedData(const std::shared_ptr<Data> &database, const std::shared_ptr<Data> &colnod) PreparedData(const std::shared_ptr<Data> &database, const std::shared_ptr<Data> &colnod)
:databaseData(std::move(database)), colnodData(std::move(colnod)) :databaseData(database), colnodData(colnod)
{ {
} }

3
src/colnod/syncmanager.cpp
View File

@ -36,6 +36,7 @@ bool SyncManager::databaseInitialization()
bool SyncManager::startSynchronization() bool SyncManager::startSynchronization()
{ {
Q_ASSERT(database);
// I have to current time from database // I have to current time from database
qint64 syncBegin = database->getNow(); qint64 syncBegin = database->getNow();
if (syncBegin == -1) { if (syncBegin == -1) {
@ -61,7 +62,7 @@ bool SyncManager::startSynchronization()
// NOW I HAVE DATA FROM DATABASE // NOW I HAVE DATA FROM DATABASE
colnod->downloadData(mlastSync.timestamp()); colnod->downloadData(mlastSync.timestamp());
connect(colnod.get(), &ColnodAPI::downloadDataFinished, [=](std::shared_ptr<Data> colnodData) { connect(colnod.get(), &ColnodAPI::downloadDataFinished, [=](const std::shared_ptr<Data> &colnodData) {
qInfo(syncmanager) << "DOWNLOADING DATA -> FINISHED"; qInfo(syncmanager) << "DOWNLOADING DATA -> FINISHED";
qInfo(syncmanager) << equals; qInfo(syncmanager) << equals;

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

@ -21,7 +21,7 @@ public:
private slots: private slots:
void login(); void login();
void getTokens(); void getTokens();
void download_data_test(); void download_test();
void download_data_test_now(); void download_data_test_now();
void download_data_fail_test(); void download_data_fail_test();
@ -56,16 +56,23 @@ void ColnodTest::getTokens()
colnod.getTokensUpdated(time); colnod.getTokensUpdated(time);
} }
void ColnodTest::download_data_test() void ColnodTest::download_test()
{ {
serversdk::RequestManager reqMan; serversdk::RequestManager reqMan;
//reqMan.setIgnoreSsl(true); reqMan.setIgnoreSsl(true);
ColnodAPI colnod(&reqMan); ColnodAPI colnod(&reqMan);
QVERIFY(!colnod.mData);
QVERIFY(!colnod.mValid);
QVERIFY(!colnod.amountData);
QVERIFY(!colnod.amountProccessesFinished);
QSignalSpy spy(&colnod, &ColnodAPI::downloadDataFinished); QSignalSpy spy(&colnod, &ColnodAPI::downloadDataFinished);
QVERIFY(spy.isValid()); QVERIFY(spy.isValid());
colnod.downloadData(1570190399259); colnod.downloadData(1570190399259);
QVERIFY(spy.wait()); QVERIFY(spy.wait());
QVERIFY(colnod.amountData == 0);
auto data = qvariant_cast<std::shared_ptr<Data>>(spy.at(0).at(0)); auto data = qvariant_cast<std::shared_ptr<Data>>(spy.at(0).at(0));
QVERIFY(data); QVERIFY(data);
@ -83,8 +90,8 @@ void ColnodTest::download_data_test_now()
QSignalSpy spy(&colnod, &ColnodAPI::downloadDataFinished); QSignalSpy spy(&colnod, &ColnodAPI::downloadDataFinished);
QVERIFY(spy.wait()); QVERIFY(spy.wait());
auto data = qvariant_cast<std::shared_ptr<Data>>(spy.at(0).at(0)); auto data = qvariant_cast<std::shared_ptr<Data>>(spy.at(0).at(0));
// No latest data
QVERIFY(data); QVERIFY(data);
QVERIFY(data->updatedTokens.isEmpty()); QVERIFY(data->updatedTokens.isEmpty());
} }