diff --git a/src/cpp/controller/PendingTask.cpp b/src/cpp/controller/PendingTask.cpp index 78679f5dd..41bff15d6 100644 --- a/src/cpp/controller/PendingTask.cpp +++ b/src/cpp/controller/PendingTask.cpp @@ -2,7 +2,6 @@ #include "../tasks/GradidoGroupAddMemberTask.h" - namespace controller { PendingTask::PendingTask(model::table::PendingTask* dbModel) @@ -18,6 +17,7 @@ namespace controller { Poco::AutoPtr PendingTask::create(int userId, std::string serializedProtoRequest, model::table::TaskType type) { auto db = new model::table::PendingTask(userId, serializedProtoRequest, type); + //auto pending_task = new PendingTask(db); auto pending_task = loadCorrectDerivedClass(db); return Poco::AutoPtr(pending_task); } @@ -29,13 +29,14 @@ namespace controller { std::vector> resultVector; resultVector.reserve(pending_task_list.size()); 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))); } return resultVector; } - + std::vector> PendingTask::loadAll() { auto db = new model::table::PendingTask(); @@ -65,5 +66,4 @@ namespace controller { } return nullptr; } - } \ No newline at end of file diff --git a/src/cpp/controller/PendingTask.h b/src/cpp/controller/PendingTask.h index 7a6cd4fcc..49444b719 100644 --- a/src/cpp/controller/PendingTask.h +++ b/src/cpp/controller/PendingTask.h @@ -22,6 +22,7 @@ namespace controller { static std::vector> load(int userId); static std::vector> loadAll(); + inline bool deleteFromDB() { return mDBModel->deleteFromDB(); } inline Poco::AutoPtr getModel() { return _getModel(); } diff --git a/src/cpp/model/table/PendingTask.cpp b/src/cpp/model/table/PendingTask.cpp index e405ffa6a..dda0b6b5d 100644 --- a/src/cpp/model/table/PendingTask.cpp +++ b/src/cpp/model/table/PendingTask.cpp @@ -75,7 +75,6 @@ namespace model return select; } - Poco::Data::Statement PendingTask::_loadIdFromDB(Poco::Data::Session session) { Poco::Data::Statement select(session); diff --git a/src/cpp/model/table/PendingTask.h b/src/cpp/model/table/PendingTask.h index 565b52eaf..d8a4842a9 100644 --- a/src/cpp/model/table/PendingTask.h +++ b/src/cpp/model/table/PendingTask.h @@ -4,6 +4,8 @@ #include "ModelBase.h" #include "Poco/Types.h" +#include + namespace model { namespace table { @@ -18,7 +20,7 @@ namespace model { TASK_TYPE_HEDERA_ACCOUNT_CREATE = 25, }; - + typedef Poco::Tuple PendingTaskTuple; class PendingTask : public ModelBase @@ -52,6 +54,7 @@ namespace model { std::string mResultJsonString; int mTaskTypeId; + std::shared_mutex mSharedMutex; }; }