Skip to content

FOUR-18599 populate cases_started, cases_participated tables (main flow) #7400

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.

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
merged 2 commits into from
Sep 20, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 32 additions & 0 deletions ProcessMaker/Contracts/CaseRepositoryInterface.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
<?php

namespace ProcessMaker\Contracts;

use ProcessMaker\Nayra\Contracts\Bpmn\TokenInterface;
use ProcessMaker\Nayra\Contracts\Engine\ExecutionInstanceInterface;

interface CaseRepositoryInterface
{
/**
* Store a new case started.
*
* @param ExecutionInstanceInterface $instance
* @return void
*/
public function create(ExecutionInstanceInterface $instance): void;
/**
* Update the case started.
*
* @param ExecutionInstanceInterface $instance
* @param TokenInterface $token
* @return void
*/
public function update(ExecutionInstanceInterface $instance, TokenInterface $token): void;
/**
* Update the status of a case started.
*
* @param ExecutionInstanceInterface $instance
* @return void
*/
public function updateStatus(ExecutionInstanceInterface $instance): void;
}
7 changes: 6 additions & 1 deletion ProcessMaker/Http/Controllers/Api/TaskController.php
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
use ProcessMaker\Http\Resources\ApiResource;
use ProcessMaker\Http\Resources\Task as Resource;
use ProcessMaker\Http\Resources\TaskCollection;
use ProcessMaker\Jobs\CaseUpdate;
use ProcessMaker\Listeners\HandleRedirectListener;
use ProcessMaker\Models\Process;
use ProcessMaker\Models\ProcessRequest;
Expand Down Expand Up @@ -253,7 +254,11 @@ public function update(Request $request, ProcessRequestToken $task)
$userToAssign = $request->input('user_id');
$task->reassign($userToAssign, $request->user());

return new Resource($task->refresh());
$taskRefreshed = $task->refresh();

CaseUpdate::dispatch($task->processRequest, $taskRefreshed);

return new Resource($taskRefreshed);
} else {
return abort(422);
}
Expand Down
32 changes: 32 additions & 0 deletions ProcessMaker/Jobs/CaseStore.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
<?php

namespace ProcessMaker\Jobs;

use Illuminate\Bus\Queueable;
use Illuminate\Contracts\Queue\ShouldBeUnique;
use Illuminate\Contracts\Queue\ShouldQueue;
use Illuminate\Foundation\Bus\Dispatchable;
use Illuminate\Queue\InteractsWithQueue;
use Illuminate\Queue\SerializesModels;
use ProcessMaker\Nayra\Contracts\Engine\ExecutionInstanceInterface;
use ProcessMaker\Repositories\CaseRepository;

class CaseStore implements ShouldQueue
{
use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;

/**
* Create a new job instance.
*/
public function __construct(protected ExecutionInstanceInterface $instance)
{
}

/**
* Execute the job.
*/
public function handle(CaseRepository $caseRepository): void
{
$caseRepository->create($this->instance);
}
}
33 changes: 33 additions & 0 deletions ProcessMaker/Jobs/CaseUpdate.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
<?php

namespace ProcessMaker\Jobs;

use Illuminate\Bus\Queueable;
use Illuminate\Contracts\Queue\ShouldBeUnique;
use Illuminate\Contracts\Queue\ShouldQueue;
use Illuminate\Foundation\Bus\Dispatchable;
use Illuminate\Queue\InteractsWithQueue;
use Illuminate\Queue\SerializesModels;
use ProcessMaker\Nayra\Contracts\Bpmn\TokenInterface;
use ProcessMaker\Nayra\Contracts\Engine\ExecutionInstanceInterface;
use ProcessMaker\Repositories\CaseRepository;

class CaseUpdate implements ShouldQueue
{
use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;

/**
* Create a new job instance.
*/
public function __construct(protected ExecutionInstanceInterface $instance, protected TokenInterface $token)
{
}

/**
* Execute the job.
*/
public function handle(CaseRepository $caseRepository): void
{
$caseRepository->update($this->instance, $this->token);
}
}
32 changes: 32 additions & 0 deletions ProcessMaker/Jobs/CaseUpdateStatus.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
<?php

namespace ProcessMaker\Jobs;

use Illuminate\Bus\Queueable;
use Illuminate\Contracts\Queue\ShouldBeUnique;
use Illuminate\Contracts\Queue\ShouldQueue;
use Illuminate\Foundation\Bus\Dispatchable;
use Illuminate\Queue\InteractsWithQueue;
use Illuminate\Queue\SerializesModels;
use ProcessMaker\Nayra\Contracts\Engine\ExecutionInstanceInterface;
use ProcessMaker\Repositories\CaseRepository;

class CaseUpdateStatus implements ShouldQueue
{
use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;

/**
* Create a new job instance.
*/
public function __construct(protected ExecutionInstanceInterface $instance)
{
}

/**
* Execute the job.
*/
public function handle(CaseRepository $caseRepository): void
{
$caseRepository->updateStatus($this->instance);
}
}
23 changes: 15 additions & 8 deletions ProcessMaker/Models/CaseParticipated.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
namespace ProcessMaker\Models;

use Database\Factories\CaseParticipatedFactory;
use Illuminate\Database\Eloquent\Casts\AsArrayObject;
use Illuminate\Database\Eloquent\Casts\AsCollection;
use Illuminate\Database\Eloquent\Factories\Factory;
use Illuminate\Database\Eloquent\Factories\HasFactory;
use ProcessMaker\Models\ProcessMakerModel;
Expand Down Expand Up @@ -31,13 +31,20 @@ class CaseParticipated extends ProcessMakerModel
];

protected $casts = [
'processes' => AsArrayObject::class,
'requests' => AsArrayObject::class,
'request_tokens' => AsArrayObject::class,
'tasks' => AsArrayObject::class,
'participants' => AsArrayObject::class,
'initiated_at' => 'datetime',
'completed_at' => 'datetime',
'processes' => AsCollection::class,
'requests' => AsCollection::class,
'request_tokens' => AsCollection::class,
'tasks' => AsCollection::class,
'participants' => AsCollection::class,
];

protected $dates = [
'initiated_at',
'completed_at',
];

protected $attributes = [
'keywords' => '',
];

protected static function newFactory(): Factory
Expand Down
23 changes: 15 additions & 8 deletions ProcessMaker/Models/CaseStarted.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

use Database\Factories\CaseStartedFactory;
use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Database\Eloquent\Casts\AsArrayObject;
use Illuminate\Database\Eloquent\Casts\AsCollection;
use Illuminate\Database\Eloquent\Factories\Factory;
use ProcessMaker\Models\ProcessMakerModel;

Expand All @@ -31,13 +31,20 @@ class CaseStarted extends ProcessMakerModel
];

protected $casts = [
'processes' => AsArrayObject::class,
'requests' => AsArrayObject::class,
'request_tokens' => AsArrayObject::class,
'tasks' => AsArrayObject::class,
'participants' => AsArrayObject::class,
'initiated_at' => 'datetime',
'completed_at' => 'datetime',
'processes' => AsCollection::class,
'requests' => AsCollection::class,
'request_tokens' => AsCollection::class,
'tasks' => AsCollection::class,
'participants' => AsCollection::class,
];

protected $dates = [
'initiated_at',
'completed_at',
];

protected $attributes = [
'keywords' => '',
];

protected static function newFactory(): Factory
Expand Down
106 changes: 106 additions & 0 deletions ProcessMaker/Repositories/CaseParticipatedRepository.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,106 @@
<?php

namespace ProcessMaker\Repositories;

use ProcessMaker\Models\CaseParticipated;
use ProcessMaker\Models\CaseStarted;
use ProcessMaker\Nayra\Contracts\Bpmn\TokenInterface;

class CaseParticipatedRepository
{
/**
* Store a new case participated.
*
* @param CaseStarted $case
* @param TokenInterface $token
* @return void
*/
public function create(CaseStarted $case, TokenInterface $token): void
{
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,
],
],
'participants' => $case->participants,
'initiated_at' => $case->initiated_at,
'completed_at' => null,
]);
} catch (\Exception $e) {
\Log::error($e->getMessage());
}
}

/**
* Update the case participated.
*
* @param CaseStarted $case
* @param TokenInterface $token
* @return 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();

$caseParticipated->update([
'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,
'participants' => $case->participants,
]);
} catch (\Exception $e) {
\Log::error($e->getMessage());
}
}

/**
* Update the status of a case participated.
*
* @param int $caseNumber
* @param array $statusData
* @return void
*/
public function updateStatus(int $caseNumber, array $statusData)
{
try {
CaseParticipated::where('case_number', $caseNumber)
->update($statusData);
} catch (\Exception $e) {
\Log::error($e->getMessage());
}
}
}
Loading
Loading