From 7230a07085fbf55431f09f8e5178ab0024e16d24 Mon Sep 17 00:00:00 2001 From: Dario Date: Mon, 30 Nov 2020 09:51:04 +0100 Subject: [PATCH] check also grup table for group url if no node server entry exist --- src/cpp/controller/User.cpp | 10 +++++++++- src/cpp/tasks/HederaTask.cpp | 3 ++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/src/cpp/controller/User.cpp b/src/cpp/controller/User.cpp index e639b29cd..19be115c8 100644 --- a/src/cpp/controller/User.cpp +++ b/src/cpp/controller/User.cpp @@ -8,6 +8,7 @@ #include "../SingletonManager/SingletonTaskObserver.h" #include "NodeServer.h" +#include "Group.h" #include "../lib/DataTypeConverter.h" @@ -529,7 +530,14 @@ namespace controller { auto model = getModel(); if (!model->getGroupId()) return ServerConfig::g_php_serverPath; auto servers = controller::NodeServer::load(model::table::NODE_SERVER_GRADIDO_COMMUNITY, model->getGroupId()); - if (!servers.size()) return ServerConfig::g_php_serverPath; + if (!servers.size()) { + auto group = controller::Group::load(model->getGroupId()); + if (!group.isNull()) { + mGroupBaseUrl = group->getModel()->getUrl(); + return mGroupBaseUrl; + } + return ServerConfig::g_php_serverPath; + } if (servers.size() > 1) { auto em = ErrorManager::getInstance(); em->addError(new ParamError(function_name, "error, more than one community server found for group", model->getGroupId())); diff --git a/src/cpp/tasks/HederaTask.cpp b/src/cpp/tasks/HederaTask.cpp index 55273ee05..07d13c841 100644 --- a/src/cpp/tasks/HederaTask.cpp +++ b/src/cpp/tasks/HederaTask.cpp @@ -140,7 +140,8 @@ int HederaTask::tryQueryReceipt() } else { if (response.getResponseCode() == proto::NOT_SUPPORTED) { - + addError(new ParamError(function_name, "query in json-format:", query->toJsonString())); + //query->toJsonString() return -3; } mLastCheck = Poco::Timestamp();