mirror of
https://github.com/IT4Change/gradido.git
synced 2025-12-13 07:45:54 +00:00
Remove dynamic cast because it lead to errors again and agin (Poco::AutoPtr don't work correct with that)
This commit is contained in:
einhornimmond
einhorn_b
parent
a08113eea7
commit
cee7d7ac3c
@ -15,10 +15,10 @@ PendingTasksManager::~PendingTasksManager()
|
||||
Poco::ScopedLock<Poco::Mutex> _lock(mWorkMutex);
|
||||
mCheckForFinishedTimer.stop();
|
||||
|
||||
for (auto it = mPendingTasks.begin(); it != mPendingTasks.end(); it++) {
|
||||
for (auto it = mPendingGradidoTransactions.begin(); it != mPendingGradidoTransactions.end(); it++) {
|
||||
delete it->second;
|
||||
}
|
||||
mPendingTasks.clear();
|
||||
mPendingGradidoTransactions.clear();
|
||||
}
|
||||
|
||||
PendingTasksManager* PendingTasksManager::getInstance()
|
||||
@ -37,31 +37,32 @@ int PendingTasksManager::load()
|
||||
return 0;
|
||||
}
|
||||
|
||||
int PendingTasksManager::addTask(Poco::AutoPtr<controller::PendingTask> task)
|
||||
|
||||
int PendingTasksManager::addTask(Poco::AutoPtr<model::gradido::Transaction> gradidoTransactionTask)
|
||||
{
|
||||
if (task.isNull() || !task->getModel()) {
|
||||
if (gradidoTransactionTask.isNull() || !gradidoTransactionTask->getModel()) {
|
||||
return -1;
|
||||
}
|
||||
|
||||
auto model = task->getModel();
|
||||
auto model = gradidoTransactionTask->getModel();
|
||||
Poco::ScopedLock<Poco::Mutex> _lock(mWorkMutex);
|
||||
auto pending_task_list = getTaskListForUser(model->getUserId());
|
||||
pending_task_list->push_back(task);
|
||||
auto pending_task_list = getGradidoTransactionsForUser(model->getUserId());
|
||||
pending_task_list->push_back(gradidoTransactionTask);
|
||||
return 0;
|
||||
|
||||
}
|
||||
|
||||
bool PendingTasksManager::removeTask(Poco::AutoPtr<controller::PendingTask> task)
|
||||
|
||||
bool PendingTasksManager::removeTask(Poco::AutoPtr<model::gradido::Transaction> gradidoTransactionTask)
|
||||
{
|
||||
if (task.isNull() || !task->getModel()) {
|
||||
if (gradidoTransactionTask.isNull() || !gradidoTransactionTask->getModel()) {
|
||||
return false;
|
||||
}
|
||||
auto model = task->getModel();
|
||||
auto model = gradidoTransactionTask->getModel();
|
||||
Poco::ScopedLock<Poco::Mutex> _lock(mWorkMutex);
|
||||
auto pending_task_list = getTaskListForUser(model->getUserId());
|
||||
auto pending_task_list = getGradidoTransactionsForUser(model->getUserId());
|
||||
bool removed = false;
|
||||
for (auto it = pending_task_list->begin(); it != pending_task_list->end(); it++) {
|
||||
if (task.get() == it->get()) {
|
||||
if (gradidoTransactionTask.get() == it->get()) {
|
||||
pending_task_list->erase(it);
|
||||
removed = true;
|
||||
break;
|
||||
@ -71,41 +72,42 @@ bool PendingTasksManager::removeTask(Poco::AutoPtr<controller::PendingTask> task
|
||||
return removed;
|
||||
}
|
||||
|
||||
PendingTasksManager::PendingTaskList* PendingTasksManager::getTaskListForUser(int userId)
|
||||
|
||||
PendingTasksManager::PendingGradidoTaskList* PendingTasksManager::getGradidoTransactionsForUser(int userId)
|
||||
{
|
||||
Poco::ScopedLock<Poco::Mutex> _lock(mWorkMutex);
|
||||
auto it = mPendingTasks.find(userId);
|
||||
if (it == mPendingTasks.end()) {
|
||||
auto pending_list = new PendingTaskList;
|
||||
mPendingTasks.insert(std::pair<int, PendingTaskList*>(userId, pending_list));
|
||||
auto it = mPendingGradidoTransactions.find(userId);
|
||||
if (it == mPendingGradidoTransactions.end()) {
|
||||
auto pending_list = new PendingGradidoTaskList;
|
||||
mPendingGradidoTransactions.insert(std::pair<int, PendingGradidoTaskList*>(userId, pending_list));
|
||||
return pending_list;
|
||||
}
|
||||
else {
|
||||
return it->second;
|
||||
}
|
||||
|
||||
}
|
||||
const PendingTasksManager::PendingTaskList* PendingTasksManager::getTaskListForUser(int userId) const
|
||||
|
||||
|
||||
const PendingTasksManager::PendingGradidoTaskList* PendingTasksManager::getGradidoTransactionsForUser(int userId) const
|
||||
{
|
||||
Poco::ScopedLock<Poco::Mutex> _lock(mWorkMutex);
|
||||
auto it = mPendingTasks.find(userId);
|
||||
if (it != mPendingTasks.end()) {
|
||||
auto it = mPendingGradidoTransactions.find(userId);
|
||||
if (it != mPendingGradidoTransactions.end()) {
|
||||
return it->second;
|
||||
}
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
bool PendingTasksManager::hasPendingTask(Poco::AutoPtr<controller::User> user, model::table::TaskType type)
|
||||
bool PendingTasksManager::hasPendingGradidoTransaction(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 it = mPendingGradidoTransactions.find(user_id);
|
||||
if (it != mPendingGradidoTransactions.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()) {
|
||||
for (auto taskIt = task_list->begin(); taskIt != task_list->end(); taskIt++) {
|
||||
if ((*taskIt)->getModel()->getTaskType() == type) {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
@ -114,20 +116,21 @@ bool PendingTasksManager::hasPendingTask(Poco::AutoPtr<controller::User> user, m
|
||||
|
||||
}
|
||||
|
||||
std::vector<Poco::AutoPtr<controller::PendingTask>> PendingTasksManager::getPendingTasks(Poco::AutoPtr<controller::User> user, model::table::TaskType type)
|
||||
|
||||
std::vector<Poco::AutoPtr<model::gradido::Transaction>> PendingTasksManager::getPendingGradidoTransactions(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;
|
||||
std::vector<Poco::AutoPtr<model::gradido::Transaction>> results;
|
||||
|
||||
auto it = mPendingTasks.find(user_id);
|
||||
if (it != mPendingTasks.end()) {
|
||||
auto it = mPendingGradidoTransactions.find(user_id);
|
||||
if (it != mPendingGradidoTransactions.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()) {
|
||||
if (task_model->getTaskType() == type) {
|
||||
results.push_back(*taskIt);
|
||||
}
|
||||
}
|
||||
@ -135,51 +138,45 @@ std::vector<Poco::AutoPtr<controller::PendingTask>> PendingTasksManager::getPend
|
||||
return results;
|
||||
}
|
||||
|
||||
std::vector<Poco::AutoPtr<controller::PendingTask>> PendingTasksManager::getTransactionsUserMustSign(Poco::AutoPtr<controller::User> user)
|
||||
std::vector<Poco::AutoPtr<model::gradido::Transaction>> PendingTasksManager::getTransactionsUserMustSign(Poco::AutoPtr<controller::User> user)
|
||||
{
|
||||
// TODO: don't use cast here, because can lead to errors
|
||||
Poco::ScopedLock<Poco::Mutex> _lock(mWorkMutex);
|
||||
std::vector<Poco::AutoPtr<controller::PendingTask>> transactions_to_sign;
|
||||
std::vector<Poco::AutoPtr<model::gradido::Transaction>> transactions_to_sign;
|
||||
|
||||
for (auto map_it = mPendingTasks.begin(); map_it != mPendingTasks.end(); map_it++)
|
||||
for (auto map_it = mPendingGradidoTransactions.begin(); map_it != mPendingGradidoTransactions.end(); map_it++)
|
||||
{
|
||||
auto list = map_it->second;
|
||||
for (auto list_it = list->begin(); list_it != list->end(); list_it++)
|
||||
{
|
||||
if ((*list_it)->getModel()->isGradidoTransaction()) {
|
||||
auto transaction = dynamic_cast<model::gradido::Transaction*>(list_it->get());
|
||||
if (transaction->mustSign(user)) {
|
||||
if((*list_it)->mustSign(user)) {
|
||||
transactions_to_sign.push_back(*list_it);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
return transactions_to_sign;
|
||||
}
|
||||
|
||||
std::vector<Poco::AutoPtr<controller::PendingTask>> PendingTasksManager::getTransactionSomeoneMustSign(Poco::AutoPtr<controller::User> user)
|
||||
std::vector<Poco::AutoPtr<model::gradido::Transaction>> PendingTasksManager::getTransactionSomeoneMustSign(Poco::AutoPtr<controller::User> user)
|
||||
{
|
||||
// TODO: don't use cast here, because can lead to errors
|
||||
Poco::ScopedLock<Poco::Mutex> _lock(mWorkMutex);
|
||||
std::vector<Poco::AutoPtr<controller::PendingTask>> transactions_to_sign;
|
||||
std::vector<Poco::AutoPtr<model::gradido::Transaction>> transactions_to_sign;
|
||||
|
||||
if (user->getModel()->getRole() != model::table::ROLE_ADMIN) {
|
||||
return transactions_to_sign;
|
||||
}
|
||||
|
||||
for (auto map_it = mPendingTasks.begin(); map_it != mPendingTasks.end(); map_it++)
|
||||
for (auto map_it = mPendingGradidoTransactions.begin(); map_it != mPendingGradidoTransactions.end(); map_it++)
|
||||
{
|
||||
auto list = map_it->second;
|
||||
for (auto list_it = list->begin(); list_it != list->end(); list_it++)
|
||||
{
|
||||
if ((*list_it)->getModel()->isGradidoTransaction()) {
|
||||
auto transaction = dynamic_cast<model::gradido::Transaction*>(list_it->get());
|
||||
if (transaction->needSomeoneToSign(user)) {
|
||||
if ((*list_it)->needSomeoneToSign(user)) {
|
||||
transactions_to_sign.push_back(*list_it);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
return transactions_to_sign;
|
||||
}
|
||||
|
||||
@ -189,13 +186,12 @@ void PendingTasksManager::checkForFinishedTasks(Poco::Timer& timer)
|
||||
Poco::ScopedLock<Poco::Mutex> _lock(mWorkMutex);
|
||||
try {
|
||||
|
||||
for (auto map_it = mPendingTasks.begin(); map_it != mPendingTasks.end(); map_it++)
|
||||
for (auto map_it = mPendingGradidoTransactions.begin(); map_it != mPendingGradidoTransactions.end(); map_it++)
|
||||
{
|
||||
auto list = map_it->second;
|
||||
for (auto list_it = list->begin(); list_it != list->end(); list_it++)
|
||||
{
|
||||
if ((*list_it)->getModel()->isGradidoTransaction()) {
|
||||
auto transaction = dynamic_cast<model::gradido::Transaction*>(list_it->get());
|
||||
auto transaction = *list_it;
|
||||
auto json = transaction->getModel()->getResultJson();
|
||||
bool removeIt = false;
|
||||
if (!json.isNull()) {
|
||||
@ -212,7 +208,6 @@ void PendingTasksManager::checkForFinishedTasks(Poco::Timer& timer)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
catch (Poco::Exception& ex) {
|
||||
NotificationList errors;
|
||||
errors.addError(new ParamError(function_name, "poco exception", ex.displayText()));
|
||||
@ -224,10 +219,11 @@ void PendingTasksManager::checkForFinishedTasks(Poco::Timer& timer)
|
||||
}
|
||||
}
|
||||
|
||||
Poco::AutoPtr<controller::PendingTask> PendingTasksManager::getPendingTask(int pendingTaskId)
|
||||
|
||||
Poco::AutoPtr<model::gradido::Transaction> PendingTasksManager::getPendingGradidoTransaction(int pendingTaskId)
|
||||
{
|
||||
Poco::ScopedLock<Poco::Mutex> _lock(mWorkMutex);
|
||||
for (auto map_it = mPendingTasks.begin(); map_it != mPendingTasks.end(); map_it++)
|
||||
for (auto map_it = mPendingGradidoTransactions.begin(); map_it != mPendingGradidoTransactions.end(); map_it++)
|
||||
{
|
||||
auto list = map_it->second;
|
||||
for (auto list_it = list->begin(); list_it != list->end(); list_it++)
|
||||
|
||||
@ -13,9 +13,10 @@
|
||||
#ifndef GRADIDO_LOGIN_SERVER_SINGLETON_MANAGER_PENDING_TASKS_MANAGER
|
||||
#define GRADIDO_LOGIN_SERVER_SINGLETON_MANAGER_PENDING_TASKS_MANAGER
|
||||
|
||||
#include "../controller/PendingTask.h"
|
||||
#include "../controller/User.h"
|
||||
#include "../model/gradido/Transaction.h"
|
||||
#include "controller/PendingTask.h"
|
||||
#include "model/gradido/Transaction.h"
|
||||
#include "controller/User.h"
|
||||
#include "model/gradido/Transaction.h"
|
||||
|
||||
class UserUpdateGroupPage;
|
||||
|
||||
@ -24,6 +25,7 @@ class PendingTasksManager: protected UniLib::lib::MultithreadContainer
|
||||
friend UserUpdateGroupPage;
|
||||
public:
|
||||
typedef std::list<Poco::AutoPtr<controller::PendingTask>> PendingTaskList;
|
||||
typedef std::list<Poco::AutoPtr<model::gradido::Transaction>> PendingGradidoTaskList;
|
||||
|
||||
~PendingTasksManager();
|
||||
|
||||
@ -34,8 +36,9 @@ public:
|
||||
|
||||
//! \return -1 task is zero
|
||||
//! \return 0 if added
|
||||
int addTask(Poco::AutoPtr<controller::PendingTask> task);
|
||||
bool removeTask(Poco::AutoPtr<controller::PendingTask> task);
|
||||
int addTask(Poco::AutoPtr<model::gradido::Transaction> gradidoTransactionTask);
|
||||
|
||||
bool removeTask(Poco::AutoPtr<model::gradido::Transaction> gradidoTransactionTask);
|
||||
|
||||
//! check if tasks can be removed
|
||||
void checkForFinishedTasks(Poco::Timer& timer);
|
||||
@ -43,12 +46,12 @@ public:
|
||||
//! by calling this, important is to call lock to prevent vanishing the list while working with it,
|
||||
//! 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);
|
||||
Poco::AutoPtr<controller::PendingTask> getPendingTask(int pendingTaskId);
|
||||
std::vector<Poco::AutoPtr<controller::PendingTask>> getTransactionsUserMustSign(Poco::AutoPtr<controller::User> user);
|
||||
std::vector<Poco::AutoPtr<controller::PendingTask>> getTransactionSomeoneMustSign(Poco::AutoPtr<controller::User> user);
|
||||
const PendingGradidoTaskList* getGradidoTransactionsForUser(int userId) const;
|
||||
bool hasPendingGradidoTransaction(Poco::AutoPtr<controller::User> user, model::table::TaskType type);
|
||||
std::vector<Poco::AutoPtr<model::gradido::Transaction>> getPendingGradidoTransactions(Poco::AutoPtr<controller::User> user, model::table::TaskType type);
|
||||
Poco::AutoPtr<model::gradido::Transaction> getPendingGradidoTransaction(int pendingTaskId);
|
||||
std::vector<Poco::AutoPtr<model::gradido::Transaction>> getTransactionsUserMustSign(Poco::AutoPtr<controller::User> user);
|
||||
std::vector<Poco::AutoPtr<model::gradido::Transaction>> getTransactionSomeoneMustSign(Poco::AutoPtr<controller::User> user);
|
||||
|
||||
|
||||
protected:
|
||||
@ -58,8 +61,10 @@ protected:
|
||||
|
||||
|
||||
std::map<int, PendingTaskList*> mPendingTasks;
|
||||
std::map<int, PendingGradidoTaskList*> mPendingGradidoTransactions;
|
||||
//! \return list for user, creating new list and map entry if not exist
|
||||
PendingTaskList* getTaskListForUser(int userId);
|
||||
PendingGradidoTaskList* getGradidoTransactionsForUser(int userId);
|
||||
};
|
||||
|
||||
|
||||
|
||||
@ -46,10 +46,7 @@ enum PageState {
|
||||
|
||||
PageState state = PAGE_NO_TRANSACTIONS;
|
||||
|
||||
|
||||
|
||||
Poco::AutoPtr<controller::PendingTask> pending_task;
|
||||
model::gradido::Transaction* transaction = nullptr;
|
||||
Poco::AutoPtr<model::gradido::Transaction> transaction;
|
||||
Poco::AutoPtr<model::gradido::TransactionBody> transaction_body;
|
||||
|
||||
if(!form.empty())
|
||||
@ -64,10 +61,9 @@ enum PageState {
|
||||
if(DataTypeConverter::NUMBER_PARSE_OKAY == DataTypeConverter::strToInt(pending_task_id_string, pending_task_id))
|
||||
{
|
||||
// load transaction from pending task manager
|
||||
pending_task = pt->getPendingTask(pending_task_id);
|
||||
if(!pending_task.isNull() && pending_task->getModel()->isGradidoTransaction())
|
||||
transaction = pt->getPendingGradidoTransaction(pending_task_id);
|
||||
if(!transaction.isNull())
|
||||
{
|
||||
transaction = dynamic_cast<model::gradido::Transaction*>(pending_task.get());
|
||||
if(transaction->hasSigned(account_user)) {
|
||||
transaction = nullptr;
|
||||
} else {
|
||||
@ -78,10 +74,11 @@ enum PageState {
|
||||
{
|
||||
//mSession->finalizeTransaction(false, true);
|
||||
//
|
||||
if(transaction && transaction->getModel()->getUserId() == user_model->getID())
|
||||
if(!transaction.isNull() && transaction->getModel()->getUserId() == user_model->getID())
|
||||
{
|
||||
pt->removeTask(pending_task);
|
||||
if(pt->removeTask(transaction)) {
|
||||
transaction->deleteFromDB();
|
||||
}
|
||||
transaction = nullptr;
|
||||
}
|
||||
}
|
||||
@ -110,7 +107,7 @@ enum PageState {
|
||||
}
|
||||
if(!hasErrors) {
|
||||
//mSession->finalizeTransaction(true, false);
|
||||
if(transaction && transaction->sign(account_user)) {
|
||||
if(!transaction.isNull() && transaction->sign(account_user)) {
|
||||
transaction = nullptr;
|
||||
}
|
||||
}
|
||||
@ -129,15 +126,15 @@ enum PageState {
|
||||
}
|
||||
|
||||
auto transactions_user_must_sign = pt->getTransactionsUserMustSign(account_user);
|
||||
std::vector<Poco::AutoPtr<controller::PendingTask>> transactions_someone_must_sign;
|
||||
std::vector<Poco::AutoPtr<model::gradido::Transaction>> transactions_someone_must_sign;
|
||||
// TODO: work with community server roles
|
||||
if(user_model->getRole() == model::table::ROLE_ADMIN) {
|
||||
transactions_someone_must_sign = pt->getTransactionSomeoneMustSign(account_user);
|
||||
}
|
||||
std::vector<Poco::AutoPtr<controller::PendingTask>> transactions_to_sign;
|
||||
std::vector<Poco::AutoPtr<model::gradido::Transaction>> transactions_to_sign;
|
||||
bool transaction_removeable = false;
|
||||
int transaction_to_sign_index = 0;
|
||||
if(!transaction)
|
||||
if(!transaction.isNull())
|
||||
{
|
||||
if(transactions_user_must_sign.size() > skip_count) {
|
||||
transactions_to_sign = transactions_user_must_sign;
|
||||
@ -149,7 +146,7 @@ enum PageState {
|
||||
|
||||
if(transactions_to_sign.size() > transaction_to_sign_index)
|
||||
{
|
||||
transaction = dynamic_cast<model::gradido::Transaction*>(transactions_to_sign[transaction_to_sign_index].get());
|
||||
transaction = transactions_to_sign[transaction_to_sign_index];
|
||||
transaction_body = transaction->getTransactionBody();
|
||||
// user can only delete there own transactions
|
||||
// TODO: Auto timeout for community transactions
|
||||
@ -181,7 +178,7 @@ enum PageState {
|
||||
{
|
||||
enableLogout = false;
|
||||
}
|
||||
if(PAGE_NO_TRANSACTIONS == state && transaction && !transaction_body.isNull())
|
||||
if(PAGE_NO_TRANSACTIONS == state && !transaction.isNull() && !transaction_body.isNull())
|
||||
{
|
||||
auto transactionType = transaction_body->getType();
|
||||
memo = transaction_body->getMemo();
|
||||
@ -326,7 +323,7 @@ enum PageState {
|
||||
</div>
|
||||
</div>
|
||||
<form>
|
||||
<% if(transaction) { %>
|
||||
<% if(!transaction.isNull()) { %>
|
||||
<input type="hidden" name="pending-task-id" value="<%= transaction->getModel()->getID() %>">
|
||||
<% } %>
|
||||
<input type="hidden" name="skip-count" value="<%= skip_count %>">
|
||||
|
||||
@ -73,15 +73,14 @@ enum PageState {
|
||||
|
||||
|
||||
pt->lock("userUpdateGroup Page");
|
||||
auto has_pending_group_add_member_task = pt->hasPendingTask(user, model::table::TASK_TYPE_GROUP_ADD_MEMBER);
|
||||
auto has_pending_group_add_member_task = pt->hasPendingGradidoTransaction(user, model::table::TASK_TYPE_GROUP_ADD_MEMBER);
|
||||
auto referer_was_checkTransaction = refererString.find("checkTransactions") != std::string::npos;
|
||||
if(has_pending_group_add_member_task) {
|
||||
state = PAGE_STATE_REQUEST_IS_RUNNING;
|
||||
std::vector<Poco::AutoPtr<controller::PendingTask>> tasks = pt->getPendingTasks(user, model::table::TASK_TYPE_GROUP_ADD_MEMBER);
|
||||
auto tasks = pt->getPendingGradidoTransactions(user, model::table::TASK_TYPE_GROUP_ADD_MEMBER);
|
||||
// should be only one
|
||||
Poco::AutoPtr<model::gradido::Transaction> transaction = tasks[0].cast<model::gradido::Transaction>();
|
||||
auto transaction = tasks[0];
|
||||
if(transaction->getSignCount() == 0) {
|
||||
|
||||
pt->unlock();
|
||||
response.redirect(getBaseUrl() + "/checkTransactions");
|
||||
return;
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user