From fa9cf69a54990f5580307e624284f06dbc974bd8 Mon Sep 17 00:00:00 2001
From: Paula Quispe <paula.quispe@processmaker.com>
Date: Thu, 2 Aug 2018 08:00:09 -0400
Subject: [PATCH] HOR-4773

---
 workflow/engine/bin/tasks/cliWorkspaces.php   | 42 -------------------
 workflow/engine/classes/WorkspaceTools.php    |  5 ++-
 .../model/AppAssignSelfServiceValue.php       | 15 ++++++-
 3 files changed, 17 insertions(+), 45 deletions(-)

diff --git a/workflow/engine/bin/tasks/cliWorkspaces.php b/workflow/engine/bin/tasks/cliWorkspaces.php
index 2666f4201..488f1cce7 100644
--- a/workflow/engine/bin/tasks/cliWorkspaces.php
+++ b/workflow/engine/bin/tasks/cliWorkspaces.php
@@ -151,21 +151,6 @@ EOT
 CLI::taskOpt("workspace", "Select the workspace whose case folders will be migrated, if multiple workspaces are present in the server.\n        Ex: -wworkflow.        Ex: --workspace=workflow", "w:", "workspace=");
 CLI::taskRun("runStructureDirectories");
 
-CLI::taskName("database-generate-self-service-by-value");
-CLI::taskDescription(<<<EOT
-  Generate or upgrade the table "self-service by value".
-
-  This command populates the table "self-service by value" for cases whose
-  task is defined with "Self Service Value Based Assignment" in "Assignment
-  Rules".
-
-  If no workspace is specified, the command will be run in all workspaces. More
-  than one workspace can be specified.
-EOT
-);
-CLI::taskArg("workspace-name", true, true);
-CLI::taskRun("run_database_generate_self_service_by_value");
-
 CLI::taskName('database-verify-consistency');
 CLI::taskDescription(<<<EOT
   Verify that the database data is consistent so any database-upgrade operation will be executed flawlessly.
@@ -931,33 +916,6 @@ function runStructureDirectories($command, $args)
     }
 }
 
-function run_database_generate_self_service_by_value($args, $opts)
-{
-    $filter = new InputFilter();
-    $opts = $filter->xssFilterHard($opts);
-    $args = $filter->xssFilterHard($args);
-    try {
-        $arrayWorkspace = get_workspaces_from_args($args);
-
-        foreach ($arrayWorkspace as $value) {
-            $workspace = $value;
-
-            try {
-                G::outRes("Generating the table \"self-service by value\" for " . pakeColor::colorize($workspace->name, "INFO") . "\n");
-                $workspace->appAssignSelfServiceValueTableGenerateData();
-            } catch (Exception $e) {
-                G::outRes("Errors generating the table \"self-service by value\" of workspace " . CLI::info($workspace->name) . ": " . CLI::error($e->getMessage()) . "\n");
-            }
-
-            echo "\n";
-        }
-
-        echo "Done!\n";
-    } catch (Exception $e) {
-        G::outRes(CLI::error($e->getMessage()) . "\n");
-    }
-}
-
 function run_database_verify_consistency($args, $opts)
 {
     verifyAppCacheConsistency($args);
diff --git a/workflow/engine/classes/WorkspaceTools.php b/workflow/engine/classes/WorkspaceTools.php
index 52b24b706..b0f406a5c 100644
--- a/workflow/engine/classes/WorkspaceTools.php
+++ b/workflow/engine/classes/WorkspaceTools.php
@@ -2319,7 +2319,10 @@ class WorkspaceTools
     /**
      * Generate data for table APP_ASSIGN_SELF_SERVICE_VALUE
      *
-     * return void
+     * @return void
+     * @throws Exception
+     *
+     * @deprecated Method deprecated in Release 3.3.0
      */
     public function appAssignSelfServiceValueTableGenerateData()
     {
diff --git a/workflow/engine/classes/model/AppAssignSelfServiceValue.php b/workflow/engine/classes/model/AppAssignSelfServiceValue.php
index a2c48430c..ec5a55988 100644
--- a/workflow/engine/classes/model/AppAssignSelfServiceValue.php
+++ b/workflow/engine/classes/model/AppAssignSelfServiceValue.php
@@ -94,7 +94,10 @@ class AppAssignSelfServiceValue extends BaseAppAssignSelfServiceValue
     /**
      * Generate data
      *
-     * return void
+     * @return void
+     * @throws Exception
+     *
+     * @deprecated Method deprecated in Release 3.3.0
      */
     public function generateData()
     {
@@ -133,7 +136,15 @@ class AppAssignSelfServiceValue extends BaseAppAssignSelfServiceValue
                     $dataVariable = (is_array($dataVariable))? $dataVariable : trim($dataVariable);
 
                     if (!empty($dataVariable)) {
-                        $this->create($row["APP_UID"], $row["DEL_INDEX"], array("PRO_UID" => $row["PRO_UID"], "TAS_UID" => $row["TAS_UID"], "GRP_UID" => serialize($dataVariable)));
+                        $this->create(
+                            $row["APP_UID"],
+                            $row["DEL_INDEX"],
+                            [
+                                "PRO_UID" => $row["PRO_UID"],
+                                "TAS_UID" => $row["TAS_UID"],
+                                "GRP_UID" => serialize($dataVariable)
+                            ]
+                        );
                     }
                 }
             }