From c1a92a6ae7a0775ab6eab9c4fc44f265da00d711 Mon Sep 17 00:00:00 2001 From: Andrea Adamczyk Date: Thu, 17 Dec 2020 10:22:51 -0400 Subject: [PATCH] PMCORE-2562 --- .../ProcessMaker/Model/ListUnassignedTest.php | 305 +----------------- .../engine/classes/model/ListCanceled.php | 3 + .../engine/classes/model/ListCanceledPeer.php | 1 + .../engine/classes/model/ListCompleted.php | 2 +- .../classes/model/ListCompletedPeer.php | 2 +- workflow/engine/classes/model/ListInbox.php | 1 + .../engine/classes/model/ListInboxPeer.php | 1 + workflow/engine/classes/model/ListMyInbox.php | 2 +- .../engine/classes/model/ListMyInboxPeer.php | 2 +- .../classes/model/ListParticipatedHistory.php | 2 +- .../model/ListParticipatedHistoryPeer.php | 2 +- .../classes/model/ListParticipatedLast.php | 2 + .../model/ListParticipatedLastPeer.php | 1 + workflow/engine/classes/model/ListPaused.php | 1 + .../engine/classes/model/ListPausedPeer.php | 1 + .../engine/classes/model/ListUnassigned.php | 1 + .../classes/model/ListUnassignedGroup.php | 2 +- .../classes/model/ListUnassignedGroupPeer.php | 2 +- .../classes/model/ListUnassignedPeer.php | 1 + 19 files changed, 22 insertions(+), 312 deletions(-) diff --git a/tests/unit/workflow/engine/src/ProcessMaker/Model/ListUnassignedTest.php b/tests/unit/workflow/engine/src/ProcessMaker/Model/ListUnassignedTest.php index d58bf69fe..24b8bcf77 100644 --- a/tests/unit/workflow/engine/src/ProcessMaker/Model/ListUnassignedTest.php +++ b/tests/unit/workflow/engine/src/ProcessMaker/Model/ListUnassignedTest.php @@ -16,309 +16,6 @@ use Tests\TestCase; */ class ListUnassignedTest extends TestCase { - /** - * Method set up. - */ - public function setUp() - { - parent::setUp(); - $this->markTestIncomplete(); - } - - /** - * This checks to make sure pagination is working properly - * - * @covers ListUnassigned::loadList - * @test - */ - public function it_should_return_pages_of_data() - { - $user = factory(User::class)->create(); - for ($x = 1; $x <= 5; $x++) { - $list = factory(ListUnassigned::class)->states('foreign_keys')->create(); - factory(TaskUser::class)->create([ - 'TAS_UID' => $list->TAS_UID, - 'USR_UID' => $user->USR_UID, - 'TU_RELATION' => 1, //Related to the user - 'TU_TYPE' => 1 - ]); - } - - // Define the filters - $filters = ['start' => 0, 'limit' => 2]; - // Get data first page - $result = ListUnassigned::loadList($user->USR_UID, $filters); - $this->assertCount(2, $result); - // Get data second page - $filters = ['start' => 2, 'limit' => 2]; - $result = ListUnassigned::loadList($user->USR_UID, $filters); - $this->assertCount(2, $result); - // Get data third page - $filters = ['start' => 4, 'limit' => 2]; - $result = ListUnassigned::loadList($user->USR_UID, $filters); - $this->assertCount(1, $result); - } - - /** - * This ensures ordering ascending and descending works by case number APP_NUMBER - * - * @covers ListUnassigned::loadList - * @test - */ - public function it_should_sort_by_case_number() - { - $user = factory(User::class)->create(); - for ($x = 1; $x <= 5; $x++) { - $list = factory(ListUnassigned::class)->states('foreign_keys')->create(); - factory(TaskUser::class)->create([ - 'TAS_UID' => $list->TAS_UID, - 'USR_UID' => $user->USR_UID, - 'TU_RELATION' => 1, //Related to the user - 'TU_TYPE' => 1 - ]); - } - //Define the filters - $filters = ['sort' => 'APP_NUMBER', 'dir' => 'ASC']; - //Get data - $result = ListUnassigned::loadList($user->USR_UID, $filters); - $this->assertGreaterThan($result[0]['APP_NUMBER'], $result[1]['APP_NUMBER']); - - //Define the filters - $filters = ['sort' => 'APP_NUMBER', 'dir' => 'DESC']; - //Get data - $result = ListUnassigned::loadList($user->USR_UID, $filters); - $this->assertGreaterThan($result[1]['APP_NUMBER'], $result[0]['APP_NUMBER']); - } - - /** - * This ensures ordering ascending and descending works by case number APP_TITLE - * - * @covers ListUnassigned::loadList - * @test - */ - public function it_should_sort_by_case_title() - { - $user = factory(User::class)->create(); - for ($x = 1; $x <= 5; $x++) { - $list = factory(ListUnassigned::class)->states('foreign_keys')->create(); - factory(TaskUser::class)->create([ - 'TAS_UID' => $list->TAS_UID, - 'USR_UID' => $user->USR_UID, - 'TU_RELATION' => 1, //Related to the user - 'TU_TYPE' => 1 - ]); - } - //Define the filters - $filters = ['sort' => 'APP_TITLE', 'dir' => 'ASC']; - //Get data - $result = ListUnassigned::loadList($user->USR_UID, $filters); - $this->assertGreaterThan($result[0]['APP_TITLE'], $result[1]['APP_TITLE']); - - //Define the filters - $filters = ['sort' => 'APP_TITLE', 'dir' => 'DESC']; - //Get data - $result = ListUnassigned::loadList($user->USR_UID, $filters); - $this->assertGreaterThan($result[1]['APP_TITLE'], $result[0]['APP_TITLE']); - } - - /** - * This ensures ordering ascending and descending works by case number APP_PRO_TITLE - * - * @covers ListUnassigned::loadList - * @test - */ - public function it_should_sort_by_process() - { - $user = factory(User::class)->create(); - for ($x = 1; $x <= 5; $x++) { - $list = factory(ListUnassigned::class)->states('foreign_keys')->create(); - factory(TaskUser::class)->create([ - 'TAS_UID' => $list->TAS_UID, - 'USR_UID' => $user->USR_UID, - 'TU_RELATION' => 1, //Related to the user - 'TU_TYPE' => 1 - ]); - } - //Define the filters - $filters = ['sort' => 'APP_PRO_TITLE', 'dir' => 'ASC']; - //Get data - $result = ListUnassigned::loadList($user->USR_UID, $filters); - $this->assertGreaterThan($result[0]['APP_PRO_TITLE'], $result[1]['APP_PRO_TITLE']); - //Define the filters - $filters = ['sort' => 'APP_PRO_TITLE', 'dir' => 'DESC']; - //Get data - $result = ListUnassigned::loadList($user->USR_UID, $filters); - $this->assertGreaterThan($result[1]['APP_PRO_TITLE'], $result[0]['APP_PRO_TITLE']); - } - - /** - * This ensures ordering ascending and descending works by case number APP_TAS_TITLE - * - * @covers ListUnassigned::loadList - * @test - */ - public function it_should_sort_by_task() - { - $user = factory(User::class)->create(); - for ($x = 1; $x <= 5; $x++) { - $list = factory(ListUnassigned::class)->states('foreign_keys')->create(); - factory(TaskUser::class)->create([ - 'TAS_UID' => $list->TAS_UID, - 'USR_UID' => $user->USR_UID, - 'TU_RELATION' => 1, //Related to the user - 'TU_TYPE' => 1 - ]); - } - //Define the filters - $filters = ['sort' => 'APP_TAS_TITLE', 'dir' => 'ASC']; - //Get data - $result = ListUnassigned::loadList($user->USR_UID, $filters); - $this->assertGreaterThan($result[0]['APP_TAS_TITLE'], $result[1]['APP_TAS_TITLE']); - //Define the filters - $filters = ['sort' => 'APP_TAS_TITLE', 'dir' => 'DESC']; - //Get data - $result = ListUnassigned::loadList($user->USR_UID, $filters); - $this->assertGreaterThan($result[1]['APP_TAS_TITLE'], $result[0]['APP_TAS_TITLE']); - } - - /** - * This checks to make sure filter by category is working properly - * - * @covers ListUnassigned::loadList - * @test - */ - public function it_should_return_data_filtered_by_process_category() - { - //Create user - $user = factory(User::class)->create(); - //Create a category - $category = factory(ProcessCategory::class)->create(); - //Create process - $process = factory(Process::class)->create([ - 'PRO_CATEGORY' => $category->CATEGORY_UID - ]); - //Create a category - $category1 = factory(ProcessCategory::class)->create(); - //Create process - $process1 = factory(Process::class)->create([ - 'PRO_CATEGORY' => $category1->CATEGORY_UID - ]); - //Create a task self service - $task = factory(Task::class)->create([ - 'TAS_ASSIGN_TYPE' => 'SELF_SERVICE', - 'TAS_GROUP_VARIABLE' => '', - 'PRO_UID' => $process->PRO_UID - ]); - //Assign a user in the task - factory(TaskUser::class)->create([ - 'TAS_UID' => $task->TAS_UID, - 'USR_UID' => $user->USR_UID, - 'TU_RELATION' => 1, //Related to the user - 'TU_TYPE' => 1 - ]); - //Create the register in list unassigned - factory(ListUnassigned::class, 2)->create([ - 'TAS_ID' => $task->TAS_ID, - 'PRO_UID' => $process->PRO_UID, - ]); - //Create the register in list unassigned - factory(ListUnassigned::class, 5)->create([ - 'TAS_ID' => $task->TAS_ID, - 'PRO_UID' => $process1->PRO_UID, - ]); - //Get all data - $result = ListUnassigned::loadList($user->USR_UID); - $this->assertCount(7, $result); - //Define the filters - $filters = ['category' => $category->CATEGORY_UID]; - //Get data - $result = ListUnassigned::loadList($user->USR_UID, $filters); - $this->assertCount(2, $result); - //Get the minor case number first - $this->assertEquals($category->CATEGORY_UID, $result[0]['PRO_CATEGORY']); - //Get the major case number second - $this->assertEquals($category->CATEGORY_UID, $result[1]['PRO_CATEGORY']); - } - - /** - * This checks to make sure filter by category is working properly - * - * @covers ListUnassigned::loadList - * @test - */ - public function it_should_return_data_filtered_by_generic_search() - { - //Create user - $user = factory(User::class)->create(); - //Create process - $process = factory(Process::class)->create(); - //Create a task self service - $task = factory(Task::class)->create([ - 'TAS_ASSIGN_TYPE' => 'SELF_SERVICE', - 'TAS_GROUP_VARIABLE' => '', - 'PRO_UID' => $process->PRO_UID - ]); - //Assign a user in the task - factory(TaskUser::class)->create([ - 'TAS_UID' => $task->TAS_UID, - 'USR_UID' => $user->USR_UID, - 'TU_RELATION' => 1, //Related to the user - 'TU_TYPE' => 1 - ]); - //Create the register in list unassigned - factory(ListUnassigned::class, 2)->create([ - 'TAS_ID' => $task->TAS_ID, - 'APP_TITLE' => 'This is a case name', - ]); - //Create the register in list unassigned - factory(ListUnassigned::class, 2)->create([ - 'TAS_ID' => $task->TAS_ID, - 'APP_PRO_TITLE' => 'This is a process name', - ]); - //Create the register in list unassigned - factory(ListUnassigned::class, 2)->create([ - 'TAS_ID' => $task->TAS_ID, - 'APP_TAS_TITLE' => 'This is a task name', - ]); - //Create other registers - factory(ListUnassigned::class, 4)->create([ - 'TAS_ID' => $task->TAS_ID - ]); - //Define the filters - $filters = ['search' => 'case name']; - //Get data related to the search - $result = ListUnassigned::loadList($user->USR_UID, $filters); - $this->assertCount(2, $result); - //Define the filters - $filters = ['search' => 'process name']; - //Get data related to the search - $result = ListUnassigned::loadList($user->USR_UID, $filters); - $this->assertCount(2, $result); - //Define the filters - $filters = ['search' => 'task name']; - //Get data related to the search - $result = ListUnassigned::loadList($user->USR_UID, $filters); - $this->assertCount(2, $result); - } - - /** - * This checks the self-service timeout cases - * - * @covers \ProcessMaker\Model\ListUnassigned::selfServiceTimeout() - * @test - */ - public function it_should_return_cases_configured_self_service_timeout() - { - // Create some cases configured the self service timeout - for ($x = 1; $x <= 5; $x++) { - $task = factory(Task::class)->states('sef_service_timeout')->create(); - factory(ListUnassigned::class)->create([ - 'TAS_UID' => $task->TAS_UID, - 'TAS_ID' => $task->TAS_ID - ]); - } - $results = ListUnassigned::selfServiceTimeout(); - $this->assertCount(5, $results); - } + // The ListUnassigned class was deprecated in Release 3.6.0 } diff --git a/workflow/engine/classes/model/ListCanceled.php b/workflow/engine/classes/model/ListCanceled.php index 9773fd2f0..86765d977 100644 --- a/workflow/engine/classes/model/ListCanceled.php +++ b/workflow/engine/classes/model/ListCanceled.php @@ -2,6 +2,9 @@ require_once 'classes/model/om/BaseListCanceled.php'; +/** + * @deprecated Class deprecated in Release 3.6.0 + */ class ListCanceled extends BaseListCanceled implements ListInterface { use ListBaseTrait; diff --git a/workflow/engine/classes/model/ListCanceledPeer.php b/workflow/engine/classes/model/ListCanceledPeer.php index d0e5969a1..8a503eb1c 100644 --- a/workflow/engine/classes/model/ListCanceledPeer.php +++ b/workflow/engine/classes/model/ListCanceledPeer.php @@ -17,6 +17,7 @@ * long as it does not already exist in the output directory. * * @package classes.model + * @deprecated Class deprecated in Release 3.6.0 */ class ListCanceledPeer extends BaseListCanceledPeer { diff --git a/workflow/engine/classes/model/ListCompleted.php b/workflow/engine/classes/model/ListCompleted.php index c5808e2ea..52ff534de 100644 --- a/workflow/engine/classes/model/ListCompleted.php +++ b/workflow/engine/classes/model/ListCompleted.php @@ -13,7 +13,7 @@ require_once 'classes/model/om/BaseListCompleted.php'; * long as it does not already exist in the output directory. * * @package classes.model - * @deprecated Method deprecated in Release 3.3.9 + * @deprecated Class deprecated in Release 3.3.9 */ class ListCompleted extends BaseListCompleted implements ListInterface { diff --git a/workflow/engine/classes/model/ListCompletedPeer.php b/workflow/engine/classes/model/ListCompletedPeer.php index ffe50e45a..6eda2fa2f 100644 --- a/workflow/engine/classes/model/ListCompletedPeer.php +++ b/workflow/engine/classes/model/ListCompletedPeer.php @@ -17,7 +17,7 @@ * long as it does not already exist in the output directory. * * @package classes.model - * @deprecated Method deprecated in Release 3.6.0 + * @deprecated Class deprecated in Release 3.6.0 */ class ListCompletedPeer extends BaseListCompletedPeer { diff --git a/workflow/engine/classes/model/ListInbox.php b/workflow/engine/classes/model/ListInbox.php index c1d527de8..0c3a0aad3 100644 --- a/workflow/engine/classes/model/ListInbox.php +++ b/workflow/engine/classes/model/ListInbox.php @@ -14,6 +14,7 @@ use ProcessMaker\BusinessModel\User as BmUser; * long as it does not already exist in the output directory. * * @package classes.model + * @deprecated Class deprecated in Release 3.6.0 */ class ListInbox extends BaseListInbox implements ListInterface diff --git a/workflow/engine/classes/model/ListInboxPeer.php b/workflow/engine/classes/model/ListInboxPeer.php index 9722cce1b..334a7e130 100644 --- a/workflow/engine/classes/model/ListInboxPeer.php +++ b/workflow/engine/classes/model/ListInboxPeer.php @@ -17,6 +17,7 @@ * long as it does not already exist in the output directory. * * @package classes.model + * @deprecated Class deprecated in Release 3.6.0 */ class ListInboxPeer extends BaseListInboxPeer { diff --git a/workflow/engine/classes/model/ListMyInbox.php b/workflow/engine/classes/model/ListMyInbox.php index 4ca260aac..7fea0fd3c 100644 --- a/workflow/engine/classes/model/ListMyInbox.php +++ b/workflow/engine/classes/model/ListMyInbox.php @@ -13,7 +13,7 @@ require_once 'classes/model/om/BaseListMyInbox.php'; * long as it does not already exist in the output directory. * * @package classes.model - * @deprecated Method deprecated in Release 3.6.0 + * @deprecated Class deprecated in Release 3.6.0 */ // @codingStandardsIgnoreStart class ListMyInbox extends BaseListMyInbox implements ListInterface diff --git a/workflow/engine/classes/model/ListMyInboxPeer.php b/workflow/engine/classes/model/ListMyInboxPeer.php index 19876ff37..b656d50f3 100644 --- a/workflow/engine/classes/model/ListMyInboxPeer.php +++ b/workflow/engine/classes/model/ListMyInboxPeer.php @@ -17,7 +17,7 @@ * long as it does not already exist in the output directory. * * @package classes.model - * @deprecated Method deprecated in Release 3.6.0 + * @deprecated Class deprecated in Release 3.6.0 */ class ListMyInboxPeer extends BaseListMyInboxPeer { diff --git a/workflow/engine/classes/model/ListParticipatedHistory.php b/workflow/engine/classes/model/ListParticipatedHistory.php index 0cec52afe..194e20f74 100644 --- a/workflow/engine/classes/model/ListParticipatedHistory.php +++ b/workflow/engine/classes/model/ListParticipatedHistory.php @@ -13,7 +13,7 @@ require_once 'classes/model/om/BaseListParticipatedHistory.php'; * long as it does not already exist in the output directory. * * @package classes.model - * @deprecated Method deprecated in Release 3.6.0 + * @deprecated Class deprecated in Release 3.6.0 */ // @codingStandardsIgnoreStart class ListParticipatedHistory extends BaseListParticipatedHistory implements ListInterface diff --git a/workflow/engine/classes/model/ListParticipatedHistoryPeer.php b/workflow/engine/classes/model/ListParticipatedHistoryPeer.php index 20e309d53..20451e27e 100644 --- a/workflow/engine/classes/model/ListParticipatedHistoryPeer.php +++ b/workflow/engine/classes/model/ListParticipatedHistoryPeer.php @@ -17,7 +17,7 @@ * long as it does not already exist in the output directory. * * @package classes.model - * @deprecated Method deprecated in Release 3.6.0 + * @deprecated Class deprecated in Release 3.6.0 */ class ListParticipatedHistoryPeer extends BaseListParticipatedHistoryPeer { diff --git a/workflow/engine/classes/model/ListParticipatedLast.php b/workflow/engine/classes/model/ListParticipatedLast.php index 9467bac9a..5450bcf40 100644 --- a/workflow/engine/classes/model/ListParticipatedLast.php +++ b/workflow/engine/classes/model/ListParticipatedLast.php @@ -12,6 +12,8 @@ use ProcessMaker\BusinessModel\Cases as BmCases; * You should add additional methods to this class to meet the * application requirements. This class will only be generated as * long as it does not already exist in the output directory. + * + * @deprecated Class deprecated in Release 3.6.0 */ class ListParticipatedLast extends BaseListParticipatedLast implements ListInterface { diff --git a/workflow/engine/classes/model/ListParticipatedLastPeer.php b/workflow/engine/classes/model/ListParticipatedLastPeer.php index a6502cf33..9cce8460f 100644 --- a/workflow/engine/classes/model/ListParticipatedLastPeer.php +++ b/workflow/engine/classes/model/ListParticipatedLastPeer.php @@ -17,6 +17,7 @@ * long as it does not already exist in the output directory. * * @package classes.model + * @deprecated Class deprecated in Release 3.6.0 */ class ListParticipatedLastPeer extends BaseListParticipatedLastPeer { diff --git a/workflow/engine/classes/model/ListPaused.php b/workflow/engine/classes/model/ListPaused.php index 7886c94ac..00620cc81 100644 --- a/workflow/engine/classes/model/ListPaused.php +++ b/workflow/engine/classes/model/ListPaused.php @@ -13,6 +13,7 @@ use ProcessMaker\BusinessModel\Cases as BmCases; * long as it does not already exist in the output directory. * * @package classes.model + * @deprecated Class deprecated in Release 3.6.0 */ class ListPaused extends BaseListPaused implements ListInterface diff --git a/workflow/engine/classes/model/ListPausedPeer.php b/workflow/engine/classes/model/ListPausedPeer.php index 224744dd1..d3558723c 100644 --- a/workflow/engine/classes/model/ListPausedPeer.php +++ b/workflow/engine/classes/model/ListPausedPeer.php @@ -17,6 +17,7 @@ * long as it does not already exist in the output directory. * * @package classes.model + * @deprecated Class deprecated in Release 3.6.0 */ class ListPausedPeer extends BaseListPausedPeer { diff --git a/workflow/engine/classes/model/ListUnassigned.php b/workflow/engine/classes/model/ListUnassigned.php index 390ed0e5e..c2722d5fd 100644 --- a/workflow/engine/classes/model/ListUnassigned.php +++ b/workflow/engine/classes/model/ListUnassigned.php @@ -15,6 +15,7 @@ use ProcessMaker\Model\Delegation; * long as it does not already exist in the output directory. * * @package classes.model + * @deprecated Class deprecated in Release 3.6.0 */ // @codingStandardsIgnoreStart class ListUnassigned extends BaseListUnassigned implements ListInterface diff --git a/workflow/engine/classes/model/ListUnassignedGroup.php b/workflow/engine/classes/model/ListUnassignedGroup.php index ce045e0a7..c5f1cf88c 100644 --- a/workflow/engine/classes/model/ListUnassignedGroup.php +++ b/workflow/engine/classes/model/ListUnassignedGroup.php @@ -13,7 +13,7 @@ require_once 'classes/model/om/BaseListUnassignedGroup.php'; * long as it does not already exist in the output directory. * * @package classes.model - * @deprecated Method deprecated in Release 3.6.0 + * @deprecated Class deprecated in Release 3.6.0 */ // @codingStandardsIgnoreStart class ListUnassignedGroup extends BaseListUnassignedGroup diff --git a/workflow/engine/classes/model/ListUnassignedGroupPeer.php b/workflow/engine/classes/model/ListUnassignedGroupPeer.php index 0efaf7247..69763681d 100644 --- a/workflow/engine/classes/model/ListUnassignedGroupPeer.php +++ b/workflow/engine/classes/model/ListUnassignedGroupPeer.php @@ -17,7 +17,7 @@ * long as it does not already exist in the output directory. * * @package classes.model - * @deprecated Method deprecated in Release 3.6.0 + * @deprecated Class deprecated in Release 3.6.0 */ class ListUnassignedGroupPeer extends BaseListUnassignedGroupPeer { diff --git a/workflow/engine/classes/model/ListUnassignedPeer.php b/workflow/engine/classes/model/ListUnassignedPeer.php index 36f0f2cf4..470bff006 100644 --- a/workflow/engine/classes/model/ListUnassignedPeer.php +++ b/workflow/engine/classes/model/ListUnassignedPeer.php @@ -17,6 +17,7 @@ * long as it does not already exist in the output directory. * * @package classes.model + * @deprecated Class deprecated in Release 3.6.0 */ class ListUnassignedPeer extends BaseListUnassignedPeer {