refactor a getTasksByWorkflow y byId

sistema-mantenimiento-back/app/Http/Controllers/ProcessManagementController.php

@@ -349,85 +349,32 @@ class ProcessManagementController extends Controller
         return $this->responseController->makeResponse(false, "ÉXITO: Consulta Exitosa", $arrHistory);
     }
 
-    //Submodulo de auditoria: Busqueda de flujos de trabajo y solicitudes de validacion
-    public function getProcessWorkflow($user, $line) {
-        $arrResponseCheckUser = $this->resourcesController->checkUserEnc($user, $line);
-        if ($arrResponseCheckUser['error']) {
-            return $this->responseController->makeResponse(true, $arrResponseCheckUser['msg'], [], 401);
-        }
-
-        try {
-            $arrProcessWorkflow = DB::table('S002V01TPRWO')
-                ->where('PRWO_NULI', '=', $line)
-                ->get([
-                    'PRWO_IDPR AS ID_PROCESO',
-                    'PRWO_IDMO AS ID_MODULO',
-                    'PRWO_NOPR AS NOMBRE_PROCESO',
-                    'PRWO_ESTA AS ESTADO',
-                ]);
-            $arrProcessWorkflow = json_decode(json_encode($arrProcessWorkflow), true);
-        } catch (\Throwable $th) {
-            return $this->responseController->makeResponse(true, "Ocurrió un error al obtener el proceso del flujo de trabajo.", $th->getMessage(), 500);
-        }
-
-        return $this->responseController->makeResponse(false, "ÉXITO: Consulta Exitosa", $arrProcessWorkflow);
-    }
-
-    public function getTasks($user, $line) {
-        $arrResponseCheckUser = $this->resourcesController->checkUserEnc($user, $line);
-        if ($arrResponseCheckUser['error']) {
-            DB::rollBack();
-            return $this->responseController->makeResponse(true, $arrResponseCheckUser['msg'], [], 401);
-        }
-
-        try {
-            $arrTasks = DB::table('S002V01TTAWO')
-                ->where('TAWO_NULI', '=', $line)
-                ->get([
-                    'TAWO_IDTA AS ID_TAREA',
-                    'TAWO_IDWO AS ID_WORKFLOW',
-                    'TAWO_IDPR AS ID_PROCESO',
-                    'TAWO_NOTA AS NOMBRE_TAREA',
-                    'TAWO_DESC AS DESCRIPCION',
-                    'TAWO_SECU AS SECUENCIA',
-                    'TAWO_ESTA AS ESTADO',
-                    'TAWO_USRE AS USUARIO_REGISTRA',
-                    'TAWO_FERE AS FECHA_REGISTRA',
-                    'TAWO_USMO AS USUARIO_MODIFICA',
-                    'TAWO_FEMO AS FECHA_MODIFICA',
-                ]);
-            $arrTasks = json_decode(json_encode($arrTasks), true);
-        } catch (\Throwable $th) {
-            return $this->responseController->makeResponse(true, "Ocurrió un error al obtener los flujos de trabajo.", $th->getMessage(), 500);
-        }
-
-        $responseCheckLatestUpdate = $this->resourcesController->checkLatestUpdate($arrTasks, $line);
-        if ($responseCheckLatestUpdate['error']) {
-            return $this->responseController->makeResponse(true, $responseCheckLatestUpdate['msg'], [], 500);
-        }
-        $arrTasks = $responseCheckLatestUpdate['response'];
-
-        return $this->responseController->makeResponse(false, "ÉXITO: Consulta Exitosa", $arrTasks);
-    }
     public function getTaskByWorkflow($idWorkflow, $user, $line) {
         $arrResponseCheckUser = $this->resourcesController->checkUserEnc($user, $line);
         if ($arrResponseCheckUser['error']) {
             return $this->responseController->makeResponse(true, $arrResponseCheckUser['msg'], [], 401);
         }
 
+        /*
         $idWorkflow = $this->encController->decrypt($idWorkflow);
         if (is_null($idWorkflow)) {
             return $this->responseController->makeResponse(true, 'El flujo de trabajo no está encriptado correctamente.', [], 500);
-        }
+        }*/
 
         try {
             $arrTask = DB::table('S002V01TTAWO')->select([
                 'TAWO_IDTA AS ID_TAREA',
                 'TAWO_NOTA AS NOMBRE_TAREA',
-                'TAWO_SECU AS SECUENCIA'
+                'TAWO_DESC AS DESCRIPCION',
+                'TAWO_SECU AS SECUENCIA',
+                'TAWO_RQVA AS REQUIERE_VALIDACION',
+                'TAWO_USAN AS USUARIOS_NOTIFICAR',
+                'TAWO_USAV AS USUARIO_VALIDADOR',
+                'TAWO_REVA AS REGLAS_VALIDACION',
+                'TAWO_IDAC AS ID_ACCION',
+                'TAWO_ESTA AS ESTADO'
             ])->where([
                 ['TAWO_IDWO', '=', $idWorkflow],
-                ['TAWO_ESTA', '=', 'Activo'],
                 ['TAWO_NULI', '=', $line],
             ])->get()->all();
         } catch (\Throwable $th) {
@@ -436,16 +383,18 @@ class ProcessManagementController extends Controller
 
         return $this->responseController->makeResponse(false, "ÉXITO: Consulta exitosa", $arrTask);
     }
+    
     public function getTaskById($idTask, $user, $line) {
         $arrResponseCheckUser = $this->resourcesController->checkUserEnc($user, $line);
         if ($arrResponseCheckUser['error']) {
             return $this->responseController->makeResponse(true, $arrResponseCheckUser['msg'], [], 401);
         }
         
+        /*
         $idTask = $this->encController->decrypt($idTask);
         if (is_null($idTask)) {
             return $this->responseController->makeResponse(true, 'El identificador no se encuentra encriptado correctamente.', [], 401);
-        }
+        }*/
 
         try {
             $arrTask = (array) DB::table('S002V01TTAWO')
@@ -453,13 +402,24 @@ class ProcessManagementController extends Controller
                 ->where('TAWO_NULI', '=', $line)
                 ->where('TAWO_ESTA', '=', 'Activo')
                 ->first([
+                    'TAWO_IDTA AS ID_TAREA',
+                    'TAWO_NULI AS NUMERO_LINEA',
                     'TAWO_IDWO AS ID_WORKFLOW',
-                    'TAWO_IDPR AS ID_PROCESO',
                     'TAWO_NOTA AS NOMBRE_TAREA',
-                    'TAWO_OTWO AS ID_OTRO_WORKFLOW',
                     'TAWO_DESC AS DESCRIPCION',
-                    'TAWO_REVA AS REGLAS_VALIDACION',
                     'TAWO_SECU AS SECUENCIA',
+                    'TAWO_RQVA AS REQUIERE_VALIDACION',
+                    'TAWO_USAN AS USUARIOS_NOTIFICAR',
+                    'TAWO_USAV AS USUARIO_VALIDADOR',
+                    'TAWO_REVA AS REGLAS_VALIDACION',
+                    'TAWO_IDAC AS ID_ACCION',
+                    'TAWO_ESTA AS ESTADO',
+                    'TAWO_INEX AS INFORMACION_EXTRA',
+                    'TAWO_USRE AS USUARIO_REGISTRO',
+                    'TAWO_FERE AS FECHA_REGISTRO',
+                    'TAWO_USMO AS USUARIO_MODIFICA',
+                    'TAWO_FEMO AS FECHA_MODIFICA',
+                    'TAWO_FEAR AS FECHA_ACTUALIZACION'
                 ]);
         } catch (\Throwable $th) {
             return $this->responseController->makeResponse(true, "Ocurrió un error al obtener las tareas.", $th->getMessage(), 500);
@@ -469,36 +429,37 @@ class ProcessManagementController extends Controller
             return $this->responseController->makeResponse(true, "La tarea no existe.", [], 500);
         }
 
+
+
+        return $this->responseController->makeResponse(false, "ÉXITO: Consulta Exitosa", $arrTask);
+    }
+    //Submodulo de auditoria: Busqueda de flujos de trabajo y solicitudes de validacion
+    public function getProcessWorkflow($user, $line) {
+        $arrResponseCheckUser = $this->resourcesController->checkUserEnc($user, $line);
+        if ($arrResponseCheckUser['error']) {
+            return $this->responseController->makeResponse(true, $arrResponseCheckUser['msg'], [], 401);
+        }
+
         try {
-            $arrNotificaciones = DB::table('S002V01TNTWO')
-                ->where('NTWO_IDTA', '=', $idTask)
-                ->where('NTWO_NULI', '=', $line)
-                ->where('NTWO_ESTA', '=', 'Activo')
-                ->orderBy('NTWO_SECU', 'ASC')
+            $arrProcessWorkflow = DB::table('S002V01TPRWO')
+                ->where('PRWO_NULI', '=', $line)
                 ->get([
-                    'NTWO_IDUS AS ID_USUARIO',
-                    'NTWO_TINO AS TIPO_NOTIFICACION',
+                    'PRWO_IDPR AS ID_PROCESO',
+                    'PRWO_IDMO AS ID_MODULO',
+                    'PRWO_NOPR AS NOMBRE_PROCESO',
+                    'PRWO_ESTA AS ESTADO',
                 ]);
-            $arrNotificaciones = json_decode(json_encode($arrNotificaciones), true);
+            $arrProcessWorkflow = json_decode(json_encode($arrProcessWorkflow), true);
         } catch (\Throwable $th) {
-            return $this->responseController->makeResponse(true, "Ocurrió un error al obtener los usuarios con notificaciones.", $th->getMessage(), 500);
-        }
-
-        $arrUserValidator = array();
-        $arrUserNotification = array();
-        foreach ($arrNotificaciones as $key => $value) {
-            if ($value['TIPO_NOTIFICACION'] === 'V') {
-                $arrUserValidator[] = $value['ID_USUARIO'];
-            }
-            if ($value['TIPO_NOTIFICACION'] === 'N') {
-                $arrUserNotification[] = $value['ID_USUARIO'];
-            }
+            return $this->responseController->makeResponse(true, "Ocurrió un error al obtener el proceso del flujo de trabajo.", $th->getMessage(), 500);
         }
-        $arrTask['NOTIFICAR_USUARIOS'] = $arrUserNotification;
-        $arrTask['USUARIOS_VALIDACION'] = $arrUserValidator;
 
-        return $this->responseController->makeResponse(false, "ÉXITO: Consulta Exitosa", $arrTask);
+        return $this->responseController->makeResponse(false, "ÉXITO: Consulta Exitosa", $arrProcessWorkflow);
     }
+
+
+    
+
     public function registerTask(Request $request) {
         $validator = Validator::make($request->all(), [
             'ID_WORKFLOW' => 'string|required',

sistema-mantenimiento-back/routes/api.php

@@ -553,16 +553,12 @@ Route::get("/print-order-details/{idOrder}/{idUser}/{line}",
     Route::get ('inventory-management/get-article-without-movements/{user}/{line}',                                             "App\Http\Controllers\StockController@getArticlesWithoutMovements");
     
     // Módulo de Procesos (Workflow)
-    //Route::post('process-management/restore-workflows',                                             "App\Http\Controllers\ProcessManagementController@restoreWorkflows");
     Route::get ('process-management/get-workflows/{user}/{line}',                                   "App\Http\Controllers\ProcessManagementController@getWorkflows");
     Route::get ('process-management/get-workflow-by-id/{idWorkflow}/{user}/{line}',                 "App\Http\Controllers\ProcessManagementController@getWorkflowById");
-    //Route::get ('process-management/get-workflows-actives/{user}/{line}',                           "App\Http\Controllers\ProcessManagementController@getWorkflowActives");
-    //Route::post('process-management/register-workflows',                                            "App\Http\Controllers\ProcessManagementController@registerWorkflow");
     Route::post('process-management/update-workflows/{idWorkflow}',                                 "App\Http\Controllers\ProcessManagementController@updateWorkflow");
-    //Route::post('process-management/delete-workflows/{idWorkflow}',                                 "App\Http\Controllers\ProcessManagementController@deleteWorkflow");
     Route::post('process-management/change-workflow-status',                       "App\Http\Controllers\ProcessManagementController@changeWorkflowStatus");
     Route::get ('process-management/get-process-workflow/{user}/{line}',                            "App\Http\Controllers\ProcessManagementController@getProcessWorkflow");
-    Route::get ('process-management/get-tasks/{user}/{line}',                                       "App\Http\Controllers\ProcessManagementController@getTasks");
+    //Route::get ('process-management/get-tasks/{user}/{line}',                                       "App\Http\Controllers\ProcessManagementController@getTasks");
     Route::get ('process-management/get-task-by-workflow/{idWorkflow}/{user}/{line}',               "App\Http\Controllers\ProcessManagementController@getTaskByWorkflow");
     Route::get ('process-management/get-task-by-id/{idTask}/{user}/{line}',                         "App\Http\Controllers\ProcessManagementController@getTaskById");
     Route::post('process-management/register-task',                                                 "App\Http\Controllers\ProcessManagementController@registerTask");