fernando/luos
1
0
Fork 0
Code Releases Activity

Merged in darojas/processmaker (pull request #144)

Browse Source 
Se agrega metodo DELETE y POST para PM USERS. Se agregan validaciones en PROJECT USER.
This commit is contained in:
erik ao
2014-02-04 17:32:43 -04:00
parent 868449ca6b 1a59f6ab93
commit fd8cda3c8f
4 changed files with 402 additions and 405 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
workflow/engine/src/BusinessModel/ProjectUser.php
View File

@@ -171,7 +171,7 @@ class ProjectUser
}
$oUser = \UsersPeer::retrieveByPK($sUserUID);
if (is_null($oUser)) {
throw (new \Exception( 'This id for `usr_uid`: '. $userUid .' do not correspond to a registered user'));
throw (new \Exception( 'This id for `usr_uid`: '. $sUserUID .' do not correspond to a registered user'));
}
$aUsers = array();
\G::LoadClass( 'case' );
@@ -281,7 +281,7 @@ class ProjectUser
$oCriteria->add( \UsersPeer::USR_USERNAME, $sWS_USER );
$userIsAssigned = \GroupUserPeer::doCount( $oCriteria );
if (! ($userIsAssigned >= 1)) {
throw (new \Exception( "The `usr_uid` `" . $sWS_USER . "` doesn't have the activity `tas_uid` `" . $sTASKS . "` assigned"));
throw (new \Exception( "The `usr_uid` `" . $sWS_USER . "` doesn't have the activity `act_uid` `" . $sTASKS . "` assigned"));
}
}
$oDataset = \TaskUserPeer::doSelectRS($oCriteria);

730
workflow/engine/src/BusinessModel/User.php
View File

File diff suppressed because it is too large Load Diff

24
workflow/engine/src/Services/Api/ProcessMaker/Project/ProjectUsers.php
View File

@@ -31,15 +31,15 @@ class ProjectUsers extends Api
}
/**
* @param string $prjUid {@min 32} {@max 32}
* @param string $prj_uid {@min 32} {@max 32}
*
* @url GET /:prjUid/starting-tasks
* @url GET /:prj_uid/starting-tasks
*/
public function doGetProjectStartingTasks($prjUid)
public function doGetProjectStartingTasks($prj_uid)
{
try {
$startingTasks = new \BusinessModel\ProjectUser();
$arrayData = $startingTasks->getProjectStartingTasks($prjUid);
$arrayData = $startingTasks->getProjectStartingTasks($prj_uid);
//Response
$response = $arrayData;
} catch (\Exception $e) {
@@ -50,16 +50,16 @@ class ProjectUsers extends Api
}
/**
* @param string $prjUid {@min 32} {@max 32}
* @param string $prj_uid {@min 32} {@max 32}
* @param string $usr_uid {@min 32} {@max 32}
*
* @url GET /:prjUid/user/:usr_uid/starting-tasks
* @url GET /:prj_uid/user/:usr_uid/starting-tasks
*/
public function doGetProjectStartingTaskUsers($prjUid, $usr_uid)
public function doGetProjectStartingTaskUsers($prj_uid, $usr_uid)
{
try {
$startingTasks = new \BusinessModel\ProjectUser();
$arrayData = $startingTasks->getProjectStartingTaskUsers($prjUid, $usr_uid);
$arrayData = $startingTasks->getProjectStartingTaskUsers($prj_uid, $usr_uid);
//Response
$response = $arrayData;
} catch (\Exception $e) {
@@ -70,17 +70,17 @@ class ProjectUsers extends Api
}
/**
* @param string $prjUid {@min 32} {@max 32}
* @param string $prj_uid {@min 32} {@max 32}
* @param wsUserCanStartTaskStructure $request_data
*
* @url POST /:prjUid/ws/user/can-start-task
* @url POST /:prj_uid/ws/user/can-start-task
*/
public function doPostProjectWsUserCanStartTask($prjUid, wsUserCanStartTaskStructure $request_data = null)
public function doPostProjectWsUserCanStartTask($prj_uid, wsUserCanStartTaskStructure $request_data = null)
{
try {
$request_data = (array)($request_data);
$user = new \BusinessModel\ProjectUser();
$objectData = $user->postProjectWsUserCanStartTask($prjUid, $request_data);
$objectData = $user->postProjectWsUserCanStartTask($prj_uid, $request_data);
//Response
$response = $objectData;
} catch (\Exception $e) {

49
workflow/engine/src/Services/Api/ProcessMaker/User.php
View File

@@ -44,25 +44,15 @@ class User extends Api
/**
* @url POST
*
* @param array $request_data
* @param string $grp_title {@from body}{@required true}
* @param string $grp_status {@from body}{@choice ACTIVE,INACTIVE}{@required true}
* @param array $request_data
*
* @status 201
*/
public function doPost(
$request_data,
$grp_title = "",
$grp_status = "ACTIVE"
) {
public function doPost($request_data) {
try {
$group = new \BusinessModel\Group();
$group->setFormatFieldNameInUppercase(false);
$arrayData = $group->create($request_data);
$user = new \BusinessModel\User();
$arrayData = $user->create($request_data);
$response = $arrayData;
return $response;
} catch (\Exception $e) {
throw (new RestException(Api::STAT_APP_EXCEPTION, $e->getMessage()));
@@ -70,41 +60,30 @@ class User extends Api
}
/**
* @url PUT /:grp_uid
* @url PUT /:usr_uid
*
* @param string $grp_uid {@min 32}{@max 32}
* @param string $usr_uid {@min 32}{@max 32}
* @param array $request_data
* @param string $grp_title {@from body}
* @param string $grp_status {@from body}{@choice ACTIVE,INACTIVE}
*/
public function doPut(
$grp_uid,
$request_data,
$grp_title = "",
$grp_status = "ACTIVE"
) {
public function doPut($usr_uid, $request_data) {
try {
$group = new \BusinessModel\Group();
$group->setFormatFieldNameInUppercase(false);
$arrayData = $group->update($grp_uid, $request_data);
$user = new \BusinessModel\User();
$arrayData = $user->update($usr_uid, $request_data);
} catch (\Exception $e) {
throw (new RestException(Api::STAT_APP_EXCEPTION, $e->getMessage()));
}
}
/**
* @url DELETE /:grp_uid
* @url DELETE /:usr_uid
*
* @param string $grp_uid {@min 32}{@max 32}
* @param string $usr_uid {@min 32}{@max 32}
*/
public function doDelete($grp_uid)
public function doDelete($usr_uid)
{
try {
$group = new \BusinessModel\Group();
$group->setFormatFieldNameInUppercase(false);
$group->delete($grp_uid);
$user = new \BusinessModel\User();
$user->delete($usr_uid);
} catch (\Exception $e) {
throw (new RestException(Api::STAT_APP_EXCEPTION, $e->getMessage()));
}