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

PMCORE-622

Browse Source
This commit is contained in:
Paula Quispe
2022-02-16 11:20:13 -04:00
parent 3a6d0a07b5
commit b27676e568
3 changed files with 134 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

116
tests/unit/workflow/engine/classes/WsBaseTest.php
View File

@@ -5,6 +5,7 @@ use Faker\Factory;
use Illuminate\Foundation\Testing\DatabaseTransactions;
use Illuminate\Support\Facades\Queue;
use ProcessMaker\Model\Application;
use ProcessMaker\Model\AppDelay;
use ProcessMaker\Model\AppThread;
use ProcessMaker\Model\Delegation;
use ProcessMaker\Model\EmailServerModel;
@@ -1293,4 +1294,119 @@ class WsBaseTest extends TestCase
//Assert the expected number of unassigned cases
$this->assertCount(0, $res);
}
/**
* Review the required fields in pause case
*
* @covers WsBase::pauseCase()
* @test
*/
public function it_review_fields_to_pause_case()
{
// Validate the appUid
$ws = new WsBase();
$response = (object) $ws->pauseCase('', 0, '');
$this->assertEquals($response->status_code, 100);
// Validate the status
$application = factory(Application::class)->states('draft')->create();
$ws = new WsBase();
$response = (object) $ws->pauseCase($application->APP_UID, 0, '');
$this->assertEquals($response->status_code, 100);
// Validate the index
$application = factory(Application::class)->states('todo')->create();
$ws = new WsBase();
$response = (object) $ws->pauseCase($application->APP_UID, '', '');
$this->assertEquals($response->status_code, 100);
// Validate the user
$application = factory(Application::class)->states('todo')->create();
$delegation = factory(Delegation::class)->states('foreign_keys')->create([
'APP_NUMBER' => $application->APP_NUMBER,
'APP_UID' => $application->APP_UID,
]);
$ws = new WsBase();
$response = (object) $ws->pauseCase($application->APP_UID, $delegation->DEL_INDEX, '');
$this->assertEquals($response->status_code, 100);
// If needs to validate the current user
$user = factory(User::class)->create();
$response = (object) $ws->pauseCase($application->APP_UID, $delegation->DEL_INDEX, $user->USR_UID, null, true);
$this->assertEquals($response->status_code, 100);
// Validate if status is closed
$application = factory(Application::class)->states('todo')->create();
$delegation = factory(Delegation::class)->states('foreign_keys')->create([
'APP_NUMBER' => $application->APP_NUMBER,
'APP_UID' => $application->APP_UID,
'DEL_THREAD_STATUS' => 'CLOSED',
'DEL_INDEX' => 2,
]);
$ws = new WsBase();
$response = (object) $ws->pauseCase($application->APP_UID, $delegation->DEL_INDEX, $delegation->USR_UID, null);
$this->assertEquals($response->status_code, 100);
// Validate if the case is paused
$application = factory(Application::class)->states('todo')->create();
$delegation = factory(Delegation::class)->states('foreign_keys')->create([
'APP_NUMBER' => $application->APP_NUMBER,
'APP_UID' => $application->APP_UID,
]);
factory(AppDelay::class)->create([
'APP_DELEGATION_USER' => $delegation->USR_UID,
'PRO_UID' => $delegation->PRO_UID,
'APP_NUMBER' => $delegation->APP_NUMBER,
'APP_DEL_INDEX' => $delegation->DEL_INDEX,
'APP_DISABLE_ACTION_USER' => 0,
'APP_TYPE' => 'PAUSE'
]);
factory(AppThread::class)->create([
'APP_UID' => $delegation->APP_UID,
'APP_THREAD_INDEX' => 1,
'APP_THREAD_PARENT' => 0,
'APP_THREAD_STATUS' => 'OPEN',
'DEL_INDEX' => $delegation->DEL_INDEX
]);
$ws = new WsBase();
$response = (object) $ws->pauseCase($application->APP_UID, $delegation->DEL_INDEX, $delegation->USR_UID, null);
// Review the unpaused date
$application = factory(Application::class)->states('todo')->create();
$delegation = factory(Delegation::class)->states('foreign_keys')->create([
'APP_NUMBER' => $application->APP_NUMBER,
'APP_UID' => $application->APP_UID,
]);
$ws = new WsBase();
$response = (object) $ws->pauseCase($delegation->APP_UID, $delegation->DEL_INDEX, $delegation->USR_UID, '06/13/2019 5:35 PM');
$this->assertEquals($response->status_code, 100);
}
/**
* Review the required fields in pause case
*
* @covers WsBase::pauseCase()
* @test
*/
public function it_pause_case()
{
$application = factory(Application::class)->states('todo')->create();
$delegation = factory(Delegation::class)->states('foreign_keys')->create([
'APP_NUMBER' => $application->APP_NUMBER,
'APP_UID' => $application->APP_UID,
'DEL_THREAD_STATUS' => 'OPEN',
'DEL_INDEX' => 2,
]);
factory(AppDelay::class)->create([
'APP_DELEGATION_USER' => $delegation->USR_UID,
'PRO_UID' => $delegation->PRO_UID,
'APP_NUMBER' => $delegation->APP_NUMBER,
'APP_DEL_INDEX' => $delegation->DEL_INDEX,
'APP_DISABLE_ACTION_USER' => 0,
'APP_TYPE' => 'PAUSE'
]);
factory(AppThread::class)->create([
'APP_UID' => $delegation->APP_UID,
'APP_THREAD_INDEX' => 1,
'APP_THREAD_PARENT' => 0,
'APP_THREAD_STATUS' => 'OPEN',
'DEL_INDEX' => $delegation->DEL_INDEX
]);
$ws = new WsBase();
$response = (object) $ws->pauseCase($delegation->APP_UID, $delegation->DEL_INDEX, $delegation->USR_UID);
$this->assertEquals($response->status_code, 0);
}
}

21
workflow/engine/classes/WsBase.php
View File

@@ -3263,12 +3263,14 @@ class WsBase
/**
* Pause case
*
* @param string caseUid : ID of the case.
* @param int delIndex : Delegation index of the case.
* @param string userUid : The unique ID of the user who will pause the case.
* @param string unpauseDate : Optional parameter. The date in the format "yyyy-mm-dd" indicating when to unpause
* @param string $caseUid: ID of the case.
* @param int $delIndex: Delegation index of the case.
* @param string $userUid: The unique ID of the user who will pause the case.
* @param string $unpauseDate: Optional parameter. The date in the format "yyyy-mm-dd" indicating when to unpause
* the case.
* @param boolean $checkUser: Check if needs to validate if the action will enable only for current user
*
* @see Ajax::pauseCase()
* @see workflow/engine/classes/class.pmFunctions.php::PMFPauseCase()
* @see workflow/engine/methods/services/soap2.php::pauseCase()
*
@@ -3276,7 +3278,7 @@ class WsBase
*
* @return $result will return an object
*/
public function pauseCase($caseUid, $delIndex, $userUid, $unpauseDate = null)
public function pauseCase($caseUid, $delIndex, $userUid, $unpauseDate = null, $checkUser = false)
{
$g = new G();
@@ -3316,6 +3318,15 @@ class WsBase
return $result;
}
// If needs to validate the current user
if ($checkUser) {
$currentUsrUid = Delegation::getCurrentUser($caseInfo['APP_NUMBER'], $delIndex);
if ($currentUsrUid !== $userUid) {
$result = new WsResponse(100, G::LoadTranslation('ID_CASE_ASSIGNED_ANOTHER_USER'));
$g->sessionVarRestore();
return $result;
}
}
// Validate if status is closed
$appDelegation = new AppDelegation();
$rows = $appDelegation->LoadParallel($caseUid, $delIndex);

4
workflow/engine/methods/cases/ajaxListener.php
View File

@@ -724,7 +724,7 @@ class Ajax
}
// Save the note pause reason
if ($_REQUEST['NOTE_REASON'] != '') {
if (!empty($_REQUEST['NOTE_REASON'])) {
$noteContent = addslashes($_REQUEST['NOTE_REASON']);
// Define the Case for register a case note
$cases = new BmCases();
@@ -733,7 +733,7 @@ class Ajax
// End save
$case = new WsBase();
$response = $case->pauseCase($appUid, $delIndex, $_SESSION['USER_LOGGED'], $unpauseDate);
$response = $case->pauseCase($appUid, $delIndex, $_SESSION['USER_LOGGED'], $unpauseDate, true);
$response = (object) $response;
if ($response->status_code == 100) {
throw new Exception($response->message);