fernando/luos
1
0
Fork 0
Code Releases Activity

PM-3659 "Uso de interface lenta (assignment rules) cuando..." SOLVED

Browse Source 
Issue:
    Uso de interface lenta (assignment rules) cuando se tienen varios usuarios (40000)
Cause:
    No se realizo de manera correcta el paginado de registros
Solution:
    > Se a implementado los siguientes end-points:
        GET /api/1.0/{workspace}/project/{prj_uid}/activity/{act_uid}/assignee/paged
        GET /api/1.0/{workspace}/project/{prj_uid}/activity/{act_uid}/available-assignee/paged
        GET /api/1.0/{workspace}/project/{prj_uid}/activity/{act_uid}/adhoc-assignee/paged
        GET /api/1.0/{workspace}/project/{prj_uid}/activity/{act_uid}/adhoc-available-assignee/paged

        Estos end-points aceptan los siguientes parametros:
            /paged?filter={filter}&start={start}&limit={limit}&type={type}
            /paged?lfilter={lfilter}&start={start}&limit={limit}&type={type}
            /paged?rfilter={rfilter}&start={start}&limit={limit}&type={type}
        Donde:
            filter:  Representa la busqueda de registros que contienen este valor
            lfilter: Representa la busqueda de registros que empiezan con este valor
            rfilter: Representa la busqueda de registros que terminan con este valor
            type:    Acepta los siguentes valores: "user", "group"
        Ejemplo:
            GET /api/1.0/{workspace}/project/{prj_uid}/activity/{act_uid}/assignee/paged?start=0&limit=3
            <<<<< 200
            {
                "total": 15,
                "start": 0,
                "limit": 3,
                "filter": "",
                "data": [
                    {
                        "aas_uid": "60593768854492f8fa43aa2064326562",
                        "aas_name": "GROUP1 (2 Users)",
                        "aas_lastname": "",
                        "aas_username": "",
                        "aas_type": "group"
                    },
                    {
                        "aas_uid": "11886228656016c9329c898096916123",
                        "aas_name": "GROUP2 (1 User)",
                        "aas_lastname": "",
                        "aas_username": "",
                        "aas_type": "group"
                    },
                    {
                        "aas_uid": "52242914255f202805bd552031573543",
                        "aas_name": "user1",
                        "aas_lastname": "user1",
                        "aas_username": "user1",
                        "aas_type": "user"
                    }
                ]
            }
    > Se a mejorado los siguientes end-points:
        GET /api/1.0/{workspace}/users?filter={filter}&start={start}&limit={limit}
        GET /api/1.0/{workspace}/users?lfilter={lfilter}&start={start}&limit={limit}
        GET /api/1.0/{workspace}/users?rfilter={rfilter}&start={start}&limit={limit}
        GET /api/1.0/{workspace}/groups?filter={filter}&start={start}&limit={limit}
        GET /api/1.0/{workspace}/groups?lfilter={lfilter}&start={start}&limit={limit}
        GET /api/1.0/{workspace}/groups?rfilter={rfilter}&start={start}&limit={limit}
This commit is contained in:
Victor Saisa Lopez
2015-09-25 15:11:42 -04:00
parent 9fa3c2d2bf
commit ef1208ce98
9 changed files with 681 additions and 755 deletions
Download Patch File Download Diff File Expand all files Collapse all files

75
workflow/engine/src/ProcessMaker/BusinessModel/Group.php
View File

@@ -460,31 +460,76 @@ class Group
try {
$arrayGroup = array();
$numRecTotal = 0;
//Verify data
$process = new \ProcessMaker\BusinessModel\Process();
$process->throwExceptionIfDataNotMetPagerVarDefinition(array("start" => $start, "limit" => $limit), $this->arrayFieldNameForException);
//Get data
if (!is_null($limit) && $limit . "" == "0") {
return $arrayGroup;
//Set variables
$filterName = "filter";
if (!is_null($arrayFilterData) && is_array($arrayFilterData) && isset($arrayFilterData["filter"])) {
$arrayAux = array(
"" => "filter",
"LEFT" => "lfilter",
"RIGHT" => "rfilter"
);
$filterName = $arrayAux[(isset($arrayFilterData["filterOption"]))? $arrayFilterData["filterOption"] : ""];
}
//Get data
if (!is_null($limit) && $limit . "" == "0") {
//Return
return array(
"total" => $numRecTotal,
"start" => (int)((!is_null($start))? $start : 0),
"limit" => (int)((!is_null($limit))? $limit : 0),
$filterName => (!is_null($arrayFilterData) && is_array($arrayFilterData) && isset($arrayFilterData["filter"]))? $arrayFilterData["filter"] : "",
"data" => $arrayGroup
);
}
//Set variables
$arrayTotalUsersByGroup = $this->getTotalUsersByGroup();
$arrayTotalTasksByGroup = $this->getTotalTasksByGroup();
//SQL
//Query
$criteria = $this->getGroupCriteria();
if (!is_null($arrayFilterData) && is_array($arrayFilterData) && isset($arrayFilterData["filter"]) && trim($arrayFilterData["filter"]) != "") {
$criteria->add(\ContentPeer::CON_VALUE, "%" . $arrayFilterData["filter"] . "%", \Criteria::LIKE);
$arraySearch = array(
"" => "%" . $arrayFilterData["filter"] . "%",
"LEFT" => $arrayFilterData["filter"] . "%",
"RIGHT" => "%" . $arrayFilterData["filter"]
);
$search = $arraySearch[(isset($arrayFilterData["filterOption"]))? $arrayFilterData["filterOption"] : ""];
$criteria->add(\ContentPeer::CON_VALUE, $search, \Criteria::LIKE);
}
//SQL
//Number records total
$criteriaCount = clone $criteria;
$criteriaCount->clearSelectColumns();
$criteriaCount->addSelectColumn("COUNT(" . \GroupwfPeer::GRP_UID . ") AS NUM_REC");
$rsCriteriaCount = \GroupwfPeer::doSelectRS($criteriaCount);
$rsCriteriaCount->setFetchmode(\ResultSet::FETCHMODE_ASSOC);
$result = $rsCriteriaCount->next();
$row = $rsCriteriaCount->getRow();
$numRecTotal = (int)($row["NUM_REC"]);
//Query
if (!is_null($sortField) && trim($sortField) != "") {
$sortField = strtoupper($sortField);
if (in_array($sortField, array("GRP_UID", "GRP_STATUS", "GRP_LDAP_DN", "GRP_UX"))) {
if (in_array(\GroupwfPeer::TABLE_NAME . "." . $sortField, $criteria->getSelectColumns())) {
$sortField = \GroupwfPeer::TABLE_NAME . "." . $sortField;
} else {
$sortField = "GRP_TITLE";
@@ -520,7 +565,13 @@ class Group
}
//Return
return $arrayGroup;
return array(
"total" => $numRecTotal,
"start" => (int)((!is_null($start))? $start : 0),
"limit" => (int)((!is_null($limit))? $limit : 0),
$filterName => (!is_null($arrayFilterData) && is_array($arrayFilterData) && isset($arrayFilterData["filter"]))? $arrayFilterData["filter"] : "",
"data" => $arrayGroup
);
} catch (\Exception $e) {
throw $e;
}
@@ -635,7 +686,7 @@ class Group
}
/**
* return permissions of user
* return permissions of user
*/
public function loadUserRolePermission ($sSystem, $sUser)
{
@@ -748,11 +799,11 @@ class Group
$rsCriteria = \UsersPeer::doSelectRS($criteria);
$rsCriteria->setFetchmode(\ResultSet::FETCHMODE_ASSOC);
if (isset($flagPermission) && $flagPermission){
if (isset($flagPermission) && $flagPermission) {
\G::LoadSystem('rbac');
while ($rsCriteria->next()) {
$row = $rsCriteria->getRow();
$aPermissions = $this->loadUserRolePermission("PROCESSMAKER", $row['USR_UID']);
$bInclude = false;
@@ -768,7 +819,7 @@ class Group
} else {
while ($rsCriteria->next()) {
$row = $rsCriteria->getRow();
$arrayUser[] = $this->getUserDataFromRecord($row);
}
}