Skip to content

Improve get activated transition in gateway #5708

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
ryancooley merged 2 commits into from
Nov 29, 2023
Merged

Improve get activated transition in gateway #5708

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
658e352
Improve get activated transition in gateway
caleeli Nov 28, 2023
cae5383
Fix variable name
caleeli Nov 28, 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
13 changes: 11 additions & 2 deletions ProcessMaker/Nayra/Repositories/PersistenceTokenTrait.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
namespace ProcessMaker\Nayra\Repositories;

use Illuminate\Support\Facades\Cache;
use Illuminate\Support\Facades\Log;
use ProcessMaker\Facades\WorkflowManager;
use ProcessMaker\Listeners\BpmnSubscriber;
use ProcessMaker\Listeners\CommentsSubscriber;
Expand Down Expand Up @@ -166,9 +167,17 @@ public function persistGatewayTokenConsumed(array $transaction)
public function persistGatewayTokenPassed(array $transaction)
{
$gateway = $this->deserializer->unserializeEntity($transaction['gateway']);
$transition = $this->deserializer->unserializeEntity($transaction['transition']);
if (!is_numeric($transaction['transition'])) {
Log::info('Invalid transition id for gateway token passed. ' . json_encode($transaction));
return;
}
$transition = $gateway->getTransitions()[$transaction['transition']] ?? null;
if (empty($transition)) {
Log::info('Invalid transition for gateway token passed. ' . json_encode($transaction));
return;
}
$tokens = $this->deserializer->unserializeTokensCollection($transaction['tokens']);
$this->tokenRepository->persistGatewayTokenPassed($gateway, $tokens[0]);
$this->tokenRepository->persistGatewayTokenPassed($gateway, $tokens->item(0));

// Comments
$subscriber = new CommentsSubscriber();
Expand Down