From c638f07c07ce65809aea65ddaf591b8c5073d3ea Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Mon, 9 Oct 2023 22:06:39 +0000 Subject: [PATCH] update --- Admin/Installer.php | 8 +-- Controller/ApiAddressAttributeController.php | 3 +- Controller/ApiAttributeController.php | 3 +- tests/Controller/ApiControllerTest.php | 54 ++++++++++---------- 4 files changed, 35 insertions(+), 33 deletions(-) diff --git a/Admin/Installer.php b/Admin/Installer.php index 35bb98a..7425c77 100755 --- a/Admin/Installer.php +++ b/Admin/Installer.php @@ -114,7 +114,7 @@ final class Installer extends InstallerAbstract $module->apiUnitAttributeTypeCreate($request, $response); - $responseData = $response->get(''); + $responseData = $response->getData(''); if (!\is_array($responseData)) { continue; @@ -186,7 +186,7 @@ final class Installer extends InstallerAbstract $module->apiUnitAttributeValueCreate($request, $response); - $responseData = $response->get(''); + $responseData = $response->getData(''); if (!\is_array($responseData)) { continue; } @@ -254,7 +254,7 @@ final class Installer extends InstallerAbstract $module->apiAddressAttributeTypeCreate($request, $response); - $responseData = $response->get(''); + $responseData = $response->getData(''); if (!\is_array($responseData)) { continue; @@ -326,7 +326,7 @@ final class Installer extends InstallerAbstract $module->apiAddressAttributeValueCreate($request, $response); - $responseData = $response->get(''); + $responseData = $response->getData(''); if (!\is_array($responseData)) { continue; } diff --git a/Controller/ApiAddressAttributeController.php b/Controller/ApiAddressAttributeController.php index 2ed8ba9..4d747c6 100644 --- a/Controller/ApiAddressAttributeController.php +++ b/Controller/ApiAddressAttributeController.php @@ -61,7 +61,8 @@ final class ApiAddressAttributeController extends Controller return; } - $attribute = $this->createAttributeFromRequest($request); + $type = AddressAttributeTypeMapper::get()->where('id', (int) $request->getData('type'))->execute(); + $attribute = $this->createAttributeFromRequest($request, $type); $this->createModel($request->header->account, $attribute, AddressAttributeMapper::class, 'attribute', $request->getOrigin()); $this->createStandardCreateResponse($request, $response, $attribute); } diff --git a/Controller/ApiAttributeController.php b/Controller/ApiAttributeController.php index 8e5d485..de2009a 100644 --- a/Controller/ApiAttributeController.php +++ b/Controller/ApiAttributeController.php @@ -61,7 +61,8 @@ final class ApiAttributeController extends Controller return; } - $attribute = $this->createAttributeFromRequest($request); + $type = UnitAttributeTypeMapper::get()->where('id', (int) $request->getData('type'))->execute(); + $attribute = $this->createAttributeFromRequest($request, $type); $this->createModel($request->header->account, $attribute, UnitAttributeMapper::class, 'attribute', $request->getOrigin()); $this->createStandardCreateResponse($request, $response, $attribute); } diff --git a/tests/Controller/ApiControllerTest.php b/tests/Controller/ApiControllerTest.php index 3b921bc..c604ada 100755 --- a/tests/Controller/ApiControllerTest.php +++ b/tests/Controller/ApiControllerTest.php @@ -101,8 +101,8 @@ final class ApiControllerTest extends \PHPUnit\Framework\TestCase $this->module->apiUnitGet($request, $response); - self::assertEquals('Karaka', $response->get('')['response']->name); - self::assertGreaterThan(0, $response->get('')['response']->id); + self::assertEquals('Karaka', $response->getDataArray('')['response']->name); + self::assertGreaterThan(0, $response->getDataArray('')['response']->id); } /** @@ -121,7 +121,7 @@ final class ApiControllerTest extends \PHPUnit\Framework\TestCase $this->module->apiUnitSet($request, $response); $this->module->apiUnitGet($request, $response); - self::assertEquals('OMS', $response->get('')['response']->name); + self::assertEquals('OMS', $response->getDataArray('')['response']->name); } /** @@ -138,8 +138,8 @@ final class ApiControllerTest extends \PHPUnit\Framework\TestCase $this->module->apiUnitFind($request, $response); - self::assertEquals('OMS', $response->get('')[0]->name); - self::assertGreaterThan(0, $response->get('')[0]->id); + self::assertEquals('OMS', $response->getData('')[0]->name); + self::assertGreaterThan(0, $response->getData('')[0]->id); } /** @@ -158,16 +158,16 @@ final class ApiControllerTest extends \PHPUnit\Framework\TestCase $this->module->apiUnitCreate($request, $response); - self::assertEquals('test', $response->get('')['response']->name); - self::assertGreaterThan(0, $response->get('')['response']->id); + self::assertEquals('test', $response->getDataArray('')['response']->name); + self::assertGreaterThan(0, $response->getDataArray('')['response']->id); // test delete /* not possible due to foreign keys (default settings in this case) - $request->setData('id', $response->get('')['response']->id); + $request->setData('id', $response->getDataArray('')['response']->id); $this->module->apiUnitDelete($request, $response); - self::assertGreaterThan(0, $response->get('')['response']->id); + self::assertGreaterThan(0, $response->getDataArray('')['response']->id); */ } @@ -206,10 +206,10 @@ final class ApiControllerTest extends \PHPUnit\Framework\TestCase $this->module->apiDepartmentCreate($request, $response); - self::assertEquals('test', $response->get('')['response']->name); - self::assertGreaterThan(0, $response->get('')['response']->id); + self::assertEquals('test', $response->getDataArray('')['response']->name); + self::assertGreaterThan(0, $response->getDataArray('')['response']->id); - self::$departmentId = $response->get('')['response']->id; + self::$departmentId = $response->getDataArray('')['response']->id; } /** @@ -226,8 +226,8 @@ final class ApiControllerTest extends \PHPUnit\Framework\TestCase $this->module->apiDepartmentFind($request, $response); - self::assertTrue(\stripos(\strtolower($response->get('')[0]->name), 'test') !== false); - self::assertGreaterThan(0, $response->get('')[0]->id); + self::assertTrue(\stripos(\strtolower($response->getData('')[0]->name), 'test') !== false); + self::assertGreaterThan(0, $response->getData('')[0]->id); } /** @@ -260,8 +260,8 @@ final class ApiControllerTest extends \PHPUnit\Framework\TestCase $this->module->apiDepartmentGet($request, $response); - self::assertEquals('test', $response->get('')['response']->name); - self::assertGreaterThan(0, $response->get('')['response']->id); + self::assertEquals('test', $response->getDataArray('')['response']->name); + self::assertGreaterThan(0, $response->getDataArray('')['response']->id); } /** @@ -280,7 +280,7 @@ final class ApiControllerTest extends \PHPUnit\Framework\TestCase $this->module->apiDepartmentSet($request, $response); $this->module->apiDepartmentGet($request, $response); - self::assertEquals('Production', $response->get('')['response']->name); + self::assertEquals('Production', $response->getDataArray('')['response']->name); } /** @@ -296,7 +296,7 @@ final class ApiControllerTest extends \PHPUnit\Framework\TestCase $request->setData('id', self::$departmentId); $this->module->apiDepartmentDelete($request, $response); - self::assertGreaterThan(0, $response->get('')['response']->id); + self::assertGreaterThan(0, $response->getDataArray('')['response']->id); } protected static $positionId = 0; @@ -317,9 +317,9 @@ final class ApiControllerTest extends \PHPUnit\Framework\TestCase $this->module->apiPositionCreate($request, $response); - self::assertEquals('test', $response->get('')['response']->name); - self::assertGreaterThan(0, $response->get('')['response']->id); - self::$positionId = $response->get('')['response']->id; + self::assertEquals('test', $response->getDataArray('')['response']->name); + self::assertGreaterThan(0, $response->getDataArray('')['response']->id); + self::$positionId = $response->getDataArray('')['response']->id; } /** @@ -336,8 +336,8 @@ final class ApiControllerTest extends \PHPUnit\Framework\TestCase $this->module->apiPositionFind($request, $response); - self::assertTrue(\stripos(\strtolower($response->get('')[0]->name), 'test') !== false); - self::assertGreaterThan(0, $response->get('')[0]->id); + self::assertTrue(\stripos(\strtolower($response->getData('')[0]->name), 'test') !== false); + self::assertGreaterThan(0, $response->getData('')[0]->id); } /** @@ -370,8 +370,8 @@ final class ApiControllerTest extends \PHPUnit\Framework\TestCase $this->module->apiPositionGet($request, $response); - self::assertEquals('test', $response->get('')['response']->name); - self::assertGreaterThan(0, $response->get('')['response']->id); + self::assertEquals('test', $response->getDataArray('')['response']->name); + self::assertGreaterThan(0, $response->getDataArray('')['response']->id); } /** @@ -390,7 +390,7 @@ final class ApiControllerTest extends \PHPUnit\Framework\TestCase $this->module->apiPositionSet($request, $response); $this->module->apiPositionGet($request, $response); - self::assertEquals('Test', $response->get('')['response']->name); + self::assertEquals('Test', $response->getDataArray('')['response']->name); } /** @@ -406,7 +406,7 @@ final class ApiControllerTest extends \PHPUnit\Framework\TestCase $request->setData('id', self::$positionId); $this->module->apiPositionDelete($request, $response); - self::assertGreaterThan(0, $response->get('')['response']->id); + self::assertGreaterThan(0, $response->getDataArray('')['response']->id); } /**