diff --git a/workflow/engine/src/ProcessMaker/Services/Api/User.php b/workflow/engine/src/ProcessMaker/Services/Api/User.php index 43842be7a..556ef88d5 100644 --- a/workflow/engine/src/ProcessMaker/Services/Api/User.php +++ b/workflow/engine/src/ProcessMaker/Services/Api/User.php @@ -1,8 +1,11 @@ setFormatFieldNameInUppercase(false); - $arrayFilterData = array( + $arrayFilterData = [ "filter" => (!is_null($filter))? $filter : ((!is_null($lfilter))? $lfilter : ((!is_null($rfilter))? $rfilter : null)), "filterOption" => (!is_null($filter))? "" : ((!is_null($lfilter))? "LEFT" : ((!is_null($rfilter))? "RIGHT" : "")) - ); + ]; - $response = $user->getUsers($arrayFilterData, null, null, $start, $limit, false, true, $status); + $response = $user->getUsers($arrayFilterData, $sort, $dir, $start, $limit, false, true, $status); - return \ProcessMaker\Util\DateTime::convertUtcToIso8601($response['data'], $this->arrayFieldIso8601); - } catch (\Exception $e) { + return DateTime::convertUtcToIso8601($response['data'], $this->arrayFieldIso8601); + } catch (Exception $e) { throw new RestException(Api::STAT_APP_EXCEPTION, $e->getMessage()); } } @@ -50,13 +53,12 @@ class User extends Api public function doGetUser($usr_uid) { try { - $user = new \ProcessMaker\BusinessModel\User(); + $user = new BmUser(); $user->setFormatFieldNameInUppercase(false); - $response = $user->getUser($usr_uid); - return \ProcessMaker\Util\DateTime::convertUtcToIso8601($response, $this->arrayFieldIso8601); - } catch (\Exception $e) { + return DateTime::convertUtcToIso8601($response, $this->arrayFieldIso8601); + } catch (Exception $e) { throw (new RestException(Api::STAT_APP_EXCEPTION, $e->getMessage())); } } @@ -73,12 +75,13 @@ class User extends Api public function doPostUser($request_data) { try { - $user = new \ProcessMaker\BusinessModel\User(); + $user = new BmUser(); $arrayData = $user->create($request_data); $response = $arrayData; + return $response; - } catch (\Exception $e) { - throw (new RestException(Api::STAT_APP_EXCEPTION, $e->getMessage())); + } catch (Exception $e) { + throw new RestException(Api::STAT_APP_EXCEPTION, $e->getMessage()); } } @@ -99,10 +102,10 @@ class User extends Api { try { $userLoggedUid = $this->getUserId(); - $user = new \ProcessMaker\BusinessModel\User(); + $user = new BmUser(); $arrayData = $user->update($usr_uid, $request_data, $userLoggedUid); - } catch (\Exception $e) { - throw (new RestException(Api::STAT_APP_EXCEPTION, $e->getMessage())); + } catch (Exception $e) { + throw new RestException(Api::STAT_APP_EXCEPTION, $e->getMessage()); } } @@ -116,10 +119,10 @@ class User extends Api public function doDeleteUser($usr_uid) { try { - $user = new \ProcessMaker\BusinessModel\User(); + $user = new BmUser(); $user->delete($usr_uid); - } catch (\Exception $e) { - throw (new RestException(Api::STAT_APP_EXCEPTION, $e->getMessage())); + } catch (Exception $e) { + throw new RestException(Api::STAT_APP_EXCEPTION, $e->getMessage()); } } @@ -133,10 +136,9 @@ class User extends Api public function doPostUserImageUpload($usr_uid) { try { - $user = new \ProcessMaker\BusinessModel\User(); + $user = new BmUser(); $user->uploadImage($usr_uid); - } catch (\Exception $e) { - //response + } catch (Exception $e) { throw new RestException(Api::STAT_APP_EXCEPTION, $e->getMessage()); } }