IT4Change/gradido
3
0
Fork 0
mirror of https://github.com/IT4Change/gradido.git synced 2026-01-20 20:01:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'grpc' of ssh://**REDACTED**/~/_C++/gradido_login_server into grpc

Browse Source
This commit is contained in:
Dario 2020-10-14 17:35:55 +02:00 committed by Ulf Gebhardt
commit 064acee487
No known key found for this signature in database
GPG Key ID: 81308EFE29ABFEBD
4 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/cpp/controller/PendingTask.cpp
View File

@ -2,7 +2,6 @@
#include "../tasks/GradidoGroupAddMemberTask.h" #include "../tasks/GradidoGroupAddMemberTask.h"
namespace controller { namespace controller {
PendingTask::PendingTask(model::table::PendingTask* dbModel) PendingTask::PendingTask(model::table::PendingTask* dbModel)
@ -18,6 +17,7 @@ namespace controller {
Poco::AutoPtr<PendingTask> PendingTask::create(int userId, std::string serializedProtoRequest, model::table::TaskType type) Poco::AutoPtr<PendingTask> PendingTask::create(int userId, std::string serializedProtoRequest, model::table::TaskType type)
{ {
auto db = new model::table::PendingTask(userId, serializedProtoRequest, type); auto db = new model::table::PendingTask(userId, serializedProtoRequest, type);
//auto pending_task = new PendingTask(db);
auto pending_task = loadCorrectDerivedClass(db); auto pending_task = loadCorrectDerivedClass(db);
return Poco::AutoPtr<PendingTask>(pending_task); return Poco::AutoPtr<PendingTask>(pending_task);
} }
@ -29,13 +29,14 @@ namespace controller {
std::vector<Poco::AutoPtr<PendingTask>> resultVector; std::vector<Poco::AutoPtr<PendingTask>> resultVector;
resultVector.reserve(pending_task_list.size()); resultVector.reserve(pending_task_list.size());
for (auto it = pending_task_list.begin(); it != pending_task_list.end(); it++) { for (auto it = pending_task_list.begin(); it != pending_task_list.end(); it++) {
//resultVector.push_back(new PendingTask(new model::table::PendingTask(*it)));
resultVector.push_back(loadCorrectDerivedClass(new model::table::PendingTask(*it))); resultVector.push_back(loadCorrectDerivedClass(new model::table::PendingTask(*it)));
} }
return resultVector; return resultVector;
} }
std::vector<Poco::AutoPtr<PendingTask>> PendingTask::loadAll() std::vector<Poco::AutoPtr<PendingTask>> PendingTask::loadAll()
{ {
auto db = new model::table::PendingTask(); auto db = new model::table::PendingTask();
@ -65,5 +66,4 @@ namespace controller {
} }
return nullptr; return nullptr;
} }
} }

1
src/cpp/controller/PendingTask.h
View File

@ -22,6 +22,7 @@ namespace controller {
static std::vector<Poco::AutoPtr<PendingTask>> load(int userId); static std::vector<Poco::AutoPtr<PendingTask>> load(int userId);
static std::vector<Poco::AutoPtr<PendingTask>> loadAll(); static std::vector<Poco::AutoPtr<PendingTask>> loadAll();
inline bool deleteFromDB() { return mDBModel->deleteFromDB(); }
inline Poco::AutoPtr<model::table::PendingTask> getModel() { return _getModel<model::table::PendingTask>(); } inline Poco::AutoPtr<model::table::PendingTask> getModel() { return _getModel<model::table::PendingTask>(); }

1
src/cpp/model/table/PendingTask.cpp
View File

@ -75,7 +75,6 @@ namespace model
return select; return select;
} }
Poco::Data::Statement PendingTask::_loadIdFromDB(Poco::Data::Session session) Poco::Data::Statement PendingTask::_loadIdFromDB(Poco::Data::Session session)
{ {
Poco::Data::Statement select(session); Poco::Data::Statement select(session);

5
src/cpp/model/table/PendingTask.h
View File

@ -4,6 +4,8 @@
#include "ModelBase.h" #include "ModelBase.h"
#include "Poco/Types.h" #include "Poco/Types.h"
#include <shared_mutex>
namespace model { namespace model {
namespace table { namespace table {
@ -18,7 +20,7 @@ namespace model {
TASK_TYPE_HEDERA_ACCOUNT_CREATE = 25, TASK_TYPE_HEDERA_ACCOUNT_CREATE = 25,
}; };
typedef Poco::Tuple<int, int, Poco::Data::BLOB, Poco::DateTime, Poco::DateTime, std::string, int> PendingTaskTuple; typedef Poco::Tuple<int, int, Poco::Data::BLOB, Poco::DateTime, Poco::DateTime, std::string, int> PendingTaskTuple;
class PendingTask : public ModelBase class PendingTask : public ModelBase
@ -52,6 +54,7 @@ namespace model {
std::string mResultJsonString; std::string mResultJsonString;
int mTaskTypeId; int mTaskTypeId;
std::shared_mutex mSharedMutex;
}; };
} }