FEAT #9105 lock for setAction + refactoring

sql/structure.sql

@@ -13,22 +13,16 @@ SET search_path = public, pg_catalog;
 SET default_tablespace = '';
 SET default_with_oids = false;
 
-CREATE SEQUENCE actions_id_seq
-  INCREMENT 1
-  MINVALUE 1
-  MAXVALUE 9223372036854775807
-  START 500
-  CACHE 1;
-
 CREATE TABLE actions
 (
-  id integer NOT NULL DEFAULT nextval('actions_id_seq'::regclass),
+  id serial NOT NULL,
   keyword character varying(32) NOT NULL DEFAULT ''::bpchar,
   label_action character varying(255),
   id_status character varying(10),
   is_system character(1) NOT NULL DEFAULT 'N'::bpchar,
   enabled character(1) NOT NULL DEFAULT 'Y'::bpchar,
   action_page character varying(255),
+  component CHARACTER VARYING (128),
   history character(1) NOT NULL DEFAULT 'N'::bpchar,
   origin character varying(255) NOT NULL DEFAULT 'apps'::bpchar,
   create_id  character(1) NOT NULL DEFAULT 'N'::bpchar,

src/app/action/controllers/ActionMethodController.php

@@ -25,8 +25,9 @@ class ActionMethodController
 
     public static function terminateAction(array $aArgs)
     {
-        ValidatorModel::notEmpty($aArgs, ['id', 'resId']);
-        ValidatorModel::intVal($aArgs, ['id', 'resId']);
+        ValidatorModel::notEmpty($aArgs, ['id', 'resources']);
+        ValidatorModel::intVal($aArgs, ['id']);
+        ValidatorModel::arrayType($aArgs, ['resources']);
 
         $set = ['locker_user_id' => null, 'locker_time' => null, 'modification_date' => 'CURRENT_TIMESTAMP'];
 
@@ -37,20 +38,22 @@ class ActionMethodController
 
         ResModel::update([
             'set'   => $set,
-            'where' => ['res_id = ?'],
-            'data'  => [$aArgs['resId']]
+            'where' => ['res_id in (?)'],
+            'data'  => [$aArgs['resources']]
         ]);
 
         if ($action['history'] == 'Y') {
-            HistoryController::add([
-                'tableName' => 'actions',
-                'recordId'  => $aArgs['resId'],
-                'eventType' => 'ACTION#' . $aArgs['id'],
-                'eventId'   => $aArgs['id'],
-                'info'      => $action['label_action']
-            ]);
-
-            //TODO M2M
+            foreach ($aArgs['resources'] as $resource) {
+                HistoryController::add([
+                    'tableName' => 'actions',
+                    'recordId'  => $resource,
+                    'eventType' => 'ACTION#' . $resource,
+                    'eventId'   => $aArgs['id'],
+                    'info'      => $action['label_action']
+                ]);
+
+                //TODO M2M
+            }
         }
 
         return true;

src/app/resource/controllers/ResourceListController.php

@@ -582,7 +582,6 @@ class ResourceListController
             return $response->withStatus(400)->withJson(['errors' => 'Action is not linked to this group basket']);
         }
 
-        //TODO Check locked ???
         $user   = UserModel::getById(['id' => $aArgs['userId'], 'select' => ['user_id']]);
         $whereClause = PreparedClauseController::getPreparedClause(['clause' => $basket['basket_clause'], 'login' => $user['user_id']]);
         $resources = ResModel::getOnView([
@@ -601,6 +600,20 @@ class ResourceListController
             }
         }
 
+        foreach ($resources as $resource) {
+            $lock = true;
+            if (empty($resource['locker_user_id'] || empty($resource['locker_time']))) {
+                $lock = false;
+            } elseif ($resource['locker_user_id'] == $currentUser['id']) {
+                $lock = false;
+            } elseif (strtotime($resource['locker_time']) < time()) {
+                $lock = false;
+            }
+            if ($lock) {
+                return $response->withStatus(403)->withJson(['errors' => 'One of resources is lock']);
+            }
+        }
+
         $action = ActionModel::getById(['id' => $aArgs['actionId'], 'select' => ['component']]);
         if (empty($action['component'])) {
             return $response->withStatus(400)->withJson(['errors' => 'Action component does not exist']);
@@ -658,7 +671,7 @@ class ResourceListController
 
         $locked = 0;
         $resourcesToLock = [];
-        foreach ($resources as $key => $resource) {
+        foreach ($resources as $resource) {
             $lock = true;
             if (empty($resource['locker_user_id'] || empty($resource['locker_time']))) {
                 $lock = false;