FOUR-18078

ProcessMaker/Console/Commands/CasesSync.php

@@ -0,0 +1,47 @@
+<?php
+
+namespace ProcessMaker\Console\Commands;
+
+use Illuminate\Console\Command;
+use ProcessMaker\Repositories\CaseSyncRepository;
+
+class CasesSync extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'cases:sync
+                            {--request_ids= : Comma-separated list of request IDs to sync}';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Sync requests with the cases tables';
+
+    /**
+     * Execute the console command.
+     */
+    public function handle()
+    {
+        $requestIds = $this->option('request_ids');
+        $requestIds = $requestIds ? explode(',', $requestIds) : [];
+
+        if (count($requestIds) > 0) {
+            $data = CaseSyncRepository::syncCases($requestIds);
+
+            foreach ($data['successes'] as $value) {
+                $this->info('Case started synced ' . $value);
+            }
+
+            foreach ($data['errors'] as $value) {
+                $this->error('Error syncing case started ' . $value);
+            }
+        } else {
+            $this->error('Please specify a list of request IDs.');
+        }
+    }
+}

ProcessMaker/Contracts/CaseApiRepositoryInterface.php

@@ -0,0 +1,62 @@
+<?php
+
+namespace ProcessMaker\Contracts;
+
+use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Http\Request;
+
+interface CaseApiRepositoryInterface
+{
+    /**
+     * Get all cases
+     *
+     * @param Request $request
+     *
+     * @return Builder
+     */
+    public function getAllCases(Request $request): Builder;
+    /**
+     * Get all cases in progress
+     *
+     * @param Request $request
+     *
+     * @return Builder
+     */
+    public function getInProgressCases(Request $request): Builder;
+    /**
+     * Get all completed cases
+     *
+     * @param Request $request
+     *
+     * @return Builder
+     */
+    public function getCompletedCases(Request $request): Builder;
+    /**
+     * Search by case number or case title.
+
+     * @param Request $request: Query parameter format: search=keyword
+     * @param Builder $query
+     *
+     * @return void
+     */
+    public function search(Request $request, Builder $query): void;
+    /**
+     * Filter the query.
+     *
+     * @param Request $request: Query parameter format: filterBy[field]=value&filterBy[field2]=value2&...
+     * @param Builder $query
+     * @param array $dateFields List of date fields in current model
+     *
+     * @return void
+     */
+    public function filterBy(Request $request, Builder $query): void;
+    /**
+     * Sort the query.
+     *
+     * @param Request $request: Query parameter format: sortBy=field:asc,field2:desc,...
+     * @param Builder $query
+     *
+     * @return void
+     */
+    public function sortBy(Request $request, Builder $query): void;
+}

ProcessMaker/Contracts/CaseRepositoryInterface.php

@@ -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;
+}

ProcessMaker/Exception/CaseValidationException.php

@@ -0,0 +1,20 @@
+<?php
+
+namespace ProcessMaker\Exception;
+
+use Exception;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class CaseValidationException extends Exception
+{
+    /**
+     * Render the exception as an HTTP response.
+     */
+    public function render(Request $request): JsonResponse
+    {
+        return response()->json([
+            'message' => $this->getMessage(),
+        ], JsonResponse::HTTP_UNPROCESSABLE_ENTITY);
+    }
+}

ProcessMaker/Http/Controllers/Api/ProcessRequestFileController.php

@@ -431,7 +431,7 @@ private function validatePDFFile(UploadedFile $file, &$errors)
     {
         $text = $file->get();
 
-        $jsKeywords = ['/JavaScript', '/JS', '<< /S /JavaScript'];
+        $jsKeywords = ['/JavaScript', '<< /S /JavaScript'];
 
         foreach ($jsKeywords as $keyword) {
             if (strpos($text, $keyword) !== false) {

ProcessMaker/Http/Controllers/Api/TaskController.php

@@ -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;
@@ -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);
         }

ProcessMaker/Http/Controllers/Api/V1_1/CaseController.php

@@ -0,0 +1,178 @@
+<?php
+
+namespace ProcessMaker\Http\Controllers\Api\V1_1;
+
+use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;
+use ProcessMaker\Http\Controllers\Api\ProcessRequestController;
+use ProcessMaker\Http\Controllers\Controller;
+use ProcessMaker\Http\Requests\CaseListRequest;
+use ProcessMaker\Http\Resources\V1_1\CaseResource;
+use ProcessMaker\Models\User;
+use ProcessMaker\Repositories\CaseApiRepository;
+
+class CaseController extends Controller
+{
+    protected $caseRepository;
+
+    const DEFAULT_PAGE_SIZE = 15;
+
+    public function __construct(private Request $request, CaseApiRepository $caseRepository) {
+        $this->caseRepository = $caseRepository;
+    }
+
+    /* The comment block you provided is a PHPDoc block. It is used to document the purpose and usage of a method in PHP
+    code. In this specific block: */
+    /**
+     * Get a list of all started cases.
+     *
+     * @param Request $request
+     *
+     * @queryParam userId int Filter by user ID.
+     * @queryParam status string Filter by case status.
+     * @queryParam sortBy string Sort by field:asc,field2:desc,...
+     * @queryParam filterBy array Filter by field=value&field2=value2&...
+     * @queryParam search string Search by case number or case title.
+     * @queryParam pageSize int Number of items per page.
+     * @queryParam page int Page number.
+     *
+     * @return array
+     */
+    public function getAllCases(CaseListRequest $request): JSonResponse
+    {
+        $query = $this->caseRepository->getAllCases($request);
+        return $this->paginateResponse($query);
+    }
+
+    /**
+     * Get a list of all started cases.
+     *
+     * @param Request $request
+     *
+     * @queryParam userId int Filter by user ID.
+     * @queryParam sortBy string Sort by field:asc,field2:desc,...
+     * @queryParam filterBy array Filter by field=value&field2=value2&...
+     * @queryParam search string Search by case number or case title.
+     * @queryParam pageSize int Number of items per page.
+     * @queryParam page int Page number.
+     *
+     * @return array
+     */
+    public function getInProgress(CaseListRequest $request): JSonResponse
+    {
+        $query = $this->caseRepository->getInProgressCases($request);
+        return $this->paginateResponse($query);
+    }
+
+    /**
+     * Get a list of all started cases.
+     *
+     * @param Request $request
+     *
+     * @queryParam userId int Filter by user ID.
+     * @queryParam sortBy string Sort by field:asc,field2:desc,...
+     * @queryParam filterBy array Filter by field=value&field2=value2&...
+     * @queryParam search string Search by case number or case title.
+     * @queryParam pageSize int Number of items per page.
+     * @queryParam page int Page number.
+     *
+     * @return array
+     */
+    public function getCompleted(CaseListRequest $request): JSonResponse
+    {
+        $query = $this->caseRepository->getCompletedCases($request);
+        return $this->paginateResponse($query);
+    }
+
+    /**
+     * Get "my cases" counters
+     *
+     * @param CaseListRequest $request
+     *
+     * @return JsonResponse
+     */
+    public function getMyCasesCounters(CaseListRequest $request): JsonResponse
+    {
+        // Load user object
+        if ($request->filled('userId')) {
+            $userId = $request->get('userId');
+            $user = User::find($userId);
+        } else {
+            $user = Auth::user();
+        }
+
+        // Initializing variables
+        $totalAllCases = null;
+        $totalMyCases = null;
+        $totalInProgress = null;
+        $totalCompleted = null;
+        $totalMyRequest = null;
+
+        // Check permission
+        if ($user->hasPermission('view-all_cases')) {
+            // The total number of cases recorded in the platform. User Id send is overridden.
+            $request->merge(['userId' => null]);
+            $queryAllCases = $this->caseRepository->getAllCases($request);
+            $totalAllCases = $queryAllCases->count();
+        }
+
+        // Restore user id
+        $request->merge(['userId' => $user->id]);
+
+        // The total number of cases recorded by the user making the request.
+        $queryMyCases = $this->caseRepository->getAllCases($request);
+        $totalMyCases = $queryMyCases->count();
+
+        // The number of In Progress cases started by the user making the request.
+        $queryInProgressCases = $this->caseRepository->getInProgressCases($request);
+        $totalInProgress = $queryInProgressCases->count();
+
+        // The number of Completed cases started by the user making the request.
+        $queryCompletedCases = $this->caseRepository->getCompletedCases($request);
+        $totalCompleted = $queryCompletedCases->count();
+
+        // Check permission
+        if ($user->hasPermission('view-my_requests')) {
+            // Only in progress requests
+            $requestAux = new Request();
+            $requestAux->replace(['type' => 'in_progress']);
+
+            // The number of requests for user making the request.
+            $totalMyRequest = (new ProcessRequestController)->index($requestAux, true, $user);
+        }
+
+        // Build response
+        return response()->json([
+            'totalAllCases' => $totalAllCases,
+            'totalMyCases' => $totalMyCases,
+            'totalInProgress' => $totalInProgress,
+            'totalCompleted' => $totalCompleted,
+            'totalMyRequest' => $totalMyRequest,
+        ]);
+    }
+
+    /**
+     * Handle pagination and return JSON response.
+     *
+     * @param Builder $query
+     *
+     * @return JsonResponse
+     */
+    private function paginateResponse(Builder $query): JsonResponse
+    {
+        $pageSize = $this->request->get('pageSize', self::DEFAULT_PAGE_SIZE);
+        $pagination = CaseResource::collection($query->paginate($pageSize));
+
+        return response()->json([
+            'data' => $pagination->items(),
+            'meta' => [
+                'total' => $pagination->total(),
+                'perPage' => $pagination->perPage(),
+                'currentPage' => $pagination->currentPage(),
+                'lastPage' => $pagination->lastPage(),
+            ],
+        ]);
+    }
+}