COnflicts

2021-11-11 16:33:48 -04:00
parent ce9e93a41f
commit b330c3c0b9
13 changed files with 257 additions and 10 deletions
--- a/tests/unit/workflow/engine/src/ProcessMaker/BusinessModel/Cases/AbstractCasesTest.php
+++ b/tests/unit/workflow/engine/src/ProcessMaker/BusinessModel/Cases/AbstractCasesTest.php
@@ -6,6 +6,9 @@ use Exception;
 use G;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
 use ProcessMaker\BusinessModel\Cases\AbstractCases;
+use ProcessMaker\BusinessModel\Cases\Draft;
+use ProcessMaker\BusinessModel\Cases\Paused;
+use ProcessMaker\BusinessModel\Cases\Unassigned;
 use ProcessMaker\Model\Application;
 use ProcessMaker\Model\Delegation;
 use ProcessMaker\Model\Process;
@@ -738,6 +741,8 @@ class AbstractCasesTest extends TestCase
        $absCases = new AbstractCases();
        $properties = [];
        $absCases->setProperties($properties);
+        $actual = $absCases->getCategoryId();
+        $this->assertEquals(0, $actual);
        $actual = $absCases->getProcessId();
        $this->assertEquals(0, $actual);
        $actual = $absCases->getTaskId();
@@ -784,6 +789,7 @@ class AbstractCasesTest extends TestCase
     * This check the setter related all the properties
     *
     * @covers \ProcessMaker\BusinessModel\Cases\AbstractCases::setProperties()
+     * @covers \ProcessMaker\BusinessModel\Cases\AbstractCases::setCategoryId()
     * @covers \ProcessMaker\BusinessModel\Cases\AbstractCases::setProcessId()
     * @covers \ProcessMaker\BusinessModel\Cases\AbstractCases::setTaskId()
     * @covers \ProcessMaker\BusinessModel\Cases\AbstractCases::setUserId()
@@ -799,6 +805,7 @@ class AbstractCasesTest extends TestCase
     * @covers \ProcessMaker\BusinessModel\Cases\AbstractCases::setOffset()
     * @covers \ProcessMaker\BusinessModel\Cases\AbstractCases::setLimit()
     *
+     * @covers \ProcessMaker\BusinessModel\Cases\AbstractCases::getCategoryId()
     * @covers \ProcessMaker\BusinessModel\Cases\AbstractCases::getProcessId()
     * @covers \ProcessMaker\BusinessModel\Cases\AbstractCases::getTaskId()
     * @covers \ProcessMaker\BusinessModel\Cases\AbstractCases::getUserId()
@@ -820,6 +827,7 @@ class AbstractCasesTest extends TestCase
        $absCases = new AbstractCases();
        $properties = [
            // Filters that works for all list
+            'category' => rand(),
            'process' => rand(),
            'task' => rand(),
            'user' => rand(),
@@ -836,6 +844,8 @@ class AbstractCasesTest extends TestCase
        ];
        $absCases->setProperties($properties);
        // Tasks - Cases
+        $actual = $absCases->getCategoryId();
+        $this->assertEquals($properties['category'], $actual);
        $actual = $absCases->getProcessId();
        $this->assertEquals($properties['process'], $actual);
        $actual = $absCases->getTaskId();
@@ -887,6 +897,33 @@ class AbstractCasesTest extends TestCase
        $this->assertNotEmpty($result);
    }

+    /**
+     * This check the get task color
+     *
+     * @covers \ProcessMaker\BusinessModel\Cases\AbstractCases::getTaskColor()
+     * @test
+     */
+    public function it_return_task_color_class()
+    {
+        $absCases = new Draft();
+        $dueDate = date('Y-m-d');
+        // Review on-time
+        $result = $absCases->getTaskColor($dueDate,'DRAFT' ,'2000-01-01');
+        $this->assertNotEmpty($result);
+
+        $absCases = new Paused();
+        $dueDate = date('Y-m-d');
+        // Review on-time
+        $result = $absCases->getTaskColor($dueDate,'PAUSED' ,'2000-01-01');
+        $this->assertNotEmpty($result);
+
+        $absCases = new Unassigned();
+        $dueDate = date('Y-m-d');
+        // Review on-time
+        $result = $absCases->getTaskColor($dueDate,'UNASSIGNED' ,'2000-01-01');
+        $this->assertNotEmpty($result);
+    }
+
    /**
     * This check task color according the due date
     *
@@ -925,5 +962,31 @@ class AbstractCasesTest extends TestCase
            $result = $absCases->threadInformation($thread, true, true);
            $this->assertNotEmpty($result);
        }
+        // APP_STATUS = DRAFT
+        foreach ($taskPending as $thread) {
+            $thread['APP_STATUS'] = 'DRAFT';
+            $result = $absCases->threadInformation($thread, true, true);
+            $this->assertNotEmpty($result);
+        }
+        // APP_STATUS = COMPLETED
+        foreach ($taskPending as $thread) {
+            $thread['APP_STATUS'] = 'COMPLETED';
+            $result = $absCases->threadInformation($thread, true, true);
+            $this->assertNotEmpty($result);
+        }
+        // DEL_THREAD_STATUS = PAUSED
+        foreach ($taskPending as $thread) {
+            $thread['APP_STATUS'] = 'TO_DO';
+            $thread['DEL_THREAD_STATUS'] = 'PAUSED';
+            $result = $absCases->threadInformation($thread, true, true);
+            $this->assertNotEmpty($result);
+        }
+        // TAS_ASSIGN_TYPE = SELF_SERVICE
+        foreach ($taskPending as $thread) {
+            $thread['APP_STATUS'] = 'TO_DO';
+            $thread['TAS_ASSIGN_TYPE'] = 'SELF_SERVICE';
+            $result = $absCases->threadInformation($thread, true, true);
+            $this->assertNotEmpty($result);
+        }
    }
 }
--- a/tests/unit/workflow/engine/src/ProcessMaker/BusinessModel/Cases/DraftTest.php
+++ b/tests/unit/workflow/engine/src/ProcessMaker/BusinessModel/Cases/DraftTest.php
@@ -788,7 +788,7 @@ class DraftTest extends TestCase
            'APP_INIT_USER' => $user->USR_UID,
            'APP_CUR_USER' => $user->USR_UID,
        ]);
-        factory(Delegation::class)->states('foreign_keys')->create([
+        $del = factory(Delegation::class)->states('foreign_keys')->create([
            'DEL_THREAD_STATUS' => 'OPEN',
            'DEL_INDEX' => 1,
            'USR_UID' => $application[0]->APP_INIT_USER,
@@ -804,7 +804,7 @@ class DraftTest extends TestCase
        $draft = new Draft();
        $draft->setUserId($user->USR_ID);
        $draft->setUserUid($user->USR_ID);
-        $res = $draft->getCasesRisk($process->PRO_ID);
+        $res = $draft->getCasesRisk($process->PRO_ID, $currentDate, $currentDate, 'ON_TIME', 10);
        $this->assertCount(1, $res);
    }

--- a/tests/unit/workflow/engine/src/ProcessMaker/BusinessModel/Cases/HomeTest.php
+++ b/tests/unit/workflow/engine/src/ProcessMaker/BusinessModel/Cases/HomeTest.php
@@ -291,7 +291,7 @@ class HomeTest extends TestCase
            'CAL_COLUMNS' => '[{"field":"case_number","enableFilter":false,"set":true},{"field":"case_title","enableFilter":false,"set":true},{"field":"process_name","enableFilter":false,"set":true},{"field":"task","enableFilter":false,"set":true},{"field":"send_by","enableFilter":false,"set":true},{"field":"due_date","enableFilter":false,"set":true},{"field":"delegation_date","enableFilter":false,"set":true},{"field":"priority","enableFilter":false,"set":true},{"field":"VAR1","enableFilter":false,"set":true},{"field":"VAR2","enableFilter":false,"set":true},{"field":"VAR3","enableFilter":false,"set":false}]',
            'ADD_TAB_UID' => $additionalTables->ADD_TAB_UID
        ]);
-        $arguments = [$caseList->CAL_ID, 0, 0, 0, 15, 0, '', '', 'APP_NUMBER,DESC'];
+        $arguments = [$caseList->CAL_ID, 0, 0, 0, 0, 15, 0, '', '', 'APP_NUMBER,DESC'];

        $home = new Home($application->APP_INIT_USER);
        $result = $home->getCustomDraft(...$arguments);
@@ -344,7 +344,7 @@ class HomeTest extends TestCase
            'CAL_COLUMNS' => '[{"field":"case_number","enableFilter":false,"set":true},{"field":"case_title","enableFilter":false,"set":true},{"field":"process_name","enableFilter":false,"set":true},{"field":"task","enableFilter":false,"set":true},{"field":"send_by","enableFilter":false,"set":true},{"field":"due_date","enableFilter":false,"set":true},{"field":"delegation_date","enableFilter":false,"set":true},{"field":"priority","enableFilter":false,"set":true},{"field":"VAR1","enableFilter":false,"set":true},{"field":"VAR2","enableFilter":false,"set":true},{"field":"VAR3","enableFilter":false,"set":false}]',
            'ADD_TAB_UID' => $additionalTables->ADD_TAB_UID
        ]);
-        $arguments = [$caseList->CAL_ID, 0, 0, 0, 15, 0, '', '', 'APP_NUMBER,DESC'];
+        $arguments = [$caseList->CAL_ID, 0, 0, 0, 0, 15, 0, '', '', 'APP_NUMBER,DESC'];

        $home = new Home($application->APP_INIT_USER);
        $result = $home->getCustomDraft(...$arguments);
@@ -423,7 +423,7 @@ class HomeTest extends TestCase
            'CAL_COLUMNS' => '[{"field":"case_number","enableFilter":false,"set":true},{"field":"case_title","enableFilter":false,"set":true},{"field":"process_name","enableFilter":false,"set":true},{"field":"task","enableFilter":false,"set":true},{"field":"send_by","enableFilter":false,"set":true},{"field":"due_date","enableFilter":false,"set":true},{"field":"delegation_date","enableFilter":false,"set":true},{"field":"priority","enableFilter":false,"set":true},{"field":"VAR1","enableFilter":false,"set":true},{"field":"VAR2","enableFilter":false,"set":true},{"field":"VAR3","enableFilter":false,"set":false}]',
            'ADD_TAB_UID' => $additionalTables->ADD_TAB_UID
        ]);
-        $arguments = [$caseList->CAL_ID, 0, 0, 0, 15, 0, '', '', 'APP_NUMBER,DESC'];
+        $arguments = [$caseList->CAL_ID, 0, 0, 0, 0, 15, 0, '', '', 'APP_NUMBER,DESC'];

        $home = new Home($application->APP_INIT_USER);
        $result = $home->getCustomDraft(...$arguments);
@@ -522,7 +522,7 @@ class HomeTest extends TestCase
            'CAL_COLUMNS' => '[{"field":"case_number","enableFilter":false,"set":true},{"field":"case_title","enableFilter":false,"set":true},{"field":"process_name","enableFilter":false,"set":true},{"field":"task","enableFilter":false,"set":true},{"field":"send_by","enableFilter":false,"set":true},{"field":"due_date","enableFilter":false,"set":true},{"field":"delegation_date","enableFilter":false,"set":true},{"field":"priority","enableFilter":false,"set":true},{"field":"VAR1","enableFilter":false,"set":true},{"field":"VAR2","enableFilter":false,"set":true},{"field":"VAR3","enableFilter":false,"set":false}]',
            'ADD_TAB_UID' => $additionalTables->ADD_TAB_UID
        ]);
-        $arguments = [$caseList->CAL_ID, 0, 0, 0, 15, 0, '', '', 'APP_NUMBER,DESC'];
+        $arguments = [$caseList->CAL_ID, 0, 0, 0, 0, 15, 0, '', '', 'APP_NUMBER,DESC'];

        $home = new Home($application1->APP_INIT_USER);
        $result = $home->getCustomDraft(...$arguments);