bent/BeetRound
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Minor refactoring to move JSON processing into JsonParser.

Browse Source
This commit is contained in:
Bent Witthold
2026-02-19 11:02:10 +01:00
parent 4519a2de3f
commit 21b8de96d8
3 changed files with 34 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
libs/BeetRoundCore/formats/jsonparser.cpp
View File

@ -90,6 +90,22 @@ QByteArray JsonParser::ToJsonObject(const QHash<QString, QVariant>& values,
return jsonDoc.toJson(QJsonDocument::Compact); return jsonDoc.toJson(QJsonDocument::Compact);
} }
ModelItemValues JsonParser::serverUserCredentialsToItemValues(const QJsonDocument& jsonDoc) {
ModelItemValues values;
const QJsonObject rootObject = jsonDoc["data"].toObject();
const QString emailAddress = rootObject["email"].toString();
const QString uuid = rootObject["id"].toString();
const QString token = rootObject["token"].toString();
values.insert(MailRole, emailAddress);
values.insert(OnlineIdRole, uuid);
values.insert(AccessCodeRole, token);
return values;
}
QJsonArray JsonParser::extractItemArray(const QJsonDocument& doc, const QString& objectName) { QJsonArray JsonParser::extractItemArray(const QJsonDocument& doc, const QString& objectName) {
QJsonArray itemArray; QJsonArray itemArray;
if (objectName.isEmpty()) { if (objectName.isEmpty()) {
@ -101,8 +117,6 @@ QJsonArray JsonParser::extractItemArray(const QJsonDocument& doc, const QString&
return itemArray; return itemArray;
} }
JsonParser::JsonParser() {}
ModelItemValues JsonParser::jsonObjectToItemValues(const QJsonObject& itemJsonObject) { ModelItemValues JsonParser::jsonObjectToItemValues(const QJsonObject& itemJsonObject) {
ModelItemValues values; ModelItemValues values;
@ -115,6 +129,8 @@ ModelItemValues JsonParser::jsonObjectToItemValues(const QJsonObject& itemJsonOb
return values; return values;
} }
JsonParser::JsonParser() {}
pair<int, QVariant> JsonParser::getKeyValuePair(const QJsonObject& itemJsonObject, const int role) { pair<int, QVariant> JsonParser::getKeyValuePair(const QJsonObject& itemJsonObject, const int role) {
QVariant result; QVariant result;
const QJsonValue jsonValue = itemJsonObject[ROLE_NAMES.value(role)]; const QJsonValue jsonValue = itemJsonObject[ROLE_NAMES.value(role)];

11
libs/BeetRoundCore/formats/jsonparser.h
View File

@ -21,12 +21,19 @@ class JsonParser {
static QByteArray ToJsonObject(const QHash<QString, QVariant>& Values, static QByteArray ToJsonObject(const QHash<QString, QVariant>& Values,
const QString& objectName = ""); const QString& objectName = "");
private: static ModelItemValues serverUserCredentialsToItemValues(const QJsonDocument& jsonDoc);
explicit JsonParser();
// static ModelItemValues parseServerResponse(const QJsonDocument& jsonDoc,
// QHash<QString, int> entries);
// static ModelItemValues parseServerResponse(const QJsonObject& object,
// QHash<QString, int> entries);
static QJsonArray extractItemArray(const QJsonDocument& doc, const QString& objectName); static QJsonArray extractItemArray(const QJsonDocument& doc, const QString& objectName);
static ModelItemValues jsonObjectToItemValues(const QJsonObject& itemJsonObject); static ModelItemValues jsonObjectToItemValues(const QJsonObject& itemJsonObject);
private:
explicit JsonParser();
static pair<int, QVariant> getKeyValuePair(const QJsonObject& itemJsonObject, const int role); static pair<int, QVariant> getKeyValuePair(const QJsonObject& itemJsonObject, const int role);
}; };

13
libs/BeetRoundCore/network/servercommunicator.cpp
View File

@ -5,6 +5,7 @@
#include <QRestAccessManager> #include <QRestAccessManager>
#include <QRestReply> #include <QRestReply>
#include "../formats/jsonparser.h"
#include "../genericcore.h" #include "../genericcore.h"
#include "../structs.h" #include "../structs.h"
#include "apiroutes.h" #include "apiroutes.h"
@ -198,6 +199,9 @@ void ServerCommunicator::onPostReplyFailure(const PostRequestTypes type,
void ServerCommunicator::currentBiddingRoundChangedReply(const QJsonDocument jsonDoc) { void ServerCommunicator::currentBiddingRoundChangedReply(const QJsonDocument jsonDoc) {
qInfo() << "Current bidding round received."; qInfo() << "Current bidding round received.";
// REFACTOR implement & use "JsonParser::parseServerResponse(const QJsonDocument& jsonDoc,
// QHash<QString, int> entries)" (generalized version of
// "serverUserCredentialsToItemValues")
const QJsonObject rootObject = jsonDoc["data"].toObject(); const QJsonObject rootObject = jsonDoc["data"].toObject();
const int roundNumber = rootObject["round_number"].toInt(); const int roundNumber = rootObject["round_number"].toInt();
const bool stopped = rootObject["stopped"].toBool(); const bool stopped = rootObject["stopped"].toBool();
@ -224,11 +228,8 @@ void ServerCommunicator::currentBiddingsReply(const QJsonDocument jsonDoc) {
void ServerCommunicator::onlineUserAccountReply(const QJsonDocument jsonDoc) { void ServerCommunicator::onlineUserAccountReply(const QJsonDocument jsonDoc) {
qInfo() << "Online user account received."; qInfo() << "Online user account received.";
// TODO move data extraction of jsonDoc into JsonParser ModelItemValues values = JsonParser::serverUserCredentialsToItemValues(jsonDoc);
const QJsonObject rootObject = jsonDoc["data"].toObject();
const QString emailAddress = rootObject["email"].toString();
const QString uuid = rootObject["id"].toString();
const QString token = rootObject["token"].toString();
emit onlineUserAccountReceived(emailAddress, uuid, token); emit onlineUserAccountReceived(values[MailRole].toString(), values[OnlineIdRole].toString(),
values[AccessCodeRole].toString());
} }