Skip to content
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ public function execute(array $skus): array
*/
private function getResultKey(string $sku, array $productSkuList): string
{
$key = array_search(strtolower($sku), array_map('strtolower', $productSkuList));
$key = array_search(strtolower($sku), array_map('strtolower', $productSkuList), true);
if ($key !== false) {
$sku = (string)$productSkuList[$key];
}
Expand Down
27 changes: 27 additions & 0 deletions InventoryCatalog/Test/Integration/GetProductTypesBySkusTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@

namespace Magento\InventoryCatalog\Test\Integration;

use Magento\InventoryCatalog\Model\Cache\ProductTypesBySkusStorage;
use Magento\InventoryCatalog\Model\ResourceModel\GetProductTypesBySkus;
use Magento\InventoryCatalogApi\Model\GetProductTypesBySkusInterface;
use Magento\TestFramework\Helper\Bootstrap;
use PHPUnit\Framework\TestCase;
Expand All @@ -21,6 +23,11 @@ class GetProductTypesBySkusTest extends TestCase
*/
private $getProductTypesBySkus;

/**
* @var ProductTypesBySkusStorage
*/
private $productTypesBySkuCacheStorage;

/**
* @inheritdoc
*/
Expand All @@ -29,6 +36,7 @@ protected function setUp(): void
parent::setUp();

$this->getProductTypesBySkus = Bootstrap::getObjectManager()->get(GetProductTypesBySkusInterface::class);
$this->productTypesBySkuCacheStorage = Bootstrap::getObjectManager()->get(ProductTypesBySkusStorage::class);
}

/**
Expand Down Expand Up @@ -57,4 +65,23 @@ public function testExecuteWithNotExistedSkus()

self::assertEquals(['simple_sku' => 'simple'], $this->getProductTypesBySkus->execute($skus));
}

/**
* @magentoDataFixture Magento_InventoryCatalog::Test/_files/products_types_numeric_skus.php
*/
public function testExecuteWithSimilairNumericSkus()
{
$skus = ['35.420', '35.4200', '35.42000'];

$expectedOutput = [
'35.420' => 'bundle',
'35.4200' => 'configurable',
'35.42000' => 'downloadable'
];

// Clean cache so the product types come from GetProductTypesBySkus directly
$this->productTypesBySkuCacheStorage->clean();

self::assertEquals($expectedOutput, $this->getProductTypesBySkus->execute($skus));
}
}
55 changes: 55 additions & 0 deletions InventoryCatalog/Test/_files/products_types_numeric_skus.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
<?php
/**
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/

use Magento\Bundle\Model\Product\Price;
use Magento\Bundle\Model\Product\Type as Bundle;
use Magento\Catalog\Api\Data\ProductInterface;
use Magento\Catalog\Api\Data\ProductInterfaceFactory;
use Magento\Catalog\Api\ProductRepositoryInterface;
use Magento\Catalog\Model\Product\Attribute\Source\Status;
use Magento\Catalog\Model\Product\Type as Simple;
use Magento\Catalog\Model\Product\Visibility;
use Magento\ConfigurableProduct\Model\Product\Type\Configurable;
use Magento\Downloadable\Model\Product\Type as Downloadable;
use Magento\GroupedProduct\Model\Product\Type\Grouped;
use Magento\TestFramework\Helper\Bootstrap;

$objectManager = Bootstrap::getObjectManager();
/** @var ProductRepositoryInterface $productRepository */
$productRepository = $objectManager->get(ProductRepositoryInterface::class);
/** @var ProductInterfaceFactory $productFactory */
$productFactory = $objectManager->get(ProductInterfaceFactory::class);

$productTypes = [
Bundle::TYPE_CODE => ['price_view' => 1, 'price_type' => Price::PRICE_TYPE_FIXED],
Configurable::TYPE_CODE => [],
Downloadable::TYPE_DOWNLOADABLE => [],
Grouped::TYPE_CODE => [],
Simple::TYPE_SIMPLE => [],
Simple::TYPE_VIRTUAL => [],
];

$i = 1;
foreach ($productTypes as $productType => $additionalProductData) {
$attrProductData = [
'attribute_set_id' => 4,
'type_id' => $productType,
'name' => $productType . '_name',
'sku' => '35.42' . str_repeat('0', $i),
'price' => 10,
'visibility' => Visibility::VISIBILITY_BOTH,
'status' => Status::STATUS_ENABLED,
];

if (!empty($additionalProductData)) {
$attrProductData = array_merge($attrProductData, $additionalProductData);
}

/** @var $product ProductInterface */
$product = $productFactory->create(['data' => $attrProductData]);
$productRepository->save($product);
$i++;
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
<?php
/**
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/

use Magento\Bundle\Model\Product\Type as Bundle;
use Magento\Catalog\Api\ProductRepositoryInterface;
use Magento\Catalog\Model\Product\Type as Simple;
use Magento\ConfigurableProduct\Model\Product\Type\Configurable;
use Magento\Downloadable\Model\Product\Type as Downloadable;
use Magento\Framework\Api\SearchCriteriaBuilder;
use Magento\Framework\Exception\NoSuchEntityException;
use Magento\Framework\Registry;
use Magento\GroupedProduct\Model\Product\Type\Grouped;
use Magento\TestFramework\Helper\Bootstrap;

$objectManager = Bootstrap::getObjectManager();

/** @var Registry $registry */
$registry = $objectManager->get(Registry::class);

$registry->unregister('isSecureArea');
$registry->register('isSecureArea', true);

/** @var ProductRepositoryInterface $productRepository */
$productRepository = $objectManager->get(ProductRepositoryInterface::class);
/** @var SearchCriteriaBuilder $searchCriteriaBuilder */
$searchCriteriaBuilder = $objectManager->get(SearchCriteriaBuilder::class);

$searchCriteria = $searchCriteriaBuilder->addFilter('sku', '35.42%', 'like')->create();
$searchResults = $productRepository->getList($searchCriteria);

foreach ($searchResults->getItems() as $product) {
try {
$productRepository->delete($product);
} catch (NoSuchEntityException $exception) {
//Product already removed
}
}

$registry->unregister('isSecureArea');
$registry->register('isSecureArea', false);