From feecd6cda88a72eb3d6d00f6fb853ab63d7d49f4 Mon Sep 17 00:00:00 2001
From: Roly Gutierrez <roly.gutierrez@processmaker.com>
Date: Tue, 12 Jul 2022 09:22:28 -0400
Subject: [PATCH] PMCORE-3832 Custom Case Counters does not provide the correct
 number nor information PMCORE_3.7.4

---
 .../src/ProcessMaker/BusinessModel/Cases/Unassigned.php   | 2 +-
 workflow/engine/src/ProcessMaker/Model/Delegation.php     | 8 ++++----
 workflow/engine/src/ProcessMaker/Model/TaskUser.php       | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/Cases/Unassigned.php b/workflow/engine/src/ProcessMaker/BusinessModel/Cases/Unassigned.php
index 6a47bf7a2..c43a13f35 100644
--- a/workflow/engine/src/ProcessMaker/BusinessModel/Cases/Unassigned.php
+++ b/workflow/engine/src/ProcessMaker/BusinessModel/Cases/Unassigned.php
@@ -250,7 +250,7 @@ class Unassigned extends AbstractCases
     {
         $caseList = CaseList::getCaseList($id, $type);
         $query = Delegation::query()->select();
-        $query->selfService($this->getUserId());
+        $query->selfService($this->getUserUid());
 
         $name = '';
         $description = '';
diff --git a/workflow/engine/src/ProcessMaker/Model/Delegation.php b/workflow/engine/src/ProcessMaker/Model/Delegation.php
index 9e668dd47..320ed211e 100644
--- a/workflow/engine/src/ProcessMaker/Model/Delegation.php
+++ b/workflow/engine/src/ProcessMaker/Model/Delegation.php
@@ -791,18 +791,18 @@ class Delegation extends Model
      * Scope a self service cases
      *
      * @param \Illuminate\Database\Eloquent\Builder $query
-     * @param string $user
+     * @param string $usrUid
      *
      * @return \Illuminate\Database\Eloquent\Builder
      */
-    public function scopeSelfService($query, $user)
+    public function scopeSelfService($query, string $usrUid)
     {
         // Add Join with task filtering only the type self-service
         $query->taskAssignType('SELF_SERVICE');
         // Filtering the open threads and without users
         $query->threadOpen()->withoutUserId();
         // Filtering the cases unassigned that the user can view
-        $this->casesUnassigned($query, $user);
+        $this->casesUnassigned($query, $usrUid);
 
         return $query;
     }
@@ -1135,7 +1135,7 @@ class Delegation extends Model
      *
      * @return \Illuminate\Database\Eloquent\Builder
      */
-    public function casesUnassigned(&$query, $usrUid)
+    public function casesUnassigned(&$query, string $usrUid)
     {
         // Get the task self services related to the user
         $taskSelfService = TaskUser::getSelfServicePerUser($usrUid);
diff --git a/workflow/engine/src/ProcessMaker/Model/TaskUser.php b/workflow/engine/src/ProcessMaker/Model/TaskUser.php
index b14fca6cf..d28692c08 100644
--- a/workflow/engine/src/ProcessMaker/Model/TaskUser.php
+++ b/workflow/engine/src/ProcessMaker/Model/TaskUser.php
@@ -62,7 +62,7 @@ class TaskUser extends Model
      *
      * @return array
      */
-    public static function getSelfServicePerUser($usrUid)
+    public static function getSelfServicePerUser(string $usrUid)
     {
         //Get the groups related to the user
         $groups = GroupUser::getGroups($usrUid, 'GRP_UID');