fernando/luos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

PMCORE-2614

Browse Source
This commit is contained in:
Paula Quispe
2020-12-22 11:01:49 -04:00
parent 1c36a18904
commit e901f82e6e
5 changed files with 78 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
workflow/engine/src/ProcessMaker/Model/User.php
View File

@@ -31,6 +31,20 @@ class User extends Model
return $this->belongsTo(GroupUser::class, 'USR_UID', 'USR_UID');
}
/**
* Scope for query to get the user by USR_UID
*
* @param \Illuminate\Database\Eloquent\Builder $query
* @param string $usrUid
*
* @return \Illuminate\Database\Eloquent\Builder
*/
public function scopeUser($query, string $usrUid)
{
$result = $query->where('USR_UID', '=', $usrUid);
return $result;
}
/**
* Return the groups from a user
*
@@ -157,4 +171,24 @@ class User extends Model
throw new Exception("Error getting the users: {$e->getMessage()}.");
}
}
/**
* Get the user id
*
* @param string $usrUid
*
* @return int
*/
public static function getId($usrUid)
{
$query = User::query()->select(['USR_ID'])
->user($usrUid)
->limit(1);
$results = $query->get();
$id = 0;
$results->each(function ($item) use (&$id) {
$id = $item->USR_ID;
});
return $id;
}
}

21
workflow/engine/src/ProcessMaker/Services/Api/Home.php
View File

@@ -76,7 +76,7 @@ class Home extends Api
$properties['task'] = $task;
// Get the user that access to the API
$usrUid = $this->getUserId();
$properties['user'] = User::find($usrUid)->first()->USR_ID;
$properties['user'] = !empty($usrUid) ? User::getId($usrUid) : 0;
// Set the pagination parameters
$paged = explode(',', $paged);
$sort = explode(',', $sort);
@@ -131,7 +131,7 @@ class Home extends Api
$properties['task'] = $task;
// Get the user that access to the API
$usrUid = $this->getUserId();
$properties['user'] = User::find($usrUid)->first()->USR_ID;
$properties['user'] = !empty($usrUid) ? User::getId($usrUid) : 0;
// Set the pagination parameters
$paged = explode(',', $paged);
$sort = explode(',', $sort);
@@ -186,7 +186,7 @@ class Home extends Api
$properties['task'] = $task;
// Get the user that access to the API
$usrUid = $this->getUserId();
$properties['user'] = User::find($usrUid)->first()->USR_ID;
$properties['user'] = !empty($usrUid) ? User::getId($usrUid) : 0;
// Set the pagination parameters
$paged = explode(',', $paged);
$sort = explode(',', $sort);
@@ -243,7 +243,7 @@ class Home extends Api
$properties['task'] = $task;
// Get the user that access to the API
$usrUid = $this->getUserId();
$properties['user'] = User::find($usrUid)->first()->USR_ID;
$properties['user'] = !empty($usrUid) ? User::getId($usrUid) : 0;
// Set the pagination parameters
$paged = explode(',', $paged);
$sort = explode(',', $sort);
@@ -308,7 +308,7 @@ class Home extends Api
$properties['task'] = $task;
// Get the user that access to the API
$usrUid = $this->getUserId();
$properties['user'] = User::find($usrUid)->first()->USR_ID;
$properties['user'] = !empty($usrUid) ? User::getId($usrUid) : 0;
$properties['filter'] = $filter;
$properties['caseStatus'] = $caseStatus;
$properties['startCaseFrom'] = $startCaseFrom;
@@ -370,7 +370,8 @@ class Home extends Api
$participatedStatuses = ['STARTED', 'IN_PROGRESS', 'COMPLETED', 'SUPERVISING'];
$participatedLabels = array_combine($participatedStatuses, ['ID_OPT_STARTED', 'ID_IN_PROGRESS', 'ID_COMPLETED', 'ID_SUPERVISING']);
$counters = [];
// Get the user that access to the API
$usrUid = $this->getUserId();
// Get counters
foreach ($participatedStatuses as $participatedStatus) {
// Initializing counter object
@@ -385,12 +386,14 @@ class Home extends Api
case 'COMPLETED':
$participated = new Participated();
$participated->setParticipatedStatus($participatedStatus);
$participated->setUserId($this->getUserId());
$usrId = !empty($usrUid) ? User::getId($usrUid) : 0;
$participated->setUserId($usrId);
$counter->counter = $participated->getCounter();
break;
case 'SUPERVISING':
$supervising = new Supervising();
$supervising->setUserUid($this->getUserId());
$usrId = !empty($usrUid) ? User::getId($usrUid) : 0;
$supervising->setUserUid($usrId);
$counter->counter = $supervising->getCounter();
break;
default:
@@ -636,7 +639,7 @@ class Home extends Api
{
$result = [];
$usrUid = $this->getUserId();
$usrId = User::find($usrUid)->first()->USR_ID;
$usrId = !empty($usrUid) ? User::getId($usrUid) : 0;
// For inbox
$inbox = new Inbox();
$inbox->setUserUid($usrUid);