FOUR-18601 populate cases_started table - sub processes#7421

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Merged
caleeli merged 5 commits into from
Oct 1, 2024
Merged

FOUR-18601 populate cases_started table - sub processes #7421

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2fbba85
feat: populate sub processes
devmiguelangel Sep 25, 2024
eeec1e6
feat: ref common functions
devmiguelangel Sep 26, 2024
3c93fd4
test: populate case sub processes
devmiguelangel Sep 26, 2024
143664c
test: fix CaseStartedSubProcessTest setup
devmiguelangel Sep 26, 2024
fd3e202
fix: add cr suggestions
devmiguelangel Sep 30, 2024
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
75 changes: 42 additions & 33 deletions ProcessMaker/Repositories/CaseParticipatedRepository.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,13 @@

class CaseParticipatedRepository
{
/**
* This property is used to store an instance of `CaseParticipated`
* when a case participated is updated.
* @var CaseParticipated|null
Comment thread
devmiguelangel marked this conversation as resolved.
*/
protected ?CaseParticipated $caseParticipated;

/**
* Store a new case participated.
*
Expand All@@ -17,24 +24,21 @@ class CaseParticipatedRepository
*/
public function create(CaseStarted $case, TokenInterface $token): void
{
if ($this->checkIfCaseParticipatedExist($token->user->id, $case->case_number)) {
Comment thread
caleeli marked this conversation as resolved.
return;
}

try {
CaseParticipated::create([
'user_id' => $token->user->id,
'case_number' => $case->case_number,
'case_title' => $case->case_title,
'case_title_formatted' => $case->case_title_formatted,
'case_status' => $case->case_status,
'processes' => $case->processes,
'requests' => $case->requests,
'request_tokens' => [$token->getKey()],
'tasks' => [
[
'id' => $token->getKey(),
'element_id' => $token->element_id,
'name' => $token->element_name,
'process_id' => $token->process_id,
],
],
'processes' => CaseUtils::storeProcesses($token->processRequest, collect()),
'requests' => CaseUtils::storeRequests($token->processRequest, collect()),
'request_tokens' => CaseUtils::storeRequestTokens($token->getKey(), collect()),
'tasks' => CaseUtils::storeTasks($token, collect()),
'participants' => $case->participants,
'initiated_at' => $case->initiated_at,
'completed_at' => null,
Expand All@@ -54,32 +58,18 @@ public function create(CaseStarted $case, TokenInterface $token): void
public function update(CaseStarted $case, TokenInterface $token)
{
try {
$caseParticipated = CaseParticipated::where('user_id', $token->user->id)
->where('case_number', $case->case_number)
->first();

// Add the token data to the request_tokens
$requestTokens = $caseParticipated->request_tokens->push($token->getKey())
->unique()
->values();
// Add the task data to the tasks
$tasks = $caseParticipated->tasks->push([
'id' => $token->getKey(),
'element_id' => $token->element_id,
'name' => $token->element_name,
'process_id' => $token->process_id,
])
->unique('id')
->values();
if (!$this->checkIfCaseParticipatedExist($token->user->id, $case->case_number)) {
Comment thread
caleeli marked this conversation as resolved.
return;
}

$caseParticipated->update([
$this->caseParticipated->updateOrFail([
'case_title' => $case->case_title,
'case_title_formatted' => $case->case_title_formatted,
'case_status' => $case->case_status,
'processes' => $case->processes,
'requests' => $case->requests,
'request_tokens' => $requestTokens,
'tasks' => $tasks,
'processes' => CaseUtils::storeProcesses($token->processRequest, $this->caseParticipated->processes),
'requests' => CaseUtils::storeRequests($token->processRequest, $this->caseParticipated->requests),
'request_tokens' => CaseUtils::storeRequestTokens($token->getKey(), $this->caseParticipated->request_tokens),
'tasks' => CaseUtils::storeTasks($token, $this->caseParticipated->tasks),
'participants' => $case->participants,
]);
} catch (\Exception $e) {
Expand All@@ -103,4 +93,23 @@ public function updateStatus(int $caseNumber, array $statusData)
\Log::error($e->getMessage());
}
}

/**
* Check if a case participated exists.
* If it exists, store the instance in the property.
* The property is used to update the JSON fields of the case participated.
*
* @param int $userId
* @param int $caseNumber
*
* @return bool
*/
private function checkIfCaseParticipatedExist(int $userId, int $caseNumber): bool
{
$this->caseParticipated = CaseParticipated::where('user_id', $userId)
->where('case_number', $caseNumber)
->first();
Comment thread
devmiguelangel marked this conversation as resolved.

return !is_null($this->caseParticipated);
}
}
117 changes: 71 additions & 46 deletions ProcessMaker/Repositories/CaseRepository.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,15 @@

class CaseRepository implements CaseRepositoryInterface
{
const CASE_STATUS_ACTIVE = 'ACTIVE';

/**
* This property is used to store an instance of `CaseStarted`
* when a case started is updated.
* @var CaseStarted|null
Comment thread
devmiguelangel marked this conversation as resolved.
*/
protected ?CaseStarted $case;

public function __construct(protected CaseParticipatedRepository $caseParticipatedRepository)
{
}
Expand All@@ -21,34 +30,27 @@ public function __construct(protected CaseParticipatedRepository $caseParticipat
*/
public function create(ExecutionInstanceInterface $instance): void
{
if (is_null($instance->case_number) || $this->checkIfCaseStartedExist($instance->case_number)) {
if (is_null($instance->case_number)) {
\Log::error('Case number is required. instance: ' . $instance->getKey());
Comment thread
devmiguelangel marked this conversation as resolved.

return;
}

try {
$processes = [
[
'id' => $instance->process->id,
'name' => $instance->process->name,
],
];
if ($this->checkIfCaseStartedExist($instance->case_number)) {
$this->updateSubProcesses($instance);

$requests = [
[
'id' => $instance->id,
'name' => $instance->name,
'parent_request_id' => $instance->parentRequest->id ?? 0,
],
];
return;
}

try {
CaseStarted::create([
'case_number' => $instance->case_number,
'user_id' => $instance->user_id,
'case_title' => $instance->case_title,
'case_title_formatted' => $instance->case_title_formatted,
'case_status' => 'IN_PROGRESS',
'processes' => $processes,
'requests' => $requests,
'case_status' => $instance->status === self::CASE_STATUS_ACTIVE ? 'IN_PROGRESS' : $instance->status,
'processes' => CaseUtils::storeProcesses($instance, collect()),
'requests' => CaseUtils::storeRequests($instance, collect()),
'request_tokens' => [],
'tasks' => [],
'participants' => [],
Expand All@@ -57,6 +59,7 @@ public function create(ExecutionInstanceInterface $instance): void
]);
} catch (\Exception $e) {
\Log::error($e->getMessage());
\Log::error($e->getTraceAsString());
}
}

Expand All@@ -69,34 +72,27 @@ 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());
Comment thread
devmiguelangel marked this conversation as resolved.

return;
}

try {
$case = CaseStarted::where('case_number', $instance->case_number)->first();
if (!$this->checkIfCaseStartedExist($instance->case_number)) {
\Log::error('Case number not found. instance: ' . $instance->id);
Comment thread
devmiguelangel marked this conversation as resolved.

if (is_null($case)) {
return;
}

$case->case_title = $instance->case_title;
$case->case_status = $instance->status === 'ACTIVE' ? 'IN_PROGRESS' : $instance->status;

$case->request_tokens = $case->request_tokens->push($token->getKey())
->unique()
->values();

if (!in_array($token->element_type, ['scriptTask'])) {
$case->tasks = $case->tasks->push([
'id' => $token->getKey(),
'element_id' => $token->element_id,
'name' => $token->element_name,
'process_id' => $token->process_id,
])
->unique('id')
->values();
}
$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);
$this->case->tasks = CaseUtils::storeTasks($token, $this->case->tasks);

$this->updateParticipants($case, $token);
$this->updateParticipants($token);

$case->saveOrFail();
$this->case->saveOrFail();
} catch (\Exception $e) {
\Log::error($e->getMessage());
}
Expand All@@ -110,6 +106,11 @@ public function update(ExecutionInstanceInterface $instance, TokenInterface $tok
*/
public function updateStatus(ExecutionInstanceInterface $instance): void
{
// If a sub-process is completed, do not update the case started status
if (!is_null($instance->parent_request_id)) {
Comment thread
devmiguelangel marked this conversation as resolved.
return;
}

try {
$data = [
'case_status' => $instance->status,
Expand All@@ -130,34 +131,33 @@ public function updateStatus(ExecutionInstanceInterface $instance): void
/**
* Update the participants of the case started.
*
* @param CaseStarted $case
* @param TokenInterface $token
* @return void
*/
private function updateParticipants(CaseStarted $case, TokenInterface $token): void
private function updateParticipants(TokenInterface $token): void
{
$user = $token->user;

if (!$user) {
return;
}

$participantExists = $case->participants->contains(function ($participant) use ($user) {
$participantExists = $this->case->participants->contains(function ($participant) use ($user) {
return $participant['id'] === $user->id;
});

if (!$participantExists) {
$case->participants->push([
$this->case->participants->push([
'id' => $user->id,
'name' => $user->getFullName(),
'title' => $user->title,
'avatar' => $user->avatar,
]);

$this->caseParticipatedRepository->create($case, $token);
$this->caseParticipatedRepository->create($this->case, $token);
}

$this->caseParticipatedRepository->update($case, $token);
$this->caseParticipatedRepository->update($this->case, $token);
}

/**
Expand All@@ -168,6 +168,31 @@ private function updateParticipants(CaseStarted $case, TokenInterface $token): v
*/
private function checkIfCaseStartedExist(int $caseNumber): bool
{
return CaseStarted::where('case_number', $caseNumber)->count() > 0;
$this->case = CaseStarted::where('case_number', $caseNumber)->first();

return !is_null($this->case);
}

/**
* Update the processes and requests of the case started.
*
* @param ExecutionInstanceInterface $instance
* @return void
*/
private function updateSubProcesses(ExecutionInstanceInterface $instance): void
{
if (is_null($instance->parent_request_id)) {
return;
}

try {
// Store the sub-processes and requests
$this->case->processes = CaseUtils::storeProcesses($instance, $this->case->processes);
$this->case->requests = CaseUtils::storeRequests($instance, $this->case->requests);

$this->case->saveOrFail();
} catch (\Exception $th) {
\Log::error($th->getMessage());
}
}
}
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
FOUR-18601 populate cases_started table - sub processes#7421

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

caleeli
merged 5 commits into

from

Oct 1, 2024
 Merged


FOUR-18601 populate cases_started table - sub processes
#7421
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
2fbba85

feat: populate sub processes


devmiguelangel Sep 25, 2024
eeec1e6

feat: ref common functions


devmiguelangel Sep 26, 2024
3c93fd4

test: populate case sub processes


devmiguelangel Sep 26, 2024
143664c

test: fix CaseStartedSubProcessTest setup


devmiguelangel Sep 26, 2024
fd3e202

fix: add cr suggestions


devmiguelangel Sep 30, 2024

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


75 changes: 42 additions & 33 deletions
ProcessMaker/Repositories/CaseParticipatedRepository.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,13 @@

class CaseParticipatedRepository
{
 /**
 * This property is used to store an instance of `CaseParticipated`
 * when a case participated is updated.
 * @var CaseParticipated|null
Comment thread
devmiguelangel marked this conversation as resolved.

 */
 protected ?CaseParticipated $caseParticipated;

 /**
 * Store a new case participated.
 *
Expand All@@ -17,24 +24,21 @@ class CaseParticipatedRepository
 */
 public function create(CaseStarted $case, TokenInterface $token): void
 {
 if ($this->checkIfCaseParticipatedExist($token->user->id, $case->case_number)) {
Comment thread
caleeli marked this conversation as resolved.

 return;
 }

 try {
 CaseParticipated::create([
 'user_id' => $token->user->id,
 'case_number' => $case->case_number,
 'case_title' => $case->case_title,
 'case_title_formatted' => $case->case_title_formatted,
 'case_status' => $case->case_status,
 'processes' => $case->processes,
 'requests' => $case->requests,
 'request_tokens' => [$token->getKey()],
 'tasks' => [
 [
 'id' => $token->getKey(),
 'element_id' => $token->element_id,
 'name' => $token->element_name,
 'process_id' => $token->process_id,
 ],
 ],
 'processes' => CaseUtils::storeProcesses($token->processRequest, collect()),
 'requests' => CaseUtils::storeRequests($token->processRequest, collect()),
 'request_tokens' => CaseUtils::storeRequestTokens($token->getKey(), collect()),
 'tasks' => CaseUtils::storeTasks($token, collect()),
 'participants' => $case->participants,
 'initiated_at' => $case->initiated_at,
 'completed_at' => null,
Expand All@@ -54,32 +58,18 @@ public function create(CaseStarted $case, TokenInterface $token): void
 public function update(CaseStarted $case, TokenInterface $token)
 {
 try {
 $caseParticipated = CaseParticipated::where('user_id', $token->user->id)
 ->where('case_number', $case->case_number)
 ->first();

 // Add the token data to the request_tokens
 $requestTokens = $caseParticipated->request_tokens->push($token->getKey())
 ->unique()
 ->values();
 // Add the task data to the tasks
 $tasks = $caseParticipated->tasks->push([
 'id' => $token->getKey(),
 'element_id' => $token->element_id,
 'name' => $token->element_name,
 'process_id' => $token->process_id,
 ])
 ->unique('id')
 ->values();
 if (!$this->checkIfCaseParticipatedExist($token->user->id, $case->case_number)) {
Comment thread
caleeli marked this conversation as resolved.

 return;
 }

 $caseParticipated->update([
 $this->caseParticipated->updateOrFail([
 'case_title' => $case->case_title,
 'case_title_formatted' => $case->case_title_formatted,
 'case_status' => $case->case_status,
 'processes' => $case->processes,
 'requests' => $case->requests,
 'request_tokens' => $requestTokens,
 'tasks' => $tasks,
 'processes' => CaseUtils::storeProcesses($token->processRequest, $this->caseParticipated->processes),
 'requests' => CaseUtils::storeRequests($token->processRequest, $this->caseParticipated->requests),
 'request_tokens' => CaseUtils::storeRequestTokens($token->getKey(), $this->caseParticipated->request_tokens),
 'tasks' => CaseUtils::storeTasks($token, $this->caseParticipated->tasks),
 'participants' => $case->participants,
 ]);
 } catch (\Exception $e) {
Expand All@@ -103,4 +93,23 @@ public function updateStatus(int $caseNumber, array $statusData)
 \Log::error($e->getMessage());
 }
 }

 /**
 * Check if a case participated exists.
 * If it exists, store the instance in the property.
 * The property is used to update the JSON fields of the case participated.
 *
 * @param int $userId
 * @param int $caseNumber
 *
 * @return bool
 */
 private function checkIfCaseParticipatedExist(int $userId, int $caseNumber): bool
 {
 $this->caseParticipated = CaseParticipated::where('user_id', $userId)
 ->where('case_number', $caseNumber)
 ->first();
Comment thread
devmiguelangel marked this conversation as resolved.


 return !is_null($this->caseParticipated);
 }
}

117 changes: 71 additions & 46 deletions
ProcessMaker/Repositories/CaseRepository.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,15 @@

class CaseRepository implements CaseRepositoryInterface
{
 const CASE_STATUS_ACTIVE = 'ACTIVE';

 /**
 * This property is used to store an instance of `CaseStarted`
 * when a case started is updated.
 * @var CaseStarted|null
Comment thread
devmiguelangel marked this conversation as resolved.

 */
 protected ?CaseStarted $case;

 public function __construct(protected CaseParticipatedRepository $caseParticipatedRepository)
 {
 }
Expand All@@ -21,34 +30,27 @@ public function __construct(protected CaseParticipatedRepository $caseParticipat
 */
 public function create(ExecutionInstanceInterface $instance): void
 {
 if (is_null($instance->case_number) || $this->checkIfCaseStartedExist($instance->case_number)) {
 if (is_null($instance->case_number)) {
 \Log::error('Case number is required. instance: ' . $instance->getKey());
Comment thread
devmiguelangel marked this conversation as resolved.


 return;
 }

 try {
 $processes = [
 [
 'id' => $instance->process->id,
 'name' => $instance->process->name,
 ],
 ];
 if ($this->checkIfCaseStartedExist($instance->case_number)) {
 $this->updateSubProcesses($instance);

 $requests = [
 [
 'id' => $instance->id,
 'name' => $instance->name,
 'parent_request_id' => $instance->parentRequest->id ?? 0,
 ],
 ];
 return;
 }

 try {
 CaseStarted::create([
 'case_number' => $instance->case_number,
 'user_id' => $instance->user_id,
 'case_title' => $instance->case_title,
 'case_title_formatted' => $instance->case_title_formatted,
 'case_status' => 'IN_PROGRESS',
 'processes' => $processes,
 'requests' => $requests,
 'case_status' => $instance->status === self::CASE_STATUS_ACTIVE ? 'IN_PROGRESS' : $instance->status,
 'processes' => CaseUtils::storeProcesses($instance, collect()),
 'requests' => CaseUtils::storeRequests($instance, collect()),
 'request_tokens' => [],
 'tasks' => [],
 'participants' => [],
Expand All@@ -57,6 +59,7 @@ public function create(ExecutionInstanceInterface $instance): void
 ]);
 } catch (\Exception $e) {
 \Log::error($e->getMessage());
 \Log::error($e->getTraceAsString());
 }
 }

Expand All@@ -69,34 +72,27 @@ 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());
Comment thread
devmiguelangel marked this conversation as resolved.


 return;
 }

 try {
 $case = CaseStarted::where('case_number', $instance->case_number)->first();
 if (!$this->checkIfCaseStartedExist($instance->case_number)) {
 \Log::error('Case number not found. instance: ' . $instance->id);
Comment thread
devmiguelangel marked this conversation as resolved.


 if (is_null($case)) {
 return;
 }

 $case->case_title = $instance->case_title;
 $case->case_status = $instance->status === 'ACTIVE' ? 'IN_PROGRESS' : $instance->status;

 $case->request_tokens = $case->request_tokens->push($token->getKey())
 ->unique()
 ->values();

 if (!in_array($token->element_type, ['scriptTask'])) {
 $case->tasks = $case->tasks->push([
 'id' => $token->getKey(),
 'element_id' => $token->element_id,
 'name' => $token->element_name,
 'process_id' => $token->process_id,
 ])
 ->unique('id')
 ->values();
 }
 $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);
 $this->case->tasks = CaseUtils::storeTasks($token, $this->case->tasks);

 $this->updateParticipants($case, $token);
 $this->updateParticipants($token);

 $case->saveOrFail();
 $this->case->saveOrFail();
 } catch (\Exception $e) {
 \Log::error($e->getMessage());
 }
Expand All@@ -110,6 +106,11 @@ public function update(ExecutionInstanceInterface $instance, TokenInterface $tok
 */
 public function updateStatus(ExecutionInstanceInterface $instance): void
 {
 // If a sub-process is completed, do not update the case started status
 if (!is_null($instance->parent_request_id)) {
Comment thread
devmiguelangel marked this conversation as resolved.

 return;
 }

 try {
 $data = [
 'case_status' => $instance->status,
Expand All@@ -130,34 +131,33 @@ public function updateStatus(ExecutionInstanceInterface $instance): void
 /**
 * Update the participants of the case started.
 *
 * @param CaseStarted $case
 * @param TokenInterface $token
 * @return void
 */
 private function updateParticipants(CaseStarted $case, TokenInterface $token): void
 private function updateParticipants(TokenInterface $token): void
 {
 $user = $token->user;

 if (!$user) {
 return;
 }

 $participantExists = $case->participants->contains(function ($participant) use ($user) {
 $participantExists = $this->case->participants->contains(function ($participant) use ($user) {
 return $participant['id'] === $user->id;
 });

 if (!$participantExists) {
 $case->participants->push([
 $this->case->participants->push([
 'id' => $user->id,
 'name' => $user->getFullName(),
 'title' => $user->title,
 'avatar' => $user->avatar,
 ]);

 $this->caseParticipatedRepository->create($case, $token);
 $this->caseParticipatedRepository->create($this->case, $token);
 }

 $this->caseParticipatedRepository->update($case, $token);
 $this->caseParticipatedRepository->update($this->case, $token);
 }

 /**
Expand All@@ -168,6 +168,31 @@ private function updateParticipants(CaseStarted $case, TokenInterface $token): v
 */
 private function checkIfCaseStartedExist(int $caseNumber): bool
 {
 return CaseStarted::where('case_number', $caseNumber)->count() > 0;
 $this->case = CaseStarted::where('case_number', $caseNumber)->first();

 return !is_null($this->case);
 }

 /**
 * Update the processes and requests of the case started.
 *
 * @param ExecutionInstanceInterface $instance
 * @return void
 */
 private function updateSubProcesses(ExecutionInstanceInterface $instance): void
 {
 if (is_null($instance->parent_request_id)) {
 return;
 }

 try {
 // Store the sub-processes and requests
 $this->case->processes = CaseUtils::storeProcesses($instance, $this->case->processes);
 $this->case->requests = CaseUtils::storeRequests($instance, $this->case->requests);

 $this->case->saveOrFail();
 } catch (\Exception $th) {
 \Log::error($th->getMessage());
 }
 }
}
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
FOUR-18601 populate cases_started table - sub processes#7421

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

caleeli
merged 5 commits into

from

Oct 1, 2024
 Merged


FOUR-18601 populate cases_started table - sub processes
#7421
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
2fbba85

feat: populate sub processes


devmiguelangel Sep 25, 2024
eeec1e6

feat: ref common functions


devmiguelangel Sep 26, 2024
3c93fd4

test: populate case sub processes


devmiguelangel Sep 26, 2024
143664c

test: fix CaseStartedSubProcessTest setup


devmiguelangel Sep 26, 2024
fd3e202

fix: add cr suggestions


devmiguelangel Sep 30, 2024

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


75 changes: 42 additions & 33 deletions
ProcessMaker/Repositories/CaseParticipatedRepository.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,13 @@

class CaseParticipatedRepository
{
 /**
 * This property is used to store an instance of `CaseParticipated`
 * when a case participated is updated.
 * @var CaseParticipated|null
Comment thread
devmiguelangel marked this conversation as resolved.

 */
 protected ?CaseParticipated $caseParticipated;

 /**
 * Store a new case participated.
 *
Expand All@@ -17,24 +24,21 @@ class CaseParticipatedRepository
 */
 public function create(CaseStarted $case, TokenInterface $token): void
 {
 if ($this->checkIfCaseParticipatedExist($token->user->id, $case->case_number)) {
Comment thread
caleeli marked this conversation as resolved.

 return;
 }

 try {
 CaseParticipated::create([
 'user_id' => $token->user->id,
 'case_number' => $case->case_number,
 'case_title' => $case->case_title,
 'case_title_formatted' => $case->case_title_formatted,
 'case_status' => $case->case_status,
 'processes' => $case->processes,
 'requests' => $case->requests,
 'request_tokens' => [$token->getKey()],
 'tasks' => [
 [
 'id' => $token->getKey(),
 'element_id' => $token->element_id,
 'name' => $token->element_name,
 'process_id' => $token->process_id,
 ],
 ],
 'processes' => CaseUtils::storeProcesses($token->processRequest, collect()),
 'requests' => CaseUtils::storeRequests($token->processRequest, collect()),
 'request_tokens' => CaseUtils::storeRequestTokens($token->getKey(), collect()),
 'tasks' => CaseUtils::storeTasks($token, collect()),
 'participants' => $case->participants,
 'initiated_at' => $case->initiated_at,
 'completed_at' => null,
Expand All@@ -54,32 +58,18 @@ public function create(CaseStarted $case, TokenInterface $token): void
 public function update(CaseStarted $case, TokenInterface $token)
 {
 try {
 $caseParticipated = CaseParticipated::where('user_id', $token->user->id)
 ->where('case_number', $case->case_number)
 ->first();

 // Add the token data to the request_tokens
 $requestTokens = $caseParticipated->request_tokens->push($token->getKey())
 ->unique()
 ->values();
 // Add the task data to the tasks
 $tasks = $caseParticipated->tasks->push([
 'id' => $token->getKey(),
 'element_id' => $token->element_id,
 'name' => $token->element_name,
 'process_id' => $token->process_id,
 ])
 ->unique('id')
 ->values();
 if (!$this->checkIfCaseParticipatedExist($token->user->id, $case->case_number)) {
Comment thread
caleeli marked this conversation as resolved.

 return;
 }

 $caseParticipated->update([
 $this->caseParticipated->updateOrFail([
 'case_title' => $case->case_title,
 'case_title_formatted' => $case->case_title_formatted,
 'case_status' => $case->case_status,
 'processes' => $case->processes,
 'requests' => $case->requests,
 'request_tokens' => $requestTokens,
 'tasks' => $tasks,
 'processes' => CaseUtils::storeProcesses($token->processRequest, $this->caseParticipated->processes),
 'requests' => CaseUtils::storeRequests($token->processRequest, $this->caseParticipated->requests),
 'request_tokens' => CaseUtils::storeRequestTokens($token->getKey(), $this->caseParticipated->request_tokens),
 'tasks' => CaseUtils::storeTasks($token, $this->caseParticipated->tasks),
 'participants' => $case->participants,
 ]);
 } catch (\Exception $e) {
Expand All@@ -103,4 +93,23 @@ public function updateStatus(int $caseNumber, array $statusData)
 \Log::error($e->getMessage());
 }
 }

 /**
 * Check if a case participated exists.
 * If it exists, store the instance in the property.
 * The property is used to update the JSON fields of the case participated.
 *
 * @param int $userId
 * @param int $caseNumber
 *
 * @return bool
 */
 private function checkIfCaseParticipatedExist(int $userId, int $caseNumber): bool
 {
 $this->caseParticipated = CaseParticipated::where('user_id', $userId)
 ->where('case_number', $caseNumber)
 ->first();
Comment thread
devmiguelangel marked this conversation as resolved.


 return !is_null($this->caseParticipated);
 }
}

117 changes: 71 additions & 46 deletions
ProcessMaker/Repositories/CaseRepository.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,15 @@

class CaseRepository implements CaseRepositoryInterface
{
 const CASE_STATUS_ACTIVE = 'ACTIVE';

 /**
 * This property is used to store an instance of `CaseStarted`
 * when a case started is updated.
 * @var CaseStarted|null
Comment thread
devmiguelangel marked this conversation as resolved.

 */
 protected ?CaseStarted $case;

 public function __construct(protected CaseParticipatedRepository $caseParticipatedRepository)
 {
 }
Expand All@@ -21,34 +30,27 @@ public function __construct(protected CaseParticipatedRepository $caseParticipat
 */
 public function create(ExecutionInstanceInterface $instance): void
 {
 if (is_null($instance->case_number) || $this->checkIfCaseStartedExist($instance->case_number)) {
 if (is_null($instance->case_number)) {
 \Log::error('Case number is required. instance: ' . $instance->getKey());
Comment thread
devmiguelangel marked this conversation as resolved.


 return;
 }

 try {
 $processes = [
 [
 'id' => $instance->process->id,
 'name' => $instance->process->name,
 ],
 ];
 if ($this->checkIfCaseStartedExist($instance->case_number)) {
 $this->updateSubProcesses($instance);

 $requests = [
 [
 'id' => $instance->id,
 'name' => $instance->name,
 'parent_request_id' => $instance->parentRequest->id ?? 0,
 ],
 ];
 return;
 }

 try {
 CaseStarted::create([
 'case_number' => $instance->case_number,
 'user_id' => $instance->user_id,
 'case_title' => $instance->case_title,
 'case_title_formatted' => $instance->case_title_formatted,
 'case_status' => 'IN_PROGRESS',
 'processes' => $processes,
 'requests' => $requests,
 'case_status' => $instance->status === self::CASE_STATUS_ACTIVE ? 'IN_PROGRESS' : $instance->status,
 'processes' => CaseUtils::storeProcesses($instance, collect()),
 'requests' => CaseUtils::storeRequests($instance, collect()),
 'request_tokens' => [],
 'tasks' => [],
 'participants' => [],
Expand All@@ -57,6 +59,7 @@ public function create(ExecutionInstanceInterface $instance): void
 ]);
 } catch (\Exception $e) {
 \Log::error($e->getMessage());
 \Log::error($e->getTraceAsString());
 }
 }

Expand All@@ -69,34 +72,27 @@ 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());
Comment thread
devmiguelangel marked this conversation as resolved.


 return;
 }

 try {
 $case = CaseStarted::where('case_number', $instance->case_number)->first();
 if (!$this->checkIfCaseStartedExist($instance->case_number)) {
 \Log::error('Case number not found. instance: ' . $instance->id);
Comment thread
devmiguelangel marked this conversation as resolved.


 if (is_null($case)) {
 return;
 }

 $case->case_title = $instance->case_title;
 $case->case_status = $instance->status === 'ACTIVE' ? 'IN_PROGRESS' : $instance->status;

 $case->request_tokens = $case->request_tokens->push($token->getKey())
 ->unique()
 ->values();

 if (!in_array($token->element_type, ['scriptTask'])) {
 $case->tasks = $case->tasks->push([
 'id' => $token->getKey(),
 'element_id' => $token->element_id,
 'name' => $token->element_name,
 'process_id' => $token->process_id,
 ])
 ->unique('id')
 ->values();
 }
 $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);
 $this->case->tasks = CaseUtils::storeTasks($token, $this->case->tasks);

 $this->updateParticipants($case, $token);
 $this->updateParticipants($token);

 $case->saveOrFail();
 $this->case->saveOrFail();
 } catch (\Exception $e) {
 \Log::error($e->getMessage());
 }
Expand All@@ -110,6 +106,11 @@ public function update(ExecutionInstanceInterface $instance, TokenInterface $tok
 */
 public function updateStatus(ExecutionInstanceInterface $instance): void
 {
 // If a sub-process is completed, do not update the case started status
 if (!is_null($instance->parent_request_id)) {
Comment thread
devmiguelangel marked this conversation as resolved.

 return;
 }

 try {
 $data = [
 'case_status' => $instance->status,
Expand All@@ -130,34 +131,33 @@ public function updateStatus(ExecutionInstanceInterface $instance): void
 /**
 * Update the participants of the case started.
 *
 * @param CaseStarted $case
 * @param TokenInterface $token
 * @return void
 */
 private function updateParticipants(CaseStarted $case, TokenInterface $token): void
 private function updateParticipants(TokenInterface $token): void
 {
 $user = $token->user;

 if (!$user) {
 return;
 }

 $participantExists = $case->participants->contains(function ($participant) use ($user) {
 $participantExists = $this->case->participants->contains(function ($participant) use ($user) {
 return $participant['id'] === $user->id;
 });

 if (!$participantExists) {
 $case->participants->push([
 $this->case->participants->push([
 'id' => $user->id,
 'name' => $user->getFullName(),
 'title' => $user->title,
 'avatar' => $user->avatar,
 ]);

 $this->caseParticipatedRepository->create($case, $token);
 $this->caseParticipatedRepository->create($this->case, $token);
 }

 $this->caseParticipatedRepository->update($case, $token);
 $this->caseParticipatedRepository->update($this->case, $token);
 }

 /**
Expand All@@ -168,6 +168,31 @@ private function updateParticipants(CaseStarted $case, TokenInterface $token): v
 */
 private function checkIfCaseStartedExist(int $caseNumber): bool
 {
 return CaseStarted::where('case_number', $caseNumber)->count() > 0;
 $this->case = CaseStarted::where('case_number', $caseNumber)->first();

 return !is_null($this->case);
 }

 /**
 * Update the processes and requests of the case started.
 *
 * @param ExecutionInstanceInterface $instance
 * @return void
 */
 private function updateSubProcesses(ExecutionInstanceInterface $instance): void
 {
 if (is_null($instance->parent_request_id)) {
 return;
 }

 try {
 // Store the sub-processes and requests
 $this->case->processes = CaseUtils::storeProcesses($instance, $this->case->processes);
 $this->case->requests = CaseUtils::storeRequests($instance, $this->case->requests);

 $this->case->saveOrFail();
 } catch (\Exception $th) {
 \Log::error($th->getMessage());
 }
 }
}
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
FOUR-18601 populate cases_started table - sub processes#7421

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

caleeli
merged 5 commits into

from

Oct 1, 2024
 Merged


FOUR-18601 populate cases_started table - sub processes
#7421
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
2fbba85

feat: populate sub processes


devmiguelangel Sep 25, 2024
eeec1e6

feat: ref common functions


devmiguelangel Sep 26, 2024
3c93fd4

test: populate case sub processes


devmiguelangel Sep 26, 2024
143664c

test: fix CaseStartedSubProcessTest setup


devmiguelangel Sep 26, 2024
fd3e202

fix: add cr suggestions


devmiguelangel Sep 30, 2024

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


75 changes: 42 additions & 33 deletions
ProcessMaker/Repositories/CaseParticipatedRepository.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,13 @@

class CaseParticipatedRepository
{
 /**
 * This property is used to store an instance of `CaseParticipated`
 * when a case participated is updated.
 * @var CaseParticipated|null
Comment thread
devmiguelangel marked this conversation as resolved.

 */
 protected ?CaseParticipated $caseParticipated;

 /**
 * Store a new case participated.
 *
Expand All@@ -17,24 +24,21 @@ class CaseParticipatedRepository
 */
 public function create(CaseStarted $case, TokenInterface $token): void
 {
 if ($this->checkIfCaseParticipatedExist($token->user->id, $case->case_number)) {
Comment thread
caleeli marked this conversation as resolved.

 return;
 }

 try {
 CaseParticipated::create([
 'user_id' => $token->user->id,
 'case_number' => $case->case_number,
 'case_title' => $case->case_title,
 'case_title_formatted' => $case->case_title_formatted,
 'case_status' => $case->case_status,
 'processes' => $case->processes,
 'requests' => $case->requests,
 'request_tokens' => [$token->getKey()],
 'tasks' => [
 [
 'id' => $token->getKey(),
 'element_id' => $token->element_id,
 'name' => $token->element_name,
 'process_id' => $token->process_id,
 ],
 ],
 'processes' => CaseUtils::storeProcesses($token->processRequest, collect()),
 'requests' => CaseUtils::storeRequests($token->processRequest, collect()),
 'request_tokens' => CaseUtils::storeRequestTokens($token->getKey(), collect()),
 'tasks' => CaseUtils::storeTasks($token, collect()),
 'participants' => $case->participants,
 'initiated_at' => $case->initiated_at,
 'completed_at' => null,
Expand All@@ -54,32 +58,18 @@ public function create(CaseStarted $case, TokenInterface $token): void
 public function update(CaseStarted $case, TokenInterface $token)
 {
 try {
 $caseParticipated = CaseParticipated::where('user_id', $token->user->id)
 ->where('case_number', $case->case_number)
 ->first();

 // Add the token data to the request_tokens
 $requestTokens = $caseParticipated->request_tokens->push($token->getKey())
 ->unique()
 ->values();
 // Add the task data to the tasks
 $tasks = $caseParticipated->tasks->push([
 'id' => $token->getKey(),
 'element_id' => $token->element_id,
 'name' => $token->element_name,
 'process_id' => $token->process_id,
 ])
 ->unique('id')
 ->values();
 if (!$this->checkIfCaseParticipatedExist($token->user->id, $case->case_number)) {
Comment thread
caleeli marked this conversation as resolved.

 return;
 }

 $caseParticipated->update([
 $this->caseParticipated->updateOrFail([
 'case_title' => $case->case_title,
 'case_title_formatted' => $case->case_title_formatted,
 'case_status' => $case->case_status,
 'processes' => $case->processes,
 'requests' => $case->requests,
 'request_tokens' => $requestTokens,
 'tasks' => $tasks,
 'processes' => CaseUtils::storeProcesses($token->processRequest, $this->caseParticipated->processes),
 'requests' => CaseUtils::storeRequests($token->processRequest, $this->caseParticipated->requests),
 'request_tokens' => CaseUtils::storeRequestTokens($token->getKey(), $this->caseParticipated->request_tokens),
 'tasks' => CaseUtils::storeTasks($token, $this->caseParticipated->tasks),
 'participants' => $case->participants,
 ]);
 } catch (\Exception $e) {
Expand All@@ -103,4 +93,23 @@ public function updateStatus(int $caseNumber, array $statusData)
 \Log::error($e->getMessage());
 }
 }

 /**
 * Check if a case participated exists.
 * If it exists, store the instance in the property.
 * The property is used to update the JSON fields of the case participated.
 *
 * @param int $userId
 * @param int $caseNumber
 *
 * @return bool
 */
 private function checkIfCaseParticipatedExist(int $userId, int $caseNumber): bool
 {
 $this->caseParticipated = CaseParticipated::where('user_id', $userId)
 ->where('case_number', $caseNumber)
 ->first();
Comment thread
devmiguelangel marked this conversation as resolved.


 return !is_null($this->caseParticipated);
 }
}

117 changes: 71 additions & 46 deletions
ProcessMaker/Repositories/CaseRepository.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,15 @@

class CaseRepository implements CaseRepositoryInterface
{
 const CASE_STATUS_ACTIVE = 'ACTIVE';

 /**
 * This property is used to store an instance of `CaseStarted`
 * when a case started is updated.
 * @var CaseStarted|null
Comment thread
devmiguelangel marked this conversation as resolved.

 */
 protected ?CaseStarted $case;

 public function __construct(protected CaseParticipatedRepository $caseParticipatedRepository)
 {
 }
Expand All@@ -21,34 +30,27 @@ public function __construct(protected CaseParticipatedRepository $caseParticipat
 */
 public function create(ExecutionInstanceInterface $instance): void
 {
 if (is_null($instance->case_number) || $this->checkIfCaseStartedExist($instance->case_number)) {
 if (is_null($instance->case_number)) {
 \Log::error('Case number is required. instance: ' . $instance->getKey());
Comment thread
devmiguelangel marked this conversation as resolved.


 return;
 }

 try {
 $processes = [
 [
 'id' => $instance->process->id,
 'name' => $instance->process->name,
 ],
 ];
 if ($this->checkIfCaseStartedExist($instance->case_number)) {
 $this->updateSubProcesses($instance);

 $requests = [
 [
 'id' => $instance->id,
 'name' => $instance->name,
 'parent_request_id' => $instance->parentRequest->id ?? 0,
 ],
 ];
 return;
 }

 try {
 CaseStarted::create([
 'case_number' => $instance->case_number,
 'user_id' => $instance->user_id,
 'case_title' => $instance->case_title,
 'case_title_formatted' => $instance->case_title_formatted,
 'case_status' => 'IN_PROGRESS',
 'processes' => $processes,
 'requests' => $requests,
 'case_status' => $instance->status === self::CASE_STATUS_ACTIVE ? 'IN_PROGRESS' : $instance->status,
 'processes' => CaseUtils::storeProcesses($instance, collect()),
 'requests' => CaseUtils::storeRequests($instance, collect()),
 'request_tokens' => [],
 'tasks' => [],
 'participants' => [],
Expand All@@ -57,6 +59,7 @@ public function create(ExecutionInstanceInterface $instance): void
 ]);
 } catch (\Exception $e) {
 \Log::error($e->getMessage());
 \Log::error($e->getTraceAsString());
 }
 }

Expand All@@ -69,34 +72,27 @@ 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());
Comment thread
devmiguelangel marked this conversation as resolved.


 return;
 }

 try {
 $case = CaseStarted::where('case_number', $instance->case_number)->first();
 if (!$this->checkIfCaseStartedExist($instance->case_number)) {
 \Log::error('Case number not found. instance: ' . $instance->id);
Comment thread
devmiguelangel marked this conversation as resolved.


 if (is_null($case)) {
 return;
 }

 $case->case_title = $instance->case_title;
 $case->case_status = $instance->status === 'ACTIVE' ? 'IN_PROGRESS' : $instance->status;

 $case->request_tokens = $case->request_tokens->push($token->getKey())
 ->unique()
 ->values();

 if (!in_array($token->element_type, ['scriptTask'])) {
 $case->tasks = $case->tasks->push([
 'id' => $token->getKey(),
 'element_id' => $token->element_id,
 'name' => $token->element_name,
 'process_id' => $token->process_id,
 ])
 ->unique('id')
 ->values();
 }
 $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);
 $this->case->tasks = CaseUtils::storeTasks($token, $this->case->tasks);

 $this->updateParticipants($case, $token);
 $this->updateParticipants($token);

 $case->saveOrFail();
 $this->case->saveOrFail();
 } catch (\Exception $e) {
 \Log::error($e->getMessage());
 }
Expand All@@ -110,6 +106,11 @@ public function update(ExecutionInstanceInterface $instance, TokenInterface $tok
 */
 public function updateStatus(ExecutionInstanceInterface $instance): void
 {
 // If a sub-process is completed, do not update the case started status
 if (!is_null($instance->parent_request_id)) {
Comment thread
devmiguelangel marked this conversation as resolved.

 return;
 }

 try {
 $data = [
 'case_status' => $instance->status,
Expand All@@ -130,34 +131,33 @@ public function updateStatus(ExecutionInstanceInterface $instance): void
 /**
 * Update the participants of the case started.
 *
 * @param CaseStarted $case
 * @param TokenInterface $token
 * @return void
 */
 private function updateParticipants(CaseStarted $case, TokenInterface $token): void
 private function updateParticipants(TokenInterface $token): void
 {
 $user = $token->user;

 if (!$user) {
 return;
 }

 $participantExists = $case->participants->contains(function ($participant) use ($user) {
 $participantExists = $this->case->participants->contains(function ($participant) use ($user) {
 return $participant['id'] === $user->id;
 });

 if (!$participantExists) {
 $case->participants->push([
 $this->case->participants->push([
 'id' => $user->id,
 'name' => $user->getFullName(),
 'title' => $user->title,
 'avatar' => $user->avatar,
 ]);

 $this->caseParticipatedRepository->create($case, $token);
 $this->caseParticipatedRepository->create($this->case, $token);
 }

 $this->caseParticipatedRepository->update($case, $token);
 $this->caseParticipatedRepository->update($this->case, $token);
 }

 /**
Expand All@@ -168,6 +168,31 @@ private function updateParticipants(CaseStarted $case, TokenInterface $token): v
 */
 private function checkIfCaseStartedExist(int $caseNumber): bool
 {
 return CaseStarted::where('case_number', $caseNumber)->count() > 0;
 $this->case = CaseStarted::where('case_number', $caseNumber)->first();

 return !is_null($this->case);
 }

 /**
 * Update the processes and requests of the case started.
 *
 * @param ExecutionInstanceInterface $instance
 * @return void
 */
 private function updateSubProcesses(ExecutionInstanceInterface $instance): void
 {
 if (is_null($instance->parent_request_id)) {
 return;
 }

 try {
 // Store the sub-processes and requests
 $this->case->processes = CaseUtils::storeProcesses($instance, $this->case->processes);
 $this->case->requests = CaseUtils::storeRequests($instance, $this->case->requests);

 $this->case->saveOrFail();
 } catch (\Exception $th) {
 \Log::error($th->getMessage());
 }
 }
}
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
FOUR-18601 populate cases_started table - sub processes#7421

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

caleeli
merged 5 commits into

from

Oct 1, 2024
 Merged


FOUR-18601 populate cases_started table - sub processes
#7421
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
2fbba85

feat: populate sub processes


devmiguelangel Sep 25, 2024
eeec1e6

feat: ref common functions


devmiguelangel Sep 26, 2024
3c93fd4

test: populate case sub processes


devmiguelangel Sep 26, 2024
143664c

test: fix CaseStartedSubProcessTest setup


devmiguelangel Sep 26, 2024
fd3e202

fix: add cr suggestions


devmiguelangel Sep 30, 2024

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


75 changes: 42 additions & 33 deletions
ProcessMaker/Repositories/CaseParticipatedRepository.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,13 @@

class CaseParticipatedRepository
{
 /**
 * This property is used to store an instance of `CaseParticipated`
 * when a case participated is updated.
 * @var CaseParticipated|null
Comment thread
devmiguelangel marked this conversation as resolved.

 */
 protected ?CaseParticipated $caseParticipated;

 /**
 * Store a new case participated.
 *
Expand All@@ -17,24 +24,21 @@ class CaseParticipatedRepository
 */
 public function create(CaseStarted $case, TokenInterface $token): void
 {
 if ($this->checkIfCaseParticipatedExist($token->user->id, $case->case_number)) {
Comment thread
caleeli marked this conversation as resolved.

 return;
 }

 try {
 CaseParticipated::create([
 'user_id' => $token->user->id,
 'case_number' => $case->case_number,
 'case_title' => $case->case_title,
 'case_title_formatted' => $case->case_title_formatted,
 'case_status' => $case->case_status,
 'processes' => $case->processes,
 'requests' => $case->requests,
 'request_tokens' => [$token->getKey()],
 'tasks' => [
 [
 'id' => $token->getKey(),
 'element_id' => $token->element_id,
 'name' => $token->element_name,
 'process_id' => $token->process_id,
 ],
 ],
 'processes' => CaseUtils::storeProcesses($token->processRequest, collect()),
 'requests' => CaseUtils::storeRequests($token->processRequest, collect()),
 'request_tokens' => CaseUtils::storeRequestTokens($token->getKey(), collect()),
 'tasks' => CaseUtils::storeTasks($token, collect()),
 'participants' => $case->participants,
 'initiated_at' => $case->initiated_at,
 'completed_at' => null,
Expand All@@ -54,32 +58,18 @@ public function create(CaseStarted $case, TokenInterface $token): void
 public function update(CaseStarted $case, TokenInterface $token)
 {
 try {
 $caseParticipated = CaseParticipated::where('user_id', $token->user->id)
 ->where('case_number', $case->case_number)
 ->first();

 // Add the token data to the request_tokens
 $requestTokens = $caseParticipated->request_tokens->push($token->getKey())
 ->unique()
 ->values();
 // Add the task data to the tasks
 $tasks = $caseParticipated->tasks->push([
 'id' => $token->getKey(),
 'element_id' => $token->element_id,
 'name' => $token->element_name,
 'process_id' => $token->process_id,
 ])
 ->unique('id')
 ->values();
 if (!$this->checkIfCaseParticipatedExist($token->user->id, $case->case_number)) {
Comment thread
caleeli marked this conversation as resolved.

 return;
 }

 $caseParticipated->update([
 $this->caseParticipated->updateOrFail([
 'case_title' => $case->case_title,
 'case_title_formatted' => $case->case_title_formatted,
 'case_status' => $case->case_status,
 'processes' => $case->processes,
 'requests' => $case->requests,
 'request_tokens' => $requestTokens,
 'tasks' => $tasks,
 'processes' => CaseUtils::storeProcesses($token->processRequest, $this->caseParticipated->processes),
 'requests' => CaseUtils::storeRequests($token->processRequest, $this->caseParticipated->requests),
 'request_tokens' => CaseUtils::storeRequestTokens($token->getKey(), $this->caseParticipated->request_tokens),
 'tasks' => CaseUtils::storeTasks($token, $this->caseParticipated->tasks),
 'participants' => $case->participants,
 ]);
 } catch (\Exception $e) {
Expand All@@ -103,4 +93,23 @@ public function updateStatus(int $caseNumber, array $statusData)
 \Log::error($e->getMessage());
 }
 }

 /**
 * Check if a case participated exists.
 * If it exists, store the instance in the property.
 * The property is used to update the JSON fields of the case participated.
 *
 * @param int $userId
 * @param int $caseNumber
 *
 * @return bool
 */
 private function checkIfCaseParticipatedExist(int $userId, int $caseNumber): bool
 {
 $this->caseParticipated = CaseParticipated::where('user_id', $userId)
 ->where('case_number', $caseNumber)
 ->first();
Comment thread
devmiguelangel marked this conversation as resolved.


 return !is_null($this->caseParticipated);
 }
}

117 changes: 71 additions & 46 deletions
ProcessMaker/Repositories/CaseRepository.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,15 @@

class CaseRepository implements CaseRepositoryInterface
{
 const CASE_STATUS_ACTIVE = 'ACTIVE';

 /**
 * This property is used to store an instance of `CaseStarted`
 * when a case started is updated.
 * @var CaseStarted|null
Comment thread
devmiguelangel marked this conversation as resolved.

 */
 protected ?CaseStarted $case;

 public function __construct(protected CaseParticipatedRepository $caseParticipatedRepository)
 {
 }
Expand All@@ -21,34 +30,27 @@ public function __construct(protected CaseParticipatedRepository $caseParticipat
 */
 public function create(ExecutionInstanceInterface $instance): void
 {
 if (is_null($instance->case_number) || $this->checkIfCaseStartedExist($instance->case_number)) {
 if (is_null($instance->case_number)) {
 \Log::error('Case number is required. instance: ' . $instance->getKey());
Comment thread
devmiguelangel marked this conversation as resolved.


 return;
 }

 try {
 $processes = [
 [
 'id' => $instance->process->id,
 'name' => $instance->process->name,
 ],
 ];
 if ($this->checkIfCaseStartedExist($instance->case_number)) {
 $this->updateSubProcesses($instance);

 $requests = [
 [
 'id' => $instance->id,
 'name' => $instance->name,
 'parent_request_id' => $instance->parentRequest->id ?? 0,
 ],
 ];
 return;
 }

 try {
 CaseStarted::create([
 'case_number' => $instance->case_number,
 'user_id' => $instance->user_id,
 'case_title' => $instance->case_title,
 'case_title_formatted' => $instance->case_title_formatted,
 'case_status' => 'IN_PROGRESS',
 'processes' => $processes,
 'requests' => $requests,
 'case_status' => $instance->status === self::CASE_STATUS_ACTIVE ? 'IN_PROGRESS' : $instance->status,
 'processes' => CaseUtils::storeProcesses($instance, collect()),
 'requests' => CaseUtils::storeRequests($instance, collect()),
 'request_tokens' => [],
 'tasks' => [],
 'participants' => [],
Expand All@@ -57,6 +59,7 @@ public function create(ExecutionInstanceInterface $instance): void
 ]);
 } catch (\Exception $e) {
 \Log::error($e->getMessage());
 \Log::error($e->getTraceAsString());
 }
 }

Expand All@@ -69,34 +72,27 @@ 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());
Comment thread
devmiguelangel marked this conversation as resolved.


 return;
 }

 try {
 $case = CaseStarted::where('case_number', $instance->case_number)->first();
 if (!$this->checkIfCaseStartedExist($instance->case_number)) {
 \Log::error('Case number not found. instance: ' . $instance->id);
Comment thread
devmiguelangel marked this conversation as resolved.


 if (is_null($case)) {
 return;
 }

 $case->case_title = $instance->case_title;
 $case->case_status = $instance->status === 'ACTIVE' ? 'IN_PROGRESS' : $instance->status;

 $case->request_tokens = $case->request_tokens->push($token->getKey())
 ->unique()
 ->values();

 if (!in_array($token->element_type, ['scriptTask'])) {
 $case->tasks = $case->tasks->push([
 'id' => $token->getKey(),
 'element_id' => $token->element_id,
 'name' => $token->element_name,
 'process_id' => $token->process_id,
 ])
 ->unique('id')
 ->values();
 }
 $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);
 $this->case->tasks = CaseUtils::storeTasks($token, $this->case->tasks);

 $this->updateParticipants($case, $token);
 $this->updateParticipants($token);

 $case->saveOrFail();
 $this->case->saveOrFail();
 } catch (\Exception $e) {
 \Log::error($e->getMessage());
 }
Expand All@@ -110,6 +106,11 @@ public function update(ExecutionInstanceInterface $instance, TokenInterface $tok
 */
 public function updateStatus(ExecutionInstanceInterface $instance): void
 {
 // If a sub-process is completed, do not update the case started status
 if (!is_null($instance->parent_request_id)) {
Comment thread
devmiguelangel marked this conversation as resolved.

 return;
 }

 try {
 $data = [
 'case_status' => $instance->status,
Expand All@@ -130,34 +131,33 @@ public function updateStatus(ExecutionInstanceInterface $instance): void
 /**
 * Update the participants of the case started.
 *
 * @param CaseStarted $case
 * @param TokenInterface $token
 * @return void
 */
 private function updateParticipants(CaseStarted $case, TokenInterface $token): void
 private function updateParticipants(TokenInterface $token): void
 {
 $user = $token->user;

 if (!$user) {
 return;
 }

 $participantExists = $case->participants->contains(function ($participant) use ($user) {
 $participantExists = $this->case->participants->contains(function ($participant) use ($user) {
 return $participant['id'] === $user->id;
 });

 if (!$participantExists) {
 $case->participants->push([
 $this->case->participants->push([
 'id' => $user->id,
 'name' => $user->getFullName(),
 'title' => $user->title,
 'avatar' => $user->avatar,
 ]);

 $this->caseParticipatedRepository->create($case, $token);
 $this->caseParticipatedRepository->create($this->case, $token);
 }

 $this->caseParticipatedRepository->update($case, $token);
 $this->caseParticipatedRepository->update($this->case, $token);
 }

 /**
Expand All@@ -168,6 +168,31 @@ private function updateParticipants(CaseStarted $case, TokenInterface $token): v
 */
 private function checkIfCaseStartedExist(int $caseNumber): bool
 {
 return CaseStarted::where('case_number', $caseNumber)->count() > 0;
 $this->case = CaseStarted::where('case_number', $caseNumber)->first();

 return !is_null($this->case);
 }

 /**
 * Update the processes and requests of the case started.
 *
 * @param ExecutionInstanceInterface $instance
 * @return void
 */
 private function updateSubProcesses(ExecutionInstanceInterface $instance): void
 {
 if (is_null($instance->parent_request_id)) {
 return;
 }

 try {
 // Store the sub-processes and requests
 $this->case->processes = CaseUtils::storeProcesses($instance, $this->case->processes);
 $this->case->requests = CaseUtils::storeRequests($instance, $this->case->requests);

 $this->case->saveOrFail();
 } catch (\Exception $th) {
 \Log::error($th->getMessage());
 }
 }
}
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
FOUR-18601 populate cases_started table - sub processes#7421

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

caleeli
merged 5 commits into

from

Oct 1, 2024
 Merged


FOUR-18601 populate cases_started table - sub processes
#7421
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
2fbba85

feat: populate sub processes


devmiguelangel Sep 25, 2024
eeec1e6

feat: ref common functions


devmiguelangel Sep 26, 2024
3c93fd4

test: populate case sub processes


devmiguelangel Sep 26, 2024
143664c

test: fix CaseStartedSubProcessTest setup


devmiguelangel Sep 26, 2024
fd3e202

fix: add cr suggestions


devmiguelangel Sep 30, 2024

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


75 changes: 42 additions & 33 deletions
ProcessMaker/Repositories/CaseParticipatedRepository.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,13 @@

class CaseParticipatedRepository
{
 /**
 * This property is used to store an instance of `CaseParticipated`
 * when a case participated is updated.
 * @var CaseParticipated|null
Comment thread
devmiguelangel marked this conversation as resolved.

 */
 protected ?CaseParticipated $caseParticipated;

 /**
 * Store a new case participated.
 *
Expand All@@ -17,24 +24,21 @@ class CaseParticipatedRepository
 */
 public function create(CaseStarted $case, TokenInterface $token): void
 {
 if ($this->checkIfCaseParticipatedExist($token->user->id, $case->case_number)) {
Comment thread
caleeli marked this conversation as resolved.

 return;
 }

 try {
 CaseParticipated::create([
 'user_id' => $token->user->id,
 'case_number' => $case->case_number,
 'case_title' => $case->case_title,
 'case_title_formatted' => $case->case_title_formatted,
 'case_status' => $case->case_status,
 'processes' => $case->processes,
 'requests' => $case->requests,
 'request_tokens' => [$token->getKey()],
 'tasks' => [
 [
 'id' => $token->getKey(),
 'element_id' => $token->element_id,
 'name' => $token->element_name,
 'process_id' => $token->process_id,
 ],
 ],
 'processes' => CaseUtils::storeProcesses($token->processRequest, collect()),
 'requests' => CaseUtils::storeRequests($token->processRequest, collect()),
 'request_tokens' => CaseUtils::storeRequestTokens($token->getKey(), collect()),
 'tasks' => CaseUtils::storeTasks($token, collect()),
 'participants' => $case->participants,
 'initiated_at' => $case->initiated_at,
 'completed_at' => null,
Expand All@@ -54,32 +58,18 @@ public function create(CaseStarted $case, TokenInterface $token): void
 public function update(CaseStarted $case, TokenInterface $token)
 {
 try {
 $caseParticipated = CaseParticipated::where('user_id', $token->user->id)
 ->where('case_number', $case->case_number)
 ->first();

 // Add the token data to the request_tokens
 $requestTokens = $caseParticipated->request_tokens->push($token->getKey())
 ->unique()
 ->values();
 // Add the task data to the tasks
 $tasks = $caseParticipated->tasks->push([
 'id' => $token->getKey(),
 'element_id' => $token->element_id,
 'name' => $token->element_name,
 'process_id' => $token->process_id,
 ])
 ->unique('id')
 ->values();
 if (!$this->checkIfCaseParticipatedExist($token->user->id, $case->case_number)) {
Comment thread
caleeli marked this conversation as resolved.

 return;
 }

 $caseParticipated->update([
 $this->caseParticipated->updateOrFail([
 'case_title' => $case->case_title,
 'case_title_formatted' => $case->case_title_formatted,
 'case_status' => $case->case_status,
 'processes' => $case->processes,
 'requests' => $case->requests,
 'request_tokens' => $requestTokens,
 'tasks' => $tasks,
 'processes' => CaseUtils::storeProcesses($token->processRequest, $this->caseParticipated->processes),
 'requests' => CaseUtils::storeRequests($token->processRequest, $this->caseParticipated->requests),
 'request_tokens' => CaseUtils::storeRequestTokens($token->getKey(), $this->caseParticipated->request_tokens),
 'tasks' => CaseUtils::storeTasks($token, $this->caseParticipated->tasks),
 'participants' => $case->participants,
 ]);
 } catch (\Exception $e) {
Expand All@@ -103,4 +93,23 @@ public function updateStatus(int $caseNumber, array $statusData)
 \Log::error($e->getMessage());
 }
 }

 /**
 * Check if a case participated exists.
 * If it exists, store the instance in the property.
 * The property is used to update the JSON fields of the case participated.
 *
 * @param int $userId
 * @param int $caseNumber
 *
 * @return bool
 */
 private function checkIfCaseParticipatedExist(int $userId, int $caseNumber): bool
 {
 $this->caseParticipated = CaseParticipated::where('user_id', $userId)
 ->where('case_number', $caseNumber)
 ->first();
Comment thread
devmiguelangel marked this conversation as resolved.


 return !is_null($this->caseParticipated);
 }
}

117 changes: 71 additions & 46 deletions
ProcessMaker/Repositories/CaseRepository.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,15 @@

class CaseRepository implements CaseRepositoryInterface
{
 const CASE_STATUS_ACTIVE = 'ACTIVE';

 /**
 * This property is used to store an instance of `CaseStarted`
 * when a case started is updated.
 * @var CaseStarted|null
Comment thread
devmiguelangel marked this conversation as resolved.

 */
 protected ?CaseStarted $case;

 public function __construct(protected CaseParticipatedRepository $caseParticipatedRepository)
 {
 }
Expand All@@ -21,34 +30,27 @@ public function __construct(protected CaseParticipatedRepository $caseParticipat
 */
 public function create(ExecutionInstanceInterface $instance): void
 {
 if (is_null($instance->case_number) || $this->checkIfCaseStartedExist($instance->case_number)) {
 if (is_null($instance->case_number)) {
 \Log::error('Case number is required. instance: ' . $instance->getKey());
Comment thread
devmiguelangel marked this conversation as resolved.


 return;
 }

 try {
 $processes = [
 [
 'id' => $instance->process->id,
 'name' => $instance->process->name,
 ],
 ];
 if ($this->checkIfCaseStartedExist($instance->case_number)) {
 $this->updateSubProcesses($instance);

 $requests = [
 [
 'id' => $instance->id,
 'name' => $instance->name,
 'parent_request_id' => $instance->parentRequest->id ?? 0,
 ],
 ];
 return;
 }

 try {
 CaseStarted::create([
 'case_number' => $instance->case_number,
 'user_id' => $instance->user_id,
 'case_title' => $instance->case_title,
 'case_title_formatted' => $instance->case_title_formatted,
 'case_status' => 'IN_PROGRESS',
 'processes' => $processes,
 'requests' => $requests,
 'case_status' => $instance->status === self::CASE_STATUS_ACTIVE ? 'IN_PROGRESS' : $instance->status,
 'processes' => CaseUtils::storeProcesses($instance, collect()),
 'requests' => CaseUtils::storeRequests($instance, collect()),
 'request_tokens' => [],
 'tasks' => [],
 'participants' => [],
Expand All@@ -57,6 +59,7 @@ public function create(ExecutionInstanceInterface $instance): void
 ]);
 } catch (\Exception $e) {
 \Log::error($e->getMessage());
 \Log::error($e->getTraceAsString());
 }
 }

Expand All@@ -69,34 +72,27 @@ 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());
Comment thread
devmiguelangel marked this conversation as resolved.


 return;
 }

 try {
 $case = CaseStarted::where('case_number', $instance->case_number)->first();
 if (!$this->checkIfCaseStartedExist($instance->case_number)) {
 \Log::error('Case number not found. instance: ' . $instance->id);
Comment thread
devmiguelangel marked this conversation as resolved.


 if (is_null($case)) {
 return;
 }

 $case->case_title = $instance->case_title;
 $case->case_status = $instance->status === 'ACTIVE' ? 'IN_PROGRESS' : $instance->status;

 $case->request_tokens = $case->request_tokens->push($token->getKey())
 ->unique()
 ->values();

 if (!in_array($token->element_type, ['scriptTask'])) {
 $case->tasks = $case->tasks->push([
 'id' => $token->getKey(),
 'element_id' => $token->element_id,
 'name' => $token->element_name,
 'process_id' => $token->process_id,
 ])
 ->unique('id')
 ->values();
 }
 $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);
 $this->case->tasks = CaseUtils::storeTasks($token, $this->case->tasks);

 $this->updateParticipants($case, $token);
 $this->updateParticipants($token);

 $case->saveOrFail();
 $this->case->saveOrFail();
 } catch (\Exception $e) {
 \Log::error($e->getMessage());
 }
Expand All@@ -110,6 +106,11 @@ public function update(ExecutionInstanceInterface $instance, TokenInterface $tok
 */
 public function updateStatus(ExecutionInstanceInterface $instance): void
 {
 // If a sub-process is completed, do not update the case started status
 if (!is_null($instance->parent_request_id)) {
Comment thread
devmiguelangel marked this conversation as resolved.

 return;
 }

 try {
 $data = [
 'case_status' => $instance->status,
Expand All@@ -130,34 +131,33 @@ public function updateStatus(ExecutionInstanceInterface $instance): void
 /**
 * Update the participants of the case started.
 *
 * @param CaseStarted $case
 * @param TokenInterface $token
 * @return void
 */
 private function updateParticipants(CaseStarted $case, TokenInterface $token): void
 private function updateParticipants(TokenInterface $token): void
 {
 $user = $token->user;

 if (!$user) {
 return;
 }

 $participantExists = $case->participants->contains(function ($participant) use ($user) {
 $participantExists = $this->case->participants->contains(function ($participant) use ($user) {
 return $participant['id'] === $user->id;
 });

 if (!$participantExists) {
 $case->participants->push([
 $this->case->participants->push([
 'id' => $user->id,
 'name' => $user->getFullName(),
 'title' => $user->title,
 'avatar' => $user->avatar,
 ]);

 $this->caseParticipatedRepository->create($case, $token);
 $this->caseParticipatedRepository->create($this->case, $token);
 }

 $this->caseParticipatedRepository->update($case, $token);
 $this->caseParticipatedRepository->update($this->case, $token);
 }

 /**
Expand All@@ -168,6 +168,31 @@ private function updateParticipants(CaseStarted $case, TokenInterface $token): v
 */
 private function checkIfCaseStartedExist(int $caseNumber): bool
 {
 return CaseStarted::where('case_number', $caseNumber)->count() > 0;
 $this->case = CaseStarted::where('case_number', $caseNumber)->first();

 return !is_null($this->case);
 }

 /**
 * Update the processes and requests of the case started.
 *
 * @param ExecutionInstanceInterface $instance
 * @return void
 */
 private function updateSubProcesses(ExecutionInstanceInterface $instance): void
 {
 if (is_null($instance->parent_request_id)) {
 return;
 }

 try {
 // Store the sub-processes and requests
 $this->case->processes = CaseUtils::storeProcesses($instance, $this->case->processes);
 $this->case->requests = CaseUtils::storeRequests($instance, $this->case->requests);

 $this->case->saveOrFail();
 } catch (\Exception $th) {
 \Log::error($th->getMessage());
 }
 }
}
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
FOUR-18601 populate cases_started table - sub processes#7421

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

caleeli
merged 5 commits into

from

Oct 1, 2024
 Merged


FOUR-18601 populate cases_started table - sub processes
#7421
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
2fbba85

feat: populate sub processes


devmiguelangel Sep 25, 2024
eeec1e6

feat: ref common functions


devmiguelangel Sep 26, 2024
3c93fd4

test: populate case sub processes


devmiguelangel Sep 26, 2024
143664c

test: fix CaseStartedSubProcessTest setup


devmiguelangel Sep 26, 2024
fd3e202

fix: add cr suggestions


devmiguelangel Sep 30, 2024

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


75 changes: 42 additions & 33 deletions
ProcessMaker/Repositories/CaseParticipatedRepository.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,13 @@

class CaseParticipatedRepository
{
 /**
 * This property is used to store an instance of `CaseParticipated`
 * when a case participated is updated.
 * @var CaseParticipated|null
Comment thread
devmiguelangel marked this conversation as resolved.

 */
 protected ?CaseParticipated $caseParticipated;

 /**
 * Store a new case participated.
 *
Expand All@@ -17,24 +24,21 @@ class CaseParticipatedRepository
 */
 public function create(CaseStarted $case, TokenInterface $token): void
 {
 if ($this->checkIfCaseParticipatedExist($token->user->id, $case->case_number)) {
Comment thread
caleeli marked this conversation as resolved.

 return;
 }

 try {
 CaseParticipated::create([
 'user_id' => $token->user->id,
 'case_number' => $case->case_number,
 'case_title' => $case->case_title,
 'case_title_formatted' => $case->case_title_formatted,
 'case_status' => $case->case_status,
 'processes' => $case->processes,
 'requests' => $case->requests,
 'request_tokens' => [$token->getKey()],
 'tasks' => [
 [
 'id' => $token->getKey(),
 'element_id' => $token->element_id,
 'name' => $token->element_name,
 'process_id' => $token->process_id,
 ],
 ],
 'processes' => CaseUtils::storeProcesses($token->processRequest, collect()),
 'requests' => CaseUtils::storeRequests($token->processRequest, collect()),
 'request_tokens' => CaseUtils::storeRequestTokens($token->getKey(), collect()),
 'tasks' => CaseUtils::storeTasks($token, collect()),
 'participants' => $case->participants,
 'initiated_at' => $case->initiated_at,
 'completed_at' => null,
Expand All@@ -54,32 +58,18 @@ public function create(CaseStarted $case, TokenInterface $token): void
 public function update(CaseStarted $case, TokenInterface $token)
 {
 try {
 $caseParticipated = CaseParticipated::where('user_id', $token->user->id)
 ->where('case_number', $case->case_number)
 ->first();

 // Add the token data to the request_tokens
 $requestTokens = $caseParticipated->request_tokens->push($token->getKey())
 ->unique()
 ->values();
 // Add the task data to the tasks
 $tasks = $caseParticipated->tasks->push([
 'id' => $token->getKey(),
 'element_id' => $token->element_id,
 'name' => $token->element_name,
 'process_id' => $token->process_id,
 ])
 ->unique('id')
 ->values();
 if (!$this->checkIfCaseParticipatedExist($token->user->id, $case->case_number)) {
Comment thread
caleeli marked this conversation as resolved.

 return;
 }

 $caseParticipated->update([
 $this->caseParticipated->updateOrFail([
 'case_title' => $case->case_title,
 'case_title_formatted' => $case->case_title_formatted,
 'case_status' => $case->case_status,
 'processes' => $case->processes,
 'requests' => $case->requests,
 'request_tokens' => $requestTokens,
 'tasks' => $tasks,
 'processes' => CaseUtils::storeProcesses($token->processRequest, $this->caseParticipated->processes),
 'requests' => CaseUtils::storeRequests($token->processRequest, $this->caseParticipated->requests),
 'request_tokens' => CaseUtils::storeRequestTokens($token->getKey(), $this->caseParticipated->request_tokens),
 'tasks' => CaseUtils::storeTasks($token, $this->caseParticipated->tasks),
 'participants' => $case->participants,
 ]);
 } catch (\Exception $e) {
Expand All@@ -103,4 +93,23 @@ public function updateStatus(int $caseNumber, array $statusData)
 \Log::error($e->getMessage());
 }
 }

 /**
 * Check if a case participated exists.
 * If it exists, store the instance in the property.
 * The property is used to update the JSON fields of the case participated.
 *
 * @param int $userId
 * @param int $caseNumber
 *
 * @return bool
 */
 private function checkIfCaseParticipatedExist(int $userId, int $caseNumber): bool
 {
 $this->caseParticipated = CaseParticipated::where('user_id', $userId)
 ->where('case_number', $caseNumber)
 ->first();
Comment thread
devmiguelangel marked this conversation as resolved.


 return !is_null($this->caseParticipated);
 }
}

117 changes: 71 additions & 46 deletions
ProcessMaker/Repositories/CaseRepository.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,15 @@

class CaseRepository implements CaseRepositoryInterface
{
 const CASE_STATUS_ACTIVE = 'ACTIVE';

 /**
 * This property is used to store an instance of `CaseStarted`
 * when a case started is updated.
 * @var CaseStarted|null
Comment thread
devmiguelangel marked this conversation as resolved.

 */
 protected ?CaseStarted $case;

 public function __construct(protected CaseParticipatedRepository $caseParticipatedRepository)
 {
 }
Expand All@@ -21,34 +30,27 @@ public function __construct(protected CaseParticipatedRepository $caseParticipat
 */
 public function create(ExecutionInstanceInterface $instance): void
 {
 if (is_null($instance->case_number) || $this->checkIfCaseStartedExist($instance->case_number)) {
 if (is_null($instance->case_number)) {
 \Log::error('Case number is required. instance: ' . $instance->getKey());
Comment thread
devmiguelangel marked this conversation as resolved.


 return;
 }

 try {
 $processes = [
 [
 'id' => $instance->process->id,
 'name' => $instance->process->name,
 ],
 ];
 if ($this->checkIfCaseStartedExist($instance->case_number)) {
 $this->updateSubProcesses($instance);

 $requests = [
 [
 'id' => $instance->id,
 'name' => $instance->name,
 'parent_request_id' => $instance->parentRequest->id ?? 0,
 ],
 ];
 return;
 }

 try {
 CaseStarted::create([
 'case_number' => $instance->case_number,
 'user_id' => $instance->user_id,
 'case_title' => $instance->case_title,
 'case_title_formatted' => $instance->case_title_formatted,
 'case_status' => 'IN_PROGRESS',
 'processes' => $processes,
 'requests' => $requests,
 'case_status' => $instance->status === self::CASE_STATUS_ACTIVE ? 'IN_PROGRESS' : $instance->status,
 'processes' => CaseUtils::storeProcesses($instance, collect()),
 'requests' => CaseUtils::storeRequests($instance, collect()),
 'request_tokens' => [],
 'tasks' => [],
 'participants' => [],
Expand All@@ -57,6 +59,7 @@ public function create(ExecutionInstanceInterface $instance): void
 ]);
 } catch (\Exception $e) {
 \Log::error($e->getMessage());
 \Log::error($e->getTraceAsString());
 }
 }

Expand All@@ -69,34 +72,27 @@ 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());
Comment thread
devmiguelangel marked this conversation as resolved.


 return;
 }

 try {
 $case = CaseStarted::where('case_number', $instance->case_number)->first();
 if (!$this->checkIfCaseStartedExist($instance->case_number)) {
 \Log::error('Case number not found. instance: ' . $instance->id);
Comment thread
devmiguelangel marked this conversation as resolved.


 if (is_null($case)) {
 return;
 }

 $case->case_title = $instance->case_title;
 $case->case_status = $instance->status === 'ACTIVE' ? 'IN_PROGRESS' : $instance->status;

 $case->request_tokens = $case->request_tokens->push($token->getKey())
 ->unique()
 ->values();

 if (!in_array($token->element_type, ['scriptTask'])) {
 $case->tasks = $case->tasks->push([
 'id' => $token->getKey(),
 'element_id' => $token->element_id,
 'name' => $token->element_name,
 'process_id' => $token->process_id,
 ])
 ->unique('id')
 ->values();
 }
 $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);
 $this->case->tasks = CaseUtils::storeTasks($token, $this->case->tasks);

 $this->updateParticipants($case, $token);
 $this->updateParticipants($token);

 $case->saveOrFail();
 $this->case->saveOrFail();
 } catch (\Exception $e) {
 \Log::error($e->getMessage());
 }
Expand All@@ -110,6 +106,11 @@ public function update(ExecutionInstanceInterface $instance, TokenInterface $tok
 */
 public function updateStatus(ExecutionInstanceInterface $instance): void
 {
 // If a sub-process is completed, do not update the case started status
 if (!is_null($instance->parent_request_id)) {
Comment thread
devmiguelangel marked this conversation as resolved.

 return;
 }

 try {
 $data = [
 'case_status' => $instance->status,
Expand All@@ -130,34 +131,33 @@ public function updateStatus(ExecutionInstanceInterface $instance): void
 /**
 * Update the participants of the case started.
 *
 * @param CaseStarted $case
 * @param TokenInterface $token
 * @return void
 */
 private function updateParticipants(CaseStarted $case, TokenInterface $token): void
 private function updateParticipants(TokenInterface $token): void
 {
 $user = $token->user;

 if (!$user) {
 return;
 }

 $participantExists = $case->participants->contains(function ($participant) use ($user) {
 $participantExists = $this->case->participants->contains(function ($participant) use ($user) {
 return $participant['id'] === $user->id;
 });

 if (!$participantExists) {
 $case->participants->push([
 $this->case->participants->push([
 'id' => $user->id,
 'name' => $user->getFullName(),
 'title' => $user->title,
 'avatar' => $user->avatar,
 ]);

 $this->caseParticipatedRepository->create($case, $token);
 $this->caseParticipatedRepository->create($this->case, $token);
 }

 $this->caseParticipatedRepository->update($case, $token);
 $this->caseParticipatedRepository->update($this->case, $token);
 }

 /**
Expand All@@ -168,6 +168,31 @@ private function updateParticipants(CaseStarted $case, TokenInterface $token): v
 */
 private function checkIfCaseStartedExist(int $caseNumber): bool
 {
 return CaseStarted::where('case_number', $caseNumber)->count() > 0;
 $this->case = CaseStarted::where('case_number', $caseNumber)->first();

 return !is_null($this->case);
 }

 /**
 * Update the processes and requests of the case started.
 *
 * @param ExecutionInstanceInterface $instance
 * @return void
 */
 private function updateSubProcesses(ExecutionInstanceInterface $instance): void
 {
 if (is_null($instance->parent_request_id)) {
 return;
 }

 try {
 // Store the sub-processes and requests
 $this->case->processes = CaseUtils::storeProcesses($instance, $this->case->processes);
 $this->case->requests = CaseUtils::storeRequests($instance, $this->case->requests);

 $this->case->saveOrFail();
 } catch (\Exception $th) {
 \Log::error($th->getMessage());
 }
 }
}
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
FOUR-18601 populate cases_started table - sub processes#7421

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

caleeli
merged 5 commits into

from

Oct 1, 2024
 Merged


FOUR-18601 populate cases_started table - sub processes
#7421
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
2fbba85

feat: populate sub processes


devmiguelangel Sep 25, 2024
eeec1e6

feat: ref common functions


devmiguelangel Sep 26, 2024
3c93fd4

test: populate case sub processes


devmiguelangel Sep 26, 2024
143664c

test: fix CaseStartedSubProcessTest setup


devmiguelangel Sep 26, 2024
fd3e202

fix: add cr suggestions


devmiguelangel Sep 30, 2024

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


75 changes: 42 additions & 33 deletions
ProcessMaker/Repositories/CaseParticipatedRepository.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,13 @@

class CaseParticipatedRepository
{
 /**
 * This property is used to store an instance of `CaseParticipated`
 * when a case participated is updated.
 * @var CaseParticipated|null
Comment thread
devmiguelangel marked this conversation as resolved.

 */
 protected ?CaseParticipated $caseParticipated;

 /**
 * Store a new case participated.
 *
Expand All@@ -17,24 +24,21 @@ class CaseParticipatedRepository
 */
 public function create(CaseStarted $case, TokenInterface $token): void
 {
 if ($this->checkIfCaseParticipatedExist($token->user->id, $case->case_number)) {
Comment thread
caleeli marked this conversation as resolved.

 return;
 }

 try {
 CaseParticipated::create([
 'user_id' => $token->user->id,
 'case_number' => $case->case_number,
 'case_title' => $case->case_title,
 'case_title_formatted' => $case->case_title_formatted,
 'case_status' => $case->case_status,
 'processes' => $case->processes,
 'requests' => $case->requests,
 'request_tokens' => [$token->getKey()],
 'tasks' => [
 [
 'id' => $token->getKey(),
 'element_id' => $token->element_id,
 'name' => $token->element_name,
 'process_id' => $token->process_id,
 ],
 ],
 'processes' => CaseUtils::storeProcesses($token->processRequest, collect()),
 'requests' => CaseUtils::storeRequests($token->processRequest, collect()),
 'request_tokens' => CaseUtils::storeRequestTokens($token->getKey(), collect()),
 'tasks' => CaseUtils::storeTasks($token, collect()),
 'participants' => $case->participants,
 'initiated_at' => $case->initiated_at,
 'completed_at' => null,
Expand All@@ -54,32 +58,18 @@ public function create(CaseStarted $case, TokenInterface $token): void
 public function update(CaseStarted $case, TokenInterface $token)
 {
 try {
 $caseParticipated = CaseParticipated::where('user_id', $token->user->id)
 ->where('case_number', $case->case_number)
 ->first();

 // Add the token data to the request_tokens
 $requestTokens = $caseParticipated->request_tokens->push($token->getKey())
 ->unique()
 ->values();
 // Add the task data to the tasks
 $tasks = $caseParticipated->tasks->push([
 'id' => $token->getKey(),
 'element_id' => $token->element_id,
 'name' => $token->element_name,
 'process_id' => $token->process_id,
 ])
 ->unique('id')
 ->values();
 if (!$this->checkIfCaseParticipatedExist($token->user->id, $case->case_number)) {
Comment thread
caleeli marked this conversation as resolved.

 return;
 }

 $caseParticipated->update([
 $this->caseParticipated->updateOrFail([
 'case_title' => $case->case_title,
 'case_title_formatted' => $case->case_title_formatted,
 'case_status' => $case->case_status,
 'processes' => $case->processes,
 'requests' => $case->requests,
 'request_tokens' => $requestTokens,
 'tasks' => $tasks,
 'processes' => CaseUtils::storeProcesses($token->processRequest, $this->caseParticipated->processes),
 'requests' => CaseUtils::storeRequests($token->processRequest, $this->caseParticipated->requests),
 'request_tokens' => CaseUtils::storeRequestTokens($token->getKey(), $this->caseParticipated->request_tokens),
 'tasks' => CaseUtils::storeTasks($token, $this->caseParticipated->tasks),
 'participants' => $case->participants,
 ]);
 } catch (\Exception $e) {
Expand All@@ -103,4 +93,23 @@ public function updateStatus(int $caseNumber, array $statusData)
 \Log::error($e->getMessage());
 }
 }

 /**
 * Check if a case participated exists.
 * If it exists, store the instance in the property.
 * The property is used to update the JSON fields of the case participated.
 *
 * @param int $userId
 * @param int $caseNumber
 *
 * @return bool
 */
 private function checkIfCaseParticipatedExist(int $userId, int $caseNumber): bool
 {
 $this->caseParticipated = CaseParticipated::where('user_id', $userId)
 ->where('case_number', $caseNumber)
 ->first();
Comment thread
devmiguelangel marked this conversation as resolved.


 return !is_null($this->caseParticipated);
 }
}

117 changes: 71 additions & 46 deletions
ProcessMaker/Repositories/CaseRepository.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,15 @@

class CaseRepository implements CaseRepositoryInterface
{
 const CASE_STATUS_ACTIVE = 'ACTIVE';

 /**
 * This property is used to store an instance of `CaseStarted`
 * when a case started is updated.
 * @var CaseStarted|null
Comment thread
devmiguelangel marked this conversation as resolved.

 */
 protected ?CaseStarted $case;

 public function __construct(protected CaseParticipatedRepository $caseParticipatedRepository)
 {
 }
Expand All@@ -21,34 +30,27 @@ public function __construct(protected CaseParticipatedRepository $caseParticipat
 */
 public function create(ExecutionInstanceInterface $instance): void
 {
 if (is_null($instance->case_number) || $this->checkIfCaseStartedExist($instance->case_number)) {
 if (is_null($instance->case_number)) {
 \Log::error('Case number is required. instance: ' . $instance->getKey());
Comment thread
devmiguelangel marked this conversation as resolved.


 return;
 }

 try {
 $processes = [
 [
 'id' => $instance->process->id,
 'name' => $instance->process->name,
 ],
 ];
 if ($this->checkIfCaseStartedExist($instance->case_number)) {
 $this->updateSubProcesses($instance);

 $requests = [
 [
 'id' => $instance->id,
 'name' => $instance->name,
 'parent_request_id' => $instance->parentRequest->id ?? 0,
 ],
 ];
 return;
 }

 try {
 CaseStarted::create([
 'case_number' => $instance->case_number,
 'user_id' => $instance->user_id,
 'case_title' => $instance->case_title,
 'case_title_formatted' => $instance->case_title_formatted,
 'case_status' => 'IN_PROGRESS',
 'processes' => $processes,
 'requests' => $requests,
 'case_status' => $instance->status === self::CASE_STATUS_ACTIVE ? 'IN_PROGRESS' : $instance->status,
 'processes' => CaseUtils::storeProcesses($instance, collect()),
 'requests' => CaseUtils::storeRequests($instance, collect()),
 'request_tokens' => [],
 'tasks' => [],
 'participants' => [],
Expand All@@ -57,6 +59,7 @@ public function create(ExecutionInstanceInterface $instance): void
 ]);
 } catch (\Exception $e) {
 \Log::error($e->getMessage());
 \Log::error($e->getTraceAsString());
 }
 }

Expand All@@ -69,34 +72,27 @@ 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());
Comment thread
devmiguelangel marked this conversation as resolved.


 return;
 }

 try {
 $case = CaseStarted::where('case_number', $instance->case_number)->first();
 if (!$this->checkIfCaseStartedExist($instance->case_number)) {
 \Log::error('Case number not found. instance: ' . $instance->id);
Comment thread
devmiguelangel marked this conversation as resolved.


 if (is_null($case)) {
 return;
 }

 $case->case_title = $instance->case_title;
 $case->case_status = $instance->status === 'ACTIVE' ? 'IN_PROGRESS' : $instance->status;

 $case->request_tokens = $case->request_tokens->push($token->getKey())
 ->unique()
 ->values();

 if (!in_array($token->element_type, ['scriptTask'])) {
 $case->tasks = $case->tasks->push([
 'id' => $token->getKey(),
 'element_id' => $token->element_id,
 'name' => $token->element_name,
 'process_id' => $token->process_id,
 ])
 ->unique('id')
 ->values();
 }
 $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);
 $this->case->tasks = CaseUtils::storeTasks($token, $this->case->tasks);

 $this->updateParticipants($case, $token);
 $this->updateParticipants($token);

 $case->saveOrFail();
 $this->case->saveOrFail();
 } catch (\Exception $e) {
 \Log::error($e->getMessage());
 }
Expand All@@ -110,6 +106,11 @@ public function update(ExecutionInstanceInterface $instance, TokenInterface $tok
 */
 public function updateStatus(ExecutionInstanceInterface $instance): void
 {
 // If a sub-process is completed, do not update the case started status
 if (!is_null($instance->parent_request_id)) {
Comment thread
devmiguelangel marked this conversation as resolved.

 return;
 }

 try {
 $data = [
 'case_status' => $instance->status,
Expand All@@ -130,34 +131,33 @@ public function updateStatus(ExecutionInstanceInterface $instance): void
 /**
 * Update the participants of the case started.
 *
 * @param CaseStarted $case
 * @param TokenInterface $token
 * @return void
 */
 private function updateParticipants(CaseStarted $case, TokenInterface $token): void
 private function updateParticipants(TokenInterface $token): void
 {
 $user = $token->user;

 if (!$user) {
 return;
 }

 $participantExists = $case->participants->contains(function ($participant) use ($user) {
 $participantExists = $this->case->participants->contains(function ($participant) use ($user) {
 return $participant['id'] === $user->id;
 });

 if (!$participantExists) {
 $case->participants->push([
 $this->case->participants->push([
 'id' => $user->id,
 'name' => $user->getFullName(),
 'title' => $user->title,
 'avatar' => $user->avatar,
 ]);

 $this->caseParticipatedRepository->create($case, $token);
 $this->caseParticipatedRepository->create($this->case, $token);
 }

 $this->caseParticipatedRepository->update($case, $token);
 $this->caseParticipatedRepository->update($this->case, $token);
 }

 /**
Expand All@@ -168,6 +168,31 @@ private function updateParticipants(CaseStarted $case, TokenInterface $token): v
 */
 private function checkIfCaseStartedExist(int $caseNumber): bool
 {
 return CaseStarted::where('case_number', $caseNumber)->count() > 0;
 $this->case = CaseStarted::where('case_number', $caseNumber)->first();

 return !is_null($this->case);
 }

 /**
 * Update the processes and requests of the case started.
 *
 * @param ExecutionInstanceInterface $instance
 * @return void
 */
 private function updateSubProcesses(ExecutionInstanceInterface $instance): void
 {
 if (is_null($instance->parent_request_id)) {
 return;
 }

 try {
 // Store the sub-processes and requests
 $this->case->processes = CaseUtils::storeProcesses($instance, $this->case->processes);
 $this->case->requests = CaseUtils::storeRequests($instance, $this->case->requests);

 $this->case->saveOrFail();
 } catch (\Exception $th) {
 \Log::error($th->getMessage());
 }
 }
}
Loading