Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
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
Next Next commit
feat: populate case started main flow
  • Loading branch information
devmiguelangel committed Sep 19, 2024
commit 4e7ee52685b331a14afe59e0f127ebace669d070
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
25 changes: 17 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 @@ -14,6 +14,8 @@ class CaseStarted extends ProcessMakerModel

protected $table = 'cases_started';

protected $primaryKey = 'case_number';

protected $fillable = [
'case_number',
'user_id',
Expand All @@ -31,13 +33,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
147 changes: 147 additions & 0 deletions ProcessMaker/Repositories/CaseRepository.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,147 @@
<?php

namespace ProcessMaker\Repositories;

use Carbon\Carbon;
use ProcessMaker\Contracts\CaseRepositoryInterface;
use ProcessMaker\Models\CaseParticipated;
use ProcessMaker\Models\CaseStarted;
use ProcessMaker\Models\User;
use ProcessMaker\Nayra\Contracts\Bpmn\TokenInterface;
use ProcessMaker\Nayra\Contracts\Engine\ExecutionInstanceInterface;

class CaseRepository implements CaseRepositoryInterface
{
public function create(ExecutionInstanceInterface $instance): void
{
if ($this->checkIfCaseStartedExist($instance->case_number)) {
return;
}

try {
$process = [
'id' => $instance->process->id,
'name' => $instance->process->name,
];

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

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' => [$process],
'requests' => [$request],
'request_tokens' => [],
'tasks' => [],
'participants' => [],
'initiated_at' => $instance->initiated_at,
'completed_at' => null,
]);
} catch (\Exception $e) {
\Log::error($e->getMessage());
}
}

public function update(ExecutionInstanceInterface $instance, TokenInterface $token): void
{
try {
$case = CaseStarted::where('case_number', $instance->case_number)->first();
$user = $token->user;

$this->updateRequestTokens($case, $token);
$this->updateTasks($case, $token);
$this->updateParticipants($case, $user);

$case->saveOrFail();
} catch (\Exception $e) {
\Log::error($e->getMessage());
dd($e->getMessage());
}
}

public function updateStatus(ExecutionInstanceInterface $instance): void
{
try {
$data = [
'case_status' => $instance->status,
];

if ($instance->status === 'COMPLETED') {
$data['completed_at'] = Carbon::now();
}

CaseStarted::where('case_number', $instance->case_number)->update($data);
} catch (\Exception $e) {
\Log::error($e->getMessage());
dd($e->getMessage());
}
}

private function updateRequestTokens(CaseStarted $case, TokenInterface $token)
{
$requestTokenExists = $case->request_tokens->contains($token->getKey());

if (!$requestTokenExists) {
$case->request_tokens->push($token->getKey());
}
}

private function updateTasks(CaseStarted $case, TokenInterface $token)
{
$taskExists = $case->tasks->contains(function ($task) use ($token) {
return $task['id'] === $token->element_id;
});

if (!$taskExists) {
$case->tasks->push([
'id' => $token->element_id,
'name' => $token->element_name,
]);
}
}

private function updateParticipants(CaseStarted $case, User | null $user)
{
if (!$user) {
return;
}

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

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

CaseParticipated::create([
'user_id' => $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' => $case->request_tokens,
'tasks' => $case->tasks,
'participants' => $case->participants,
'initiated_at' => $case->initiated_at,
'completed_at' => $case->completed_at,
]);
}
}

private function checkIfCaseStartedExist(int $caseNumber): bool
{
return CaseStarted::where('case_number', $caseNumber)->count() > 0;
}
}
Loading