diff --git a/Controller/BackendController.php b/Controller/BackendController.php index f727256..83985ce 100755 --- a/Controller/BackendController.php +++ b/Controller/BackendController.php @@ -101,6 +101,8 @@ final class BackendController extends Controller $statsDepartments = []; $statsCategories = []; + + /** @var \Modules\RiskManagement\Models\Risk $risk */ foreach ($view->data['risks'] as $risk) { if ($risk->department->id !== 0) { if (!isset($statsDepartments[$risk->department->name])) { diff --git a/tests/Models/CauseMapperTest.php b/tests/Models/CauseMapperTest.php index 48b6ea7..d3cb5c4 100755 --- a/tests/Models/CauseMapperTest.php +++ b/tests/Models/CauseMapperTest.php @@ -19,7 +19,6 @@ use Modules\Organization\Models\NullUnit; use Modules\RiskManagement\Models\Category; use Modules\RiskManagement\Models\Cause; use Modules\RiskManagement\Models\CauseMapper; -use Modules\RiskManagement\Models\Department; use Modules\RiskManagement\Models\Risk; /** @@ -35,10 +34,7 @@ final class CauseMapperTest extends \PHPUnit\Framework\TestCase $obj->title = 'Cause Test'; $obj->descriptionRaw = 'Description'; $obj->probability = 1; - - $department = new Department(); - $department->department = new NullOrgDepartment(1); - $obj->department = $department; + $obj->department = new NullOrgDepartment(1); $category = new Category(); $category->title = 'Test Cat'; diff --git a/tests/Models/NullDepartmentTest.php b/tests/Models/NullDepartmentTest.php deleted file mode 100755 index 49d0587..0000000 --- a/tests/Models/NullDepartmentTest.php +++ /dev/null @@ -1,44 +0,0 @@ -id); - } - - #[\PHPUnit\Framework\Attributes\Group('module')] - public function testJsonSerialize() : void - { - $null = new NullDepartment(2); - self::assertEquals(['id' => 2], $null->jsonSerialize()); - } -} diff --git a/tests/Models/ProcessMapperTest.php b/tests/Models/ProcessMapperTest.php index cb1944c..11468d9 100755 --- a/tests/Models/ProcessMapperTest.php +++ b/tests/Models/ProcessMapperTest.php @@ -14,8 +14,8 @@ declare(strict_types=1); namespace Modules\RiskManagement\tests\Models; +use Modules\Organization\Models\NullDepartment; use Modules\Organization\Models\NullUnit; -use Modules\RiskManagement\Models\NullDepartment; use Modules\RiskManagement\Models\Process; use Modules\RiskManagement\Models\ProcessMapper; @@ -30,11 +30,10 @@ final class ProcessMapperTest extends \PHPUnit\Framework\TestCase { $obj = new Process(); $obj->title = 'Name'; - $obj->descriptionRaw = 'Description'; $obj->department = new NullDepartment(1); $obj->responsible = 1; $obj->deputy = 1; - $obj->unit = new NullUnit(1); + $obj->unit = 1; ProcessMapper::create()->execute($obj); @@ -44,6 +43,6 @@ final class ProcessMapperTest extends \PHPUnit\Framework\TestCase self::assertEquals($obj->responsible, $objR->responsible); self::assertEquals($obj->deputy, $objR->deputy); self::assertEquals($obj->department->id, $objR->department->id); - self::assertEquals($obj->unit->id, $objR->unit->id); + self::assertEquals($obj->unit, $objR->unit); } } diff --git a/tests/Models/ProjectTest.php b/tests/Models/ProjectTest.php deleted file mode 100755 index 55cb379..0000000 --- a/tests/Models/ProjectTest.php +++ /dev/null @@ -1,35 +0,0 @@ -id); - self::assertNull($obj->project); - self::assertNull($obj->responsible); - self::assertNull($obj->deputy); - } -} diff --git a/tests/Models/RiskMapperTest.php b/tests/Models/RiskMapperTest.php index eedd718..5599563 100755 --- a/tests/Models/RiskMapperTest.php +++ b/tests/Models/RiskMapperTest.php @@ -17,12 +17,10 @@ namespace Modules\RiskManagement\tests\Models; use Modules\Admin\Models\NullAccount; use Modules\Media\Models\Media; use Modules\Organization\Models\NullDepartment; -use Modules\Organization\Models\NullUnit; use Modules\ProjectManagement\Models\NullProject; use Modules\RiskManagement\Models\Category; use Modules\RiskManagement\Models\Cause; use Modules\RiskManagement\Models\Process; -use Modules\RiskManagement\Models\Project; use Modules\RiskManagement\Models\Risk; use Modules\RiskManagement\Models\RiskMapper; use Modules\RiskManagement\Models\RiskObject; @@ -41,7 +39,7 @@ final class RiskMapperTest extends \PHPUnit\Framework\TestCase $obj->name = 'Risk Test'; $obj->descriptionRaw = 'Description'; - $obj->unit = new NullUnit(1); + $obj->unit = 1; $obj->department = new NullDepartment(1); $categoryObj = new Category(); @@ -50,26 +48,24 @@ final class RiskMapperTest extends \PHPUnit\Framework\TestCase $processObj = new Process(); $obj->process = $processObj; - $projectObj = new Project(); - $projectObj->project = new NullProject(1); - $obj->project = $projectObj; + $obj->project = new NullProject(1); $obj->responsible = 1; $obj->deputy = 1; $causeObj = new Cause(); $causeObj->title = 'Risk Test Cause'; - $obj->addCause($causeObj); + $obj->causes[] = $causeObj; $solutionObj = new Solution(); $solutionObj->title = 'Risk Test Solution'; - $obj->addSolution($solutionObj); + $obj->solutions[] = $solutionObj; $riskObj = new RiskObject(); $riskObj->title = 'Risk Test Object'; - $obj->addRiskObject($riskObj); + $obj->riskObjects[] = $riskObj; - $obj->addHistory(2); + $obj->histScore[] = 2; $media = new Media(); $media->createdBy = new NullAccount(1); @@ -85,22 +81,22 @@ final class RiskMapperTest extends \PHPUnit\Framework\TestCase $objR = RiskMapper::get()->with('project')->with('project/project')->with('causes')->with('solutions')->with('riskObjects')->with('files')->where('id', $obj->id)->execute(); self::assertEquals($obj->name, $objR->name); self::assertEquals($obj->descriptionRaw, $objR->descriptionRaw); - self::assertEquals($obj->unit->id, $objR->unit->id); + self::assertEquals($obj->unit, $objR->unit); self::assertEquals($obj->department->id, $objR->department->id); self::assertEquals($obj->category->id, $objR->category->id); self::assertEquals($obj->process->id, $objR->process->id); self::assertEquals($obj->responsible, $objR->responsible); self::assertEquals($obj->deputy, $objR->deputy); - self::assertEquals($obj->project->project->id, $objR->project->project->id); + self::assertEquals($obj->project->id, $objR->project->id); - $causes = $objR->getCauses(); - self::assertEquals($obj->getCauses()[0]->title, \end($causes)->title); + $causes = $objR->causes; + self::assertEquals($obj->causes[0]->title, \end($causes)->title); - $solutions = $objR->getSolutions(); - self::assertEquals($obj->getSolutions()[0]->title, \end($solutions)->title); + $solutions = $objR->solutions; + self::assertEquals($obj->solutions[0]->title, \end($solutions)->title); - $riskObjects = $objR->getRiskObjects(); - self::assertEquals($obj->getRiskObjects()[0]->title, \end($riskObjects)->title); + $riskObjects = $objR->riskObjects; + self::assertEquals($obj->riskObjects[0]->title, \end($riskObjects)->title); //self::assertEquals($obj->getHistory()[0], $objR->getHistory()[0]); $media = $objR->files; diff --git a/tests/Models/RiskTest.php b/tests/Models/RiskTest.php index 29289cd..f5d2a40 100755 --- a/tests/Models/RiskTest.php +++ b/tests/Models/RiskTest.php @@ -48,40 +48,10 @@ final class RiskTest extends \PHPUnit\Framework\TestCase self::assertNull($this->risk->project); self::assertNull($this->risk->responsible); self::assertNull($this->risk->deputy); - self::assertEquals([], $this->risk->getHistory()); - self::assertEquals([], $this->risk->getCauses()); - self::assertEquals([], $this->risk->getSolutions()); - self::assertEquals([], $this->risk->getRiskObjects()); + self::assertEquals([], $this->risk->histScore); + self::assertEquals([], $this->risk->causes); + self::assertEquals([], $this->risk->solutions); + self::assertEquals([], $this->risk->riskObjects); self::assertEquals([], $this->risk->files); } - - #[\PHPUnit\Framework\Attributes\Group('module')] - public function testCauseInputOutput() : void - { - $this->risk->addCause(new Cause()); - self::assertCount(1, $this->risk->getCauses()); - self::assertInstanceOf('\Modules\RiskManagement\Models\Cause', $this->risk->getCauses()[0]); - } - - #[\PHPUnit\Framework\Attributes\Group('module')] - public function testSolutionInputOutput() : void - { - $this->risk->addSolution(new Solution()); - self::assertCount(1, $this->risk->getSolutions()); - self::assertInstanceOf('\Modules\RiskManagement\Models\Solution', $this->risk->getSolutions()[0]); - } - - #[\PHPUnit\Framework\Attributes\Group('module')] - public function testRiskObjectInputOutput() : void - { - $this->risk->addRiskObject(2); - self::assertCount(1, $this->risk->getRiskObjects()); - } - - #[\PHPUnit\Framework\Attributes\Group('module')] - public function testHistoryInputOutput() : void - { - $this->risk->addHistory(2); - self::assertCount(1, $this->risk->getHistory()); - } }