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

create group member update transaction from user update group page, fix some minor things

Browse Source
This commit is contained in:
Dario 2020-10-19 16:35:04 +02:00 committed by Ulf Gebhardt
parent 28926b9507
commit d8035cac3d
No known key found for this signature in database
GPG Key ID: 81308EFE29ABFEBD
8 changed files with 183 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

97
src/cpp/HTTPInterface/UserUpdateGroupPage.cpp
View File

@ -10,6 +10,9 @@
#include "../controller/Group.h"
#include "../SingletonManager/SessionManager.h"
#include "../SingletonManager/PendingTasksManager.h"
#include "../lib/DataTypeConverter.h"
#include "../model/gradido/Transaction.h"
enum PageState {
PAGE_STATE_OVERVIEW,
@ -35,17 +38,61 @@ void UserUpdateGroupPage::handleRequest(Poco::Net::HTTPServerRequest& request, P
if (_compressResponse) response.set("Content-Encoding", "gzip");
Poco::Net::HTMLForm form(request, request.stream());
#line 17 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\userUpdateGroup.cpsp"
#line 20 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\userUpdateGroup.cpsp"
const char* pageName = gettext("Gruppe wählen");
auto user = mSession->getNewUser();
auto sm = SessionManager::getInstance();
auto pt = PendingTasksManager::getInstance();
PageState state = PAGE_STATE_OVERVIEW;
auto groups = controller::Group::listAll();
if(!form.empty()) {
auto group_id_string = form.get("group_id", "");
if(group_id_string == "") {
addError(new Error(gettext("Fehler"), gettext("HTML Form Fehler")));
} else {
int group_id = 0;
if(DataTypeConverter::NUMBER_PARSE_OKAY == DataTypeConverter::strToInt(group_id_string, group_id)) {
std::string group_alias = "";
Poco::AutoPtr<controller::Group> choosen_group;
for(auto it = groups.begin(); it != groups.end(); it++) {
auto group_model = (*it)->getModel();
if(group_model->getID() == group_id) {
choosen_group = *it;
}
}
if(choosen_group.isNull()) {
addError(new Error(gettext("Fehler"), gettext("Interner Fehler")));
} else {
auto addGroupMemberTransaction =
model::gradido::Transaction::create(user, choosen_group);
response.redirect(ServerConfig::g_serverPath + "/checkTransactions");
return;
state = PAGE_STATE_REQUEST_IS_RUNNING;
}
} else {
addError(new Error(gettext("Fehler"), gettext("HTML Value Type Fehler")));
}
}
} else {
pt->lock("userUpdateGroup Page");
if(pt->hasPendingTask(user, model::table::TASK_TYPE_GROUP_ADD_MEMBER)) {
state = PAGE_STATE_REQUEST_IS_RUNNING;
std::vector<Poco::AutoPtr<controller::PendingTask>> tasks = pt->getPendingTasks(user, model::table::TASK_TYPE_GROUP_ADD_MEMBER);
// should be only one
Poco::AutoPtr<model::gradido::Transaction> transaction = tasks[0].cast<model::gradido::Transaction>();
if(transaction->getSignCount() == 0) {
response.redirect(ServerConfig::g_serverPath + "/checkTransactions");
return;
}
}
pt->unlock();
}
auto groups = controller::Group::listAll();
#line 3 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\header.cpsp"
@ -105,79 +152,93 @@ void UserUpdateGroupPage::handleRequest(Poco::Net::HTTPServerRequest& request, P
responseStream << " </div>";
// end include header.cpsp
responseStream << "\n";
#line 30 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\userUpdateGroup.cpsp"
#line 77 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\userUpdateGroup.cpsp"
responseStream << ( getErrorsHtml() );
responseStream << "\n";
responseStream << "<div class=\"content-list\">\n";
responseStream << "\t";
#line 32 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\userUpdateGroup.cpsp"
#line 79 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\userUpdateGroup.cpsp"
if(PAGE_STATE_OVERVIEW == state ) { responseStream << "\n";
responseStream << " <div class=\"content-list-title\">\n";
responseStream << " <h1>";
#line 34 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\userUpdateGroup.cpsp"
#line 81 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\userUpdateGroup.cpsp"
responseStream << ( gettext("Gruppe wählen") );
responseStream << "</h1>\n";
responseStream << " </div>\n";
responseStream << "\t<p>";
#line 36 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\userUpdateGroup.cpsp"
#line 83 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\userUpdateGroup.cpsp"
responseStream << ( gettext("Bitte wähle die Gruppe/Gemeinschaft aus, zu der du gehörst.") );
responseStream << "</p>\n";
responseStream << "\t<p>";
#line 37 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\userUpdateGroup.cpsp"
#line 84 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\userUpdateGroup.cpsp"
responseStream << ( gettext("Du bekommst eine Bestätigungsmail, nachdem dein Beitritt bestätigt wurde.") );
responseStream << "</p>\n";
responseStream << "\t<form method=\"POST\">\n";
responseStream << "\t\t<div class=\"content-list-table\">\n";
responseStream << "\t\t\t<div class=\"row\">\n";
responseStream << "\t\t\t\t<div class=\"cell header-cell c1\">";
#line 41 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\userUpdateGroup.cpsp"
#line 88 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\userUpdateGroup.cpsp"
responseStream << ( gettext("Auswahl") );
responseStream << "</div>\n";
responseStream << "\t\t\t\t<div class=\"cell header-cell c2\">Name</div>\n";
responseStream << "\t\t\t\t<div class=\"cell header-cell c2\">Alias</div>\n";
responseStream << "\t\t\t\t<div class=\"cell header-cell c3\">Url</div>\n";
responseStream << "\t\t\t\t<div class=\"cell header-cell c5\">";
#line 45 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\userUpdateGroup.cpsp"
#line 92 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\userUpdateGroup.cpsp"
responseStream << ( gettext("Description") );
responseStream << "</div>\n";
responseStream << "\t\t\t</div>\n";
responseStream << "\t\t\t";
#line 47 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\userUpdateGroup.cpsp"
#line 94 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\userUpdateGroup.cpsp"
for(auto it = groups.begin(); it != groups.end(); it++) {
auto group_model = (*it)->getModel(); responseStream << "\n";
responseStream << "\t\t\t\t<div class=\"row\">\n";
responseStream << "\t\t\t\t\t<div class=\"cell c1\"><input type=\"radio\" class=\"form-control\" name=\"group_id\" value=\"";
#line 50 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\userUpdateGroup.cpsp"
#line 97 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\userUpdateGroup.cpsp"
responseStream << ( group_model->getID());
responseStream << "\" /></div>\n";
responseStream << "\t\t\t\t\t<div class=\"cell c2\">";
#line 51 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\userUpdateGroup.cpsp"
#line 98 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\userUpdateGroup.cpsp"
responseStream << ( group_model->getName() );
responseStream << "</div>\n";
responseStream << "\t\t\t\t\t<div class=\"cell c2\">";
#line 52 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\userUpdateGroup.cpsp"
#line 99 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\userUpdateGroup.cpsp"
responseStream << ( group_model->getAlias() );
responseStream << "</div>\n";
responseStream << "\t\t\t\t\t<div class=\"cell c3\">";
#line 53 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\userUpdateGroup.cpsp"
#line 100 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\userUpdateGroup.cpsp"
responseStream << ( group_model->getUrl() );
responseStream << "</div>\n";
responseStream << "\t\t\t\t\t<div class=\"cell c5\">";
#line 54 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\userUpdateGroup.cpsp"
#line 101 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\userUpdateGroup.cpsp"
responseStream << ( group_model->getDescription());
responseStream << "</div>\n";
responseStream << "\t\t\t\t</div>\n";
responseStream << "\t\t\t";
#line 56 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\userUpdateGroup.cpsp"
#line 103 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\userUpdateGroup.cpsp"
} responseStream << "\n";
responseStream << "\t\t\t<input class=\"grd-form-bn grd-form-bn-succeed grd_clickable\" type=\"submit\" name=\"submit\" value=\"";
#line 57 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\userUpdateGroup.cpsp"
#line 104 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\userUpdateGroup.cpsp"
responseStream << ( gettext("Beitrittsanfrage senden") );
responseStream << "\"/>\n";
responseStream << "\t\t</div>\n";
responseStream << "\t</form>\n";
responseStream << "\t";
#line 60 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\userUpdateGroup.cpsp"
#line 107 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\userUpdateGroup.cpsp"
} else if(PAGE_STATE_REQUEST_IS_RUNNING == state) { responseStream << "\n";
responseStream << "\t\t<p>";
#line 108 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\userUpdateGroup.cpsp"
responseStream << ( gettext("Deine Beitrittsanfrage wird bearbeitet, du bekommst eine E-Mail wenn sie bestätigt oder abgelehnt wurde.") );
responseStream << "</p>\n";
responseStream << "\t\t<p><a href=\"";
#line 109 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\userUpdateGroup.cpsp"
responseStream << ( ServerConfig::g_serverPath );
responseStream << "/logout\">";
#line 109 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\userUpdateGroup.cpsp"
responseStream << ( gettext("Abmelden") );
responseStream << "</a></p>\n";
responseStream << "\t";
#line 110 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\userUpdateGroup.cpsp"
} responseStream << "\n";
responseStream << "</div>\n";
// begin include footer.cpsp

42
src/cpp/SingletonManager/PendingTasksManager.cpp
View File

@ -64,4 +64,44 @@ const PendingTasksManager::PendingTaskList* PendingTasksManager::getTaskListForU
return it->second;
}
return nullptr;
}
}
bool PendingTasksManager::hasPendingTask(Poco::AutoPtr<controller::User> user, model::table::TaskType type)
{
auto model = user->getModel();
int user_id = model->getID();
Poco::ScopedLock<Poco::Mutex> _lock(mWorkMutex);
auto it = mPendingTasks.find(user_id);
if (it != mPendingTasks.end()) {
auto task_list = it->second;
for (auto task = task_list->begin(); task != task_list->end(); it++) {
auto task_model = (*task)->getModel();
if (type == task_model->getTaskType()) {
return true;
}
}
}
return false;
}
std::vector<Poco::AutoPtr<controller::PendingTask>> PendingTasksManager::getPendingTasks(Poco::AutoPtr<controller::User> user, model::table::TaskType type)
{
auto model = user->getModel();
int user_id = model->getID();
Poco::ScopedLock<Poco::Mutex> _lock(mWorkMutex);
std::vector<Poco::AutoPtr<controller::PendingTask>> results;
auto it = mPendingTasks.find(user_id);
if (it != mPendingTasks.end()) {
auto task_list = it->second;
results.reserve(task_list->size());
for (auto taskIt = task_list->begin(); taskIt != task_list->end(); taskIt++) {
auto task_model = (*taskIt)->getModel();
if (type == task_model->getTaskType()) {
results.push_back(*taskIt);
}
}
}
return results;
}

3
src/cpp/SingletonManager/PendingTasksManager.h
View File

@ -14,6 +14,7 @@
#define GRADIDO_LOGIN_SERVER_SINGLETON_MANAGER_PENDING_TASKS_MANAGER
#include "../controller/PendingTask.h"
#include "../controller/User.h"
class PendingTasksManager: public UniLib::lib::MultithreadContainer
{
@ -35,6 +36,8 @@ public:
//! and unlock afterwards
//! \return list or nullptr if no list for user exist
const PendingTaskList* getTaskListForUser(int userId) const;
bool hasPendingTask(Poco::AutoPtr<controller::User> user, model::table::TaskType type);
std::vector<Poco::AutoPtr<controller::PendingTask>> getPendingTasks(Poco::AutoPtr<controller::User> user, model::table::TaskType type);
protected:
PendingTasksManager();

3
src/cpp/controller/User.h
View File

@ -143,6 +143,9 @@ namespace controller {
inline void setBalance(int gradidoBalance) { std::unique_lock<std::shared_mutex> _lock(mSharedMutex); mGradidoCurrentBalance = gradidoBalance; }
inline int getBalance() { std::shared_lock<std::shared_mutex> _lock(mSharedMutex); return mGradidoCurrentBalance; }
// connection to other tables
protected:

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

@ -39,6 +39,7 @@ namespace model {
{
// no current user in group, at least login server known, so we need only one signature for transaction
// TODO: maybe check with node server, but maybe it isn't necessary
// check sequence number in topic db entry, should be <= 1
mMinSignatureCount = 1;
}

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

@ -7,7 +7,9 @@ namespace model {
Transaction::Transaction(Poco::AutoPtr<TransactionBody> body)
: mTransactionBody(body), mBodyBytesHash(0)
{
auto body_bytes = mTransactionBody->getBodyBytes();
mBodyBytesHash = DRMakeStringHash(body_bytes.data(), body_bytes.size());
mProtoTransaction.set_body_bytes(body_bytes);
}
Transaction::Transaction(const std::string& protoMessageBin, model::table::PendingTask* dbModel)
@ -63,7 +65,7 @@ namespace model {
}
model->setUserId(user->getModel()->getID());
model->setTaskType(type);
model->setRequest(mProtoTransaction.body_bytes());
model->setRequest(mProtoTransaction.SerializeAsString());
if (!model->insertIntoDB(true)) {
return false;
}

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

@ -29,6 +29,7 @@ namespace model {
static Poco::AutoPtr<Transaction> load(model::table::PendingTask* dbModel);
bool addSign(Poco::AutoPtr<controller::User> user);
int getSignCount() { return mProtoTransaction.sig_map().sigpair_size(); }
TransactionValidation validate();
inline Poco::AutoPtr<TransactionBody> getTransactionBody() { Poco::ScopedLock<Poco::Mutex> _lock(mWorkMutex); return mTransactionBody; }

52
src/cpsp/userUpdateGroup.cpsp
View File

@ -7,6 +7,9 @@
#include "../controller/Group.h"
#include "../SingletonManager/SessionManager.h"
#include "../SingletonManager/PendingTasksManager.h"
#include "../lib/DataTypeConverter.h"
#include "../model/gradido/Transaction.h"
enum PageState {
PAGE_STATE_OVERVIEW,
@ -18,12 +21,56 @@ enum PageState {
const char* pageName = gettext("Gruppe wählen");
auto user = mSession->getNewUser();
auto sm = SessionManager::getInstance();
auto pt = PendingTasksManager::getInstance();
PageState state = PAGE_STATE_OVERVIEW;
auto groups = controller::Group::listAll();
if(!form.empty()) {
auto group_id_string = form.get("group_id", "");
if(group_id_string == "") {
addError(new Error(gettext("Fehler"), gettext("HTML Form Fehler")));
} else {
int group_id = 0;
if(DataTypeConverter::NUMBER_PARSE_OKAY == DataTypeConverter::strToInt(group_id_string, group_id)) {
std::string group_alias = "";
Poco::AutoPtr<controller::Group> choosen_group;
for(auto it = groups.begin(); it != groups.end(); it++) {
auto group_model = (*it)->getModel();
if(group_model->getID() == group_id) {
choosen_group = *it;
}
}
if(choosen_group.isNull()) {
addError(new Error(gettext("Fehler"), gettext("Interner Fehler")));
} else {
auto addGroupMemberTransaction =
model::gradido::Transaction::create(user, choosen_group);
response.redirect(ServerConfig::g_serverPath + "/checkTransactions");
return;
state = PAGE_STATE_REQUEST_IS_RUNNING;
}
} else {
addError(new Error(gettext("Fehler"), gettext("HTML Value Type Fehler")));
}
}
} else {
pt->lock("userUpdateGroup Page");
if(pt->hasPendingTask(user, model::table::TASK_TYPE_GROUP_ADD_MEMBER)) {
state = PAGE_STATE_REQUEST_IS_RUNNING;
std::vector<Poco::AutoPtr<controller::PendingTask>> tasks = pt->getPendingTasks(user, model::table::TASK_TYPE_GROUP_ADD_MEMBER);
// should be only one
Poco::AutoPtr<model::gradido::Transaction> transaction = tasks[0].cast<model::gradido::Transaction>();
if(transaction->getSignCount() == 0) {
response.redirect(ServerConfig::g_serverPath + "/checkTransactions");
return;
}
}
pt->unlock();
}
auto groups = controller::Group::listAll();
%><%@ include file="header.cpsp" %>
@ -57,6 +104,9 @@ enum PageState {
<input class="grd-form-bn grd-form-bn-succeed grd_clickable" type="submit" name="submit" value="<%= gettext("Beitrittsanfrage senden") %>"/>
</div>
</form>
<% } else if(PAGE_STATE_REQUEST_IS_RUNNING == state) { %>
<p><%= gettext("Deine Beitrittsanfrage wird bearbeitet, du bekommst eine E-Mail wenn sie bestätigt oder abgelehnt wurde.") %></p>
<p><a href="<%= ServerConfig::g_serverPath %>/logout"><%= gettext("Abmelden") %></a></p>
<% } %>
</div>
<%@ include file="footer.cpsp" %>