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

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

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