IT4Change/gradido
3
0
Fork 0
mirror of https://github.com/IT4Change/gradido.git synced 2025-12-13 07:45:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

show both transaction json by sending cross group transaction

Browse Source
This commit is contained in:
einhornimmond 2021-02-08 08:31:02 +01:00 committed by Ulf Gebhardt
parent 95cb35129b
commit 1865e9e814
No known key found for this signature in database
GPG Key ID: 81308EFE29ABFEBD
4 changed files with 38 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
src/cpp/HTTPInterface/AdminNodeServerTestPage.cpp
View File

@ -718,33 +718,45 @@ void AdminNodeServerTestPage::handleRequest(Poco::Net::HTTPServerRequest& reques
Poco::Thread::sleep(sleep_ms_between_transactions); Poco::Thread::sleep(sleep_ms_between_transactions);
transaction6[0]->sign(user_2); transaction6[0]->sign(user_2);
auto transaction6_json = transaction6[0]->getTransactionAsJson(true); auto transaction6_json = transaction6[0]->getTransactionAsJson(true);
auto paired_transaction = transaction6[0]->getPairedTransaction();
responseStream << "\n"; responseStream << "\n";
responseStream << "\t\t\t\t\t<p>"; responseStream << "\t\t\t\t\t<p>";
#line 357 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminNodeServerTest.cpsp" #line 358 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminNodeServerTest.cpsp"
responseStream << ( DataTypeConverter::replaceNewLineWithBr(transaction6_json) ); responseStream << ( DataTypeConverter::replaceNewLineWithBr(transaction6_json) );
responseStream << "</p>\t\t\n"; responseStream << "</p>\t\t\n";
responseStream << "\t\t\t\t\t";
#line 359 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminNodeServerTest.cpsp"
if(!paired_transaction.isNull()) {
auto transaction6_2_json = paired_transaction->getTransactionAsJson(true);
responseStream << "<p>";
#line 361 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminNodeServerTest.cpsp"
responseStream << ( DataTypeConverter::replaceNewLineWithBr(transaction6_2_json) );
responseStream << "</p>\n";
responseStream << "\t\t\t\t\t";
#line 362 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminNodeServerTest.cpsp"
} responseStream << "\n";
responseStream << "\t\t\t\t"; responseStream << "\t\t\t\t";
#line 358 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminNodeServerTest.cpsp" #line 363 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminNodeServerTest.cpsp"
} responseStream << "\n"; } responseStream << "\n";
responseStream << "\t\t\t"; responseStream << "\t\t\t";
#line 359 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminNodeServerTest.cpsp" #line 364 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminNodeServerTest.cpsp"
} responseStream << " \n"; } responseStream << " \n";
responseStream << "\t\t\t<p>Time: "; responseStream << "\t\t\t<p>Time: ";
#line 360 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminNodeServerTest.cpsp" #line 365 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminNodeServerTest.cpsp"
responseStream << ( time2.string() ); responseStream << ( time2.string() );
responseStream << "</p>\n"; responseStream << "</p>\n";
responseStream << "\t\t</li>\n"; responseStream << "\t\t</li>\n";
responseStream << "\t\t<li>\n"; responseStream << "\t\t<li>\n";
responseStream << "\t\t\t<p>8. Wait "; responseStream << "\t\t\t<p>8. Wait ";
#line 363 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminNodeServerTest.cpsp" #line 368 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminNodeServerTest.cpsp"
responseStream << ( hedera_timeout ); responseStream << ( hedera_timeout );
responseStream << " seconds to give hedera time to process transactions</p>\n"; responseStream << " seconds to give hedera time to process transactions</p>\n";
responseStream << "\t\t\t"; responseStream << "\t\t\t";
#line 364 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminNodeServerTest.cpsp" #line 369 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminNodeServerTest.cpsp"
if(!steps[6]) { responseStream << "\n"; if(!steps[6]) { responseStream << "\n";
responseStream << "\t\t\t\t<p>skipped</p>\n"; responseStream << "\t\t\t\t<p>skipped</p>\n";
responseStream << "\t\t\t"; responseStream << "\t\t\t";
#line 366 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminNodeServerTest.cpsp" #line 371 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminNodeServerTest.cpsp"
} else { } else {
Poco::Thread::sleep(hedera_timeout * 1000); Poco::Thread::sleep(hedera_timeout * 1000);
} responseStream << "\n"; } responseStream << "\n";
@ -752,12 +764,12 @@ void AdminNodeServerTestPage::handleRequest(Poco::Net::HTTPServerRequest& reques
responseStream << "\t\t<li>\n"; responseStream << "\t\t<li>\n";
responseStream << "\t\t\t<p>9. Ask choosen node for transaction and print result</p>\n"; responseStream << "\t\t\t<p>9. Ask choosen node for transaction and print result</p>\n";
responseStream << "\t\t\t"; responseStream << "\t\t\t";
#line 372 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminNodeServerTest.cpsp" #line 377 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminNodeServerTest.cpsp"
time2.reset(); time2.reset();
if(!steps[7] || node_server.isNull()) { if(!steps[7] || node_server.isNull()) {
responseStream << "<p>skipped</p>\n"; responseStream << "<p>skipped</p>\n";
responseStream << "\t\t\t"; responseStream << "\t\t\t";
#line 375 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminNodeServerTest.cpsp" #line 380 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminNodeServerTest.cpsp"
} else { } else {
auto node_server_model = node_server->getModel(); auto node_server_model = node_server->getModel();
JsonRPCRequest jsonrpc(node_server_model->getUrl(), node_server_model->getPort()); JsonRPCRequest jsonrpc(node_server_model->getUrl(), node_server_model->getPort());
@ -770,20 +782,20 @@ void AdminNodeServerTestPage::handleRequest(Poco::Net::HTTPServerRequest& reques
Poco::JSON::Stringifier::stringify(gn_answear, ss, 4, -1, Poco::JSON_PRESERVE_KEY_ORDER); Poco::JSON::Stringifier::stringify(gn_answear, ss, 4, -1, Poco::JSON_PRESERVE_KEY_ORDER);
std::string answear_string = ss.str(); responseStream << "\n"; std::string answear_string = ss.str(); responseStream << "\n";
responseStream << "\t\t\t\t\t"; responseStream << "\t\t\t\t\t";
#line 386 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminNodeServerTest.cpsp" #line 391 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminNodeServerTest.cpsp"
responseStream << ( DataTypeConverter::replaceNewLineWithBr(answear_string) ); responseStream << ( DataTypeConverter::replaceNewLineWithBr(answear_string) );
#line 386 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminNodeServerTest.cpsp" #line 391 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminNodeServerTest.cpsp"
} }
} responseStream << "\n"; } responseStream << "\n";
responseStream << "\t\t\t<p>Time: "; responseStream << "\t\t\t<p>Time: ";
#line 389 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminNodeServerTest.cpsp" #line 394 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminNodeServerTest.cpsp"
responseStream << ( time2.string() ); responseStream << ( time2.string() );
responseStream << "</p>\n"; responseStream << "</p>\n";
responseStream << "\t\t</li>\n"; responseStream << "\t\t</li>\n";
responseStream << "\t</ul>\n"; responseStream << "\t</ul>\n";
responseStream << "\t"; responseStream << "\t";
#line 392 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminNodeServerTest.cpsp" #line 397 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminNodeServerTest.cpsp"
} else if(PAGE_GET_TRANSACTION_RPC_CALL == page && !node_server.isNull()) { } else if(PAGE_GET_TRANSACTION_RPC_CALL == page && !node_server.isNull()) {
Profiler time3; Profiler time3;
auto node_server_model = node_server->getModel(); auto node_server_model = node_server->getModel();
@ -798,23 +810,23 @@ void AdminNodeServerTestPage::handleRequest(Poco::Net::HTTPServerRequest& reques
Poco::JSON::Stringifier::stringify(gn_answear, ss, 4, -1, Poco::JSON_PRESERVE_KEY_ORDER); Poco::JSON::Stringifier::stringify(gn_answear, ss, 4, -1, Poco::JSON_PRESERVE_KEY_ORDER);
std::string answear_string = ss.str(); responseStream << "\n"; std::string answear_string = ss.str(); responseStream << "\n";
responseStream << "\t\t\t"; responseStream << "\t\t\t";
#line 405 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminNodeServerTest.cpsp" #line 410 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminNodeServerTest.cpsp"
responseStream << ( DataTypeConverter::replaceNewLineWithBr(answear_string) ); responseStream << ( DataTypeConverter::replaceNewLineWithBr(answear_string) );
#line 405 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminNodeServerTest.cpsp" #line 410 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminNodeServerTest.cpsp"
} }
responseStream << "\n"; responseStream << "\n";
responseStream << "\t\t<p>Time: "; responseStream << "\t\t<p>Time: ";
#line 408 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminNodeServerTest.cpsp" #line 413 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminNodeServerTest.cpsp"
responseStream << ( time3.string() ); responseStream << ( time3.string() );
responseStream << "</p>\n"; responseStream << "</p>\n";
responseStream << "\t"; responseStream << "\t";
#line 409 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminNodeServerTest.cpsp" #line 414 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminNodeServerTest.cpsp"
} responseStream << "\n"; } responseStream << "\n";
responseStream << "\t\n"; responseStream << "\t\n";
responseStream << "</div>\n"; responseStream << "</div>\n";
responseStream << "<script type=\"text/javascript\" src=\""; responseStream << "<script type=\"text/javascript\" src=\"";
#line 412 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminNodeServerTest.cpsp" #line 417 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminNodeServerTest.cpsp"
responseStream << ( ServerConfig::g_php_serverPath ); responseStream << ( ServerConfig::g_php_serverPath );
responseStream << "/js/tabs.js\"></script>\n"; responseStream << "/js/tabs.js\"></script>\n";
// begin include footer.cpsp // begin include footer.cpsp

1
src/cpp/model/gradido/Transaction.cpp
View File

@ -412,6 +412,7 @@ namespace model {
if (!transaction.isNull()) { if (!transaction.isNull()) {
transaction->sign(user); transaction->sign(user);
// dirty hack because gn crashes if its get transactions out of order // dirty hack because gn crashes if its get transactions out of order
mPairedTransaction = transaction;
Poco::Thread::sleep(1000); Poco::Thread::sleep(1000);
} }
else { else {

3
src/cpp/model/gradido/Transaction.h
View File

@ -60,12 +60,13 @@ namespace model {
bool needSomeoneToSign(Poco::AutoPtr<controller::User> user); bool needSomeoneToSign(Poco::AutoPtr<controller::User> user);
std::string getTransactionAsJson(bool replaceBase64WithHex = false); std::string getTransactionAsJson(bool replaceBase64WithHex = false);
inline Poco::AutoPtr<Transaction> getPairedTransaction() { return mPairedTransaction; }
bool setTopicIdByGroup(const std::string& alias); bool setTopicIdByGroup(const std::string& alias);
protected: protected:
Poco::AutoPtr<Transaction> mPairedTransaction;
Poco::AutoPtr<TransactionBody> mTransactionBody; Poco::AutoPtr<TransactionBody> mTransactionBody;
proto::gradido::GradidoTransaction mProtoTransaction; proto::gradido::GradidoTransaction mProtoTransaction;

5
src/cpsp/adminNodeServerTest.cpsp
View File

@ -353,8 +353,13 @@ enum PageType
Poco::Thread::sleep(sleep_ms_between_transactions); Poco::Thread::sleep(sleep_ms_between_transactions);
transaction6[0]->sign(user_2); transaction6[0]->sign(user_2);
auto transaction6_json = transaction6[0]->getTransactionAsJson(true); auto transaction6_json = transaction6[0]->getTransactionAsJson(true);
auto paired_transaction = transaction6[0]->getPairedTransaction();
%> %>
<p><%= DataTypeConverter::replaceNewLineWithBr(transaction6_json) %></p> <p><%= DataTypeConverter::replaceNewLineWithBr(transaction6_json) %></p>
<% if(!paired_transaction.isNull()) {
auto transaction6_2_json = paired_transaction->getTransactionAsJson(true);
%><p><%= DataTypeConverter::replaceNewLineWithBr(transaction6_2_json) %></p>
<% } %>
<% } %> <% } %>
<% } %> <% } %>
<p>Time: <%= time2.string() %></p> <p>Time: <%= time2.string() %></p>