Jingga/oms-ItemManagement
1
0
Fork 0
mirror of https://github.com/Karaka-Management/oms-ItemManagement.git synced 2026-02-14 11:18:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

cs fixes, bug fixes, code coverage

Browse Source
This commit is contained in:
Dennis Eichhorn 2021-11-16 00:05:43 +01:00
parent 00866ece42
commit 478cdffe28
13 changed files with 37 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Controller/ApiController.php
View File

@ -33,13 +33,13 @@ use Modules\ItemManagement\Models\NullItemAttributeType;
use Modules\ItemManagement\Models\NullItemAttributeValue; use Modules\ItemManagement\Models\NullItemAttributeValue;
use Modules\ItemManagement\Models\NullItemL11nType; use Modules\ItemManagement\Models\NullItemL11nType;
use Modules\Media\Models\PathSettings; use Modules\Media\Models\PathSettings;
use phpOMS\Localization\ISO639x1Enum;
use phpOMS\Localization\Money; use phpOMS\Localization\Money;
use phpOMS\Message\Http\RequestStatusCode; use phpOMS\Message\Http\RequestStatusCode;
use phpOMS\Message\NotificationLevel; use phpOMS\Message\NotificationLevel;
use phpOMS\Message\RequestAbstract; use phpOMS\Message\RequestAbstract;
use phpOMS\Message\ResponseAbstract; use phpOMS\Message\ResponseAbstract;
use phpOMS\Model\Message\FormValidation; use phpOMS\Model\Message\FormValidation;
use phpOMS\Localization\ISO639x1Enum;
/** /**
* ItemManagement class. * ItemManagement class.
@ -223,7 +223,7 @@ final class ApiController extends Controller
*/ */
private function createItemAttributeTypeL11nFromRequest(RequestAbstract $request) : ItemAttributeTypeL11n private function createItemAttributeTypeL11nFromRequest(RequestAbstract $request) : ItemAttributeTypeL11n
{ {
$attrL11n = new ItemAttributeTypeL11n(); $attrL11n = new ItemAttributeTypeL11n();
$attrL11n->type = (int) ($request->getData('type') ?? 0); $attrL11n->type = (int) ($request->getData('type') ?? 0);
$attrL11n->setLanguage((string) ( $attrL11n->setLanguage((string) (
$request->getData('language') ?? $request->getLanguage() $request->getData('language') ?? $request->getLanguage()

8
Models/Item.php
View File

@ -310,10 +310,10 @@ class Item
public function toArray() : array public function toArray() : array
{ {
return [ return [
'id' => $this->id, 'id' => $this->id,
'number' => $this->number, 'number' => $this->number,
'status' => $this->status, 'status' => $this->status,
'info' => $this->info, 'info' => $this->info,
]; ];
} }

7
Models/ItemAttribute.php
View File

@ -65,7 +65,7 @@ class ItemAttribute implements \JsonSerializable, ArrayableInterface
*/ */
public function __construct() public function __construct()
{ {
$this->type = new NullItemAttributeType(); $this->type = new NullItemAttributeType();
$this->value = new NullItemAttributeValue(); $this->value = new NullItemAttributeValue();
} }
@ -87,8 +87,9 @@ class ItemAttribute implements \JsonSerializable, ArrayableInterface
public function toArray() : array public function toArray() : array
{ {
return [ return [
'id' => $this->id, 'id' => $this->id,
'type' => $this->type, 'item' => $this->item,
'type' => $this->type,
'value' => $this->value, 'value' => $this->value,
]; ];
} }

8
Models/ItemAttributeType.php
View File

@ -154,11 +154,11 @@ class ItemAttributeType implements \JsonSerializable, ArrayableInterface
public function toArray() : array public function toArray() : array
{ {
return [ return [
'id' => $this->id, 'id' => $this->id,
'name' => $this->name, 'name' => $this->name,
'validationPattern' => $this->validationPattern, 'validationPattern' => $this->validationPattern,
'custom' => $this->custom, 'custom' => $this->custom,
'isRequired' => $this->isRequired, 'isRequired' => $this->isRequired,
]; ];
} }

2
Models/ItemL11nType.php
View File

@ -72,7 +72,7 @@ class ItemL11nType implements \JsonSerializable, ArrayableInterface
public function toArray() : array public function toArray() : array
{ {
return [ return [
'id' => $this->id, 'id' => $this->id,
'title' => $this->title, 'title' => $this->title,
]; ];
} }

10
Models/ItemMapper.php
View File

@ -35,12 +35,12 @@ final class ItemMapper extends DataMapperAbstract
* @since 1.0.0 * @since 1.0.0
*/ */
protected static array $columns = [ protected static array $columns = [
'itemmgmt_item_id' => ['name' => 'itemmgmt_item_id', 'type' => 'int', 'internal' => 'id'], 'itemmgmt_item_id' => ['name' => 'itemmgmt_item_id', 'type' => 'int', 'internal' => 'id'],
'itemmgmt_item_no' => ['name' => 'itemmgmt_item_no', 'type' => 'string', 'internal' => 'number', 'autocomplete' => true], 'itemmgmt_item_no' => ['name' => 'itemmgmt_item_no', 'type' => 'string', 'internal' => 'number', 'autocomplete' => true],
'itemmgmt_item_status' => ['name' => 'itemmgmt_item_status', 'type' => 'int', 'internal' => 'status'], 'itemmgmt_item_status' => ['name' => 'itemmgmt_item_status', 'type' => 'int', 'internal' => 'status'],
'itemmgmt_item_info' => ['name' => 'itemmgmt_item_info', 'type' => 'string', 'internal' => 'info'], 'itemmgmt_item_info' => ['name' => 'itemmgmt_item_info', 'type' => 'string', 'internal' => 'info'],
'itemmgmt_item_salesprice' => ['name' => 'itemmgmt_item_salesprice', 'type' => 'Serializable', 'internal' => 'salesPrice'], 'itemmgmt_item_salesprice' => ['name' => 'itemmgmt_item_salesprice', 'type' => 'Serializable', 'internal' => 'salesPrice'],
'itemmgmt_item_purchaseprice' => ['name' => 'itemmgmt_item_purchaseprice', 'type' => 'Serializable', 'internal' => 'purchasePrice'], 'itemmgmt_item_purchaseprice' => ['name' => 'itemmgmt_item_purchaseprice', 'type' => 'Serializable', 'internal' => 'purchasePrice'],
]; ];
protected static array $conditionals = [ protected static array $conditionals = [

1
tests/Controller/Api/ApiControllerItemTrait.php
View File

@ -14,7 +14,6 @@ declare(strict_types=1);
namespace Modules\ItemManagement\tests\Controller\Api; namespace Modules\ItemManagement\tests\Controller\Api;
use phpOMS\Localization\ISO3166TwoEnum;
use phpOMS\Message\Http\HttpRequest; use phpOMS\Message\Http\HttpRequest;
use phpOMS\Message\Http\HttpResponse; use phpOMS\Message\Http\HttpResponse;
use phpOMS\Message\Http\RequestStatusCode; use phpOMS\Message\Http\RequestStatusCode;

5
tests/Controller/ApiControllerTest.php
View File

@ -25,14 +25,9 @@ use phpOMS\Application\ApplicationAbstract;
use phpOMS\DataStorage\Session\HttpSession; use phpOMS\DataStorage\Session\HttpSession;
use phpOMS\Dispatcher\Dispatcher; use phpOMS\Dispatcher\Dispatcher;
use phpOMS\Event\EventManager; use phpOMS\Event\EventManager;
use phpOMS\Message\Http\HttpRequest;
use phpOMS\Message\Http\HttpResponse;
use phpOMS\Message\Http\RequestStatusCode;
use phpOMS\Module\ModuleAbstract; use phpOMS\Module\ModuleAbstract;
use phpOMS\Module\ModuleManager; use phpOMS\Module\ModuleManager;
use phpOMS\Router\WebRouter; use phpOMS\Router\WebRouter;
use phpOMS\System\MimeType;
use phpOMS\Uri\HttpUri;
use phpOMS\Utils\TestUtils; use phpOMS\Utils\TestUtils;
/** /**

1
tests/Models/ItemAttributeTest.php
View File

@ -51,6 +51,7 @@ final class ItemAttributeTest extends \PHPUnit\Framework\TestCase
self::assertEquals( self::assertEquals(
[ [
'id', 'id',
'item',
'type', 'type',
'value', 'value',
], ],

14
tests/Models/ItemAttributeTypeTest.php
View File

@ -65,18 +65,18 @@ final class ItemAttributeTypeTest extends \PHPUnit\Framework\TestCase
*/ */
public function testSerialize() : void public function testSerialize() : void
{ {
$this->attr->name = 'Test'; $this->attr->name = 'Test';
$this->attr->validationPattern = 'Pattern'; $this->attr->validationPattern = 'Pattern';
$this->attr->custom = true; $this->attr->custom = true;
$this->attr->isRequired = true; $this->attr->isRequired = true;
self::assertEquals( self::assertEquals(
[ [
'id' => 0, 'id' => 0,
'name' => 'Test', 'name' => 'Test',
'validationPattern' => 'Pattern', 'validationPattern' => 'Pattern',
'custom' => true, 'custom' => true,
'isRequired' => true, 'isRequired' => true,
], ],
$this->attr->jsonSerialize() $this->attr->jsonSerialize()
); );

4
tests/Models/ItemAttributeValueTest.php
View File

@ -15,8 +15,8 @@ declare(strict_types=1);
namespace Modules\ItemManagement\tests\Models; namespace Modules\ItemManagement\tests\Models;
use Modules\ItemManagement\Models\ItemAttributeValue; use Modules\ItemManagement\Models\ItemAttributeValue;
use phpOMS\Localization\ISO639x1Enum;
use phpOMS\Localization\ISO3166TwoEnum; use phpOMS\Localization\ISO3166TwoEnum;
use phpOMS\Localization\ISO639x1Enum;
/** /**
* @internal * @internal
@ -41,7 +41,7 @@ final class ItemAttributeValueTest extends \PHPUnit\Framework\TestCase
{ {
self::assertEquals(0, $this->attr->getId()); self::assertEquals(0, $this->attr->getId());
self::assertEquals(0, $this->attr->type); self::assertEquals(0, $this->attr->type);
self::assertEquals(null, $this->attr->getValue()); self::assertNull($this->attr->getValue());
self::assertFalse($this->attr->isDefault); self::assertFalse($this->attr->isDefault);
} }

8
tests/Models/ItemL11nTest.php
View File

@ -62,15 +62,15 @@ final class ItemL11nTest extends \PHPUnit\Framework\TestCase
public function testSerialize() : void public function testSerialize() : void
{ {
$this->l11n->description = 'Title'; $this->l11n->description = 'Title';
$this->l11n->item = 2; $this->l11n->item = 2;
$this->l11n->setLanguage(ISO639x1Enum::_DE); $this->l11n->setLanguage(ISO639x1Enum::_DE);
self::assertEquals( self::assertEquals(
[ [
'id' => 0, 'id' => 0,
'description' => 'Title', 'description' => 'Title',
'item' => 2, 'item' => 2,
'language' => ISO639x1Enum::_DE, 'language' => ISO639x1Enum::_DE,
], ],
$this->l11n->jsonSerialize() $this->l11n->jsonSerialize()
); );

7
tests/Models/ItemTest.php
View File

@ -14,13 +14,12 @@ declare(strict_types=1);
namespace Modules\ItemManagement\tests\Models; namespace Modules\ItemManagement\tests\Models;
use Modules\Editor\Models\EditorDoc;
use Modules\ItemManagement\Models\Item; use Modules\ItemManagement\Models\Item;
use Modules\ItemManagement\Models\ItemAttribute; use Modules\ItemManagement\Models\ItemAttribute;
use Modules\ItemManagement\Models\ItemL11n; use Modules\ItemManagement\Models\ItemL11n;
use Modules\ItemManagement\Models\ItemStatus; use Modules\ItemManagement\Models\ItemStatus;
use Modules\Editor\Models\EditorDoc;
use Modules\Media\Models\Media; use Modules\Media\Models\Media;
use Modules\Profile\Models\ContactElement;
/** /**
* @internal * @internal
@ -58,7 +57,7 @@ final class ItemTest extends \PHPUnit\Framework\TestCase
self::assertInstanceOf('phpOMS\Localization\Money', $this->item->purchasePrice); self::assertInstanceOf('phpOMS\Localization\Money', $this->item->purchasePrice);
} }
/** /**
* @covers Modules\ItemManagement\Models\Item * @covers Modules\ItemManagement\Models\Item
* @group module * @group module
*/ */
@ -68,7 +67,7 @@ final class ItemTest extends \PHPUnit\Framework\TestCase
self::assertEquals(ItemStatus::INACTIVE, $this->item->getStatus()); self::assertEquals(ItemStatus::INACTIVE, $this->item->getStatus());
} }
/** /**
* @covers Modules\ItemManagement\Models\Item * @covers Modules\ItemManagement\Models\Item
* @group module * @group module
*/ */