Skip to content

FOUR-8841 Improve start and complete events using the existing main class TokenRepository - Request creation #4861

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
caleeli merged 4 commits into from
Jun 13, 2023
Merged

FOUR-8841 Improve start and complete events using the existing main class TokenRepository - Request creation #4861

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
85ddb65
FOUR-8841 Improve start and complete events using the existing main c…
julceslauhub Jun 7, 2023
50cc1cd
Merge branch 'FOUR-8177' into FOUR-8841
caleeli Jun 12, 2023
ee3732c
Refactor Persistance Handler
caleeli Jun 12, 2023
8698988
FOUR-8841 Improve start and complete events using the existing main c…
julceslauhub Jun 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions ProcessMaker/Http/Kernel.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,12 @@ class Kernel extends HttpKernel
// API Middleware is defined with routeMiddleware below.
// See routes/api.php
],
'engine' => [
'auth:api',
'setlocale',
'bindings',
'sanitize',
],
];

/**
Expand Down
77 changes: 44 additions & 33 deletions ProcessMaker/Nayra/Managers/WorkflowManagerRabbitMq.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,8 @@ public function triggerStartEvent(Definitions $definitions, StartEventInterface
'signal_events' => [],
]);

// Create triggered
// TO DO:
// Serialize instance
$state = $this->serializeState($request);

// Dispatch start process action
$this->dispatchAction([
Expand All @@ -59,25 +59,20 @@ public function triggerStartEvent(Definitions $definitions, StartEventInterface
'instance_id' => $request->uuid,
'request_id' => $request->getKey(),
'element_id' => $event->getId(),
'data'=> $data,
'data' => $data,
'extra_properties' => [
'user_id' => $userId,
'process_id' => $definitions->id,
'request_id' => $request->getKey(),
],
],
'state' => [
'requests' => [
$request->uuid => [
'id' => $request->uuid,
'callable_id' => $request->callable_id,
'data' => $request->data,
'tokens' => [],
]
],
'state' => $state,
'session' => [
'user_id' => $userId,
],
]);

//Return the instance created
return $request;
}

Expand All @@ -99,10 +94,37 @@ public function completeTask(Definitions $definitions, ExecutionInstanceInterfac

// Get complementary information
$version = $definitions->getLatestVersion();
$userId = $this->getCurrentUserId();
$state = $this->serializeState($instance);

// Dispatch complete task action
$this->dispatchAction([
'bpmn' => $version->getKey(),
'action' => self::ACTION_COMPLETE_TASK,
'params' => [
'request_id' => $token->process_request_id,
'token_id' => $token->uuid,
'element_id' => $token->element_id,
'data' => $data,
],
'state' => $state,
'session' => [
'user_id' => $userId,
],
]);
}

/**
* Build a state object
*
* @param ProcessRequest $instance
* @return array
*/
private function serializeState(ProcessRequest $instance)
{
// Get open tokens
$tokensRows = [];
$tokens = $instance->tokens()->where('status', '!=', 'CLOSED')->get();
$tokens = $instance->tokens()->where('status', '!=', 'CLOSED')->where('status', '!=', 'TRIGGERED')->get();
foreach ($tokens as $token) {
$tokensRows[] = array_merge($token->token_properties ?: [], [
'id' => $token->uuid,
Expand All @@ -112,27 +134,16 @@ public function completeTask(Definitions $definitions, ExecutionInstanceInterfac
]);
}

// Dispatch complete task action
$this->dispatchAction([
'bpmn' => $version->getKey(),
'action' => self::ACTION_COMPLETE_TASK,
'params' => [
'request_id' => $token->process_request_id,
'token_id' => $token->uuid,
'element_id' => $token->element_id,
'data'=> $data,
],
'state' => [
'requests' => [
[
'id' => $instance->uuid,
'callable_id' => $instance->callable_id,
'data' => $instance->data,
'tokens' => $tokensRows,
]
return [
'requests' => [
[
'id' => $instance->uuid,
'callable_id' => $instance->callable_id,
'data' => $instance->data,
'tokens' => $tokensRows,
],
]
]);
],
];
}

/**
Expand Down
9 changes: 5 additions & 4 deletions ProcessMaker/Nayra/MessageBrokers/ServiceKafka.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

use Junges\Kafka\Facades\Kafka;
use Junges\Kafka\Contracts\KafkaConsumerMessage;
use ProcessMaker\Nayra\Repositories\EntityRepositoryFactory;
use ProcessMaker\Nayra\Repositories\PersistenceHandler;

class ServiceKafka
{
Expand Down Expand Up @@ -65,11 +65,11 @@ public function worker()
// Get transactions
$transactions = $message->getBody();

// Store transsactions
// Store transactions
$this->storeData($transactions);
})->build();

// Consume incomming messages
// Consume incoming messages
$consumer->consume();
}

Expand All @@ -80,8 +80,9 @@ public function worker()
*/
private function storeData(array $transactions)
{
$handler = new PersistenceHandler();
foreach ($transactions as $transaction) {
EntityRepositoryFactory::createRepository($transaction['entity'])->save($transaction);
$handler->save($transaction);
}
}
}
5 changes: 3 additions & 2 deletions ProcessMaker/Nayra/MessageBrokers/ServiceRabbitMq.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

use PhpAmqpLib\Connection\AMQPStreamConnection;
use PhpAmqpLib\Message\AMQPMessage;
use ProcessMaker\Nayra\Repositories\EntityRepositoryFactory;
use ProcessMaker\Nayra\Repositories\PersistenceHandler;

class ServiceRabbitMq
{
Expand Down Expand Up @@ -123,8 +123,9 @@ public function worker(): void
*/
private function storeData(array $transactions): void
{
$handler = new PersistenceHandler();
foreach ($transactions as $transaction) {
EntityRepositoryFactory::createRepository($transaction['entity'])->save($transaction);
$handler->save($transaction);
}
}
}
Loading