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

PMCORE-3379

Browse Source
This commit is contained in:
Andrea Adamczyk
2021-09-29 16:28:55 -04:00
parent 6ed4ae566f
commit 436e1e0b04
3 changed files with 270 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

269
tests/unit/workflow/engine/src/ProcessMaker/Model/DelegationTest.php
View File

@@ -1111,13 +1111,37 @@ class DelegationTest extends TestCase
]);
}
// Searching by a existent case number, result ordered by APP_NUMBER, filter by APP_NUMBER in DESC mode
$results = Delegation::search(null, 0, 25, $application->APP_NUMBER, null, null, 'DESC',
'APP_NUMBER', null, null, null, 'APP_NUMBER');
$results = Delegation::search(
null,
0,
25,
$application->APP_NUMBER,
null,
null,
'DESC',
'APP_NUMBER',
null,
null,
null,
'APP_NUMBER'
);
$this->assertCount(1, $results['data']);
$this->assertEquals($application->APP_NUMBER, $results['data'][0]['APP_NUMBER']);
// Searching by a existent case number, result ordered by APP_NUMBER, filter by APP_NUMBER in ASC mode
$results = Delegation::search(null, 0, 25, $application->APP_NUMBER, null, null, 'ASC',
'APP_NUMBER', null, null, null, 'APP_NUMBER');
$results = Delegation::search(
null,
0,
25,
$application->APP_NUMBER,
null,
null,
'ASC',
'APP_NUMBER',
null,
null,
null,
'APP_NUMBER'
);
$this->assertCount(1, $results['data']);
$this->assertEquals($application->APP_NUMBER, $results['data'][0]['APP_NUMBER']);
}
@@ -1136,13 +1160,37 @@ class DelegationTest extends TestCase
DB::commit();
// Searching by a existent case title, result ordered by APP_NUMBER, filter by APP_NUMBER in DESC mode
$results = Delegation::search(null, 0, 10, $title, null, null, 'DESC',
'APP_NUMBER', null, null, null, 'APP_TITLE');
$results = Delegation::search(
null,
0,
10,
$title,
null,
null,
'DESC',
'APP_NUMBER',
null,
null,
null,
'APP_TITLE'
);
$this->assertCount(1, $results['data']);
$this->assertEquals($title, $results['data'][0]['APP_TITLE']);
// Searching by a existent case title, result ordered by APP_NUMBER, filter by APP_NUMBER in ASC mode
$results = Delegation::search(null, 0, 10, $title, null, null, 'ASC',
'APP_NUMBER', null, null, null, 'APP_TITLE');
$results = Delegation::search(
null,
0,
10,
$title,
null,
null,
'ASC',
'APP_NUMBER',
null,
null,
null,
'APP_TITLE'
);
$this->assertCount(1, $results['data']);
$this->assertEquals($title, $results['data'][0]['APP_TITLE']);
}
@@ -1165,21 +1213,69 @@ class DelegationTest extends TestCase
'TAS_ID' => $task->TAS_ID
]);
// Get the order taskTitle in ASC mode
$results = Delegation::search(null, 0, 10, $task->TAS_TITLE, null, null, 'ASC',
'TAS_TITLE', null, null, null, 'TAS_TITLE');
$results = Delegation::search(
null,
0,
10,
$task->TAS_TITLE,
null,
null,
'ASC',
'TAS_TITLE',
null,
null,
null,
'TAS_TITLE'
);
$this->assertCount(1, $results['data']);
$this->assertEquals($task->TAS_TITLE, $results['data'][0]['APP_TAS_TITLE']);
$results = Delegation::search(null, 0, 10, null, null, null, 'ASC',
'TAS_TITLE', null, null, null, 'TAS_TITLE');
$results = Delegation::search(
null,
0,
10,
null,
null,
null,
'ASC',
'TAS_TITLE',
null,
null,
null,
'TAS_TITLE'
);
$this->assertGreaterThan($results['data'][0]['APP_TAS_TITLE'], $results['data'][1]['APP_TAS_TITLE']);
// Get the order taskTitle in DESC mode
$results = Delegation::search(null, 0, 10, $task->TAS_TITLE, null, null, 'DESC',
'TAS_TITLE', null, null, null, 'TAS_TITLE');
$results = Delegation::search(
null,
0,
10,
$task->TAS_TITLE,
null,
null,
'DESC',
'TAS_TITLE',
null,
null,
null,
'TAS_TITLE'
);
$this->assertCount(1, $results['data']);
$this->assertEquals($task->TAS_TITLE, $results['data'][0]['APP_TAS_TITLE']);
$results = Delegation::search(null, 0, 10, null, null, null, 'DESC',
'TAS_TITLE', null, null, null, 'TAS_TITLE');
$results = Delegation::search(
null,
0,
10,
null,
null,
null,
'DESC',
'TAS_TITLE',
null,
null,
null,
'TAS_TITLE'
);
$this->assertLessThan($results['data'][0]['APP_TAS_TITLE'], $results['data'][1]['APP_TAS_TITLE']);
}
@@ -1431,8 +1527,19 @@ class DelegationTest extends TestCase
factory(Delegation::class, 10)->states('foreign_keys')->create([
'DEL_DELEGATE_DATE' => '2019-01-05 00:00:00'
]);
$results = Delegation::search(null, 0, 25, null, null, null, null, null, null, '2019-01-02 00:00:00',
'2019-01-03 00:00:00');
$results = Delegation::search(
null,
0,
25,
null,
null,
null,
null,
null,
null,
'2019-01-02 00:00:00',
'2019-01-03 00:00:00'
);
$this->assertCount(20, $results['data']);
foreach ($results['data'] as $value) {
$this->assertGreaterThanOrEqual('2019-01-02 00:00:00', $value['DEL_DELEGATE_DATE']);
@@ -1463,7 +1570,16 @@ class DelegationTest extends TestCase
]);
// Search setting only from
$results = Delegation::search(
null, 0, 40, null, null, null, null, null, null, '2019-01-02 00:00:00'
null,
0,
40,
null,
null,
null,
null,
null,
null,
'2019-01-02 00:00:00'
);
$this->assertCount(40, $results['data']);
foreach ($results['data'] as $value) {
@@ -1472,7 +1588,17 @@ class DelegationTest extends TestCase
}
// Search setting only to
$results = Delegation::search(
null, 0, 40, null, null, null, null, null, null, null, '2019-01-04 00:00:00'
null,
0,
40,
null,
null,
null,
null,
null,
null,
null,
'2019-01-04 00:00:00'
);
foreach ($results['data'] as $value) {
$this->assertLessThanOrEqual('2019-01-04 00:00:00', $value['DEL_DELEGATE_DATE']);
@@ -1502,8 +1628,20 @@ class DelegationTest extends TestCase
'DEL_THREAD_STATUS' => 'CLOSED'
]);
// Get first page, searching for threads are closed
$results = Delegation::search(null, 0, 5, $application->APP_NUMBER, null, null, null,
'TAS_TITLE', null, null, null, 'TAS_TITLE');
$results = Delegation::search(
null,
0,
5,
$application->APP_NUMBER,
null,
null,
null,
'TAS_TITLE',
null,
null,
null,
'TAS_TITLE'
);
$this->assertCount(0, $results['data']);
}
@@ -1565,8 +1703,20 @@ class DelegationTest extends TestCase
'DEL_INDEX' => 2
]);
// Get first page, searching for threads are open
$results = Delegation::search(null, 0, 5, $application->APP_NUMBER, null, null, null, null, null, null, null,
'APP_NUMBER');
$results = Delegation::search(
null,
0,
5,
$application->APP_NUMBER,
null,
null,
null,
null,
null,
null,
null,
'APP_NUMBER'
);
$this->assertCount(1, $results['data']);
}
@@ -1610,20 +1760,56 @@ class DelegationTest extends TestCase
'PRO_ID' => $processWithoutCat->PRO_ID
]);
// Search the cases when the process has related to the category and search by another category
$results = Delegation::search(null, 0, 25, null, $processWithCat->PRO_ID, null, null, null,
$category[1]->CATEGORY_UID);
$results = Delegation::search(
null,
0,
25,
null,
$processWithCat->PRO_ID,
null,
null,
null,
$category[1]->CATEGORY_UID
);
$this->assertCount(0, $results['data']);
// Search the cases when the process has related to the category and search by this relation
$results = Delegation::search(null, 0, 25, null, $processWithCat->PRO_ID, null, null, null,
$category[0]->CATEGORY_UID);
$results = Delegation::search(
null,
0,
25,
null,
$processWithCat->PRO_ID,
null,
null,
null,
$category[0]->CATEGORY_UID
);
$this->assertCount(1, $results['data']);
// Search the cases when the process does not have relation with category and search by a category
$results = Delegation::search(null, 0, 25, null, $processWithoutCat->PRO_ID, null, null, null,
$category[1]->CATEGORY_UID);
$results = Delegation::search(
null,
0,
25,
null,
$processWithoutCat->PRO_ID,
null,
null,
null,
$category[1]->CATEGORY_UID
);
$this->assertCount(0, $results['data']);
// Search the cases when the process does not have relation with category empty
$results = Delegation::search(null, 0, 25, null, $processWithoutCat->PRO_ID, null, null, null,
'');
$results = Delegation::search(
null,
0,
25,
null,
$processWithoutCat->PRO_ID,
null,
null,
null,
''
);
$this->assertCount(5, $results['data']);
}
@@ -1653,7 +1839,6 @@ class DelegationTest extends TestCase
factory(Delegation::class, 5)->create([
'PRO_ID' => $process->PRO_ID,
]);
}
/**
@@ -3204,7 +3389,6 @@ class DelegationTest extends TestCase
]);
$result = Delegation::participation($application->APP_UID, $user->USR_UID);
$this->assertTrue($result);
}
/**
@@ -3395,4 +3579,21 @@ class DelegationTest extends TestCase
$result = Delegation::casesStartedBy($delegation->USR_ID);
$this->assertNotEmpty($result);
}
/**
* Test the scopeParticipatedUser
*
* @covers \ProcessMaker\Model\Delegation::scopeParticipatedUser()
* @test
*/
public function it_return_scope_participated_user()
{
$application = factory(Application::class)->states('completed')->create();
$table = factory(Delegation::class)->states('foreign_keys')->create([
'APP_NUMBER' => $application->APP_NUMBER,
'APP_UID' => $application->APP_UID,
]);
$res = $table->joinApplication()->participatedUser($table->USR_ID)->get();
$this->assertCount(1, $res);
}
}

16
workflow/engine/src/ProcessMaker/BusinessModel/Cases/Participated.php
View File

@@ -122,22 +122,26 @@ class Participated extends AbstractCases
$query->joinUser();
// Join with application
$query->joinApplication();
// Scope to Participated
$query->participated($this->getUserId());
// Add filter
$filter = $this->getParticipatedStatus();
switch ($filter) {
case 'STARTED':
// Scope to Participated
$query->participated($this->getUserId());
// Scope that search for the STARTED by user: DRAFT, TO_DO, CANCELED AND COMPLETED
$query->caseStarted();
break;
case 'IN_PROGRESS':
// Scope to Participated
$query->participated($this->getUserId());
// Only cases in progress: TO_DO without DRAFT
$query->caseTodo();
// Group by AppNumber
$query->groupBy('APP_NUMBER');
break;
case 'COMPLETED':
// Scope to Participated User
$query->participatedUser($this->getUserId());
// Scope that search for the COMPLETED
$query->caseCompleted();
// Scope to set the last thread
@@ -280,22 +284,26 @@ class Participated extends AbstractCases
$query = Delegation::query()->select();
// Join with application
$query->joinApplication();
// Scope that sets the queries for Participated
$query->participated($this->getUserId());
// Get filter
$filter = $this->getParticipatedStatus();
switch ($filter) {
case 'STARTED':
// Scope that sets the queries for Participated
$query->participated($this->getUserId());
// Scope that search for the STARTED by user: DRAFT, TO_DO, CANCELED AND COMPLETED
$query->caseStarted();
break;
case 'IN_PROGRESS':
// Scope that sets the queries for Participated
$query->participated($this->getUserId());
// Only distinct APP_NUMBER
$query->distinct();
// Scope for only TO_DO cases
$query->caseTodo();
break;
case 'COMPLETED':
// Scope that sets the queries for Participated
$query->participatedUser($this->getUserId());
// Scope that search for the COMPLETED
$query->caseCompleted();
// Scope to set the last thread

19
workflow/engine/src/ProcessMaker/Model/Delegation.php
View File

@@ -1050,6 +1050,25 @@ class Delegation extends Model
return $query;
}
/**
* Scope a participated user in the case
*
* @param \Illuminate\Database\Eloquent\Builder $query
* @param int $user
*
* @return \Illuminate\Database\Eloquent\Builder
*/
public function scopeParticipatedUser($query, $user)
{
// Scope to set the user who participated in the case
$query->whereIn('APP_DELEGATION.APP_NUMBER', function ($query) use ($user) {
$query->select('APP_NUMBER')->from('APP_DELEGATION')
->where('USR_ID', $user)->distinct();
});
return $query;
}
/**
* Get specific cases unassigned that the user can view
*