diff --git a/workflow/engine/bin/tasks/cliListIds.php b/workflow/engine/bin/tasks/cliListIds.php index 767ed8b95..6bbe1c218 100644 --- a/workflow/engine/bin/tasks/cliListIds.php +++ b/workflow/engine/bin/tasks/cliListIds.php @@ -16,7 +16,7 @@ function list_ids($command, $args) foreach ($workspaces as $index => $workspace) { $hostPort1 = explode(":", $workspace->dbInfo['DB_HOST']); - $hostPort = $hostPort1[0].(isset($hostPort[1]) ? ";port=".$hostPort[1] : ""); + $hostPort = $hostPort1[0] . (isset($hostPort[1]) ? ";port=" . $hostPort[1] : ""); $connectionString = sprintf("%s:host=%s;dbname=%s", $workspace->dbInfo['DB_ADAPTER'], $hostPort, $workspace->dbInfo['DB_NAME']); @@ -49,8 +49,7 @@ function list_ids($command, $args) $dbh->query('UPDATE LIST_UNASSIGNED SET ' . 'PRO_ID=(SELECT PRO_ID FROM PROCESS WHERE PROCESS.PRO_UID=LIST_UNASSIGNED.PRO_UID);'); $dbh->query('UPDATE LIST_UNASSIGNED_GROUP SET ' - . 'USR_ID=(SELECT USR_ID FROM USERS WHERE USERS.USR_UID=LIST_UNASSIGNED_GROUP.USR_UID); ' - ); + . 'USR_ID=(SELECT USR_ID FROM USERS WHERE USERS.USR_UID=LIST_UNASSIGNED_GROUP.USR_UID);'); } //Done diff --git a/workflow/engine/classes/class.wsTools.php b/workflow/engine/classes/class.wsTools.php index 08b93a8d1..1a79f6e3a 100644 --- a/workflow/engine/classes/class.wsTools.php +++ b/workflow/engine/classes/class.wsTools.php @@ -3631,6 +3631,40 @@ class workspaceTools $con->commit(); CLI::logging("-> Migrating And Populating Indexing for avoiding the use of table APP_CACHE_VIEW Done \n"); + + // Populating PRO_ID, USR_ID + CLI::logging("-> Populating PRO_ID, USR_ID aat LIST_* \n"); + $con->begin(); + $stmt = $con->createStatement(); + $rs = $stmt->executeQuery(); + $stmt->executeQuery('UPDATE LIST_CANCELLED SET ' + . 'USR_ID=(SELECT USR_ID FROM USERS WHERE USERS.USR_UID=LIST_CANCELLED.USR_UID), ' + . 'PRO_ID=(SELECT PRO_ID FROM PROCESS WHERE PROCESS.PRO_UID=LIST_CANCELLED.PRO_UID);'); + $stmt->executeQuery('UPDATE LIST_COMPLETED SET ' + . 'USR_ID=(SELECT USR_ID FROM USERS WHERE USERS.USR_UID=LIST_COMPLETED.USR_UID), ' + . 'PRO_ID=(SELECT PRO_ID FROM PROCESS WHERE PROCESS.PRO_UID=LIST_COMPLETED.PRO_UID)'); + $stmt->executeQuery('UPDATE LIST_INBOX SET ' + . 'USR_ID=(SELECT USR_ID FROM USERS WHERE USERS.USR_UID=LIST_INBOX.USR_UID), ' + . 'PRO_ID=(SELECT PRO_ID FROM PROCESS WHERE PROCESS.PRO_UID=LIST_INBOX.PRO_UID);'); + $stmt->executeQuery('UPDATE LIST_MY_INBOX SET ' + . 'USR_ID=(SELECT USR_ID FROM USERS WHERE USERS.USR_UID=LIST_MY_INBOX.USR_UID), ' + . 'PRO_ID=(SELECT PRO_ID FROM PROCESS WHERE PROCESS.PRO_UID=LIST_MY_INBOX.PRO_UID);'); + $stmt->executeQuery('UPDATE LIST_PARTICIPATED_HISTORY SET ' + . 'USR_ID=(SELECT USR_ID FROM USERS WHERE USERS.USR_UID=LIST_PARTICIPATED_HISTORY.USR_UID), ' + . 'PRO_ID=(SELECT PRO_ID FROM PROCESS WHERE PROCESS.PRO_UID=LIST_PARTICIPATED_HISTORY.PRO_UID);'); + $stmt->executeQuery('UPDATE LIST_PARTICIPATED_LAST SET ' + . 'USR_ID=(SELECT USR_ID FROM USERS WHERE USERS.USR_UID=LIST_PARTICIPATED_LAST.USR_UID), ' + . 'PRO_ID=(SELECT PRO_ID FROM PROCESS WHERE PROCESS.PRO_UID=LIST_PARTICIPATED_LAST.PRO_UID);'); + $stmt->executeQuery('UPDATE LIST_PAUSED SET ' + . 'USR_ID=(SELECT USR_ID FROM USERS WHERE USERS.USR_UID=LIST_PAUSED.USR_UID), ' + . 'PRO_ID=(SELECT PRO_ID FROM PROCESS WHERE PROCESS.PRO_UID=LIST_PAUSED.PRO_UID);'); + $stmt->executeQuery('UPDATE LIST_UNASSIGNED SET ' + . 'PRO_ID=(SELECT PRO_ID FROM PROCESS WHERE PROCESS.PRO_UID=LIST_UNASSIGNED.PRO_UID);'); + $stmt->executeQuery('UPDATE LIST_UNASSIGNED_GROUP SET ' + . 'USR_ID=(SELECT USR_ID FROM USERS WHERE USERS.USR_UID=LIST_UNASSIGNED_GROUP.USR_UID);'); + $con->commit(); + + CLI::logging("-> Populating PRO_ID, USR_ID aat LIST_* Done \n"); } } diff --git a/workflow/engine/classes/model/ListCanceled.php b/workflow/engine/classes/model/ListCanceled.php index fcb29f87a..4b2ada9d7 100644 --- a/workflow/engine/classes/model/ListCanceled.php +++ b/workflow/engine/classes/model/ListCanceled.php @@ -106,9 +106,13 @@ class ListCanceled extends BaseListCanceled { BasePeer::doUpdate($criteriaWhere, $criteriaSet, Propel::getConnection("workflow")); $p = new Process(); - if(!empty($data['PRO_UID'])) $data['PRO_ID'] = $p->load($data['PRO_UID'])['PRO_ID']; + if (!empty($data['PRO_UID'])) { + $data['PRO_ID'] = $p->load($data['PRO_UID'])['PRO_ID']; + } $u = new Users(); - if(!empty($data['USR_UID'])) $data['USR_ID'] = $data['USR_UID']==='SELF_SERVICES' ? null : $u->load($data['USR_UID'])['USR_ID']; + if (!empty($data['USR_UID'])) { + $data['USR_ID'] = $data['USR_UID']==='SELF_SERVICES' ? null : $u->load($data['USR_UID'])['USR_ID']; + } $con = Propel::getConnection( ListCanceledPeer::DATABASE_NAME ); try { $this->fromArray( $data, BasePeer::TYPE_FIELDNAME ); @@ -137,9 +141,13 @@ class ListCanceled extends BaseListCanceled { public function update($data) { $p = new Process(); - if(!empty($data['PRO_UID'])) $data['PRO_ID'] = $p->load($data['PRO_UID'])['PRO_ID']; + if (!empty($data['PRO_UID'])) { + $data['PRO_ID'] = $p->load($data['PRO_UID'])['PRO_ID']; + } $u = new Users(); - if(!empty($data['USR_UID'])) $data['USR_ID'] = $data['USR_UID']==='SELF_SERVICES' ? null : $u->load($data['USR_UID'])['USR_ID']; + if (!empty($data['USR_UID'])) { + $data['USR_ID'] = $data['USR_UID']==='SELF_SERVICES' ? null : $u->load($data['USR_UID'])['USR_ID']; + } $con = Propel::getConnection( ListCanceledPeer::DATABASE_NAME ); try { $con->begin(); diff --git a/workflow/engine/classes/model/ListCompleted.php b/workflow/engine/classes/model/ListCompleted.php index a17923153..698d3fbc9 100644 --- a/workflow/engine/classes/model/ListCompleted.php +++ b/workflow/engine/classes/model/ListCompleted.php @@ -98,9 +98,13 @@ class ListCompleted extends BaseListCompleted BasePeer::doUpdate($criteriaWhere, $criteriaSet, Propel::getConnection("workflow")); $p = new Process(); - if(!empty($data['PRO_UID'])) $data['PRO_ID'] = $p->load($data['PRO_UID'])['PRO_ID']; + if (!empty($data['PRO_UID'])) { + $data['PRO_ID'] = $p->load($data['PRO_UID'])['PRO_ID']; + } $u = new Users(); - if(!empty($data['USR_UID'])) $data['USR_ID'] = $data['USR_UID']==='SELF_SERVICES' ? null : $u->load($data['USR_UID'])['USR_ID']; + if (!empty($data['USR_UID'])) { + $data['USR_ID'] = $data['USR_UID']==='SELF_SERVICES' ? null : $u->load($data['USR_UID'])['USR_ID']; + } $con = Propel::getConnection( ListCompletedPeer::DATABASE_NAME ); try { $this->fromArray( $data, BasePeer::TYPE_FIELDNAME ); @@ -129,9 +133,13 @@ class ListCompleted extends BaseListCompleted public function update($data) { $p = new Process(); - if(!empty($data['PRO_UID'])) $data['PRO_ID'] = $p->load($data['PRO_UID'])['PRO_ID']; + if (!empty($data['PRO_UID'])) { + $data['PRO_ID'] = $p->load($data['PRO_UID'])['PRO_ID']; + } $u = new Users(); - if(!empty($data['USR_UID'])) $data['USR_ID'] = $data['USR_UID']==='SELF_SERVICES' ? null : $u->load($data['USR_UID'])['USR_ID']; + if (!empty($data['USR_UID'])) { + $data['USR_ID'] = $data['USR_UID']==='SELF_SERVICES' ? null : $u->load($data['USR_UID'])['USR_ID']; + } $con = Propel::getConnection( ListCompletedPeer::DATABASE_NAME ); try { $con->begin(); diff --git a/workflow/engine/classes/model/ListInbox.php b/workflow/engine/classes/model/ListInbox.php index 958429a1d..7f4c18e71 100644 --- a/workflow/engine/classes/model/ListInbox.php +++ b/workflow/engine/classes/model/ListInbox.php @@ -33,9 +33,13 @@ class ListInbox extends BaseListInbox $data['APP_TITLE'] = G::replaceDataField($data['APP_TITLE'], $aData['APP_DATA']); } $p = new Process(); - if(!empty($data['PRO_UID'])) $data['PRO_ID'] = $p->load($data['PRO_UID'])['PRO_ID']; + if (!empty($data['PRO_UID'])) { + $data['PRO_ID'] = $p->load($data['PRO_UID'])['PRO_ID']; + } $u = new Users(); - if(!empty($data['USR_UID'])) $data['USR_ID'] = $data['USR_UID']==='SELF_SERVICES' ? null : $u->load($data['USR_UID'])['USR_ID']; + if (!empty($data['USR_UID'])) { + $data['USR_ID'] = $data['USR_UID']==='SELF_SERVICES' ? null : $u->load($data['USR_UID'])['USR_ID']; + } $this->fromArray( $data, BasePeer::TYPE_FIELDNAME ); if ($this->validate()) { $result = $this->save(); @@ -151,9 +155,13 @@ class ListInbox extends BaseListInbox } $p = new Process(); - if(!empty($data['PRO_UID'])) $data['PRO_ID'] = $p->load($data['PRO_UID'])['PRO_ID']; + if (!empty($data['PRO_UID'])) { + $data['PRO_ID'] = $p->load($data['PRO_UID'])['PRO_ID']; + } $u = new Users(); - if(!empty($data['USR_UID'])) $data['USR_ID'] = $data['USR_UID']==='SELF_SERVICES' ? null : $u->load($data['USR_UID'])['USR_ID']; + if (!empty($data['USR_UID'])) { + $data['USR_ID'] = $data['USR_UID']==='SELF_SERVICES' ? null : $u->load($data['USR_UID'])['USR_ID']; + } $con = Propel::getConnection( ListInboxPeer::DATABASE_NAME ); try { $con->begin(); diff --git a/workflow/engine/classes/model/ListMyInbox.php b/workflow/engine/classes/model/ListMyInbox.php index 1845d8ad8..68947f79c 100644 --- a/workflow/engine/classes/model/ListMyInbox.php +++ b/workflow/engine/classes/model/ListMyInbox.php @@ -26,9 +26,13 @@ class ListMyInbox extends BaseListMyInbox public function create($data) { $p = new Process(); - if(!empty($data['PRO_UID'])) $data['PRO_ID'] = $p->load($data['PRO_UID'])['PRO_ID']; + if (!empty($data['PRO_UID'])) { + $data['PRO_ID'] = $p->load($data['PRO_UID'])['PRO_ID']; + } $u = new Users(); - if(!empty($data['USR_UID'])) $data['USR_ID'] = $data['USR_UID']==='SELF_SERVICES' ? null : $u->load($data['USR_UID'])['USR_ID']; + if (!empty($data['USR_UID'])) { + $data['USR_ID'] = $data['USR_UID']==='SELF_SERVICES' ? null : $u->load($data['USR_UID'])['USR_ID']; + } $con = Propel::getConnection( ListMyInboxPeer::DATABASE_NAME ); try { $this->fromArray( $data, BasePeer::TYPE_FIELDNAME ); @@ -59,7 +63,9 @@ class ListMyInbox extends BaseListMyInbox $p = new Process(); $data['PRO_ID'] = $p->load($data['PRO_UID'])['PRO_ID']; $u = new Users(); - if(!empty($data['USR_UID'])) $data['USR_ID'] = $data['USR_UID']==='SELF_SERVICES' ? null : $u->load($data['USR_UID'])['USR_ID']; + if(!empty($data['USR_UID'])) { + $data['USR_ID'] = $data['USR_UID']==='SELF_SERVICES' ? null : $u->load($data['USR_UID'])['USR_ID']; + } $con = Propel::getConnection( ListMyInboxPeer::DATABASE_NAME ); try { $con->begin(); diff --git a/workflow/engine/classes/model/ListParticipatedHistory.php b/workflow/engine/classes/model/ListParticipatedHistory.php index 9c8cfc0e5..d158ea00b 100644 --- a/workflow/engine/classes/model/ListParticipatedHistory.php +++ b/workflow/engine/classes/model/ListParticipatedHistory.php @@ -26,9 +26,13 @@ class ListParticipatedHistory extends BaseListParticipatedHistory public function create($data) { $p = new Process(); - if(!empty($data['PRO_UID'])) $data['PRO_ID'] = $p->load($data['PRO_UID'])['PRO_ID']; + if(!empty($data['PRO_UID'])) { + $data['PRO_ID'] = $p->load($data['PRO_UID'])['PRO_ID']; + } $u = new Users(); - if(!empty($data['USR_UID'])) $data['USR_ID'] = $data['USR_UID']==='SELF_SERVICES' ? null : $u->load($data['USR_UID'])['USR_ID']; + if(!empty($data['USR_UID'])) { + $data['USR_ID'] = $data['USR_UID']==='SELF_SERVICES' ? null : $u->load($data['USR_UID'])['USR_ID']; + } $con = Propel::getConnection( ListParticipatedHistoryPeer::DATABASE_NAME ); try { $this->fromArray( $data, BasePeer::TYPE_FIELDNAME ); @@ -57,9 +61,13 @@ class ListParticipatedHistory extends BaseListParticipatedHistory public function update($data) { $p = new Process(); - if(!empty($data['PRO_UID'])) $data['PRO_ID'] = $p->load($data['PRO_UID'])['PRO_ID']; + if(!empty($data['PRO_UID'])) { + $data['PRO_ID'] = $p->load($data['PRO_UID'])['PRO_ID']; + } $u = new Users(); - if(!empty($data['USR_UID'])) $data['USR_ID'] = $data['USR_UID']==='SELF_SERVICES' ? null : $u->load($data['USR_UID'])['USR_ID']; + if(!empty($data['USR_UID'])) { + $data['USR_ID'] = $data['USR_UID']==='SELF_SERVICES' ? null : $u->load($data['USR_UID'])['USR_ID']; + } $con = Propel::getConnection( ListParticipatedHistoryPeer::DATABASE_NAME ); try { $con->begin(); diff --git a/workflow/engine/classes/model/ListParticipatedLast.php b/workflow/engine/classes/model/ListParticipatedLast.php index a8f6235cd..945f43fce 100644 --- a/workflow/engine/classes/model/ListParticipatedLast.php +++ b/workflow/engine/classes/model/ListParticipatedLast.php @@ -71,9 +71,13 @@ class ListParticipatedLast extends BaseListParticipatedLast } $p = new Process(); - if(!empty($data['PRO_UID'])) $data['PRO_ID'] = $p->load($data['PRO_UID'])['PRO_ID']; + if(!empty($data['PRO_UID'])) { + $data['PRO_ID'] = $p->load($data['PRO_UID'])['PRO_ID']; + } $u = new Users(); - if(!empty($data['USR_UID'])) $data['USR_ID'] = $data['USR_UID']==='SELF_SERVICES' ? null : $u->load($data['USR_UID'])['USR_ID']; + if(!empty($data['USR_UID'])) { + $data['USR_ID'] = $data['USR_UID']==='SELF_SERVICES' ? null : $u->load($data['USR_UID'])['USR_ID']; + } $con = Propel::getConnection( ListParticipatedLastPeer::DATABASE_NAME ); try { $this->fromArray( $data, BasePeer::TYPE_FIELDNAME ); @@ -103,9 +107,13 @@ class ListParticipatedLast extends BaseListParticipatedLast { $data['DEL_THREAD_STATUS'] = (isset($data['DEL_THREAD_STATUS'])) ? $data['DEL_THREAD_STATUS'] : 'OPEN'; $p = new Process(); - if(!empty($data['PRO_UID'])) $data['PRO_ID'] = $p->load($data['PRO_UID'])['PRO_ID']; + if(!empty($data['PRO_UID'])) { + $data['PRO_ID'] = $p->load($data['PRO_UID'])['PRO_ID']; + } $u = new Users(); - if(!empty($data['USR_UID'])) $data['USR_ID'] = $data['USR_UID']==='SELF_SERVICES' ? null : $u->load($data['USR_UID'])['USR_ID']; + if(!empty($data['USR_UID'])) { + $data['USR_ID'] = $data['USR_UID']==='SELF_SERVICES' ? null : $u->load($data['USR_UID'])['USR_ID']; + } $con = Propel::getConnection( ListParticipatedLastPeer::DATABASE_NAME ); try { $con->begin(); diff --git a/workflow/engine/classes/model/ListPaused.php b/workflow/engine/classes/model/ListPaused.php index 91d7f6cd8..d4b67d7a2 100644 --- a/workflow/engine/classes/model/ListPaused.php +++ b/workflow/engine/classes/model/ListPaused.php @@ -115,9 +115,13 @@ class ListPaused extends BaseListPaused { $oListInbox->remove($data['APP_UID'], $data['DEL_INDEX']); $p = new Process(); - if(!empty($data['PRO_UID'])) $data['PRO_ID'] = $p->load($data['PRO_UID'])['PRO_ID']; + if(!empty($data['PRO_UID'])) { + $data['PRO_ID'] = $p->load($data['PRO_UID'])['PRO_ID']; + } $u = new Users(); - if(!empty($data['USR_UID'])) $data['USR_ID'] = $data['USR_UID']==='SELF_SERVICES' ? null : $u->load($data['USR_UID'])['USR_ID']; + if(!empty($data['USR_UID'])) { + $data['USR_ID'] = $data['USR_UID']==='SELF_SERVICES' ? null : $u->load($data['USR_UID'])['USR_ID']; + } $con = Propel::getConnection( ListPausedPeer::DATABASE_NAME ); try { $this->fromArray( $data, BasePeer::TYPE_FIELDNAME ); @@ -146,9 +150,13 @@ class ListPaused extends BaseListPaused { public function update($data) { $p = new Process(); - if(!empty($data['PRO_UID'])) $data['PRO_ID'] = $p->load($data['PRO_UID'])['PRO_ID']; + if(!empty($data['PRO_UID'])) { + $data['PRO_ID'] = $p->load($data['PRO_UID'])['PRO_ID']; + } $u = new Users(); - if(!empty($data['USR_UID'])) $data['USR_ID'] = $data['USR_UID']==='SELF_SERVICES' ? null : $u->load($data['USR_UID'])['USR_ID']; + if(!empty($data['USR_UID'])) { + $data['USR_ID'] = $data['USR_UID']==='SELF_SERVICES' ? null : $u->load($data['USR_UID'])['USR_ID']; + } $con = Propel::getConnection( ListPausedPeer::DATABASE_NAME ); try { $con->begin(); diff --git a/workflow/engine/classes/model/ListUnassigned.php b/workflow/engine/classes/model/ListUnassigned.php index 880931461..a04e07b08 100644 --- a/workflow/engine/classes/model/ListUnassigned.php +++ b/workflow/engine/classes/model/ListUnassigned.php @@ -27,7 +27,9 @@ class ListUnassigned extends BaseListUnassigned public function create($data) { $p = new Process(); - if(!empty($data['PRO_UID'])) $data['PRO_ID'] = $p->load($data['PRO_UID'])['PRO_ID']; + if(!empty($data['PRO_UID'])) { + $data['PRO_ID'] = $p->load($data['PRO_UID'])['PRO_ID']; + } $con = Propel::getConnection( ListUnassignedPeer::DATABASE_NAME ); try { $this->fromArray( $data, BasePeer::TYPE_FIELDNAME ); @@ -56,7 +58,9 @@ class ListUnassigned extends BaseListUnassigned public function update($data) { $p = new Process(); - if(!empty($data['PRO_UID'])) $data['PRO_ID'] = $p->load($data['PRO_UID'])['PRO_ID']; + if(!empty($data['PRO_UID'])) { + $data['PRO_ID'] = $p->load($data['PRO_UID'])['PRO_ID']; + } $con = Propel::getConnection( ListUnassignedPeer::DATABASE_NAME ); try { $con->begin(); diff --git a/workflow/engine/classes/model/ListUnassignedGroup.php b/workflow/engine/classes/model/ListUnassignedGroup.php index 5086f4b46..5bd90dda6 100644 --- a/workflow/engine/classes/model/ListUnassignedGroup.php +++ b/workflow/engine/classes/model/ListUnassignedGroup.php @@ -25,7 +25,9 @@ class ListUnassignedGroup extends BaseListUnassignedGroup { public function create($data) { $u = new Users(); - if(!empty($data['USR_UID'])) $data['USR_ID'] = $data['USR_UID']==='SELF_SERVICES' ? null : $u->load($data['USR_UID'])['USR_ID']; + if(!empty($data['USR_UID'])) { + $data['USR_ID'] = $data['USR_UID']==='SELF_SERVICES' ? null : $u->load($data['USR_UID'])['USR_ID']; + } $con = Propel::getConnection( ListUnassignedGroupPeer::DATABASE_NAME ); try { $this->fromArray( $data, BasePeer::TYPE_FIELDNAME ); @@ -52,6 +54,9 @@ class ListUnassignedGroup extends BaseListUnassignedGroup { */ public function update($data) { + if(!empty($data['USR_UID'])) { + $data['USR_ID'] = $data['USR_UID']==='SELF_SERVICES' ? null : $u->load($data['USR_UID'])['USR_ID']; + } $con = Propel::getConnection( ListUnassignedGroupPeer::DATABASE_NAME ); try { $con->begin();