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

PMCORE-3878

Browse Source
This commit is contained in:
Paula Quispe
2022-08-03 12:17:12 -04:00
parent 6bd2537b23
commit 71c5ecc0c4
3 changed files with 36 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
database/factories/DelegationFactory.php
View File

@@ -27,6 +27,7 @@ $factory->define(\ProcessMaker\Model\Delegation::class, function(Faker $faker) {
'DEL_TYPE' => 'NORMAL', 'DEL_TYPE' => 'NORMAL',
'DEL_THREAD' => 1, 'DEL_THREAD' => 1,
'DEL_THREAD_STATUS' => 'OPEN', 'DEL_THREAD_STATUS' => 'OPEN',
'DEL_THREAD_STATUS_ID' => 1,
'DEL_PRIORITY' => 3, 'DEL_PRIORITY' => 3,
'DEL_DELEGATE_DATE' => $faker->dateTime(), 'DEL_DELEGATE_DATE' => $faker->dateTime(),
'DEL_INIT_DATE' => $faker->dateTime(), 'DEL_INIT_DATE' => $faker->dateTime(),
@@ -79,6 +80,7 @@ $factory->state(\ProcessMaker\Model\Delegation::class, 'foreign_keys', function
'DEL_TYPE' => 'NORMAL', 'DEL_TYPE' => 'NORMAL',
'DEL_THREAD' => 1, 'DEL_THREAD' => 1,
'DEL_THREAD_STATUS' => 'OPEN', 'DEL_THREAD_STATUS' => 'OPEN',
'DEL_THREAD_STATUS_ID' => 1,
'DEL_PRIORITY' => 3, 'DEL_PRIORITY' => 3,
'DEL_DELEGATE_DATE' => $delegateDate, 'DEL_DELEGATE_DATE' => $delegateDate,
'DEL_INIT_DATE' => $initDate, 'DEL_INIT_DATE' => $initDate,
@@ -125,6 +127,7 @@ $factory->state(\ProcessMaker\Model\Delegation::class, 'web_entry', function (Fa
'DEL_TYPE' => 'NORMAL', 'DEL_TYPE' => 'NORMAL',
'DEL_THREAD' => 1, 'DEL_THREAD' => 1,
'DEL_THREAD_STATUS' => 'OPEN', 'DEL_THREAD_STATUS' => 'OPEN',
'DEL_THREAD_STATUS_ID' => 1,
'DEL_PRIORITY' => 3, 'DEL_PRIORITY' => 3,
'DEL_DELEGATE_DATE' => $faker->dateTime(), 'DEL_DELEGATE_DATE' => $faker->dateTime(),
'DEL_INIT_DATE' => $faker->dateTime(), 'DEL_INIT_DATE' => $faker->dateTime(),
@@ -148,6 +151,7 @@ $factory->state(\ProcessMaker\Model\Delegation::class, 'open', function (Faker $
return [ return [
'DEL_THREAD_STATUS' => 'OPEN', 'DEL_THREAD_STATUS' => 'OPEN',
'DEL_THREAD_STATUS_ID' => 1,
'DEL_DELEGATE_DATE' => $delegateDate, 'DEL_DELEGATE_DATE' => $delegateDate,
'DEL_INIT_DATE' => $initDate, 'DEL_INIT_DATE' => $initDate,
'DEL_RISK_DATE' => $riskDate, 'DEL_RISK_DATE' => $riskDate,

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

@@ -143,6 +143,18 @@ class DelegationTest extends TestCase
$this->assertCount(1, $table->threadOpen()->get()); $this->assertCount(1, $table->threadOpen()->get());
} }
/**
* This test scopeThreadIdOpen
*
* @covers \ProcessMaker\Model\Delegation::scopeThreadIdOpen()
* @test
*/
public function it_return_scope_thread_id_open()
{
$table = factory(Delegation::class)->states('foreign_keys')->create();
$this->assertCount(1, $table->threadIdOpen()->get());
}
/** /**
* This test scopeThreadPause * This test scopeThreadPause
* *

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

@@ -94,6 +94,17 @@ class Delegation extends Model
return $query->where('APP_DELEGATION.DEL_THREAD_STATUS', '=', 'OPEN'); return $query->where('APP_DELEGATION.DEL_THREAD_STATUS', '=', 'OPEN');
} }
/**
* Scope a query to only include open threads
*
* @param \Illuminate\Database\Eloquent\Builder $query
* @return \Illuminate\Database\Eloquent\Builder
*/
public function scopeThreadIdOpen($query)
{
return $query->where('APP_DELEGATION.DEL_THREAD_STATUS_ID', 1);
}
/** /**
* Scope a query to only include pause threads * Scope a query to only include pause threads
* *
@@ -2182,6 +2193,15 @@ class Delegation extends Model
$query = Delegation::query()->select(['APP_NUMBER']); $query = Delegation::query()->select(['APP_NUMBER']);
// Filter the title // Filter the title
$query->title($search); $query->title($search);
// Get open or last thread
$query->where(function ($query) {
// Get open threads
$query->threadIdOpen();
// Get last
$query->orWhere(function ($query) {
$query->lastThread();
});
});
// Group by // Group by
$query->groupBy('APP_NUMBER'); $query->groupBy('APP_NUMBER');
// Get the result // Get the result