mirror of
https://gitlab.com/spaceti-app/integrations/acs/colnod-connector.git
synced 2026-07-12 14:30:50 +02:00
removing commented code + removing unnecessary signals
Adding check to RequestManager::processRequest ( void -> bool ) Nothing helped at alll -> same bug appears ( could be connected to Qt itself )
This commit is contained in:
parent
9f9ae6243c
commit
e60ba77d45
@ -1 +1 @@
|
|||||||
Subproject commit b643f25421757703b930d48a3c0175b7e9de1c72
|
Subproject commit 3640c0db5d1e24b314b00cc2b0dd61915080381b
|
||||||
@ -20,11 +20,16 @@ ColnodAPI::ColnodAPI(serversdk::RequestManager* reqMan, const bool &dryMode, QSt
|
|||||||
* @return signal with nullptr when something went wrong
|
* @return signal with nullptr when something went wrong
|
||||||
* @return signal with data when valid data returned
|
* @return signal with data when valid data returned
|
||||||
*/
|
*/
|
||||||
void ColnodAPI::downloadData(const qint64 &time)
|
bool ColnodAPI::downloadData(const qint64 &time)
|
||||||
{
|
{
|
||||||
// Have to get Login
|
// Have to get Login
|
||||||
auto login = requestLogin();
|
auto login = requestLogin();
|
||||||
Q_ASSERT(login);
|
Q_ASSERT(login);
|
||||||
|
if (login->networkReply() == nullptr) {
|
||||||
|
qCCritical(colnod) << "Not possible to create login request";
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
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) {
|
||||||
@ -48,23 +53,8 @@ void ColnodAPI::downloadData(const qint64 &time)
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
// NOTE: why?
|
|
||||||
// auto errorHandler = [=](const std::shared_ptr<serversdk::Request>& request){
|
|
||||||
// if (!checkRequest(request)) {
|
|
||||||
// qWarning(colnod) << "ERROR during calling" << request->url() << ", request unsuccessful";
|
|
||||||
// mValid = false;
|
|
||||||
// emit downloadDataFinished(nullptr); // TODO: think about it, will the other if passed?
|
|
||||||
// }
|
|
||||||
// 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
|
||||||
connect(this, &ColnodAPI::partOfDataReady, this, &ColnodAPI::areDataReady);
|
//connect(this, &ColnodAPI::partOfDataReady, this, &ColnodAPI::areDataReady);
|
||||||
|
|
||||||
Timestamp timestamp;
|
Timestamp timestamp;
|
||||||
timestamp.setTimestamp(time);
|
timestamp.setTimestamp(time);
|
||||||
@ -74,6 +64,17 @@ void ColnodAPI::downloadData(const qint64 &time)
|
|||||||
|
|
||||||
auto checkData = [&dataCount, &data, this]() {
|
auto checkData = [&dataCount, &data, this]() {
|
||||||
qDebug() << "check data" << dataCount;
|
qDebug() << "check data" << dataCount;
|
||||||
|
// FIX: Problem with ASSERT: "dataCount < 5" -> datacount sometime -> 32677 ( bad memory allocation )
|
||||||
|
// Not possible to pinpoint memory problem.
|
||||||
|
// Possible sources:
|
||||||
|
// 0) Bad code -> dataCount -> &dataCount -> ++ what it does. Increase dataCount or increment address?
|
||||||
|
// - have to double check this problem
|
||||||
|
// 1) ColnodAPI
|
||||||
|
// 2) RequestManager ( serversdk )
|
||||||
|
// 3) Problem with testing QtTest logic
|
||||||
|
// - try to change stack allocation to heap ( std::unique_ptr )
|
||||||
|
// - reason: Does not make sence but something else could appear
|
||||||
|
// 4) Lambda slots
|
||||||
if (dataCount > 5) {
|
if (dataCount > 5) {
|
||||||
qCCritical(colnod) << "check data cannnot be higher then 4";
|
qCCritical(colnod) << "check data cannnot be higher then 4";
|
||||||
}
|
}
|
||||||
@ -82,56 +83,52 @@ void ColnodAPI::downloadData(const qint64 &time)
|
|||||||
emit downloadDataFinished(data);
|
emit downloadDataFinished(data);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
// Getting tokens from ColnodAPI
|
||||||
auto tokensRequest = getTokensUpdated(timestamp);
|
auto tokensRequest = getTokensUpdated(timestamp);
|
||||||
// connect(tokensRequest.get(), &serversdk::Request::finished, errorHandler);
|
connect(tokensRequest.get(), &serversdk::Request::finished, [=](){
|
||||||
connect(tokensRequest.get(), &serversdk::Request::finished, [=, &dataCount](){
|
|
||||||
qDebug(colnod) << "tokens finished";
|
qDebug(colnod) << "tokens finished";
|
||||||
|
|
||||||
|
// false when not possible to load request data
|
||||||
if (!saveUpdatedTokens(data, tokensRequest->responseData())) {
|
if (!saveUpdatedTokens(data, tokensRequest->responseData())) {
|
||||||
emit downloadDataFinished(nullptr);
|
emit downloadDataFinished(nullptr);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
++dataCount;
|
|
||||||
checkData();
|
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, [=](){
|
||||||
connect(deletedTokensRequest.get(), &serversdk::Request::finished, [=, &dataCount](){
|
|
||||||
qDebug(colnod) << "tokens finished";
|
qDebug(colnod) << "tokens finished";
|
||||||
if (!saveDeletedTokens(data, deletedTokensRequest->responseData())) {
|
if (!saveDeletedTokens(data, deletedTokensRequest->responseData())) {
|
||||||
emit downloadDataFinished(nullptr);
|
emit downloadDataFinished(nullptr);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
++dataCount;
|
|
||||||
checkData();
|
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, [=](){
|
||||||
connect(subjectsRequest.get(), &serversdk::Request::finished, [=, &dataCount](){
|
|
||||||
qDebug(colnod) << "tokens finished";
|
qDebug(colnod) << "tokens finished";
|
||||||
if (!saveUpdatedSubjects(data, subjectsRequest->responseData())) {
|
if (!saveUpdatedSubjects(data, subjectsRequest->responseData())) {
|
||||||
emit downloadDataFinished(nullptr);
|
emit downloadDataFinished(nullptr);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
++dataCount;
|
|
||||||
checkData();
|
checkData();
|
||||||
});
|
});
|
||||||
|
|
||||||
auto deletedSubjectsRequest = getSubjectsDeleted(timestamp);
|
auto deletedSubjectsRequest = getSubjectsDeleted(timestamp);
|
||||||
// connect(deletedSubjectsRequest.get(), &serversdk::Request::finished, errorHandler);
|
connect(deletedSubjectsRequest.get(), &serversdk::Request::finished, [=](){
|
||||||
connect(deletedSubjectsRequest.get(), &serversdk::Request::finished, [=, &dataCount](){
|
|
||||||
qDebug(colnod) << "tokens finished";
|
qDebug(colnod) << "tokens finished";
|
||||||
saveDeletedSubjects(data, deletedSubjectsRequest->responseData());
|
if (!saveDeletedSubjects(data, deletedSubjectsRequest->responseData())) {
|
||||||
++dataCount;
|
emit downloadDataFinished(nullptr);
|
||||||
|
return;
|
||||||
|
}
|
||||||
checkData();
|
checkData();
|
||||||
// emit partOfDataReady(data);
|
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
void ColnodAPI::processData(const std::shared_ptr<Data> &data)
|
void ColnodAPI::processData(const std::shared_ptr<Data> &data)
|
||||||
|
|||||||
@ -41,10 +41,10 @@ class ColnodAPI: public QObject
|
|||||||
Q_OBJECT
|
Q_OBJECT
|
||||||
friend class ColnodTest;
|
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");
|
||||||
|
|
||||||
void downloadData(const qint64 &time);
|
bool downloadData(const qint64 &time);
|
||||||
void processData(const std::shared_ptr<Data> &data);
|
void processData(const std::shared_ptr<Data> &data);
|
||||||
|
|
||||||
// New approach
|
// New approach
|
||||||
@ -91,7 +91,7 @@ private:
|
|||||||
|
|
||||||
signals:
|
signals:
|
||||||
void downloadDataFinished(std::shared_ptr<Data> = std::shared_ptr<Data>());
|
void downloadDataFinished(std::shared_ptr<Data> = std::shared_ptr<Data>());
|
||||||
void partOfDataReady(std::shared_ptr<Data> = std::shared_ptr<Data>());
|
// void partOfDataReady(std::shared_ptr<Data> = std::shared_ptr<Data>());
|
||||||
void partOfDataProcessFinished();
|
void partOfDataProcessFinished();
|
||||||
void dataProcessFinished();
|
void dataProcessFinished();
|
||||||
|
|
||||||
|
|||||||
@ -69,7 +69,7 @@ void ColnodTest::download_test()
|
|||||||
|
|
||||||
QSignalSpy spy(&colnod, &ColnodAPI::downloadDataFinished);
|
QSignalSpy spy(&colnod, &ColnodAPI::downloadDataFinished);
|
||||||
QVERIFY(spy.isValid());
|
QVERIFY(spy.isValid());
|
||||||
colnod.downloadData(1570190399259);
|
QVERIFY(colnod.downloadData(1570190399259));
|
||||||
QVERIFY(spy.wait());
|
QVERIFY(spy.wait());
|
||||||
QVERIFY(colnod.amountData == 0);
|
QVERIFY(colnod.amountData == 0);
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user