Solving conflicts merginf with last merge in develop branch

workflow/engine/src/ProcessMaker/Model/AppTimeoutAction.php

@@ -0,0 +1,103 @@
+<?php
+
+namespace ProcessMaker\Model;
+
+use Illuminate\Database\Eloquent\Model;
+
+class AppTimeoutAction extends Model
+{
+    protected $table = 'APP_TIMEOUT_ACTION_EXECUTED';
+    // We do not have create/update timestamps for this table
+    public $timestamps = false;
+    // Filter by a specific case using case number
+    private $caseUid = '';
+    // Filter by a specific index
+    private $index = 0;
+
+    /**
+     * Set Case Uid
+     *
+     * @param string $caseUid
+     */
+    public function setCaseUid($caseUid)
+    {
+        $this->caseUid = $caseUid;
+    }
+
+    /**
+     * Get Case Uid
+     *
+     * @return string
+     */
+    public function getCaseUid()
+    {
+        return $this->caseUid;
+    }
+
+    /**
+     * Set index
+     *
+     * @param int $index
+     */
+    public function setIndex($index)
+    {
+        $this->index = $index;
+    }
+
+    /**
+     * Get index
+     *
+     * @return int
+     */
+    public function getIndex()
+    {
+        return $this->index;
+    }
+
+    /**
+     * Scope a query to get specific case uid
+     *
+     * @param  \Illuminate\Database\Eloquent\Builder $query
+     * @param string $appUid
+     *
+     * @return \Illuminate\Database\Eloquent\Builder
+     */
+    public function scopeCase($query, $appUid)
+    {
+        return $query->where('APP_UID', $appUid);
+    }
+
+    /**
+     * Scope a query to get index
+     *
+     * @param  \Illuminate\Database\Eloquent\Builder $query
+     * @param int $index
+     *
+     * @return \Illuminate\Database\Eloquent\Builder
+     */
+    public function scopeIndex($query, $index)
+    {
+        return $query->where('DEL_INDEX', $index);
+    }
+
+    /**
+     * Get the records related to the case and index if it was defined
+     *
+     * @return array
+     */
+    public function cases()
+    {
+        $query = AppTimeoutAction::query()->select();
+        // Specific case uid
+        if (!empty($this->getCaseUid())) {
+            $query->case($this->getCaseUid());
+        }
+        // Specific index
+        if (!empty($this->getIndex())) {
+            $query->index($this->getIndex());
+        }
+        $results = $query->get()->toArray();
+
+        return $results;
+    }
+}

workflow/engine/src/ProcessMaker/Model/ListUnassigned.php

@@ -46,8 +46,9 @@ class ListUnassigned extends Model
     /**
      * Scope a query to only include specific tasks
      *
-     * @param  \Illuminate\Database\Eloquent\Builder $query
-     * @param  array $tasks
+     * @param \Illuminate\Database\Eloquent\Builder $query
+     * @param array $tasks
+     *
      * @return \Illuminate\Database\Eloquent\Builder
      */
     public function scopeTasksIn($query, array $tasks)
@@ -58,8 +59,8 @@ class ListUnassigned extends Model
     /**
      * Scope a query to only include a specific case
      *
-     * @param  \Illuminate\Database\Eloquent\Builder $query
-     * @param  integer $appNumber
+     * @param \Illuminate\Database\Eloquent\Builder $query
+     * @param integer $appNumber
      *
      * @return \Illuminate\Database\Eloquent\Builder
      */
@@ -71,8 +72,8 @@ class ListUnassigned extends Model
     /**
      * Scope a query to only include a specific index
      *
-     * @param  \Illuminate\Database\Eloquent\Builder $query
-     * @param  integer $index
+     * @param \Illuminate\Database\Eloquent\Builder $query
+     * @param integer $index
      *
      * @return \Illuminate\Database\Eloquent\Builder
      */
@@ -84,8 +85,8 @@ class ListUnassigned extends Model
     /**
      * Scope a query to only include a specific task
      *
-     * @param  \Illuminate\Database\Eloquent\Builder $query
-     * @param  integer $task
+     * @param \Illuminate\Database\Eloquent\Builder $query
+     * @param integer $task
      *
      * @return \Illuminate\Database\Eloquent\Builder
      */
@@ -100,7 +101,7 @@ class ListUnassigned extends Model
      * @param string $userUid
      * @param array $filters
      *
-     * @return array
+     * @return int
      */
     public static function doCount($userUid, $filters = [])
     {
@@ -125,4 +126,21 @@ class ListUnassigned extends Model
 
         return $result;
     }
+
+    /**
+     * Get the unassigned cases related to the self service timeout
+     *
+     * @return array
+     */
+    public static function selfServiceTimeout()
+    {
+        $query = ListUnassigned::query()->select();
+        $query->join('TASK', function ($join) {
+            $join->on('LIST_UNASSIGNED.TAS_ID', '=', 'TASK.TAS_ID')
+                ->where('TASK.TAS_SELFSERVICE_TIMEOUT', '=', 1);
+        });
+        $results = $query->get()->toArray();
+
+        return $results;
+    }
 }

workflow/engine/src/ProcessMaker/Model/Triggers.php

@@ -10,11 +10,34 @@ class Triggers extends Model
     protected $table = 'TRIGGERS';
     // No timestamps
     public $timestamps = false;
-    //primary key
+    // Primary key
     protected $primaryKey = 'TRI_UID';
-    //No incrementing
+    // No incrementing
     public $incrementing = false;
 
+    // Filter by a specific uid
+    private $triUid = '';
+
+    /**
+     * Set trigger uid
+     *
+     * @param string $triUid
+     */
+    public function setTrigger($triUid)
+    {
+        $this->triUid = $triUid;
+    }
+
+    /**
+     * Get trigger uid
+     *
+     * @return int
+     */
+    public function getTrigger()
+    {
+        return $this->triUid;
+    }
+
     /**
      * Scope a query to filter an specific process
      *
@@ -22,8 +45,37 @@ class Triggers extends Model
      * @param  string $columns
      * @return \Illuminate\Database\Eloquent\Builder
      */
-    public function scopeProcess($query, string $proUID)
+    public function scopeProcess($query, string $proUid)
     {
-        return $query->where('PRO_UID', $proUID);
+        return $query->where('PRO_UID', $proUid);
+    }
+
+    /**
+     * Scope a query to filter an specific trigger
+     *
+     * @param  \Illuminate\Database\Eloquent\Builder $query
+     * @param  string $triUid
+     * @return \Illuminate\Database\Eloquent\Builder
+     */
+    public function scopeTrigger($query, string $triUid)
+    {
+        return $query->where('TRI_UID', $triUid);
+    }
+
+    /**
+     * Get the records
+     *
+     * @return array
+     */
+    public function triggers()
+    {
+        $query = Triggers::query()->select();
+        // Specific trigger
+        if (!empty($this->getTrigger())) {
+            $query->trigger($this->getTrigger());
+        }
+        $results = $query->get()->toArray();
+
+        return $results;
     }
 }