[REFACTORING] create StoreController + res

core/Controllers/CoreController.php

@@ -18,7 +18,6 @@ namespace Core\Controllers;
 use Core\Models\CoreConfigModel;
 use Psr\Http\Message\RequestInterface;
 use Psr\Http\Message\ResponseInterface;
-use Respect\Validation\Validator;
 use Core\Models\ServiceModel;
 
 class CoreController

core/Controllers/ResController.php

@@ -24,64 +24,32 @@ use Core\Models\DocserverTypeModel;
 use Core\Models\UserModel;
 use Core\Models\ResModel;
 use Notes\Models\NoteModel;
-use Entities\Models\EntityModel;
-use Core\Controllers\DocserverController;
-use Core\Controllers\DocserverToolsController;
 
 require_once 'core/class/class_db_pdo.php';
 
 class ResController
 {
-    public function create(RequestInterface $request, ResponseInterface $response, $aArgs)
+    public function create(RequestInterface $request, ResponseInterface $response)
     {
+        $data = $request->getParams();
 
-        if (empty($aArgs)) {
-            $aArgs = $request->getParsedBody();
-        }
-
-        // if(empty($aArgs)) {
-        //     $aArgs = $request->getQueryParams();
-        //     $aArgs['data'] = json_decode($aArgs['data']);
-        //     $aArgs['data'] = $this->object2array($aArgs['data']);
-        //     //FIX pb if data has parent
-        //     if (isset($aArgs['data']['data'])) {
-        //         $aArgs['data'] = $aArgs['data']['data'];
-        //     }
-        // }
-
-        $aArgs['data'] = $this->object2array($aArgs['data']);
-
-        //*****************************************************************************************
-        //LOG ONLY LOG FOR DEBUG
-        // $file = fopen('storeResourceLogs.log', a);
-        // fwrite($file, '[' . date('Y-m-d H:i:s') . '] new request' . PHP_EOL);
-        // foreach ($aArgs as $key => $value) {
-        //     if ($key <> 'encodedFile') {
-        //         fwrite($file, '[' . date('Y-m-d H:i:s') . '] ' . $key . ' : ' . $value . PHP_EOL);
-        //     }
-        // }
-        // fclose($file);
-        // ob_flush();
-        // ob_start();
-        // print_r($aArgs['data']);
-        // file_put_contents("storeResourceLogs.log", ob_get_flush());
-        //END LOG FOR DEBUG ONLY
-        //*****************************************************************************************
-
-        $return = $this->storeResource($aArgs);
-
-        if ($return['errors']) {
-            return $response
-                ->withStatus(500)
-                ->withJson(
-                    ['errors' => _NOT_CREATE . ' ' . $return['errors']]
-                );
+        $check = Validator::notEmpty()->validate($data['encodedFile']);
+        $check = $check && Validator::stringType()->notEmpty()->validate($data['fileFormat']);
+        $check = $check && Validator::stringType()->notEmpty()->validate($data['status']);
+        $check = $check && Validator::stringType()->notEmpty()->validate($data['collId']);
+        $check = $check && Validator::stringType()->notEmpty()->validate($data['table']);
+        $check = $check && Validator::arrayType()->notEmpty()->validate($data['data']);
+        if (!$check) {
+            return $response->withStatus(400)->withJson(['errors' => 'Bad Request']);
         }
 
-        //standardize ws response for MaarchCapture
-        $wsReturn['resId'] = $return[0];
-        
-        return $response->withJson($wsReturn);
+        $resId = StoreController::storeResource($data);
+
+        if (empty($resId) || !empty($resId['errors'])) {
+            return $response->withStatus(500)->withJson(['errors' => '[ResController create] ' . $resId['errors']]);
+        }
+
+        return $response->withJson(['resId' => $resId]);
     }
 
     public function delete(RequestInterface $request, ResponseInterface $response, $aArgs)

core/Models/ResModelAbstract.php

@@ -17,25 +17,14 @@ namespace Core\Models;
 
 class ResModelAbstract
 {
-    /**
-     * Retrieve info of resId
-     * @param  $aArgs array
-     *
-     * @return array $res
-     */
     public static function getById(array $aArgs = [])
     {
         ValidatorModel::notEmpty($aArgs, ['resId']);
         ValidatorModel::intVal($aArgs, ['resId']);
-        ValidatorModel::stringType($aArgs, ['table']);
-
-        if (empty($aArgs['table'])) {
-            $aArgs['table'] = 'res_letterbox';
-        }
 
         $aReturn = DatabaseModel::select([
             'select'    => empty($aArgs['select']) ? ['*'] : $aArgs['select'],
-            'table'     => [$aArgs['table']],
+            'table'     => ['res_letterbox'],
             'where'     => ['res_id = ?'],
             'data'      => [$aArgs['resId']]
         ]);
@@ -119,29 +108,21 @@ class ResModelAbstract
         return $aReturn;
     }
 
-    /**
-     * insert into a resTable
-     * @param  $aArgs array
-     *
-     * @return boolean
-     */
     public static function create(array $aArgs = [])
     {
-        ValidatorModel::notEmpty($aArgs, ['data']);
-        ValidatorModel::arrayType($aArgs, ['data']);
-        ValidatorModel::stringType($aArgs, ['table']);
+        ValidatorModel::notEmpty($aArgs, ['format', 'typist', 'creation_date', 'docserver_id', 'path', 'filename', 'fingerprint', 'filesize', 'status']);
+        ValidatorModel::stringType($aArgs, ['format', 'typist', 'creation_date', 'docserver_id', 'path', 'filename', 'fingerprint', 'status']);
+        ValidatorModel::intVal($aArgs, ['filesize']);
 
-        if (empty($aArgs['table'])) {
-            $aArgs['table'] = 'res_letterbox';
-        }
+        $nextSequenceId = DatabaseModel::getNextSequenceValue(['sequenceId' => 'res_id_mlb_seq']);
+        $aArgs['res_id'] = $nextSequenceId;
 
         DatabaseModel::insert([
-            'table'         => $aArgs['table'],
-            'columnsValues' => $aArgs['data']
-
+            'table'         => 'res_letterbox',
+            'columnsValues' => $aArgs
         ]);
 
-        return true;
+        return $nextSequenceId;
     }
 
     /**

modules/attachments/Models/AttachmentsModelAbstract.php

@@ -41,6 +41,23 @@ class AttachmentsModelAbstract
         return $aAttachment[0];
     }
 
+    public static function create(array $aArgs)
+    {
+        ValidatorModel::notEmpty($aArgs, ['format', 'typist', 'creation_date', 'docserver_id', 'path', 'filename', 'fingerprint', 'filesize', 'status']);
+        ValidatorModel::stringType($aArgs, ['format', 'typist', 'creation_date', 'docserver_id', 'path', 'filename', 'fingerprint', 'filesize', 'status']);
+        ValidatorModel::intVal($aArgs, ['filesize']);
+
+        $nextSequenceId = DatabaseModel::getNextSequenceValue(['sequenceId' => 'res_attachment_res_id_seq']);
+        $aArgs['res_id'] = $nextSequenceId;
+
+        DatabaseModel::insert([
+            'table'         => 'res_attachments',
+            'columnsValues' => $aArgs
+        ]);
+
+        return $nextSequenceId;
+    }
+
     public static function getAttachmentsTypesByXML()
     {
         $customId = CoreConfigModel::getCustomId();