Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
47 changes: 47 additions & 0 deletions ProcessMaker/Console/Commands/CasesSync.php
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
<?php

namespace ProcessMaker\Console\Commands;

use Illuminate\Console\Command;
use ProcessMaker\Repositories\CaseSyncRepository;

class CasesSync extends Command
{
/**
* The name and signature of the console command.
*
* @var string
*/
protected $signature = 'cases:sync
{--request_ids= : Comma-separated list of request IDs to sync}';

/**
* The console command description.
*
* @var string
*/
protected $description = 'Sync requests with the cases tables';

/**
* Execute the console command.
*/
public function handle()
{
$requestIds = $this->option('request_ids');
$requestIds = $requestIds ? explode(',', $requestIds) : [];

if (count($requestIds) > 0) {
$data = CaseSyncRepository::syncCases($requestIds);

foreach ($data['successes'] as $value) {
$this->info('Case started synced ' . $value);
}

foreach ($data['errors'] as $value) {
$this->error('Error syncing case started ' . $value);
}
} else {
$this->error('Please specify a list of request IDs.');
}
}
}
10 changes: 7 additions & 3 deletions ProcessMaker/Repositories/CaseParticipatedRepository.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,7 @@

namespace ProcessMaker\Repositories;

use Illuminate\Support\Facades\Log;
use ProcessMaker\Models\CaseParticipated;
use ProcessMaker\Models\CaseStarted;
use ProcessMaker\Nayra\Contracts\Bpmn\TokenInterface;
Expand DownExpand Up@@ -44,7 +45,8 @@ public function create(CaseStarted $case, TokenInterface $token): void
'completed_at' => null,
]);
} catch (\Exception $e) {
\Log::error($e->getMessage());
Log::error('CaseException: ' . $e->getMessage());
Log::error('CaseException: ' . $e->getTraceAsString());
}
}

Expand DownExpand Up@@ -73,7 +75,8 @@ public function update(CaseStarted $case, TokenInterface $token)
'participants' => $case->participants,
]);
} catch (\Exception $e) {
\Log::error($e->getMessage());
Log::error('CaseException: ' . $e->getMessage());
Log::error('CaseException: ' . $e->getTraceAsString());
}
}

Expand All@@ -90,7 +93,8 @@ public function updateStatus(int $caseNumber, array $statusData)
CaseParticipated::where('case_number', $caseNumber)
->update($statusData);
} catch (\Exception $e) {
\Log::error($e->getMessage());
Log::error('CaseException: ' . $e->getMessage());
Log::error('CaseException: ' . $e->getTraceAsString());
}
}

Expand Down
45 changes: 25 additions & 20 deletions ProcessMaker/Repositories/CaseRepository.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@
namespace ProcessMaker\Repositories;

use Carbon\Carbon;
use Illuminate\Support\Facades\Log;
use ProcessMaker\Contracts\CaseRepositoryInterface;
use ProcessMaker\Models\CaseStarted;
use ProcessMaker\Nayra\Contracts\Bpmn\TokenInterface;
Expand All@@ -12,15 +13,20 @@ class CaseRepository implements CaseRepositoryInterface
{
const CASE_STATUS_ACTIVE = 'ACTIVE';

/**
* @var CaseParticipatedRepository
*/
protected CaseParticipatedRepository $caseParticipatedRepository;
/**
* This property is used to store an instance of `CaseStarted`
* when a case started is updated.
* @var CaseStarted|null
*/
protected ?CaseStarted $case;

public function __construct(protected CaseParticipatedRepository $caseParticipatedRepository)
public function __construct()
{
$this->caseParticipatedRepository = new CaseParticipatedRepository();
}
/**
* Store a new case started.
Expand All@@ -31,8 +37,7 @@ public function __construct(protected CaseParticipatedRepository $caseParticipat
public function create(ExecutionInstanceInterface $instance): void
{
if (is_null($instance->case_number)) {
\Log::error('Case number is required. instance: ' . $instance->getKey());

Log::error('case number is required, method=create, instance=' . $instance->getKey());
return;
}

Expand All@@ -58,8 +63,8 @@ public function create(ExecutionInstanceInterface $instance): void
'completed_at' => null,
]);
} catch (\Exception $e) {
\Log::error($e->getMessage());
\Log::error($e->getTraceAsString());
Log::error('CaseException: ' . $e->getMessage());
Log::error('CaseException: ' . $e->getTraceAsString());
}
}

Expand All@@ -72,19 +77,12 @@ public function create(ExecutionInstanceInterface $instance): void
*/
public function update(ExecutionInstanceInterface $instance, TokenInterface $token): void
{
if (is_null($instance->case_number)) {
\Log::error('Case number is required. instance: ' . $instance->getKey());

if (!$this->checkIfCaseStartedExist($instance->case_number)) {
Log::error('case started not found, method=update, instance=' . $instance->getKey());
return;
}

try {
if (!$this->checkIfCaseStartedExist($instance->case_number)) {
\Log::error('Case number not found. instance: ' . $instance->id);

return;
}

$this->case->case_title = $instance->case_title;
$this->case->case_status = $instance->status === self::CASE_STATUS_ACTIVE ? 'IN_PROGRESS' : $instance->status;
$this->case->request_tokens = CaseUtils::storeRequestTokens($token->getKey(), $this->case->request_tokens);
Expand All@@ -94,7 +92,8 @@ public function update(ExecutionInstanceInterface $instance, TokenInterface $tok

$this->case->saveOrFail();
} catch (\Exception $e) {
\Log::error($e->getMessage());
Log::error('CaseException: ' . $e->getMessage());
Log::error('CaseException: ' . $e->getTraceAsString());
}
}

Expand DownExpand Up@@ -124,7 +123,8 @@ public function updateStatus(ExecutionInstanceInterface $instance): void
CaseStarted::where('case_number', $instance->case_number)->update($data);
$this->caseParticipatedRepository->updateStatus($instance->case_number, $data);
} catch (\Exception $e) {
\Log::error($e->getMessage());
Log::error('CaseException: ' . $e->getMessage());
Log::error('CaseException: ' . $e->getTraceAsString());
}
}

Expand DownExpand Up@@ -163,11 +163,15 @@ private function updateParticipants(TokenInterface $token): void
/**
* Check if the case started exist.
*
* @param int $caseNumber
* @param int|null $caseNumber
* @return bool
*/
private function checkIfCaseStartedExist(int $caseNumber): bool
private function checkIfCaseStartedExist(int | null $caseNumber): bool
{
if (is_null($caseNumber)) {
return false;
}

$this->case = CaseStarted::where('case_number', $caseNumber)->first();

return !is_null($this->case);
Expand All@@ -191,8 +195,9 @@ private function updateSubProcesses(ExecutionInstanceInterface $instance): void
$this->case->requests = CaseUtils::storeRequests($instance, $this->case->requests);

$this->case->saveOrFail();
} catch (\Exception $th) {
\Log::error($th->getMessage());
} catch (\Exception $e) {
Log::error('CaseException: ' . $e->getMessage());
Log::error('CaseException: ' . $e->getTraceAsString());
}
}
}
190 changes: 190 additions & 0 deletions ProcessMaker/Repositories/CaseSyncRepository.php
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,190 @@
<?php

namespace ProcessMaker\Repositories;

use Illuminate\Support\Collection;
use ProcessMaker\Models\CaseParticipated;
use ProcessMaker\Models\CaseStarted;
use ProcessMaker\Models\ProcessRequest;

class CaseSyncRepository
{
/**
* Sync the cases started.
*
* @param array $requestIds
* @return array
*/
public static function syncCases(array $requestIds): array
{
$requests = ProcessRequest::with([
'tokens', 'process', 'childRequests.process', 'childRequests.tokens', 'participants',
])
->whereIn('id', $requestIds)
->get();

$successes = [];
$errors = [];

foreach ($requests as $instance) {
try {
if (!is_null($instance->parent_request_id)) {
continue;
}

$csProcesses = CaseUtils::storeProcesses($instance, collect());
$csRequests = CaseUtils::storeRequests($instance, collect());
$csRequestTokens = collect();
$csTasks = collect();
$participants = $instance->participants->map->only('id', 'fullName', 'title', 'avatar');
$status = $instance->status === CaseRepository::CASE_STATUS_ACTIVE ? 'IN_PROGRESS' : $instance->status;

$cpData = self::prepareCaseStartedData($instance, $status, $participants);

self::processTokens($instance, $cpData, $csRequestTokens, $csTasks);

self::processChildRequests($instance, $cpData, $csProcesses, $csRequests, $participants, $csRequestTokens, $csTasks);

$caseStarted = CaseStarted::updateOrCreate(
['case_number' => $instance->case_number],
[
'user_id' => $instance->user_id,
'case_title' => $instance->case_title,
'case_title_formatted' => $instance->case_title_formatted,
'case_status' => $status,
'processes' => $csProcesses,
'requests' => $csRequests,
'request_tokens' => $csRequestTokens,
'tasks' => $csTasks,
'participants' => $participants,
'initiated_at' => $instance->initiated_at,
'completed_at' => $instance->completed_at,
],
);

$successes[] = $caseStarted->case_number;
} catch (\Exception $e) {
$errors[] = $instance->case_number . ' ' . $e->getMessage();
}
}

return [
'successes' => $successes,
'errors' => $errors,
];
}

/**
* Prepare the case started data.
*
* @param ProcessRequest $instance
* @param string $status
* @param Collection $participants
* @return array
*/
private static function prepareCaseStartedData($instance, $status, $participants)
{
return [
'case_title' => $instance->case_title,
'case_title_formatted' => $instance->case_title_formatted,
'case_status' => $status,
'processes' => CaseUtils::storeProcesses($instance, collect()),
'requests' => CaseUtils::storeRequests($instance, collect()),
'request_tokens' => collect(),
'tasks' => collect(),
'participants' => $participants,
'initiated_at' => $instance->initiated_at,
'completed_at' => $instance->completed_at,
];
}

/**
* Process the tokens.
*
* @param ProcessRequest $instance
* @param array $cpData
* @param Collection $csRequestTokens
* @param Collection $csTasks
* @return void
*/
private static function processTokens($instance, &$cpData, &$csRequestTokens, &$csTasks)
{
foreach ($instance->tokens as $token) {
if (in_array($token->element_type, CaseUtils::ALLOWED_REQUEST_TOKENS)) {
$cpData['processes'] = CaseUtils::storeProcesses($instance, $cpData['processes']);
$cpData['requests'] = CaseUtils::storeRequests($instance, $cpData['requests']);
$cpData['request_tokens'] = CaseUtils::storeRequestTokens($token->getKey(), $cpData['request_tokens']);
$cpData['tasks'] = CaseUtils::storeTasks($token, $cpData['tasks']);

$csRequestTokens = CaseUtils::storeRequestTokens($token->getKey(), $csRequestTokens);
$csTasks = CaseUtils::storeTasks($token, $csTasks);

self::syncCasesParticipated($instance->case_number, $token->user_id, $cpData);
}
}
}

/**
* Process the child requests.
*
* @param ProcessRequest $instance
* @param array $cpData
* @param Collection $csProcesses
* @param Collection $csRequests
* @param Collection $participants
* @param Collection $csRequestTokens
* @param Collection $csTasks
* @return void
*/
private static function processChildRequests(
$instance, &$cpData, &$csProcesses, &$csRequests, &$participants, &$csRequestTokens, &$csTasks
)
{
foreach ($instance->childRequests as $subProcess) {
$cpData['processes'] = CaseUtils::storeProcesses($subProcess, collect());
$cpData['requests'] = CaseUtils::storeRequests($subProcess, collect());
$cpData['request_tokens'] = collect();
$cpData['tasks'] = collect();

$csProcesses = CaseUtils::storeProcesses($subProcess, $csProcesses);
$csRequests = CaseUtils::storeRequests($subProcess, $csRequests);

$participants = $participants
->merge($subProcess->participants->map->only('id', 'fullName', 'title', 'avatar'))
->unique('id')
->values();

foreach ($subProcess->tokens as $spToken) {
if (in_array($spToken->element_type, CaseUtils::ALLOWED_REQUEST_TOKENS)) {
$cpData['processes'] = CaseUtils::storeProcesses($subProcess, $cpData['processes']);
$cpData['requests'] = CaseUtils::storeRequests($subProcess, $cpData['requests']);
$cpData['request_tokens'] = CaseUtils::storeRequestTokens($spToken->getKey(), $cpData['request_tokens']);
$cpData['tasks'] = CaseUtils::storeTasks($spToken, $cpData['tasks']);

$csRequestTokens = CaseUtils::storeRequestTokens($spToken->getKey(), $csRequestTokens);
$csTasks = CaseUtils::storeTasks($spToken, $csTasks);

self::syncCasesParticipated($instance->case_number, $spToken->user_id, $cpData);
}
}
}
}

/**
* Sync the cases participated.
*
* @param CaseStarted $caseStarted
* @param TokenInterface $token
* @return void
*/
private static function syncCasesParticipated($caseNumber, $userId, $data)
{
CaseParticipated::updateOrCreate(
[
'case_number' => $caseNumber,
'user_id' => $userId,
],
$data,
);
}
}
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
47 changes: 47 additions & 0 deletions ProcessMaker/Console/Commands/CasesSync.php
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
<?php

namespace ProcessMaker\Console\Commands;

use Illuminate\Console\Command;
use ProcessMaker\Repositories\CaseSyncRepository;

class CasesSync extends Command
{
/**
* The name and signature of the console command.
*
* @var string
*/
protected $signature = 'cases:sync
{--request_ids= : Comma-separated list of request IDs to sync}';

/**
* The console command description.
*
* @var string
*/
protected $description = 'Sync requests with the cases tables';

/**
* Execute the console command.
*/
public function handle()
{
$requestIds = $this->option('request_ids');
$requestIds = $requestIds ? explode(',', $requestIds) : [];

if (count($requestIds) > 0) {
$data = CaseSyncRepository::syncCases($requestIds);

foreach ($data['successes'] as $value) {
$this->info('Case started synced ' . $value);
}

foreach ($data['errors'] as $value) {
$this->error('Error syncing case started ' . $value);
}
} else {
$this->error('Please specify a list of request IDs.');
}
}
}
10 changes: 7 additions & 3 deletions ProcessMaker/Repositories/CaseParticipatedRepository.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,7 @@

namespace ProcessMaker\Repositories;

use Illuminate\Support\Facades\Log;
use ProcessMaker\Models\CaseParticipated;
use ProcessMaker\Models\CaseStarted;
use ProcessMaker\Nayra\Contracts\Bpmn\TokenInterface;
Expand DownExpand Up@@ -44,7 +45,8 @@ public function create(CaseStarted $case, TokenInterface $token): void
'completed_at' => null,
]);
} catch (\Exception $e) {
\Log::error($e->getMessage());
Log::error('CaseException: ' . $e->getMessage());
Log::error('CaseException: ' . $e->getTraceAsString());
}
}

Expand DownExpand Up@@ -73,7 +75,8 @@ public function update(CaseStarted $case, TokenInterface $token)
'participants' => $case->participants,
]);
} catch (\Exception $e) {
\Log::error($e->getMessage());
Log::error('CaseException: ' . $e->getMessage());
Log::error('CaseException: ' . $e->getTraceAsString());
}
}

Expand All@@ -90,7 +93,8 @@ public function updateStatus(int $caseNumber, array $statusData)
CaseParticipated::where('case_number', $caseNumber)
->update($statusData);
} catch (\Exception $e) {
\Log::error($e->getMessage());
Log::error('CaseException: ' . $e->getMessage());
Log::error('CaseException: ' . $e->getTraceAsString());
}
}

Expand Down
45 changes: 25 additions & 20 deletions ProcessMaker/Repositories/CaseRepository.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@
namespace ProcessMaker\Repositories;

use Carbon\Carbon;
use Illuminate\Support\Facades\Log;
use ProcessMaker\Contracts\CaseRepositoryInterface;
use ProcessMaker\Models\CaseStarted;
use ProcessMaker\Nayra\Contracts\Bpmn\TokenInterface;
Expand All@@ -12,15 +13,20 @@ class CaseRepository implements CaseRepositoryInterface
{
const CASE_STATUS_ACTIVE = 'ACTIVE';

/**
* @var CaseParticipatedRepository
*/
protected CaseParticipatedRepository $caseParticipatedRepository;
/**
* This property is used to store an instance of `CaseStarted`
* when a case started is updated.
* @var CaseStarted|null
*/
protected ?CaseStarted $case;

public function __construct(protected CaseParticipatedRepository $caseParticipatedRepository)
public function __construct()
{
$this->caseParticipatedRepository = new CaseParticipatedRepository();
}
/**
* Store a new case started.
Expand All@@ -31,8 +37,7 @@ public function __construct(protected CaseParticipatedRepository $caseParticipat
public function create(ExecutionInstanceInterface $instance): void
{
if (is_null($instance->case_number)) {
\Log::error('Case number is required. instance: ' . $instance->getKey());

Log::error('case number is required, method=create, instance=' . $instance->getKey());
return;
}

Expand All@@ -58,8 +63,8 @@ public function create(ExecutionInstanceInterface $instance): void
'completed_at' => null,
]);
} catch (\Exception $e) {
\Log::error($e->getMessage());
\Log::error($e->getTraceAsString());
Log::error('CaseException: ' . $e->getMessage());
Log::error('CaseException: ' . $e->getTraceAsString());
}
}

Expand All@@ -72,19 +77,12 @@ public function create(ExecutionInstanceInterface $instance): void
*/
public function update(ExecutionInstanceInterface $instance, TokenInterface $token): void
{
if (is_null($instance->case_number)) {
\Log::error('Case number is required. instance: ' . $instance->getKey());

if (!$this->checkIfCaseStartedExist($instance->case_number)) {
Log::error('case started not found, method=update, instance=' . $instance->getKey());
return;
}

try {
if (!$this->checkIfCaseStartedExist($instance->case_number)) {
\Log::error('Case number not found. instance: ' . $instance->id);

return;
}

$this->case->case_title = $instance->case_title;
$this->case->case_status = $instance->status === self::CASE_STATUS_ACTIVE ? 'IN_PROGRESS' : $instance->status;
$this->case->request_tokens = CaseUtils::storeRequestTokens($token->getKey(), $this->case->request_tokens);
Expand All@@ -94,7 +92,8 @@ public function update(ExecutionInstanceInterface $instance, TokenInterface $tok

$this->case->saveOrFail();
} catch (\Exception $e) {
\Log::error($e->getMessage());
Log::error('CaseException: ' . $e->getMessage());
Log::error('CaseException: ' . $e->getTraceAsString());
}
}

Expand DownExpand Up@@ -124,7 +123,8 @@ public function updateStatus(ExecutionInstanceInterface $instance): void
CaseStarted::where('case_number', $instance->case_number)->update($data);
$this->caseParticipatedRepository->updateStatus($instance->case_number, $data);
} catch (\Exception $e) {
\Log::error($e->getMessage());
Log::error('CaseException: ' . $e->getMessage());
Log::error('CaseException: ' . $e->getTraceAsString());
}
}

Expand DownExpand Up@@ -163,11 +163,15 @@ private function updateParticipants(TokenInterface $token): void
/**
* Check if the case started exist.
*
* @param int $caseNumber
* @param int|null $caseNumber
* @return bool
*/
private function checkIfCaseStartedExist(int $caseNumber): bool
private function checkIfCaseStartedExist(int | null $caseNumber): bool
{
if (is_null($caseNumber)) {
return false;
}

$this->case = CaseStarted::where('case_number', $caseNumber)->first();

return !is_null($this->case);
Expand All@@ -191,8 +195,9 @@ private function updateSubProcesses(ExecutionInstanceInterface $instance): void
$this->case->requests = CaseUtils::storeRequests($instance, $this->case->requests);

$this->case->saveOrFail();
} catch (\Exception $th) {
\Log::error($th->getMessage());
} catch (\Exception $e) {
Log::error('CaseException: ' . $e->getMessage());
Log::error('CaseException: ' . $e->getTraceAsString());
}
}
}
190 changes: 190 additions & 0 deletions ProcessMaker/Repositories/CaseSyncRepository.php
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,190 @@
<?php

namespace ProcessMaker\Repositories;

use Illuminate\Support\Collection;
use ProcessMaker\Models\CaseParticipated;
use ProcessMaker\Models\CaseStarted;
use ProcessMaker\Models\ProcessRequest;

class CaseSyncRepository
{
/**
* Sync the cases started.
*
* @param array $requestIds
* @return array
*/
public static function syncCases(array $requestIds): array
{
$requests = ProcessRequest::with([
'tokens', 'process', 'childRequests.process', 'childRequests.tokens', 'participants',
])
->whereIn('id', $requestIds)
->get();

$successes = [];
$errors = [];

foreach ($requests as $instance) {
try {
if (!is_null($instance->parent_request_id)) {
continue;
}

$csProcesses = CaseUtils::storeProcesses($instance, collect());
$csRequests = CaseUtils::storeRequests($instance, collect());
$csRequestTokens = collect();
$csTasks = collect();
$participants = $instance->participants->map->only('id', 'fullName', 'title', 'avatar');
$status = $instance->status === CaseRepository::CASE_STATUS_ACTIVE ? 'IN_PROGRESS' : $instance->status;

$cpData = self::prepareCaseStartedData($instance, $status, $participants);

self::processTokens($instance, $cpData, $csRequestTokens, $csTasks);

self::processChildRequests($instance, $cpData, $csProcesses, $csRequests, $participants, $csRequestTokens, $csTasks);

$caseStarted = CaseStarted::updateOrCreate(
['case_number' => $instance->case_number],
[
'user_id' => $instance->user_id,
'case_title' => $instance->case_title,
'case_title_formatted' => $instance->case_title_formatted,
'case_status' => $status,
'processes' => $csProcesses,
'requests' => $csRequests,
'request_tokens' => $csRequestTokens,
'tasks' => $csTasks,
'participants' => $participants,
'initiated_at' => $instance->initiated_at,
'completed_at' => $instance->completed_at,
],
);

$successes[] = $caseStarted->case_number;
} catch (\Exception $e) {
$errors[] = $instance->case_number . ' ' . $e->getMessage();
}
}

return [
'successes' => $successes,
'errors' => $errors,
];
}

/**
* Prepare the case started data.
*
* @param ProcessRequest $instance
* @param string $status
* @param Collection $participants
* @return array
*/
private static function prepareCaseStartedData($instance, $status, $participants)
{
return [
'case_title' => $instance->case_title,
'case_title_formatted' => $instance->case_title_formatted,
'case_status' => $status,
'processes' => CaseUtils::storeProcesses($instance, collect()),
'requests' => CaseUtils::storeRequests($instance, collect()),
'request_tokens' => collect(),
'tasks' => collect(),
'participants' => $participants,
'initiated_at' => $instance->initiated_at,
'completed_at' => $instance->completed_at,
];
}

/**
* Process the tokens.
*
* @param ProcessRequest $instance
* @param array $cpData
* @param Collection $csRequestTokens
* @param Collection $csTasks
* @return void
*/
private static function processTokens($instance, &$cpData, &$csRequestTokens, &$csTasks)
{
foreach ($instance->tokens as $token) {
if (in_array($token->element_type, CaseUtils::ALLOWED_REQUEST_TOKENS)) {
$cpData['processes'] = CaseUtils::storeProcesses($instance, $cpData['processes']);
$cpData['requests'] = CaseUtils::storeRequests($instance, $cpData['requests']);
$cpData['request_tokens'] = CaseUtils::storeRequestTokens($token->getKey(), $cpData['request_tokens']);
$cpData['tasks'] = CaseUtils::storeTasks($token, $cpData['tasks']);

$csRequestTokens = CaseUtils::storeRequestTokens($token->getKey(), $csRequestTokens);
$csTasks = CaseUtils::storeTasks($token, $csTasks);

self::syncCasesParticipated($instance->case_number, $token->user_id, $cpData);
}
}
}

/**
* Process the child requests.
*
* @param ProcessRequest $instance
* @param array $cpData
* @param Collection $csProcesses
* @param Collection $csRequests
* @param Collection $participants
* @param Collection $csRequestTokens
* @param Collection $csTasks
* @return void
*/
private static function processChildRequests(
$instance, &$cpData, &$csProcesses, &$csRequests, &$participants, &$csRequestTokens, &$csTasks
)
{
foreach ($instance->childRequests as $subProcess) {
$cpData['processes'] = CaseUtils::storeProcesses($subProcess, collect());
$cpData['requests'] = CaseUtils::storeRequests($subProcess, collect());
$cpData['request_tokens'] = collect();
$cpData['tasks'] = collect();

$csProcesses = CaseUtils::storeProcesses($subProcess, $csProcesses);
$csRequests = CaseUtils::storeRequests($subProcess, $csRequests);

$participants = $participants
->merge($subProcess->participants->map->only('id', 'fullName', 'title', 'avatar'))
->unique('id')
->values();

foreach ($subProcess->tokens as $spToken) {
if (in_array($spToken->element_type, CaseUtils::ALLOWED_REQUEST_TOKENS)) {
$cpData['processes'] = CaseUtils::storeProcesses($subProcess, $cpData['processes']);
$cpData['requests'] = CaseUtils::storeRequests($subProcess, $cpData['requests']);
$cpData['request_tokens'] = CaseUtils::storeRequestTokens($spToken->getKey(), $cpData['request_tokens']);
$cpData['tasks'] = CaseUtils::storeTasks($spToken, $cpData['tasks']);

$csRequestTokens = CaseUtils::storeRequestTokens($spToken->getKey(), $csRequestTokens);
$csTasks = CaseUtils::storeTasks($spToken, $csTasks);

self::syncCasesParticipated($instance->case_number, $spToken->user_id, $cpData);
}
}
}
}

/**
* Sync the cases participated.
*
* @param CaseStarted $caseStarted
* @param TokenInterface $token
* @return void
*/
private static function syncCasesParticipated($caseNumber, $userId, $data)
{
CaseParticipated::updateOrCreate(
[
'case_number' => $caseNumber,
'user_id' => $userId,
],
$data,
);
}
}
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
47 changes: 47 additions & 0 deletions ProcessMaker/Console/Commands/CasesSync.php
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
<?php

namespace ProcessMaker\Console\Commands;

use Illuminate\Console\Command;
use ProcessMaker\Repositories\CaseSyncRepository;

class CasesSync extends Command
{
/**
* The name and signature of the console command.
*
* @var string
*/
protected $signature = 'cases:sync
{--request_ids= : Comma-separated list of request IDs to sync}';

/**
* The console command description.
*
* @var string
*/
protected $description = 'Sync requests with the cases tables';

/**
* Execute the console command.
*/
public function handle()
{
$requestIds = $this->option('request_ids');
$requestIds = $requestIds ? explode(',', $requestIds) : [];

if (count($requestIds) > 0) {
$data = CaseSyncRepository::syncCases($requestIds);

foreach ($data['successes'] as $value) {
$this->info('Case started synced ' . $value);
}

foreach ($data['errors'] as $value) {
$this->error('Error syncing case started ' . $value);
}
} else {
$this->error('Please specify a list of request IDs.');
}
}
}
10 changes: 7 additions & 3 deletions ProcessMaker/Repositories/CaseParticipatedRepository.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,7 @@

namespace ProcessMaker\Repositories;

use Illuminate\Support\Facades\Log;
use ProcessMaker\Models\CaseParticipated;
use ProcessMaker\Models\CaseStarted;
use ProcessMaker\Nayra\Contracts\Bpmn\TokenInterface;
Expand DownExpand Up@@ -44,7 +45,8 @@ public function create(CaseStarted $case, TokenInterface $token): void
'completed_at' => null,
]);
} catch (\Exception $e) {
\Log::error($e->getMessage());
Log::error('CaseException: ' . $e->getMessage());
Log::error('CaseException: ' . $e->getTraceAsString());
}
}

Expand DownExpand Up@@ -73,7 +75,8 @@ public function update(CaseStarted $case, TokenInterface $token)
'participants' => $case->participants,
]);
} catch (\Exception $e) {
\Log::error($e->getMessage());
Log::error('CaseException: ' . $e->getMessage());
Log::error('CaseException: ' . $e->getTraceAsString());
}
}

Expand All@@ -90,7 +93,8 @@ public function updateStatus(int $caseNumber, array $statusData)
CaseParticipated::where('case_number', $caseNumber)
->update($statusData);
} catch (\Exception $e) {
\Log::error($e->getMessage());
Log::error('CaseException: ' . $e->getMessage());
Log::error('CaseException: ' . $e->getTraceAsString());
}
}

Expand Down
45 changes: 25 additions & 20 deletions ProcessMaker/Repositories/CaseRepository.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@
namespace ProcessMaker\Repositories;

use Carbon\Carbon;
use Illuminate\Support\Facades\Log;
use ProcessMaker\Contracts\CaseRepositoryInterface;
use ProcessMaker\Models\CaseStarted;
use ProcessMaker\Nayra\Contracts\Bpmn\TokenInterface;
Expand All@@ -12,15 +13,20 @@ class CaseRepository implements CaseRepositoryInterface
{
const CASE_STATUS_ACTIVE = 'ACTIVE';

/**
* @var CaseParticipatedRepository
*/
protected CaseParticipatedRepository $caseParticipatedRepository;
/**
* This property is used to store an instance of `CaseStarted`
* when a case started is updated.
* @var CaseStarted|null
*/
protected ?CaseStarted $case;

public function __construct(protected CaseParticipatedRepository $caseParticipatedRepository)
public function __construct()
{
$this->caseParticipatedRepository = new CaseParticipatedRepository();
}
/**
* Store a new case started.
Expand All@@ -31,8 +37,7 @@ public function __construct(protected CaseParticipatedRepository $caseParticipat
public function create(ExecutionInstanceInterface $instance): void
{
if (is_null($instance->case_number)) {
\Log::error('Case number is required. instance: ' . $instance->getKey());

Log::error('case number is required, method=create, instance=' . $instance->getKey());
return;
}

Expand All@@ -58,8 +63,8 @@ public function create(ExecutionInstanceInterface $instance): void
'completed_at' => null,
]);
} catch (\Exception $e) {
\Log::error($e->getMessage());
\Log::error($e->getTraceAsString());
Log::error('CaseException: ' . $e->getMessage());
Log::error('CaseException: ' . $e->getTraceAsString());
}
}

Expand All@@ -72,19 +77,12 @@ public function create(ExecutionInstanceInterface $instance): void
*/
public function update(ExecutionInstanceInterface $instance, TokenInterface $token): void
{
if (is_null($instance->case_number)) {
\Log::error('Case number is required. instance: ' . $instance->getKey());

if (!$this->checkIfCaseStartedExist($instance->case_number)) {
Log::error('case started not found, method=update, instance=' . $instance->getKey());
return;
}

try {
if (!$this->checkIfCaseStartedExist($instance->case_number)) {
\Log::error('Case number not found. instance: ' . $instance->id);

return;
}

$this->case->case_title = $instance->case_title;
$this->case->case_status = $instance->status === self::CASE_STATUS_ACTIVE ? 'IN_PROGRESS' : $instance->status;
$this->case->request_tokens = CaseUtils::storeRequestTokens($token->getKey(), $this->case->request_tokens);
Expand All@@ -94,7 +92,8 @@ public function update(ExecutionInstanceInterface $instance, TokenInterface $tok

$this->case->saveOrFail();
} catch (\Exception $e) {
\Log::error($e->getMessage());
Log::error('CaseException: ' . $e->getMessage());
Log::error('CaseException: ' . $e->getTraceAsString());
}
}

Expand DownExpand Up@@ -124,7 +123,8 @@ public function updateStatus(ExecutionInstanceInterface $instance): void
CaseStarted::where('case_number', $instance->case_number)->update($data);
$this->caseParticipatedRepository->updateStatus($instance->case_number, $data);
} catch (\Exception $e) {
\Log::error($e->getMessage());
Log::error('CaseException: ' . $e->getMessage());
Log::error('CaseException: ' . $e->getTraceAsString());
}
}

Expand DownExpand Up@@ -163,11 +163,15 @@ private function updateParticipants(TokenInterface $token): void
/**
* Check if the case started exist.
*
* @param int $caseNumber
* @param int|null $caseNumber
* @return bool
*/
private function checkIfCaseStartedExist(int $caseNumber): bool
private function checkIfCaseStartedExist(int | null $caseNumber): bool
{
if (is_null($caseNumber)) {
return false;
}

$this->case = CaseStarted::where('case_number', $caseNumber)->first();

return !is_null($this->case);
Expand All@@ -191,8 +195,9 @@ private function updateSubProcesses(ExecutionInstanceInterface $instance): void
$this->case->requests = CaseUtils::storeRequests($instance, $this->case->requests);

$this->case->saveOrFail();
} catch (\Exception $th) {
\Log::error($th->getMessage());
} catch (\Exception $e) {
Log::error('CaseException: ' . $e->getMessage());
Log::error('CaseException: ' . $e->getTraceAsString());
}
}
}
190 changes: 190 additions & 0 deletions ProcessMaker/Repositories/CaseSyncRepository.php
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,190 @@
<?php

namespace ProcessMaker\Repositories;

use Illuminate\Support\Collection;
use ProcessMaker\Models\CaseParticipated;
use ProcessMaker\Models\CaseStarted;
use ProcessMaker\Models\ProcessRequest;

class CaseSyncRepository
{
/**
* Sync the cases started.
*
* @param array $requestIds
* @return array
*/
public static function syncCases(array $requestIds): array
{
$requests = ProcessRequest::with([
'tokens', 'process', 'childRequests.process', 'childRequests.tokens', 'participants',
])
->whereIn('id', $requestIds)
->get();

$successes = [];
$errors = [];

foreach ($requests as $instance) {
try {
if (!is_null($instance->parent_request_id)) {
continue;
}

$csProcesses = CaseUtils::storeProcesses($instance, collect());
$csRequests = CaseUtils::storeRequests($instance, collect());
$csRequestTokens = collect();
$csTasks = collect();
$participants = $instance->participants->map->only('id', 'fullName', 'title', 'avatar');
$status = $instance->status === CaseRepository::CASE_STATUS_ACTIVE ? 'IN_PROGRESS' : $instance->status;

$cpData = self::prepareCaseStartedData($instance, $status, $participants);

self::processTokens($instance, $cpData, $csRequestTokens, $csTasks);

self::processChildRequests($instance, $cpData, $csProcesses, $csRequests, $participants, $csRequestTokens, $csTasks);

$caseStarted = CaseStarted::updateOrCreate(
['case_number' => $instance->case_number],
[
'user_id' => $instance->user_id,
'case_title' => $instance->case_title,
'case_title_formatted' => $instance->case_title_formatted,
'case_status' => $status,
'processes' => $csProcesses,
'requests' => $csRequests,
'request_tokens' => $csRequestTokens,
'tasks' => $csTasks,
'participants' => $participants,
'initiated_at' => $instance->initiated_at,
'completed_at' => $instance->completed_at,
],
);

$successes[] = $caseStarted->case_number;
} catch (\Exception $e) {
$errors[] = $instance->case_number . ' ' . $e->getMessage();
}
}

return [
'successes' => $successes,
'errors' => $errors,
];
}

/**
* Prepare the case started data.
*
* @param ProcessRequest $instance
* @param string $status
* @param Collection $participants
* @return array
*/
private static function prepareCaseStartedData($instance, $status, $participants)
{
return [
'case_title' => $instance->case_title,
'case_title_formatted' => $instance->case_title_formatted,
'case_status' => $status,
'processes' => CaseUtils::storeProcesses($instance, collect()),
'requests' => CaseUtils::storeRequests($instance, collect()),
'request_tokens' => collect(),
'tasks' => collect(),
'participants' => $participants,
'initiated_at' => $instance->initiated_at,
'completed_at' => $instance->completed_at,
];
}

/**
* Process the tokens.
*
* @param ProcessRequest $instance
* @param array $cpData
* @param Collection $csRequestTokens
* @param Collection $csTasks
* @return void
*/
private static function processTokens($instance, &$cpData, &$csRequestTokens, &$csTasks)
{
foreach ($instance->tokens as $token) {
if (in_array($token->element_type, CaseUtils::ALLOWED_REQUEST_TOKENS)) {
$cpData['processes'] = CaseUtils::storeProcesses($instance, $cpData['processes']);
$cpData['requests'] = CaseUtils::storeRequests($instance, $cpData['requests']);
$cpData['request_tokens'] = CaseUtils::storeRequestTokens($token->getKey(), $cpData['request_tokens']);
$cpData['tasks'] = CaseUtils::storeTasks($token, $cpData['tasks']);

$csRequestTokens = CaseUtils::storeRequestTokens($token->getKey(), $csRequestTokens);
$csTasks = CaseUtils::storeTasks($token, $csTasks);

self::syncCasesParticipated($instance->case_number, $token->user_id, $cpData);
}
}
}

/**
* Process the child requests.
*
* @param ProcessRequest $instance
* @param array $cpData
* @param Collection $csProcesses
* @param Collection $csRequests
* @param Collection $participants
* @param Collection $csRequestTokens
* @param Collection $csTasks
* @return void
*/
private static function processChildRequests(
$instance, &$cpData, &$csProcesses, &$csRequests, &$participants, &$csRequestTokens, &$csTasks
)
{
foreach ($instance->childRequests as $subProcess) {
$cpData['processes'] = CaseUtils::storeProcesses($subProcess, collect());
$cpData['requests'] = CaseUtils::storeRequests($subProcess, collect());
$cpData['request_tokens'] = collect();
$cpData['tasks'] = collect();

$csProcesses = CaseUtils::storeProcesses($subProcess, $csProcesses);
$csRequests = CaseUtils::storeRequests($subProcess, $csRequests);

$participants = $participants
->merge($subProcess->participants->map->only('id', 'fullName', 'title', 'avatar'))
->unique('id')
->values();

foreach ($subProcess->tokens as $spToken) {
if (in_array($spToken->element_type, CaseUtils::ALLOWED_REQUEST_TOKENS)) {
$cpData['processes'] = CaseUtils::storeProcesses($subProcess, $cpData['processes']);
$cpData['requests'] = CaseUtils::storeRequests($subProcess, $cpData['requests']);
$cpData['request_tokens'] = CaseUtils::storeRequestTokens($spToken->getKey(), $cpData['request_tokens']);
$cpData['tasks'] = CaseUtils::storeTasks($spToken, $cpData['tasks']);

$csRequestTokens = CaseUtils::storeRequestTokens($spToken->getKey(), $csRequestTokens);
$csTasks = CaseUtils::storeTasks($spToken, $csTasks);

self::syncCasesParticipated($instance->case_number, $spToken->user_id, $cpData);
}
}
}
}

/**
* Sync the cases participated.
*
* @param CaseStarted $caseStarted
* @param TokenInterface $token
* @return void
*/
private static function syncCasesParticipated($caseNumber, $userId, $data)
{
CaseParticipated::updateOrCreate(
[
'case_number' => $caseNumber,
'user_id' => $userId,
],
$data,
);
}
}
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
47 changes: 47 additions & 0 deletions ProcessMaker/Console/Commands/CasesSync.php
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
<?php

namespace ProcessMaker\Console\Commands;

use Illuminate\Console\Command;
use ProcessMaker\Repositories\CaseSyncRepository;

class CasesSync extends Command
{
/**
* The name and signature of the console command.
*
* @var string
*/
protected $signature = 'cases:sync
{--request_ids= : Comma-separated list of request IDs to sync}';

/**
* The console command description.
*
* @var string
*/
protected $description = 'Sync requests with the cases tables';

/**
* Execute the console command.
*/
public function handle()
{
$requestIds = $this->option('request_ids');
$requestIds = $requestIds ? explode(',', $requestIds) : [];

if (count($requestIds) > 0) {
$data = CaseSyncRepository::syncCases($requestIds);

foreach ($data['successes'] as $value) {
$this->info('Case started synced ' . $value);
}

foreach ($data['errors'] as $value) {
$this->error('Error syncing case started ' . $value);
}
} else {
$this->error('Please specify a list of request IDs.');
}
}
}
10 changes: 7 additions & 3 deletions ProcessMaker/Repositories/CaseParticipatedRepository.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,7 @@

namespace ProcessMaker\Repositories;

use Illuminate\Support\Facades\Log;
use ProcessMaker\Models\CaseParticipated;
use ProcessMaker\Models\CaseStarted;
use ProcessMaker\Nayra\Contracts\Bpmn\TokenInterface;
Expand DownExpand Up@@ -44,7 +45,8 @@ public function create(CaseStarted $case, TokenInterface $token): void
'completed_at' => null,
]);
} catch (\Exception $e) {
\Log::error($e->getMessage());
Log::error('CaseException: ' . $e->getMessage());
Log::error('CaseException: ' . $e->getTraceAsString());
}
}

Expand DownExpand Up@@ -73,7 +75,8 @@ public function update(CaseStarted $case, TokenInterface $token)
'participants' => $case->participants,
]);
} catch (\Exception $e) {
\Log::error($e->getMessage());
Log::error('CaseException: ' . $e->getMessage());
Log::error('CaseException: ' . $e->getTraceAsString());
}
}

Expand All@@ -90,7 +93,8 @@ public function updateStatus(int $caseNumber, array $statusData)
CaseParticipated::where('case_number', $caseNumber)
->update($statusData);
} catch (\Exception $e) {
\Log::error($e->getMessage());
Log::error('CaseException: ' . $e->getMessage());
Log::error('CaseException: ' . $e->getTraceAsString());
}
}

Expand Down
45 changes: 25 additions & 20 deletions ProcessMaker/Repositories/CaseRepository.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@
namespace ProcessMaker\Repositories;

use Carbon\Carbon;
use Illuminate\Support\Facades\Log;
use ProcessMaker\Contracts\CaseRepositoryInterface;
use ProcessMaker\Models\CaseStarted;
use ProcessMaker\Nayra\Contracts\Bpmn\TokenInterface;
Expand All@@ -12,15 +13,20 @@ class CaseRepository implements CaseRepositoryInterface
{
const CASE_STATUS_ACTIVE = 'ACTIVE';

/**
* @var CaseParticipatedRepository
*/
protected CaseParticipatedRepository $caseParticipatedRepository;
/**
* This property is used to store an instance of `CaseStarted`
* when a case started is updated.
* @var CaseStarted|null
*/
protected ?CaseStarted $case;

public function __construct(protected CaseParticipatedRepository $caseParticipatedRepository)
public function __construct()
{
$this->caseParticipatedRepository = new CaseParticipatedRepository();
}
/**
* Store a new case started.
Expand All@@ -31,8 +37,7 @@ public function __construct(protected CaseParticipatedRepository $caseParticipat
public function create(ExecutionInstanceInterface $instance): void
{
if (is_null($instance->case_number)) {
\Log::error('Case number is required. instance: ' . $instance->getKey());

Log::error('case number is required, method=create, instance=' . $instance->getKey());
return;
}

Expand All@@ -58,8 +63,8 @@ public function create(ExecutionInstanceInterface $instance): void
'completed_at' => null,
]);
} catch (\Exception $e) {
\Log::error($e->getMessage());
\Log::error($e->getTraceAsString());
Log::error('CaseException: ' . $e->getMessage());
Log::error('CaseException: ' . $e->getTraceAsString());
}
}

Expand All@@ -72,19 +77,12 @@ public function create(ExecutionInstanceInterface $instance): void
*/
public function update(ExecutionInstanceInterface $instance, TokenInterface $token): void
{
if (is_null($instance->case_number)) {
\Log::error('Case number is required. instance: ' . $instance->getKey());

if (!$this->checkIfCaseStartedExist($instance->case_number)) {
Log::error('case started not found, method=update, instance=' . $instance->getKey());
return;
}

try {
if (!$this->checkIfCaseStartedExist($instance->case_number)) {
\Log::error('Case number not found. instance: ' . $instance->id);

return;
}

$this->case->case_title = $instance->case_title;
$this->case->case_status = $instance->status === self::CASE_STATUS_ACTIVE ? 'IN_PROGRESS' : $instance->status;
$this->case->request_tokens = CaseUtils::storeRequestTokens($token->getKey(), $this->case->request_tokens);
Expand All@@ -94,7 +92,8 @@ public function update(ExecutionInstanceInterface $instance, TokenInterface $tok

$this->case->saveOrFail();
} catch (\Exception $e) {
\Log::error($e->getMessage());
Log::error('CaseException: ' . $e->getMessage());
Log::error('CaseException: ' . $e->getTraceAsString());
}
}

Expand DownExpand Up@@ -124,7 +123,8 @@ public function updateStatus(ExecutionInstanceInterface $instance): void
CaseStarted::where('case_number', $instance->case_number)->update($data);
$this->caseParticipatedRepository->updateStatus($instance->case_number, $data);
} catch (\Exception $e) {
\Log::error($e->getMessage());
Log::error('CaseException: ' . $e->getMessage());
Log::error('CaseException: ' . $e->getTraceAsString());
}
}

Expand DownExpand Up@@ -163,11 +163,15 @@ private function updateParticipants(TokenInterface $token): void
/**
* Check if the case started exist.
*
* @param int $caseNumber
* @param int|null $caseNumber
* @return bool
*/
private function checkIfCaseStartedExist(int $caseNumber): bool
private function checkIfCaseStartedExist(int | null $caseNumber): bool
{
if (is_null($caseNumber)) {
return false;
}

$this->case = CaseStarted::where('case_number', $caseNumber)->first();

return !is_null($this->case);
Expand All@@ -191,8 +195,9 @@ private function updateSubProcesses(ExecutionInstanceInterface $instance): void
$this->case->requests = CaseUtils::storeRequests($instance, $this->case->requests);

$this->case->saveOrFail();
} catch (\Exception $th) {
\Log::error($th->getMessage());
} catch (\Exception $e) {
Log::error('CaseException: ' . $e->getMessage());
Log::error('CaseException: ' . $e->getTraceAsString());
}
}
}
190 changes: 190 additions & 0 deletions ProcessMaker/Repositories/CaseSyncRepository.php
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,190 @@
<?php

namespace ProcessMaker\Repositories;

use Illuminate\Support\Collection;
use ProcessMaker\Models\CaseParticipated;
use ProcessMaker\Models\CaseStarted;
use ProcessMaker\Models\ProcessRequest;

class CaseSyncRepository
{
/**
* Sync the cases started.
*
* @param array $requestIds
* @return array
*/
public static function syncCases(array $requestIds): array
{
$requests = ProcessRequest::with([
'tokens', 'process', 'childRequests.process', 'childRequests.tokens', 'participants',
])
->whereIn('id', $requestIds)
->get();

$successes = [];
$errors = [];

foreach ($requests as $instance) {
try {
if (!is_null($instance->parent_request_id)) {
continue;
}

$csProcesses = CaseUtils::storeProcesses($instance, collect());
$csRequests = CaseUtils::storeRequests($instance, collect());
$csRequestTokens = collect();
$csTasks = collect();
$participants = $instance->participants->map->only('id', 'fullName', 'title', 'avatar');
$status = $instance->status === CaseRepository::CASE_STATUS_ACTIVE ? 'IN_PROGRESS' : $instance->status;

$cpData = self::prepareCaseStartedData($instance, $status, $participants);

self::processTokens($instance, $cpData, $csRequestTokens, $csTasks);

self::processChildRequests($instance, $cpData, $csProcesses, $csRequests, $participants, $csRequestTokens, $csTasks);

$caseStarted = CaseStarted::updateOrCreate(
['case_number' => $instance->case_number],
[
'user_id' => $instance->user_id,
'case_title' => $instance->case_title,
'case_title_formatted' => $instance->case_title_formatted,
'case_status' => $status,
'processes' => $csProcesses,
'requests' => $csRequests,
'request_tokens' => $csRequestTokens,
'tasks' => $csTasks,
'participants' => $participants,
'initiated_at' => $instance->initiated_at,
'completed_at' => $instance->completed_at,
],
);

$successes[] = $caseStarted->case_number;
} catch (\Exception $e) {
$errors[] = $instance->case_number . ' ' . $e->getMessage();
}
}

return [
'successes' => $successes,
'errors' => $errors,
];
}

/**
* Prepare the case started data.
*
* @param ProcessRequest $instance
* @param string $status
* @param Collection $participants
* @return array
*/
private static function prepareCaseStartedData($instance, $status, $participants)
{
return [
'case_title' => $instance->case_title,
'case_title_formatted' => $instance->case_title_formatted,
'case_status' => $status,
'processes' => CaseUtils::storeProcesses($instance, collect()),
'requests' => CaseUtils::storeRequests($instance, collect()),
'request_tokens' => collect(),
'tasks' => collect(),
'participants' => $participants,
'initiated_at' => $instance->initiated_at,
'completed_at' => $instance->completed_at,
];
}

/**
* Process the tokens.
*
* @param ProcessRequest $instance
* @param array $cpData
* @param Collection $csRequestTokens
* @param Collection $csTasks
* @return void
*/
private static function processTokens($instance, &$cpData, &$csRequestTokens, &$csTasks)
{
foreach ($instance->tokens as $token) {
if (in_array($token->element_type, CaseUtils::ALLOWED_REQUEST_TOKENS)) {
$cpData['processes'] = CaseUtils::storeProcesses($instance, $cpData['processes']);
$cpData['requests'] = CaseUtils::storeRequests($instance, $cpData['requests']);
$cpData['request_tokens'] = CaseUtils::storeRequestTokens($token->getKey(), $cpData['request_tokens']);
$cpData['tasks'] = CaseUtils::storeTasks($token, $cpData['tasks']);

$csRequestTokens = CaseUtils::storeRequestTokens($token->getKey(), $csRequestTokens);
$csTasks = CaseUtils::storeTasks($token, $csTasks);

self::syncCasesParticipated($instance->case_number, $token->user_id, $cpData);
}
}
}

/**
* Process the child requests.
*
* @param ProcessRequest $instance
* @param array $cpData
* @param Collection $csProcesses
* @param Collection $csRequests
* @param Collection $participants
* @param Collection $csRequestTokens
* @param Collection $csTasks
* @return void
*/
private static function processChildRequests(
$instance, &$cpData, &$csProcesses, &$csRequests, &$participants, &$csRequestTokens, &$csTasks
)
{
foreach ($instance->childRequests as $subProcess) {
$cpData['processes'] = CaseUtils::storeProcesses($subProcess, collect());
$cpData['requests'] = CaseUtils::storeRequests($subProcess, collect());
$cpData['request_tokens'] = collect();
$cpData['tasks'] = collect();

$csProcesses = CaseUtils::storeProcesses($subProcess, $csProcesses);
$csRequests = CaseUtils::storeRequests($subProcess, $csRequests);

$participants = $participants
->merge($subProcess->participants->map->only('id', 'fullName', 'title', 'avatar'))
->unique('id')
->values();

foreach ($subProcess->tokens as $spToken) {
if (in_array($spToken->element_type, CaseUtils::ALLOWED_REQUEST_TOKENS)) {
$cpData['processes'] = CaseUtils::storeProcesses($subProcess, $cpData['processes']);
$cpData['requests'] = CaseUtils::storeRequests($subProcess, $cpData['requests']);
$cpData['request_tokens'] = CaseUtils::storeRequestTokens($spToken->getKey(), $cpData['request_tokens']);
$cpData['tasks'] = CaseUtils::storeTasks($spToken, $cpData['tasks']);

$csRequestTokens = CaseUtils::storeRequestTokens($spToken->getKey(), $csRequestTokens);
$csTasks = CaseUtils::storeTasks($spToken, $csTasks);

self::syncCasesParticipated($instance->case_number, $spToken->user_id, $cpData);
}
}
}
}

/**
* Sync the cases participated.
*
* @param CaseStarted $caseStarted
* @param TokenInterface $token
* @return void
*/
private static function syncCasesParticipated($caseNumber, $userId, $data)
{
CaseParticipated::updateOrCreate(
[
'case_number' => $caseNumber,
'user_id' => $userId,
],
$data,
);
}
}
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
47 changes: 47 additions & 0 deletions ProcessMaker/Console/Commands/CasesSync.php
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
<?php

namespace ProcessMaker\Console\Commands;

use Illuminate\Console\Command;
use ProcessMaker\Repositories\CaseSyncRepository;

class CasesSync extends Command
{
/**
* The name and signature of the console command.
*
* @var string
*/
protected $signature = 'cases:sync
{--request_ids= : Comma-separated list of request IDs to sync}';

/**
* The console command description.
*
* @var string
*/
protected $description = 'Sync requests with the cases tables';

/**
* Execute the console command.
*/
public function handle()
{
$requestIds = $this->option('request_ids');
$requestIds = $requestIds ? explode(',', $requestIds) : [];

if (count($requestIds) > 0) {
$data = CaseSyncRepository::syncCases($requestIds);

foreach ($data['successes'] as $value) {
$this->info('Case started synced ' . $value);
}

foreach ($data['errors'] as $value) {
$this->error('Error syncing case started ' . $value);
}
} else {
$this->error('Please specify a list of request IDs.');
}
}
}
10 changes: 7 additions & 3 deletions ProcessMaker/Repositories/CaseParticipatedRepository.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,7 @@

namespace ProcessMaker\Repositories;

use Illuminate\Support\Facades\Log;
use ProcessMaker\Models\CaseParticipated;
use ProcessMaker\Models\CaseStarted;
use ProcessMaker\Nayra\Contracts\Bpmn\TokenInterface;
Expand DownExpand Up@@ -44,7 +45,8 @@ public function create(CaseStarted $case, TokenInterface $token): void
'completed_at' => null,
]);
} catch (\Exception $e) {
\Log::error($e->getMessage());
Log::error('CaseException: ' . $e->getMessage());
Log::error('CaseException: ' . $e->getTraceAsString());
}
}

Expand DownExpand Up@@ -73,7 +75,8 @@ public function update(CaseStarted $case, TokenInterface $token)
'participants' => $case->participants,
]);
} catch (\Exception $e) {
\Log::error($e->getMessage());
Log::error('CaseException: ' . $e->getMessage());
Log::error('CaseException: ' . $e->getTraceAsString());
}
}

Expand All@@ -90,7 +93,8 @@ public function updateStatus(int $caseNumber, array $statusData)
CaseParticipated::where('case_number', $caseNumber)
->update($statusData);
} catch (\Exception $e) {
\Log::error($e->getMessage());
Log::error('CaseException: ' . $e->getMessage());
Log::error('CaseException: ' . $e->getTraceAsString());
}
}

Expand Down
45 changes: 25 additions & 20 deletions ProcessMaker/Repositories/CaseRepository.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@
namespace ProcessMaker\Repositories;

use Carbon\Carbon;
use Illuminate\Support\Facades\Log;
use ProcessMaker\Contracts\CaseRepositoryInterface;
use ProcessMaker\Models\CaseStarted;
use ProcessMaker\Nayra\Contracts\Bpmn\TokenInterface;
Expand All@@ -12,15 +13,20 @@ class CaseRepository implements CaseRepositoryInterface
{
const CASE_STATUS_ACTIVE = 'ACTIVE';

/**
* @var CaseParticipatedRepository
*/
protected CaseParticipatedRepository $caseParticipatedRepository;
/**
* This property is used to store an instance of `CaseStarted`
* when a case started is updated.
* @var CaseStarted|null
*/
protected ?CaseStarted $case;

public function __construct(protected CaseParticipatedRepository $caseParticipatedRepository)
public function __construct()
{
$this->caseParticipatedRepository = new CaseParticipatedRepository();
}
/**
* Store a new case started.
Expand All@@ -31,8 +37,7 @@ public function __construct(protected CaseParticipatedRepository $caseParticipat
public function create(ExecutionInstanceInterface $instance): void
{
if (is_null($instance->case_number)) {
\Log::error('Case number is required. instance: ' . $instance->getKey());

Log::error('case number is required, method=create, instance=' . $instance->getKey());
return;
}

Expand All@@ -58,8 +63,8 @@ public function create(ExecutionInstanceInterface $instance): void
'completed_at' => null,
]);
} catch (\Exception $e) {
\Log::error($e->getMessage());
\Log::error($e->getTraceAsString());
Log::error('CaseException: ' . $e->getMessage());
Log::error('CaseException: ' . $e->getTraceAsString());
}
}

Expand All@@ -72,19 +77,12 @@ public function create(ExecutionInstanceInterface $instance): void
*/
public function update(ExecutionInstanceInterface $instance, TokenInterface $token): void
{
if (is_null($instance->case_number)) {
\Log::error('Case number is required. instance: ' . $instance->getKey());

if (!$this->checkIfCaseStartedExist($instance->case_number)) {
Log::error('case started not found, method=update, instance=' . $instance->getKey());
return;
}

try {
if (!$this->checkIfCaseStartedExist($instance->case_number)) {
\Log::error('Case number not found. instance: ' . $instance->id);

return;
}

$this->case->case_title = $instance->case_title;
$this->case->case_status = $instance->status === self::CASE_STATUS_ACTIVE ? 'IN_PROGRESS' : $instance->status;
$this->case->request_tokens = CaseUtils::storeRequestTokens($token->getKey(), $this->case->request_tokens);
Expand All@@ -94,7 +92,8 @@ public function update(ExecutionInstanceInterface $instance, TokenInterface $tok

$this->case->saveOrFail();
} catch (\Exception $e) {
\Log::error($e->getMessage());
Log::error('CaseException: ' . $e->getMessage());
Log::error('CaseException: ' . $e->getTraceAsString());
}
}

Expand DownExpand Up@@ -124,7 +123,8 @@ public function updateStatus(ExecutionInstanceInterface $instance): void
CaseStarted::where('case_number', $instance->case_number)->update($data);
$this->caseParticipatedRepository->updateStatus($instance->case_number, $data);
} catch (\Exception $e) {
\Log::error($e->getMessage());
Log::error('CaseException: ' . $e->getMessage());
Log::error('CaseException: ' . $e->getTraceAsString());
}
}

Expand DownExpand Up@@ -163,11 +163,15 @@ private function updateParticipants(TokenInterface $token): void
/**
* Check if the case started exist.
*
* @param int $caseNumber
* @param int|null $caseNumber
* @return bool
*/
private function checkIfCaseStartedExist(int $caseNumber): bool
private function checkIfCaseStartedExist(int | null $caseNumber): bool
{
if (is_null($caseNumber)) {
return false;
}

$this->case = CaseStarted::where('case_number', $caseNumber)->first();

return !is_null($this->case);
Expand All@@ -191,8 +195,9 @@ private function updateSubProcesses(ExecutionInstanceInterface $instance): void
$this->case->requests = CaseUtils::storeRequests($instance, $this->case->requests);

$this->case->saveOrFail();
} catch (\Exception $th) {
\Log::error($th->getMessage());
} catch (\Exception $e) {
Log::error('CaseException: ' . $e->getMessage());
Log::error('CaseException: ' . $e->getTraceAsString());
}
}
}
190 changes: 190 additions & 0 deletions ProcessMaker/Repositories/CaseSyncRepository.php
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,190 @@
<?php

namespace ProcessMaker\Repositories;

use Illuminate\Support\Collection;
use ProcessMaker\Models\CaseParticipated;
use ProcessMaker\Models\CaseStarted;
use ProcessMaker\Models\ProcessRequest;

class CaseSyncRepository
{
/**
* Sync the cases started.
*
* @param array $requestIds
* @return array
*/
public static function syncCases(array $requestIds): array
{
$requests = ProcessRequest::with([
'tokens', 'process', 'childRequests.process', 'childRequests.tokens', 'participants',
])
->whereIn('id', $requestIds)
->get();

$successes = [];
$errors = [];

foreach ($requests as $instance) {
try {
if (!is_null($instance->parent_request_id)) {
continue;
}

$csProcesses = CaseUtils::storeProcesses($instance, collect());
$csRequests = CaseUtils::storeRequests($instance, collect());
$csRequestTokens = collect();
$csTasks = collect();
$participants = $instance->participants->map->only('id', 'fullName', 'title', 'avatar');
$status = $instance->status === CaseRepository::CASE_STATUS_ACTIVE ? 'IN_PROGRESS' : $instance->status;

$cpData = self::prepareCaseStartedData($instance, $status, $participants);

self::processTokens($instance, $cpData, $csRequestTokens, $csTasks);

self::processChildRequests($instance, $cpData, $csProcesses, $csRequests, $participants, $csRequestTokens, $csTasks);

$caseStarted = CaseStarted::updateOrCreate(
['case_number' => $instance->case_number],
[
'user_id' => $instance->user_id,
'case_title' => $instance->case_title,
'case_title_formatted' => $instance->case_title_formatted,
'case_status' => $status,
'processes' => $csProcesses,
'requests' => $csRequests,
'request_tokens' => $csRequestTokens,
'tasks' => $csTasks,
'participants' => $participants,
'initiated_at' => $instance->initiated_at,
'completed_at' => $instance->completed_at,
],
);

$successes[] = $caseStarted->case_number;
} catch (\Exception $e) {
$errors[] = $instance->case_number . ' ' . $e->getMessage();
}
}

return [
'successes' => $successes,
'errors' => $errors,
];
}

/**
* Prepare the case started data.
*
* @param ProcessRequest $instance
* @param string $status
* @param Collection $participants
* @return array
*/
private static function prepareCaseStartedData($instance, $status, $participants)
{
return [
'case_title' => $instance->case_title,
'case_title_formatted' => $instance->case_title_formatted,
'case_status' => $status,
'processes' => CaseUtils::storeProcesses($instance, collect()),
'requests' => CaseUtils::storeRequests($instance, collect()),
'request_tokens' => collect(),
'tasks' => collect(),
'participants' => $participants,
'initiated_at' => $instance->initiated_at,
'completed_at' => $instance->completed_at,
];
}

/**
* Process the tokens.
*
* @param ProcessRequest $instance
* @param array $cpData
* @param Collection $csRequestTokens
* @param Collection $csTasks
* @return void
*/
private static function processTokens($instance, &$cpData, &$csRequestTokens, &$csTasks)
{
foreach ($instance->tokens as $token) {
if (in_array($token->element_type, CaseUtils::ALLOWED_REQUEST_TOKENS)) {
$cpData['processes'] = CaseUtils::storeProcesses($instance, $cpData['processes']);
$cpData['requests'] = CaseUtils::storeRequests($instance, $cpData['requests']);
$cpData['request_tokens'] = CaseUtils::storeRequestTokens($token->getKey(), $cpData['request_tokens']);
$cpData['tasks'] = CaseUtils::storeTasks($token, $cpData['tasks']);

$csRequestTokens = CaseUtils::storeRequestTokens($token->getKey(), $csRequestTokens);
$csTasks = CaseUtils::storeTasks($token, $csTasks);

self::syncCasesParticipated($instance->case_number, $token->user_id, $cpData);
}
}
}

/**
* Process the child requests.
*
* @param ProcessRequest $instance
* @param array $cpData
* @param Collection $csProcesses
* @param Collection $csRequests
* @param Collection $participants
* @param Collection $csRequestTokens
* @param Collection $csTasks
* @return void
*/
private static function processChildRequests(
$instance, &$cpData, &$csProcesses, &$csRequests, &$participants, &$csRequestTokens, &$csTasks
)
{
foreach ($instance->childRequests as $subProcess) {
$cpData['processes'] = CaseUtils::storeProcesses($subProcess, collect());
$cpData['requests'] = CaseUtils::storeRequests($subProcess, collect());
$cpData['request_tokens'] = collect();
$cpData['tasks'] = collect();

$csProcesses = CaseUtils::storeProcesses($subProcess, $csProcesses);
$csRequests = CaseUtils::storeRequests($subProcess, $csRequests);

$participants = $participants
->merge($subProcess->participants->map->only('id', 'fullName', 'title', 'avatar'))
->unique('id')
->values();

foreach ($subProcess->tokens as $spToken) {
if (in_array($spToken->element_type, CaseUtils::ALLOWED_REQUEST_TOKENS)) {
$cpData['processes'] = CaseUtils::storeProcesses($subProcess, $cpData['processes']);
$cpData['requests'] = CaseUtils::storeRequests($subProcess, $cpData['requests']);
$cpData['request_tokens'] = CaseUtils::storeRequestTokens($spToken->getKey(), $cpData['request_tokens']);
$cpData['tasks'] = CaseUtils::storeTasks($spToken, $cpData['tasks']);

$csRequestTokens = CaseUtils::storeRequestTokens($spToken->getKey(), $csRequestTokens);
$csTasks = CaseUtils::storeTasks($spToken, $csTasks);

self::syncCasesParticipated($instance->case_number, $spToken->user_id, $cpData);
}
}
}
}

/**
* Sync the cases participated.
*
* @param CaseStarted $caseStarted
* @param TokenInterface $token
* @return void
*/
private static function syncCasesParticipated($caseNumber, $userId, $data)
{
CaseParticipated::updateOrCreate(
[
'case_number' => $caseNumber,
'user_id' => $userId,
],
$data,
);
}
}
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
47 changes: 47 additions & 0 deletions ProcessMaker/Console/Commands/CasesSync.php
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
<?php

namespace ProcessMaker\Console\Commands;

use Illuminate\Console\Command;
use ProcessMaker\Repositories\CaseSyncRepository;

class CasesSync extends Command
{
/**
* The name and signature of the console command.
*
* @var string
*/
protected $signature = 'cases:sync
{--request_ids= : Comma-separated list of request IDs to sync}';

/**
* The console command description.
*
* @var string
*/
protected $description = 'Sync requests with the cases tables';

/**
* Execute the console command.
*/
public function handle()
{
$requestIds = $this->option('request_ids');
$requestIds = $requestIds ? explode(',', $requestIds) : [];

if (count($requestIds) > 0) {
$data = CaseSyncRepository::syncCases($requestIds);

foreach ($data['successes'] as $value) {
$this->info('Case started synced ' . $value);
}

foreach ($data['errors'] as $value) {
$this->error('Error syncing case started ' . $value);
}
} else {
$this->error('Please specify a list of request IDs.');
}
}
}
10 changes: 7 additions & 3 deletions ProcessMaker/Repositories/CaseParticipatedRepository.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,7 @@

namespace ProcessMaker\Repositories;

use Illuminate\Support\Facades\Log;
use ProcessMaker\Models\CaseParticipated;
use ProcessMaker\Models\CaseStarted;
use ProcessMaker\Nayra\Contracts\Bpmn\TokenInterface;
Expand DownExpand Up@@ -44,7 +45,8 @@ public function create(CaseStarted $case, TokenInterface $token): void
'completed_at' => null,
]);
} catch (\Exception $e) {
\Log::error($e->getMessage());
Log::error('CaseException: ' . $e->getMessage());
Log::error('CaseException: ' . $e->getTraceAsString());
}
}

Expand DownExpand Up@@ -73,7 +75,8 @@ public function update(CaseStarted $case, TokenInterface $token)
'participants' => $case->participants,
]);
} catch (\Exception $e) {
\Log::error($e->getMessage());
Log::error('CaseException: ' . $e->getMessage());
Log::error('CaseException: ' . $e->getTraceAsString());
}
}

Expand All@@ -90,7 +93,8 @@ public function updateStatus(int $caseNumber, array $statusData)
CaseParticipated::where('case_number', $caseNumber)
->update($statusData);
} catch (\Exception $e) {
\Log::error($e->getMessage());
Log::error('CaseException: ' . $e->getMessage());
Log::error('CaseException: ' . $e->getTraceAsString());
}
}

Expand Down
45 changes: 25 additions & 20 deletions ProcessMaker/Repositories/CaseRepository.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@
namespace ProcessMaker\Repositories;

use Carbon\Carbon;
use Illuminate\Support\Facades\Log;
use ProcessMaker\Contracts\CaseRepositoryInterface;
use ProcessMaker\Models\CaseStarted;
use ProcessMaker\Nayra\Contracts\Bpmn\TokenInterface;
Expand All@@ -12,15 +13,20 @@ class CaseRepository implements CaseRepositoryInterface
{
const CASE_STATUS_ACTIVE = 'ACTIVE';

/**
* @var CaseParticipatedRepository
*/
protected CaseParticipatedRepository $caseParticipatedRepository;
/**
* This property is used to store an instance of `CaseStarted`
* when a case started is updated.
* @var CaseStarted|null
*/
protected ?CaseStarted $case;

public function __construct(protected CaseParticipatedRepository $caseParticipatedRepository)
public function __construct()
{
$this->caseParticipatedRepository = new CaseParticipatedRepository();
}
/**
* Store a new case started.
Expand All@@ -31,8 +37,7 @@ public function __construct(protected CaseParticipatedRepository $caseParticipat
public function create(ExecutionInstanceInterface $instance): void
{
if (is_null($instance->case_number)) {
\Log::error('Case number is required. instance: ' . $instance->getKey());

Log::error('case number is required, method=create, instance=' . $instance->getKey());
return;
}

Expand All@@ -58,8 +63,8 @@ public function create(ExecutionInstanceInterface $instance): void
'completed_at' => null,
]);
} catch (\Exception $e) {
\Log::error($e->getMessage());
\Log::error($e->getTraceAsString());
Log::error('CaseException: ' . $e->getMessage());
Log::error('CaseException: ' . $e->getTraceAsString());
}
}

Expand All@@ -72,19 +77,12 @@ public function create(ExecutionInstanceInterface $instance): void
*/
public function update(ExecutionInstanceInterface $instance, TokenInterface $token): void
{
if (is_null($instance->case_number)) {
\Log::error('Case number is required. instance: ' . $instance->getKey());

if (!$this->checkIfCaseStartedExist($instance->case_number)) {
Log::error('case started not found, method=update, instance=' . $instance->getKey());
return;
}

try {
if (!$this->checkIfCaseStartedExist($instance->case_number)) {
\Log::error('Case number not found. instance: ' . $instance->id);

return;
}

$this->case->case_title = $instance->case_title;
$this->case->case_status = $instance->status === self::CASE_STATUS_ACTIVE ? 'IN_PROGRESS' : $instance->status;
$this->case->request_tokens = CaseUtils::storeRequestTokens($token->getKey(), $this->case->request_tokens);
Expand All@@ -94,7 +92,8 @@ public function update(ExecutionInstanceInterface $instance, TokenInterface $tok

$this->case->saveOrFail();
} catch (\Exception $e) {
\Log::error($e->getMessage());
Log::error('CaseException: ' . $e->getMessage());
Log::error('CaseException: ' . $e->getTraceAsString());
}
}

Expand DownExpand Up@@ -124,7 +123,8 @@ public function updateStatus(ExecutionInstanceInterface $instance): void
CaseStarted::where('case_number', $instance->case_number)->update($data);
$this->caseParticipatedRepository->updateStatus($instance->case_number, $data);
} catch (\Exception $e) {
\Log::error($e->getMessage());
Log::error('CaseException: ' . $e->getMessage());
Log::error('CaseException: ' . $e->getTraceAsString());
}
}

Expand DownExpand Up@@ -163,11 +163,15 @@ private function updateParticipants(TokenInterface $token): void
/**
* Check if the case started exist.
*
* @param int $caseNumber
* @param int|null $caseNumber
* @return bool
*/
private function checkIfCaseStartedExist(int $caseNumber): bool
private function checkIfCaseStartedExist(int | null $caseNumber): bool
{
if (is_null($caseNumber)) {
return false;
}

$this->case = CaseStarted::where('case_number', $caseNumber)->first();

return !is_null($this->case);
Expand All@@ -191,8 +195,9 @@ private function updateSubProcesses(ExecutionInstanceInterface $instance): void
$this->case->requests = CaseUtils::storeRequests($instance, $this->case->requests);

$this->case->saveOrFail();
} catch (\Exception $th) {
\Log::error($th->getMessage());
} catch (\Exception $e) {
Log::error('CaseException: ' . $e->getMessage());
Log::error('CaseException: ' . $e->getTraceAsString());
}
}
}
190 changes: 190 additions & 0 deletions ProcessMaker/Repositories/CaseSyncRepository.php
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,190 @@
<?php

namespace ProcessMaker\Repositories;

use Illuminate\Support\Collection;
use ProcessMaker\Models\CaseParticipated;
use ProcessMaker\Models\CaseStarted;
use ProcessMaker\Models\ProcessRequest;

class CaseSyncRepository
{
/**
* Sync the cases started.
*
* @param array $requestIds
* @return array
*/
public static function syncCases(array $requestIds): array
{
$requests = ProcessRequest::with([
'tokens', 'process', 'childRequests.process', 'childRequests.tokens', 'participants',
])
->whereIn('id', $requestIds)
->get();

$successes = [];
$errors = [];

foreach ($requests as $instance) {
try {
if (!is_null($instance->parent_request_id)) {
continue;
}

$csProcesses = CaseUtils::storeProcesses($instance, collect());
$csRequests = CaseUtils::storeRequests($instance, collect());
$csRequestTokens = collect();
$csTasks = collect();
$participants = $instance->participants->map->only('id', 'fullName', 'title', 'avatar');
$status = $instance->status === CaseRepository::CASE_STATUS_ACTIVE ? 'IN_PROGRESS' : $instance->status;

$cpData = self::prepareCaseStartedData($instance, $status, $participants);

self::processTokens($instance, $cpData, $csRequestTokens, $csTasks);

self::processChildRequests($instance, $cpData, $csProcesses, $csRequests, $participants, $csRequestTokens, $csTasks);

$caseStarted = CaseStarted::updateOrCreate(
['case_number' => $instance->case_number],
[
'user_id' => $instance->user_id,
'case_title' => $instance->case_title,
'case_title_formatted' => $instance->case_title_formatted,
'case_status' => $status,
'processes' => $csProcesses,
'requests' => $csRequests,
'request_tokens' => $csRequestTokens,
'tasks' => $csTasks,
'participants' => $participants,
'initiated_at' => $instance->initiated_at,
'completed_at' => $instance->completed_at,
],
);

$successes[] = $caseStarted->case_number;
} catch (\Exception $e) {
$errors[] = $instance->case_number . ' ' . $e->getMessage();
}
}

return [
'successes' => $successes,
'errors' => $errors,
];
}

/**
* Prepare the case started data.
*
* @param ProcessRequest $instance
* @param string $status
* @param Collection $participants
* @return array
*/
private static function prepareCaseStartedData($instance, $status, $participants)
{
return [
'case_title' => $instance->case_title,
'case_title_formatted' => $instance->case_title_formatted,
'case_status' => $status,
'processes' => CaseUtils::storeProcesses($instance, collect()),
'requests' => CaseUtils::storeRequests($instance, collect()),
'request_tokens' => collect(),
'tasks' => collect(),
'participants' => $participants,
'initiated_at' => $instance->initiated_at,
'completed_at' => $instance->completed_at,
];
}

/**
* Process the tokens.
*
* @param ProcessRequest $instance
* @param array $cpData
* @param Collection $csRequestTokens
* @param Collection $csTasks
* @return void
*/
private static function processTokens($instance, &$cpData, &$csRequestTokens, &$csTasks)
{
foreach ($instance->tokens as $token) {
if (in_array($token->element_type, CaseUtils::ALLOWED_REQUEST_TOKENS)) {
$cpData['processes'] = CaseUtils::storeProcesses($instance, $cpData['processes']);
$cpData['requests'] = CaseUtils::storeRequests($instance, $cpData['requests']);
$cpData['request_tokens'] = CaseUtils::storeRequestTokens($token->getKey(), $cpData['request_tokens']);
$cpData['tasks'] = CaseUtils::storeTasks($token, $cpData['tasks']);

$csRequestTokens = CaseUtils::storeRequestTokens($token->getKey(), $csRequestTokens);
$csTasks = CaseUtils::storeTasks($token, $csTasks);

self::syncCasesParticipated($instance->case_number, $token->user_id, $cpData);
}
}
}

/**
* Process the child requests.
*
* @param ProcessRequest $instance
* @param array $cpData
* @param Collection $csProcesses
* @param Collection $csRequests
* @param Collection $participants
* @param Collection $csRequestTokens
* @param Collection $csTasks
* @return void
*/
private static function processChildRequests(
$instance, &$cpData, &$csProcesses, &$csRequests, &$participants, &$csRequestTokens, &$csTasks
)
{
foreach ($instance->childRequests as $subProcess) {
$cpData['processes'] = CaseUtils::storeProcesses($subProcess, collect());
$cpData['requests'] = CaseUtils::storeRequests($subProcess, collect());
$cpData['request_tokens'] = collect();
$cpData['tasks'] = collect();

$csProcesses = CaseUtils::storeProcesses($subProcess, $csProcesses);
$csRequests = CaseUtils::storeRequests($subProcess, $csRequests);

$participants = $participants
->merge($subProcess->participants->map->only('id', 'fullName', 'title', 'avatar'))
->unique('id')
->values();

foreach ($subProcess->tokens as $spToken) {
if (in_array($spToken->element_type, CaseUtils::ALLOWED_REQUEST_TOKENS)) {
$cpData['processes'] = CaseUtils::storeProcesses($subProcess, $cpData['processes']);
$cpData['requests'] = CaseUtils::storeRequests($subProcess, $cpData['requests']);
$cpData['request_tokens'] = CaseUtils::storeRequestTokens($spToken->getKey(), $cpData['request_tokens']);
$cpData['tasks'] = CaseUtils::storeTasks($spToken, $cpData['tasks']);

$csRequestTokens = CaseUtils::storeRequestTokens($spToken->getKey(), $csRequestTokens);
$csTasks = CaseUtils::storeTasks($spToken, $csTasks);

self::syncCasesParticipated($instance->case_number, $spToken->user_id, $cpData);
}
}
}
}

/**
* Sync the cases participated.
*
* @param CaseStarted $caseStarted
* @param TokenInterface $token
* @return void
*/
private static function syncCasesParticipated($caseNumber, $userId, $data)
{
CaseParticipated::updateOrCreate(
[
'case_number' => $caseNumber,
'user_id' => $userId,
],
$data,
);
}
}
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
47 changes: 47 additions & 0 deletions ProcessMaker/Console/Commands/CasesSync.php
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
<?php

namespace ProcessMaker\Console\Commands;

use Illuminate\Console\Command;
use ProcessMaker\Repositories\CaseSyncRepository;

class CasesSync extends Command
{
/**
* The name and signature of the console command.
*
* @var string
*/
protected $signature = 'cases:sync
{--request_ids= : Comma-separated list of request IDs to sync}';

/**
* The console command description.
*
* @var string
*/
protected $description = 'Sync requests with the cases tables';

/**
* Execute the console command.
*/
public function handle()
{
$requestIds = $this->option('request_ids');
$requestIds = $requestIds ? explode(',', $requestIds) : [];

if (count($requestIds) > 0) {
$data = CaseSyncRepository::syncCases($requestIds);

foreach ($data['successes'] as $value) {
$this->info('Case started synced ' . $value);
}

foreach ($data['errors'] as $value) {
$this->error('Error syncing case started ' . $value);
}
} else {
$this->error('Please specify a list of request IDs.');
}
}
}
10 changes: 7 additions & 3 deletions ProcessMaker/Repositories/CaseParticipatedRepository.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,7 @@

namespace ProcessMaker\Repositories;

use Illuminate\Support\Facades\Log;
use ProcessMaker\Models\CaseParticipated;
use ProcessMaker\Models\CaseStarted;
use ProcessMaker\Nayra\Contracts\Bpmn\TokenInterface;
Expand DownExpand Up@@ -44,7 +45,8 @@ public function create(CaseStarted $case, TokenInterface $token): void
'completed_at' => null,
]);
} catch (\Exception $e) {
\Log::error($e->getMessage());
Log::error('CaseException: ' . $e->getMessage());
Log::error('CaseException: ' . $e->getTraceAsString());
}
}

Expand DownExpand Up@@ -73,7 +75,8 @@ public function update(CaseStarted $case, TokenInterface $token)
'participants' => $case->participants,
]);
} catch (\Exception $e) {
\Log::error($e->getMessage());
Log::error('CaseException: ' . $e->getMessage());
Log::error('CaseException: ' . $e->getTraceAsString());
}
}

Expand All@@ -90,7 +93,8 @@ public function updateStatus(int $caseNumber, array $statusData)
CaseParticipated::where('case_number', $caseNumber)
->update($statusData);
} catch (\Exception $e) {
\Log::error($e->getMessage());
Log::error('CaseException: ' . $e->getMessage());
Log::error('CaseException: ' . $e->getTraceAsString());
}
}

Expand Down
45 changes: 25 additions & 20 deletions ProcessMaker/Repositories/CaseRepository.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@
namespace ProcessMaker\Repositories;

use Carbon\Carbon;
use Illuminate\Support\Facades\Log;
use ProcessMaker\Contracts\CaseRepositoryInterface;
use ProcessMaker\Models\CaseStarted;
use ProcessMaker\Nayra\Contracts\Bpmn\TokenInterface;
Expand All@@ -12,15 +13,20 @@ class CaseRepository implements CaseRepositoryInterface
{
const CASE_STATUS_ACTIVE = 'ACTIVE';

/**
* @var CaseParticipatedRepository
*/
protected CaseParticipatedRepository $caseParticipatedRepository;
/**
* This property is used to store an instance of `CaseStarted`
* when a case started is updated.
* @var CaseStarted|null
*/
protected ?CaseStarted $case;

public function __construct(protected CaseParticipatedRepository $caseParticipatedRepository)
public function __construct()
{
$this->caseParticipatedRepository = new CaseParticipatedRepository();
}
/**
* Store a new case started.
Expand All@@ -31,8 +37,7 @@ public function __construct(protected CaseParticipatedRepository $caseParticipat
public function create(ExecutionInstanceInterface $instance): void
{
if (is_null($instance->case_number)) {
\Log::error('Case number is required. instance: ' . $instance->getKey());

Log::error('case number is required, method=create, instance=' . $instance->getKey());
return;
}

Expand All@@ -58,8 +63,8 @@ public function create(ExecutionInstanceInterface $instance): void
'completed_at' => null,
]);
} catch (\Exception $e) {
\Log::error($e->getMessage());
\Log::error($e->getTraceAsString());
Log::error('CaseException: ' . $e->getMessage());
Log::error('CaseException: ' . $e->getTraceAsString());
}
}

Expand All@@ -72,19 +77,12 @@ public function create(ExecutionInstanceInterface $instance): void
*/
public function update(ExecutionInstanceInterface $instance, TokenInterface $token): void
{
if (is_null($instance->case_number)) {
\Log::error('Case number is required. instance: ' . $instance->getKey());

if (!$this->checkIfCaseStartedExist($instance->case_number)) {
Log::error('case started not found, method=update, instance=' . $instance->getKey());
return;
}

try {
if (!$this->checkIfCaseStartedExist($instance->case_number)) {
\Log::error('Case number not found. instance: ' . $instance->id);

return;
}

$this->case->case_title = $instance->case_title;
$this->case->case_status = $instance->status === self::CASE_STATUS_ACTIVE ? 'IN_PROGRESS' : $instance->status;
$this->case->request_tokens = CaseUtils::storeRequestTokens($token->getKey(), $this->case->request_tokens);
Expand All@@ -94,7 +92,8 @@ public function update(ExecutionInstanceInterface $instance, TokenInterface $tok

$this->case->saveOrFail();
} catch (\Exception $e) {
\Log::error($e->getMessage());
Log::error('CaseException: ' . $e->getMessage());
Log::error('CaseException: ' . $e->getTraceAsString());
}
}

Expand DownExpand Up@@ -124,7 +123,8 @@ public function updateStatus(ExecutionInstanceInterface $instance): void
CaseStarted::where('case_number', $instance->case_number)->update($data);
$this->caseParticipatedRepository->updateStatus($instance->case_number, $data);
} catch (\Exception $e) {
\Log::error($e->getMessage());
Log::error('CaseException: ' . $e->getMessage());
Log::error('CaseException: ' . $e->getTraceAsString());
}
}

Expand DownExpand Up@@ -163,11 +163,15 @@ private function updateParticipants(TokenInterface $token): void
/**
* Check if the case started exist.
*
* @param int $caseNumber
* @param int|null $caseNumber
* @return bool
*/
private function checkIfCaseStartedExist(int $caseNumber): bool
private function checkIfCaseStartedExist(int | null $caseNumber): bool
{
if (is_null($caseNumber)) {
return false;
}

$this->case = CaseStarted::where('case_number', $caseNumber)->first();

return !is_null($this->case);
Expand All@@ -191,8 +195,9 @@ private function updateSubProcesses(ExecutionInstanceInterface $instance): void
$this->case->requests = CaseUtils::storeRequests($instance, $this->case->requests);

$this->case->saveOrFail();
} catch (\Exception $th) {
\Log::error($th->getMessage());
} catch (\Exception $e) {
Log::error('CaseException: ' . $e->getMessage());
Log::error('CaseException: ' . $e->getTraceAsString());
}
}
}
190 changes: 190 additions & 0 deletions ProcessMaker/Repositories/CaseSyncRepository.php
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,190 @@
<?php

namespace ProcessMaker\Repositories;

use Illuminate\Support\Collection;
use ProcessMaker\Models\CaseParticipated;
use ProcessMaker\Models\CaseStarted;
use ProcessMaker\Models\ProcessRequest;

class CaseSyncRepository
{
/**
* Sync the cases started.
*
* @param array $requestIds
* @return array
*/
public static function syncCases(array $requestIds): array
{
$requests = ProcessRequest::with([
'tokens', 'process', 'childRequests.process', 'childRequests.tokens', 'participants',
])
->whereIn('id', $requestIds)
->get();

$successes = [];
$errors = [];

foreach ($requests as $instance) {
try {
if (!is_null($instance->parent_request_id)) {
continue;
}

$csProcesses = CaseUtils::storeProcesses($instance, collect());
$csRequests = CaseUtils::storeRequests($instance, collect());
$csRequestTokens = collect();
$csTasks = collect();
$participants = $instance->participants->map->only('id', 'fullName', 'title', 'avatar');
$status = $instance->status === CaseRepository::CASE_STATUS_ACTIVE ? 'IN_PROGRESS' : $instance->status;

$cpData = self::prepareCaseStartedData($instance, $status, $participants);

self::processTokens($instance, $cpData, $csRequestTokens, $csTasks);

self::processChildRequests($instance, $cpData, $csProcesses, $csRequests, $participants, $csRequestTokens, $csTasks);

$caseStarted = CaseStarted::updateOrCreate(
['case_number' => $instance->case_number],
[
'user_id' => $instance->user_id,
'case_title' => $instance->case_title,
'case_title_formatted' => $instance->case_title_formatted,
'case_status' => $status,
'processes' => $csProcesses,
'requests' => $csRequests,
'request_tokens' => $csRequestTokens,
'tasks' => $csTasks,
'participants' => $participants,
'initiated_at' => $instance->initiated_at,
'completed_at' => $instance->completed_at,
],
);

$successes[] = $caseStarted->case_number;
} catch (\Exception $e) {
$errors[] = $instance->case_number . ' ' . $e->getMessage();
}
}

return [
'successes' => $successes,
'errors' => $errors,
];
}

/**
* Prepare the case started data.
*
* @param ProcessRequest $instance
* @param string $status
* @param Collection $participants
* @return array
*/
private static function prepareCaseStartedData($instance, $status, $participants)
{
return [
'case_title' => $instance->case_title,
'case_title_formatted' => $instance->case_title_formatted,
'case_status' => $status,
'processes' => CaseUtils::storeProcesses($instance, collect()),
'requests' => CaseUtils::storeRequests($instance, collect()),
'request_tokens' => collect(),
'tasks' => collect(),
'participants' => $participants,
'initiated_at' => $instance->initiated_at,
'completed_at' => $instance->completed_at,
];
}

/**
* Process the tokens.
*
* @param ProcessRequest $instance
* @param array $cpData
* @param Collection $csRequestTokens
* @param Collection $csTasks
* @return void
*/
private static function processTokens($instance, &$cpData, &$csRequestTokens, &$csTasks)
{
foreach ($instance->tokens as $token) {
if (in_array($token->element_type, CaseUtils::ALLOWED_REQUEST_TOKENS)) {
$cpData['processes'] = CaseUtils::storeProcesses($instance, $cpData['processes']);
$cpData['requests'] = CaseUtils::storeRequests($instance, $cpData['requests']);
$cpData['request_tokens'] = CaseUtils::storeRequestTokens($token->getKey(), $cpData['request_tokens']);
$cpData['tasks'] = CaseUtils::storeTasks($token, $cpData['tasks']);

$csRequestTokens = CaseUtils::storeRequestTokens($token->getKey(), $csRequestTokens);
$csTasks = CaseUtils::storeTasks($token, $csTasks);

self::syncCasesParticipated($instance->case_number, $token->user_id, $cpData);
}
}
}

/**
* Process the child requests.
*
* @param ProcessRequest $instance
* @param array $cpData
* @param Collection $csProcesses
* @param Collection $csRequests
* @param Collection $participants
* @param Collection $csRequestTokens
* @param Collection $csTasks
* @return void
*/
private static function processChildRequests(
$instance, &$cpData, &$csProcesses, &$csRequests, &$participants, &$csRequestTokens, &$csTasks
)
{
foreach ($instance->childRequests as $subProcess) {
$cpData['processes'] = CaseUtils::storeProcesses($subProcess, collect());
$cpData['requests'] = CaseUtils::storeRequests($subProcess, collect());
$cpData['request_tokens'] = collect();
$cpData['tasks'] = collect();

$csProcesses = CaseUtils::storeProcesses($subProcess, $csProcesses);
$csRequests = CaseUtils::storeRequests($subProcess, $csRequests);

$participants = $participants
->merge($subProcess->participants->map->only('id', 'fullName', 'title', 'avatar'))
->unique('id')
->values();

foreach ($subProcess->tokens as $spToken) {
if (in_array($spToken->element_type, CaseUtils::ALLOWED_REQUEST_TOKENS)) {
$cpData['processes'] = CaseUtils::storeProcesses($subProcess, $cpData['processes']);
$cpData['requests'] = CaseUtils::storeRequests($subProcess, $cpData['requests']);
$cpData['request_tokens'] = CaseUtils::storeRequestTokens($spToken->getKey(), $cpData['request_tokens']);
$cpData['tasks'] = CaseUtils::storeTasks($spToken, $cpData['tasks']);

$csRequestTokens = CaseUtils::storeRequestTokens($spToken->getKey(), $csRequestTokens);
$csTasks = CaseUtils::storeTasks($spToken, $csTasks);

self::syncCasesParticipated($instance->case_number, $spToken->user_id, $cpData);
}
}
}
}

/**
* Sync the cases participated.
*
* @param CaseStarted $caseStarted
* @param TokenInterface $token
* @return void
*/
private static function syncCasesParticipated($caseNumber, $userId, $data)
{
CaseParticipated::updateOrCreate(
[
'case_number' => $caseNumber,
'user_id' => $userId,
],
$data,
);
}
}
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
47 changes: 47 additions & 0 deletions ProcessMaker/Console/Commands/CasesSync.php
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
<?php

namespace ProcessMaker\Console\Commands;

use Illuminate\Console\Command;
use ProcessMaker\Repositories\CaseSyncRepository;

class CasesSync extends Command
{
/**
* The name and signature of the console command.
*
* @var string
*/
protected $signature = 'cases:sync
{--request_ids= : Comma-separated list of request IDs to sync}';

/**
* The console command description.
*
* @var string
*/
protected $description = 'Sync requests with the cases tables';

/**
* Execute the console command.
*/
public function handle()
{
$requestIds = $this->option('request_ids');
$requestIds = $requestIds ? explode(',', $requestIds) : [];

if (count($requestIds) > 0) {
$data = CaseSyncRepository::syncCases($requestIds);

foreach ($data['successes'] as $value) {
$this->info('Case started synced ' . $value);
}

foreach ($data['errors'] as $value) {
$this->error('Error syncing case started ' . $value);
}
} else {
$this->error('Please specify a list of request IDs.');
}
}
}
10 changes: 7 additions & 3 deletions ProcessMaker/Repositories/CaseParticipatedRepository.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,7 @@

namespace ProcessMaker\Repositories;

use Illuminate\Support\Facades\Log;
use ProcessMaker\Models\CaseParticipated;
use ProcessMaker\Models\CaseStarted;
use ProcessMaker\Nayra\Contracts\Bpmn\TokenInterface;
Expand DownExpand Up@@ -44,7 +45,8 @@ public function create(CaseStarted $case, TokenInterface $token): void
'completed_at' => null,
]);
} catch (\Exception $e) {
\Log::error($e->getMessage());
Log::error('CaseException: ' . $e->getMessage());
Log::error('CaseException: ' . $e->getTraceAsString());
}
}

Expand DownExpand Up@@ -73,7 +75,8 @@ public function update(CaseStarted $case, TokenInterface $token)
'participants' => $case->participants,
]);
} catch (\Exception $e) {
\Log::error($e->getMessage());
Log::error('CaseException: ' . $e->getMessage());
Log::error('CaseException: ' . $e->getTraceAsString());
}
}

Expand All@@ -90,7 +93,8 @@ public function updateStatus(int $caseNumber, array $statusData)
CaseParticipated::where('case_number', $caseNumber)
->update($statusData);
} catch (\Exception $e) {
\Log::error($e->getMessage());
Log::error('CaseException: ' . $e->getMessage());
Log::error('CaseException: ' . $e->getTraceAsString());
}
}

Expand Down
45 changes: 25 additions & 20 deletions ProcessMaker/Repositories/CaseRepository.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@
namespace ProcessMaker\Repositories;

use Carbon\Carbon;
use Illuminate\Support\Facades\Log;
use ProcessMaker\Contracts\CaseRepositoryInterface;
use ProcessMaker\Models\CaseStarted;
use ProcessMaker\Nayra\Contracts\Bpmn\TokenInterface;
Expand All@@ -12,15 +13,20 @@ class CaseRepository implements CaseRepositoryInterface
{
const CASE_STATUS_ACTIVE = 'ACTIVE';

/**
* @var CaseParticipatedRepository
*/
protected CaseParticipatedRepository $caseParticipatedRepository;
/**
* This property is used to store an instance of `CaseStarted`
* when a case started is updated.
* @var CaseStarted|null
*/
protected ?CaseStarted $case;

public function __construct(protected CaseParticipatedRepository $caseParticipatedRepository)
public function __construct()
{
$this->caseParticipatedRepository = new CaseParticipatedRepository();
}
/**
* Store a new case started.
Expand All@@ -31,8 +37,7 @@ public function __construct(protected CaseParticipatedRepository $caseParticipat
public function create(ExecutionInstanceInterface $instance): void
{
if (is_null($instance->case_number)) {
\Log::error('Case number is required. instance: ' . $instance->getKey());

Log::error('case number is required, method=create, instance=' . $instance->getKey());
return;
}

Expand All@@ -58,8 +63,8 @@ public function create(ExecutionInstanceInterface $instance): void
'completed_at' => null,
]);
} catch (\Exception $e) {
\Log::error($e->getMessage());
\Log::error($e->getTraceAsString());
Log::error('CaseException: ' . $e->getMessage());
Log::error('CaseException: ' . $e->getTraceAsString());
}
}

Expand All@@ -72,19 +77,12 @@ public function create(ExecutionInstanceInterface $instance): void
*/
public function update(ExecutionInstanceInterface $instance, TokenInterface $token): void
{
if (is_null($instance->case_number)) {
\Log::error('Case number is required. instance: ' . $instance->getKey());

if (!$this->checkIfCaseStartedExist($instance->case_number)) {
Log::error('case started not found, method=update, instance=' . $instance->getKey());
return;
}

try {
if (!$this->checkIfCaseStartedExist($instance->case_number)) {
\Log::error('Case number not found. instance: ' . $instance->id);

return;
}

$this->case->case_title = $instance->case_title;
$this->case->case_status = $instance->status === self::CASE_STATUS_ACTIVE ? 'IN_PROGRESS' : $instance->status;
$this->case->request_tokens = CaseUtils::storeRequestTokens($token->getKey(), $this->case->request_tokens);
Expand All@@ -94,7 +92,8 @@ public function update(ExecutionInstanceInterface $instance, TokenInterface $tok

$this->case->saveOrFail();
} catch (\Exception $e) {
\Log::error($e->getMessage());
Log::error('CaseException: ' . $e->getMessage());
Log::error('CaseException: ' . $e->getTraceAsString());
}
}

Expand DownExpand Up@@ -124,7 +123,8 @@ public function updateStatus(ExecutionInstanceInterface $instance): void
CaseStarted::where('case_number', $instance->case_number)->update($data);
$this->caseParticipatedRepository->updateStatus($instance->case_number, $data);
} catch (\Exception $e) {
\Log::error($e->getMessage());
Log::error('CaseException: ' . $e->getMessage());
Log::error('CaseException: ' . $e->getTraceAsString());
}
}

Expand DownExpand Up@@ -163,11 +163,15 @@ private function updateParticipants(TokenInterface $token): void
/**
* Check if the case started exist.
*
* @param int $caseNumber
* @param int|null $caseNumber
* @return bool
*/
private function checkIfCaseStartedExist(int $caseNumber): bool
private function checkIfCaseStartedExist(int | null $caseNumber): bool
{
if (is_null($caseNumber)) {
return false;
}

$this->case = CaseStarted::where('case_number', $caseNumber)->first();

return !is_null($this->case);
Expand All@@ -191,8 +195,9 @@ private function updateSubProcesses(ExecutionInstanceInterface $instance): void
$this->case->requests = CaseUtils::storeRequests($instance, $this->case->requests);

$this->case->saveOrFail();
} catch (\Exception $th) {
\Log::error($th->getMessage());
} catch (\Exception $e) {
Log::error('CaseException: ' . $e->getMessage());
Log::error('CaseException: ' . $e->getTraceAsString());
}
}
}
190 changes: 190 additions & 0 deletions ProcessMaker/Repositories/CaseSyncRepository.php
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,190 @@
<?php

namespace ProcessMaker\Repositories;

use Illuminate\Support\Collection;
use ProcessMaker\Models\CaseParticipated;
use ProcessMaker\Models\CaseStarted;
use ProcessMaker\Models\ProcessRequest;

class CaseSyncRepository
{
/**
* Sync the cases started.
*
* @param array $requestIds
* @return array
*/
public static function syncCases(array $requestIds): array
{
$requests = ProcessRequest::with([
'tokens', 'process', 'childRequests.process', 'childRequests.tokens', 'participants',
])
->whereIn('id', $requestIds)
->get();

$successes = [];
$errors = [];

foreach ($requests as $instance) {
try {
if (!is_null($instance->parent_request_id)) {
continue;
}

$csProcesses = CaseUtils::storeProcesses($instance, collect());
$csRequests = CaseUtils::storeRequests($instance, collect());
$csRequestTokens = collect();
$csTasks = collect();
$participants = $instance->participants->map->only('id', 'fullName', 'title', 'avatar');
$status = $instance->status === CaseRepository::CASE_STATUS_ACTIVE ? 'IN_PROGRESS' : $instance->status;

$cpData = self::prepareCaseStartedData($instance, $status, $participants);

self::processTokens($instance, $cpData, $csRequestTokens, $csTasks);

self::processChildRequests($instance, $cpData, $csProcesses, $csRequests, $participants, $csRequestTokens, $csTasks);

$caseStarted = CaseStarted::updateOrCreate(
['case_number' => $instance->case_number],
[
'user_id' => $instance->user_id,
'case_title' => $instance->case_title,
'case_title_formatted' => $instance->case_title_formatted,
'case_status' => $status,
'processes' => $csProcesses,
'requests' => $csRequests,
'request_tokens' => $csRequestTokens,
'tasks' => $csTasks,
'participants' => $participants,
'initiated_at' => $instance->initiated_at,
'completed_at' => $instance->completed_at,
],
);

$successes[] = $caseStarted->case_number;
} catch (\Exception $e) {
$errors[] = $instance->case_number . ' ' . $e->getMessage();
}
}

return [
'successes' => $successes,
'errors' => $errors,
];
}

/**
* Prepare the case started data.
*
* @param ProcessRequest $instance
* @param string $status
* @param Collection $participants
* @return array
*/
private static function prepareCaseStartedData($instance, $status, $participants)
{
return [
'case_title' => $instance->case_title,
'case_title_formatted' => $instance->case_title_formatted,
'case_status' => $status,
'processes' => CaseUtils::storeProcesses($instance, collect()),
'requests' => CaseUtils::storeRequests($instance, collect()),
'request_tokens' => collect(),
'tasks' => collect(),
'participants' => $participants,
'initiated_at' => $instance->initiated_at,
'completed_at' => $instance->completed_at,
];
}

/**
* Process the tokens.
*
* @param ProcessRequest $instance
* @param array $cpData
* @param Collection $csRequestTokens
* @param Collection $csTasks
* @return void
*/
private static function processTokens($instance, &$cpData, &$csRequestTokens, &$csTasks)
{
foreach ($instance->tokens as $token) {
if (in_array($token->element_type, CaseUtils::ALLOWED_REQUEST_TOKENS)) {
$cpData['processes'] = CaseUtils::storeProcesses($instance, $cpData['processes']);
$cpData['requests'] = CaseUtils::storeRequests($instance, $cpData['requests']);
$cpData['request_tokens'] = CaseUtils::storeRequestTokens($token->getKey(), $cpData['request_tokens']);
$cpData['tasks'] = CaseUtils::storeTasks($token, $cpData['tasks']);

$csRequestTokens = CaseUtils::storeRequestTokens($token->getKey(), $csRequestTokens);
$csTasks = CaseUtils::storeTasks($token, $csTasks);

self::syncCasesParticipated($instance->case_number, $token->user_id, $cpData);
}
}
}

/**
* Process the child requests.
*
* @param ProcessRequest $instance
* @param array $cpData
* @param Collection $csProcesses
* @param Collection $csRequests
* @param Collection $participants
* @param Collection $csRequestTokens
* @param Collection $csTasks
* @return void
*/
private static function processChildRequests(
$instance, &$cpData, &$csProcesses, &$csRequests, &$participants, &$csRequestTokens, &$csTasks
)
{
foreach ($instance->childRequests as $subProcess) {
$cpData['processes'] = CaseUtils::storeProcesses($subProcess, collect());
$cpData['requests'] = CaseUtils::storeRequests($subProcess, collect());
$cpData['request_tokens'] = collect();
$cpData['tasks'] = collect();

$csProcesses = CaseUtils::storeProcesses($subProcess, $csProcesses);
$csRequests = CaseUtils::storeRequests($subProcess, $csRequests);

$participants = $participants
->merge($subProcess->participants->map->only('id', 'fullName', 'title', 'avatar'))
->unique('id')
->values();

foreach ($subProcess->tokens as $spToken) {
if (in_array($spToken->element_type, CaseUtils::ALLOWED_REQUEST_TOKENS)) {
$cpData['processes'] = CaseUtils::storeProcesses($subProcess, $cpData['processes']);
$cpData['requests'] = CaseUtils::storeRequests($subProcess, $cpData['requests']);
$cpData['request_tokens'] = CaseUtils::storeRequestTokens($spToken->getKey(), $cpData['request_tokens']);
$cpData['tasks'] = CaseUtils::storeTasks($spToken, $cpData['tasks']);

$csRequestTokens = CaseUtils::storeRequestTokens($spToken->getKey(), $csRequestTokens);
$csTasks = CaseUtils::storeTasks($spToken, $csTasks);

self::syncCasesParticipated($instance->case_number, $spToken->user_id, $cpData);
}
}
}
}

/**
* Sync the cases participated.
*
* @param CaseStarted $caseStarted
* @param TokenInterface $token
* @return void
*/
private static function syncCasesParticipated($caseNumber, $userId, $data)
{
CaseParticipated::updateOrCreate(
[
'case_number' => $caseNumber,
'user_id' => $userId,
],
$data,
);
}
}
Loading