From 0e60eac1103a4551379fc3548c09a6461834bb7e Mon Sep 17 00:00:00 2001 From: Leonid Poluyanov Date: Wed, 9 Aug 2017 15:57:29 +0300 Subject: [PATCH 1/6] MAGETWO-71431: ImportProductsTest random failures --- .../Test/TestCase/ImportProductsTest.xml | 12 +++++ .../CatalogImportExport/Test/etc/testcase.xml | 3 +- .../Indexer/Test/TestStep/ReindexStep.php | 50 +++++++++++++++++++ 3 files changed, 64 insertions(+), 1 deletion(-) create mode 100644 dev/tests/functional/tests/app/Magento/Indexer/Test/TestStep/ReindexStep.php diff --git a/dev/tests/functional/tests/app/Magento/CatalogImportExport/Test/TestCase/ImportProductsTest.xml b/dev/tests/functional/tests/app/Magento/CatalogImportExport/Test/TestCase/ImportProductsTest.xml index cb29537c8dea0..2c7f6665df0aa 100644 --- a/dev/tests/functional/tests/app/Magento/CatalogImportExport/Test/TestCase/ImportProductsTest.xml +++ b/dev/tests/functional/tests/app/Magento/CatalogImportExport/Test/TestCase/ImportProductsTest.xml @@ -29,6 +29,10 @@ + + catalog_category_product + catalog_product_category + @@ -45,6 +49,10 @@ 4 catalogProductSimple::default_in_custom_website catalogProductSimple::default + + catalog_category_product + catalog_product_category + @@ -60,6 +68,10 @@ 7 7 catalogProductSimple::default_in_custom_website + + catalog_category_product + catalog_product_category + diff --git a/dev/tests/functional/tests/app/Magento/CatalogImportExport/Test/etc/testcase.xml b/dev/tests/functional/tests/app/Magento/CatalogImportExport/Test/etc/testcase.xml index 3438787d668f7..be8bf8b89dd16 100644 --- a/dev/tests/functional/tests/app/Magento/CatalogImportExport/Test/etc/testcase.xml +++ b/dev/tests/functional/tests/app/Magento/CatalogImportExport/Test/etc/testcase.xml @@ -11,6 +11,7 @@ - + + diff --git a/dev/tests/functional/tests/app/Magento/Indexer/Test/TestStep/ReindexStep.php b/dev/tests/functional/tests/app/Magento/Indexer/Test/TestStep/ReindexStep.php new file mode 100644 index 0000000000000..1a3cb4a034765 --- /dev/null +++ b/dev/tests/functional/tests/app/Magento/Indexer/Test/TestStep/ReindexStep.php @@ -0,0 +1,50 @@ +indexer = $indexer; + $this->indexerType = $indexerType; + } + + /** + * Run reindex process. + * All indexers will be refreshed in a case of empty $indexerType array. + * + * @return void + */ + public function run() + { + $this->indexer->reindex($this->indexerType); + } +} From 30081f9e7f410c956b3016df25258e4872a9ec97 Mon Sep 17 00:00:00 2001 From: Oleksandr Miroshnichenko Date: Tue, 1 Aug 2017 11:49:55 +0300 Subject: [PATCH 2/6] MAGETWO-71030: Sound from video from parent configurable product plays when start play video of child --- .../view/frontend/web/js/fotorama-add-video-events.js | 1 + 1 file changed, 1 insertion(+) diff --git a/app/code/Magento/ProductVideo/view/frontend/web/js/fotorama-add-video-events.js b/app/code/Magento/ProductVideo/view/frontend/web/js/fotorama-add-video-events.js index f78e424d741eb..03ce42bf25c4a 100644 --- a/app/code/Magento/ProductVideo/view/frontend/web/js/fotorama-add-video-events.js +++ b/app/code/Magento/ProductVideo/view/frontend/web/js/fotorama-add-video-events.js @@ -617,6 +617,7 @@ define([ var videoSettings; videoSettings = this.options.videoSettings[0]; + $image.find('.' + this.PV).remove(); $image.append( '
Magento\Catalog\Model\Indexer\Price\CompositeProductBatchSizeManagement + + Magento\Catalog\Model\ResourceModel\Product\Indexer\Price\CompositeProductBatchSizeAdjuster + diff --git a/app/code/Magento/Catalog/Model/Indexer/Product/Price/Action/Full.php b/app/code/Magento/Catalog/Model/Indexer/Product/Price/Action/Full.php index 88dba03def001..eb15833a7d0b2 100644 --- a/app/code/Magento/Catalog/Model/Indexer/Product/Price/Action/Full.php +++ b/app/code/Magento/Catalog/Model/Indexer/Product/Price/Action/Full.php @@ -106,6 +106,9 @@ public function execute($ids = null) $this->_defaultIndexerResource->getMainTable() ); + // Prepare replica table for indexation. + $this->_defaultIndexerResource->getConnection()->truncateTable($replicaTable); + /** @var \Magento\Catalog\Model\ResourceModel\Product\Indexer\AbstractIndexer $indexer */ foreach ($this->getTypeIndexers() as $indexer) { $indexer->getTableStrategy()->setUseIdxTable(false); diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Price/BatchSizeCalculator.php b/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Price/BatchSizeCalculator.php index b31147af2342f..47c23b101a3b2 100644 --- a/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Price/BatchSizeCalculator.php +++ b/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Price/BatchSizeCalculator.php @@ -21,15 +21,24 @@ class BatchSizeCalculator */ private $estimators; + /** + * @var \Magento\Catalog\Model\ResourceModel\Product\Indexer\Price\CompositeProductBatchSizeAdjusterInterface[] + * @since 2.2.0 + */ + private $batchSizeAdjusters; + /** * BatchSizeCalculator constructor. * @param array $batchRowsCount * @param array $estimators + * @param array $batchSizeAdjusters + * @since 2.2.0 */ - public function __construct(array $batchRowsCount, array $estimators) + public function __construct(array $batchRowsCount, array $estimators, array $batchSizeAdjusters) { $this->batchRowsCount = $batchRowsCount; $this->estimators = $estimators; + $this->batchSizeAdjusters = $batchSizeAdjusters; } /** @@ -52,6 +61,10 @@ public function estimateBatchSize(\Magento\Framework\DB\Adapter\AdapterInterface ? $this->estimators[$indexerTypeId] : $this->estimators['default']; + $batchRowsCount = isset($this->batchSizeAdjusters[$indexerTypeId]) + ? $this->batchSizeAdjusters[$indexerTypeId]->adjust($batchRowsCount) + : $batchRowsCount; + $calculator->ensureBatchSize($connection, $batchRowsCount); return $batchRowsCount; diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Price/CompositeProductBatchSizeAdjuster.php b/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Price/CompositeProductBatchSizeAdjuster.php new file mode 100644 index 0000000000000..0054167c5386f --- /dev/null +++ b/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Price/CompositeProductBatchSizeAdjuster.php @@ -0,0 +1,35 @@ +compositeProductRelationsCalculator = $compositeProductRelationsCalculator; + } + + /** + * {@inheritdoc} + */ + public function adjust($batchSize) + { + $maxRelationsCount = $this->compositeProductRelationsCalculator->getMaxRelationsCount(); + return $maxRelationsCount > 0 ? ceil($batchSize / $maxRelationsCount) : $batchSize; + } +} diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Price/CompositeProductBatchSizeAdjusterInterface.php b/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Price/CompositeProductBatchSizeAdjusterInterface.php new file mode 100644 index 0000000000000..5472527a85919 --- /dev/null +++ b/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Price/CompositeProductBatchSizeAdjusterInterface.php @@ -0,0 +1,22 @@ +indexerResource = $indexerResource; + } + + /** + * Returns maximum number of composite related products. + * + * @return int + */ + public function getMaxRelationsCount() + { + $connection = $this->indexerResource->getConnection(); + $relationSelect = $connection->select(); + $relationSelect->from( + ['relation' => $this->indexerResource->getTable('catalog_product_relation')], + ['count' => new \Zend_Db_Expr('count(relation.child_id)')] + ); + $relationSelect->group('parent_id'); + + $maxSelect = $connection->select(); + $maxSelect->from( + ['max_value' => $relationSelect], + ['count' => new \Zend_Db_Expr('MAX(count)')] + ); + return $connection->fetchOne($maxSelect); + } +} diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Price/CompositeProductRowSizeEstimator.php b/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Price/CompositeProductRowSizeEstimator.php index a3425bfc9d729..94a94c720b026 100644 --- a/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Price/CompositeProductRowSizeEstimator.php +++ b/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Price/CompositeProductRowSizeEstimator.php @@ -20,11 +20,6 @@ class CompositeProductRowSizeEstimator implements IndexTableRowSizeEstimatorInte */ const MEMORY_SIZE_FOR_ONE_ROW = 200; - /** - * @var DefaultPrice - */ - private $indexerResource; - /** * @var WebsiteManagementInterface */ @@ -36,18 +31,25 @@ class CompositeProductRowSizeEstimator implements IndexTableRowSizeEstimatorInte private $collectionFactory; /** - * @param DefaultPrice $indexerResource + * @var CompositeProductRelationsCalculator + * @since 2.2.0 + */ + private $compositeProductRelationsCalculator; + + /** * @param WebsiteManagementInterface $websiteManagement * @param CollectionFactory $collectionFactory + * @param CompositeProductRelationsCalculator $compositeProductRelationsCalculator + * @since 2.2.0 */ public function __construct( - DefaultPrice $indexerResource, WebsiteManagementInterface $websiteManagement, - CollectionFactory $collectionFactory + CollectionFactory $collectionFactory, + CompositeProductRelationsCalculator $compositeProductRelationsCalculator ) { - $this->indexerResource = $indexerResource; $this->websiteManagement = $websiteManagement; $this->collectionFactory = $collectionFactory; + $this->compositeProductRelationsCalculator = $compositeProductRelationsCalculator; } /** @@ -59,21 +61,7 @@ public function estimateRowSize() { $websitesCount = $this->websiteManagement->getCount(); $customerGroupCount = $this->collectionFactory->create()->getSize(); - - $connection = $this->indexerResource->getConnection(); - $relationSelect = $connection->select(); - $relationSelect->from( - ['relation' => $this->indexerResource->getTable('catalog_product_relation')], - ['count' => new \Zend_Db_Expr('count(relation.child_id)')] - ); - $relationSelect->group('parent_id'); - - $maxSelect = $connection->select(); - $maxSelect->from( - ['max_value' => $relationSelect], - ['count' => new \Zend_Db_Expr('MAX(count)')] - ); - $maxRelatedProductCount = $connection->fetchOne($maxSelect); + $maxRelatedProductCount = $this->compositeProductRelationsCalculator->getMaxRelationsCount(); /** * Calculate memory size for largest composite product in database. diff --git a/app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/Product/Indexer/Price/BatchSizeCalculatorTest.php b/app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/Product/Indexer/Price/BatchSizeCalculatorTest.php index 74bce577f53a1..9508782cb4a99 100644 --- a/app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/Product/Indexer/Price/BatchSizeCalculatorTest.php +++ b/app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/Product/Indexer/Price/BatchSizeCalculatorTest.php @@ -29,7 +29,8 @@ protected function setUp() $this->batchRowsCount = 200; $this->model = new \Magento\Catalog\Model\ResourceModel\Product\Indexer\Price\BatchSizeCalculator( ['default' => $this->batchRowsCount], - ['default' => $this->estimatorMock] + ['default' => $this->estimatorMock], + [] ); } diff --git a/app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/Product/Indexer/Price/CompositeProductBatchSizeAdjusterTest.php b/app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/Product/Indexer/Price/CompositeProductBatchSizeAdjusterTest.php new file mode 100644 index 0000000000000..69def72af1669 --- /dev/null +++ b/app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/Product/Indexer/Price/CompositeProductBatchSizeAdjusterTest.php @@ -0,0 +1,39 @@ +relationsCalculatorMock = $this->getMockBuilder(CompositeProductRelationsCalculator::class) + ->disableOriginalConstructor() + ->getMock(); + $this->model = new CompositeProductBatchSizeAdjuster($this->relationsCalculatorMock); + } + + public function testAdjust() + { + $this->relationsCalculatorMock->expects($this->once()) + ->method('getMaxRelationsCount') + ->willReturn(200); + $this->assertEquals(25, $this->model->adjust(5000)); + } +} diff --git a/app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/Product/Indexer/Price/CompositeProductRelationsCalculatorTest.php b/app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/Product/Indexer/Price/CompositeProductRelationsCalculatorTest.php new file mode 100644 index 0000000000000..3eda8616275a1 --- /dev/null +++ b/app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/Product/Indexer/Price/CompositeProductRelationsCalculatorTest.php @@ -0,0 +1,71 @@ +defaultPriceMock = $this->getMockBuilder(DefaultPrice::class)->disableOriginalConstructor()->getMock(); + $this->model = new CompositeProductRelationsCalculator($this->defaultPriceMock); + } + + public function testGetMaxRelationsCount() + { + $tableName = 'catalog_product_relation'; + $maxRelatedProductCount = 200; + + $connectionMock = $this->getMockBuilder(\Magento\Framework\DB\Adapter\AdapterInterface::class)->getMock(); + $this->defaultPriceMock->expects($this->once())->method('getConnection')->willReturn($connectionMock); + $this->defaultPriceMock->expects($this->once())->method('getTable')->with($tableName)->willReturn($tableName); + + $relationSelectMock = $this->getMockBuilder(\Magento\Framework\DB\Select::class) + ->disableOriginalConstructor() + ->getMock(); + $relationSelectMock->expects($this->once()) + ->method('from') + ->with( + ['relation' => $tableName], + ['count' => 'count(relation.child_id)'] + ) + ->willReturnSelf(); + $relationSelectMock->expects($this->once())->method('group')->with('parent_id')->willReturnSelf(); + $connectionMock->expects($this->at(0))->method('select')->willReturn($relationSelectMock); + + $maxSelectMock = $this->getMockBuilder(\Magento\Framework\DB\Select::class) + ->disableOriginalConstructor() + ->getMock(); + $maxSelectMock->expects($this->once()) + ->method('from') + ->with( + ['max_value' => $relationSelectMock], + ['count' => 'MAX(count)'] + ) + ->willReturnSelf(); + $connectionMock->expects($this->at(1))->method('select')->willReturn($maxSelectMock); + + $connectionMock->expects($this->at(2)) + ->method('fetchOne') + ->with($maxSelectMock) + ->willReturn($maxRelatedProductCount); + + $this->assertEquals($maxRelatedProductCount, $this->model->getMaxRelationsCount()); + } +} diff --git a/app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/Product/Indexer/Price/CompositeProductRowSizeEstimatorTest.php b/app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/Product/Indexer/Price/CompositeProductRowSizeEstimatorTest.php index 2eefb4e715ad4..728044b89cafe 100644 --- a/app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/Product/Indexer/Price/CompositeProductRowSizeEstimatorTest.php +++ b/app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/Product/Indexer/Price/CompositeProductRowSizeEstimatorTest.php @@ -23,7 +23,7 @@ class CompositeProductRowSizeEstimatorTest extends \PHPUnit\Framework\TestCase /** * @var \PHPUnit_Framework_MockObject_MockObject */ - private $defaultPriceMock; + private $relationsCalculatorMock; /** * @var \PHPUnit_Framework_MockObject_MockObject @@ -37,55 +37,27 @@ protected function setUp() \Magento\Customer\Model\ResourceModel\Group\CollectionFactory::class, ['create'] ); - $this->defaultPriceMock = $this->createMock( - \Magento\Catalog\Model\ResourceModel\Product\Indexer\Price\DefaultPrice::class + $this->relationsCalculatorMock = $this->createMock( + \Magento\Catalog\Model\ResourceModel\Product\Indexer\Price\CompositeProductRelationsCalculator::class ); $this->model = new CompositeProductRowSizeEstimator( - $this->defaultPriceMock, $this->websiteManagementMock, - $this->collectionFactoryMock + $this->collectionFactoryMock, + $this->relationsCalculatorMock ); } public function testEstimateRowSize() { $expectedResult = 40000000; - $tableName = 'catalog_product_relation'; $maxRelatedProductCount = 10; $this->websiteManagementMock->expects($this->once())->method('getCount')->willReturn(100); $collectionMock = $this->createMock(\Magento\Customer\Model\ResourceModel\Group\Collection::class); $this->collectionFactoryMock->expects($this->once())->method('create')->willReturn($collectionMock); $collectionMock->expects($this->once())->method('getSize')->willReturn(200); - - $connectionMock = $this->createMock(\Magento\Framework\DB\Adapter\AdapterInterface::class); - $this->defaultPriceMock->expects($this->once())->method('getConnection')->willReturn($connectionMock); - $this->defaultPriceMock->expects($this->once())->method('getTable')->with($tableName)->willReturn($tableName); - - $relationSelectMock = $this->createMock(\Magento\Framework\DB\Select::class); - $relationSelectMock->expects($this->once()) - ->method('from') - ->with( - ['relation' => $tableName], - ['count' => 'count(relation.child_id)'] - ) - ->willReturnSelf(); - $relationSelectMock->expects($this->once())->method('group')->with('parent_id')->willReturnSelf(); - $connectionMock->expects($this->at(0))->method('select')->willReturn($relationSelectMock); - - $maxSelectMock = $this->createMock(\Magento\Framework\DB\Select::class); - $maxSelectMock->expects($this->once()) - ->method('from') - ->with( - ['max_value' => $relationSelectMock], - ['count' => 'MAX(count)'] - ) - ->willReturnSelf(); - $connectionMock->expects($this->at(1))->method('select')->willReturn($maxSelectMock); - - $connectionMock->expects($this->at(2)) - ->method('fetchOne') - ->with($maxSelectMock) + $this->relationsCalculatorMock->expects($this->once()) + ->method('getMaxRelationsCount') ->willReturn($maxRelatedProductCount); $this->assertEquals( diff --git a/app/code/Magento/ConfigurableProduct/etc/di.xml b/app/code/Magento/ConfigurableProduct/etc/di.xml index 1ec382bf37b29..30fd8737c3820 100644 --- a/app/code/Magento/ConfigurableProduct/etc/di.xml +++ b/app/code/Magento/ConfigurableProduct/etc/di.xml @@ -180,6 +180,9 @@ Magento\Catalog\Model\Indexer\Price\CompositeProductBatchSizeManagement + + Magento\Catalog\Model\ResourceModel\Product\Indexer\Price\CompositeProductBatchSizeAdjuster + diff --git a/app/code/Magento/GroupedProduct/etc/di.xml b/app/code/Magento/GroupedProduct/etc/di.xml index ff2cac0bd3186..f39bcfa01453c 100644 --- a/app/code/Magento/GroupedProduct/etc/di.xml +++ b/app/code/Magento/GroupedProduct/etc/di.xml @@ -94,6 +94,9 @@ Magento\Catalog\Model\Indexer\Price\CompositeProductBatchSizeManagement + + Magento\Catalog\Model\ResourceModel\Product\Indexer\Price\CompositeProductBatchSizeAdjuster + From f5769cf84f7098a10d8af6390c9211cf9ca4ac3f Mon Sep 17 00:00:00 2001 From: Oleksandr Miroshnichenko Date: Thu, 10 Aug 2017 12:49:51 +0300 Subject: [PATCH 5/6] MAGETWO-71373: Cannot Install Magento without Some Modules --- .../Framework/EntityManager/Test/Unit/OperationPoolTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/internal/Magento/Framework/EntityManager/Test/Unit/OperationPoolTest.php b/lib/internal/Magento/Framework/EntityManager/Test/Unit/OperationPoolTest.php index 469fbbadeddb2..cd44a3088122f 100644 --- a/lib/internal/Magento/Framework/EntityManager/Test/Unit/OperationPoolTest.php +++ b/lib/internal/Magento/Framework/EntityManager/Test/Unit/OperationPoolTest.php @@ -21,7 +21,7 @@ public function testGetOperationUsesDefaultValueForEntityThatDoesNotProvideCusto $objectManagerMock->expects($this->once()) ->method('get') - ->with('Magento\Framework\EntityManager\Operation\Read'); + ->with(\Magento\Framework\EntityManager\Operation\Read::class); $operationPool->getOperation('entity_type', 'read'); } From 869b246a126fec8b209fea0a0df1ddf0c54a5d6d Mon Sep 17 00:00:00 2001 From: Iryna Lagno Date: Wed, 9 Aug 2017 12:20:45 +0300 Subject: [PATCH 6/6] MAGETWO-71385: Remove Deprecated AroundProductRepositorySave Plugin --- .../Catalog/Model/ProductRepository.php | 2 +- .../Test/Unit/Model/ProductRepositoryTest.php | 3 +- .../Plugin/AroundProductRepositorySave.php | 44 --- .../AroundProductRepositorySaveTest.php | 351 ------------------ app/code/Magento/CatalogInventory/etc/di.xml | 3 - .../Model/Plugin/ProductRepositorySave.php | 4 +- .../Magento/Catalog/Api/CostStorageTest.php | 2 +- .../Api/ProductRepositoryTest.php | 1 + 8 files changed, 7 insertions(+), 403 deletions(-) delete mode 100644 app/code/Magento/CatalogInventory/Model/Plugin/AroundProductRepositorySave.php delete mode 100644 app/code/Magento/CatalogInventory/Test/Unit/Model/Plugin/AroundProductRepositorySaveTest.php diff --git a/app/code/Magento/Catalog/Model/ProductRepository.php b/app/code/Magento/Catalog/Model/ProductRepository.php index aac9ec4807cbf..4a72539e982f2 100644 --- a/app/code/Magento/Catalog/Model/ProductRepository.php +++ b/app/code/Magento/Catalog/Model/ProductRepository.php @@ -641,7 +641,7 @@ public function save(\Magento\Catalog\Api\Data\ProductInterface $product, $saveO } unset($this->instances[$product->getSku()]); unset($this->instancesById[$product->getId()]); - return $this->get($product->getSku()); + return $this->get($product->getSku(), false, $product->getStoreId()); } /** diff --git a/app/code/Magento/Catalog/Test/Unit/Model/ProductRepositoryTest.php b/app/code/Magento/Catalog/Test/Unit/Model/ProductRepositoryTest.php index 44d38adc5c15c..b537e2c406cab 100644 --- a/app/code/Magento/Catalog/Test/Unit/Model/ProductRepositoryTest.php +++ b/app/code/Magento/Catalog/Test/Unit/Model/ProductRepositoryTest.php @@ -193,7 +193,8 @@ protected function setUp() 'validate', 'save', 'getMediaGalleryEntries', - 'setData' + 'setData', + 'getStoreId' ]); $this->initializedProductMock->expects($this->any()) ->method('hasGalleryAttribute') diff --git a/app/code/Magento/CatalogInventory/Model/Plugin/AroundProductRepositorySave.php b/app/code/Magento/CatalogInventory/Model/Plugin/AroundProductRepositorySave.php deleted file mode 100644 index d8378556ec3c2..0000000000000 --- a/app/code/Magento/CatalogInventory/Model/Plugin/AroundProductRepositorySave.php +++ /dev/null @@ -1,44 +0,0 @@ -get($product->getSku(), false, $product->getStoreId()); - } -} diff --git a/app/code/Magento/CatalogInventory/Test/Unit/Model/Plugin/AroundProductRepositorySaveTest.php b/app/code/Magento/CatalogInventory/Test/Unit/Model/Plugin/AroundProductRepositorySaveTest.php deleted file mode 100644 index 049313a9a3108..0000000000000 --- a/app/code/Magento/CatalogInventory/Test/Unit/Model/Plugin/AroundProductRepositorySaveTest.php +++ /dev/null @@ -1,351 +0,0 @@ -markTestSkipped('Test needs to be refactored.'); - $this->stockRegistry = $this->getMockBuilder(StockRegistryInterface::class) - ->setMethods(['getStockItem', 'updateStockItemBySku']) - ->getMockForAbstractClass(); - $this->storeManager = $this->getMockBuilder(StoreManagerInterface::class) - ->getMockForAbstractClass(); - $this->stockConfiguration = $this->getMockBuilder(StockConfigurationInterface::class) - ->setMethods(['getDefaultScopeId']) - ->getMockForAbstractClass(); - - $this->plugin = new AroundProductRepositorySave( - $this->stockRegistry, - $this->storeManager, - $this->stockConfiguration - ); - - $this->savedProduct = $this->getMockBuilder(ProductInterface::class) - ->setMethods(['getExtensionAttributes', 'getStoreId']) - ->getMockForAbstractClass(); - - $this->productRepository = $this->getMockBuilder(ProductRepositoryInterface::class) - ->setMethods(['get']) - ->getMockForAbstractClass(); - $this->product = $this->getMockBuilder(ProductInterface::class) - ->setMethods(['getExtensionAttributes', 'getStoreId']) - ->getMockForAbstractClass(); - $this->productExtension = $this->getMockForAbstractClass( - ProductExtensionInterface::class, - [], - '', - false, - false, - true, - ['getStockItem'] - ); - $this->stockItem = $this->getMockBuilder(StockItemInterface::class) - ->setMethods(['setWebsiteId', 'getWebsiteId', 'getStockId']) - ->getMockForAbstractClass(); - $this->defaultStock = $this->getMockBuilder(StockInterface::class) - ->setMethods(['getStockId']) - ->getMockForAbstractClass(); - } - - public function testAfterSaveWhenProductHasNoStockItemNeedingToBeUpdated() - { - // pretend we have no extension attributes at all - $this->product->expects($this->once()) - ->method('getExtensionAttributes') - ->willReturn(null); - $this->productExtension->expects($this->never())->method('getStockItem'); - - // pretend that the product already has existing stock item information - $this->stockRegistry->expects($this->once())->method('getStockItem')->willReturn($this->stockItem); - $this->stockItem->expects($this->once())->method('getItemId')->willReturn(1); - $this->stockItem->expects($this->never())->method('setProductId'); - $this->stockItem->expects($this->never())->method('setWebsiteId'); - - // expect that there are no changes to the existing stock item information - $result = $this->plugin->afterSave($this->productRepository, $this->savedProduct, $this->product); - $this->assertEquals( - $this->savedProduct, - $result - ); - } - - public function testAfterSaveWhenProductHasNoPersistentStockItemInfo() - { - // pretend we do have extension attributes, but none for 'stock_item' - $this->product->expects($this->once()) - ->method('getExtensionAttributes') - ->willReturn($this->productExtension); - $this->productExtension->expects($this->once()) - ->method('getStockItem') - ->willReturn(null); - - $this->stockConfiguration->expects($this->once())->method('getDefaultScopeId')->willReturn(1); - $this->stockRegistry->expects($this->once())->method('getStockItem')->willReturn($this->stockItem); - $this->stockRegistry->expects($this->once())->method('updateStockItemBySku'); - - $this->stockItem->expects($this->once())->method('getItemId')->willReturn(null); - $this->stockItem->expects($this->once())->method('setProductId'); - $this->stockItem->expects($this->once())->method('setWebsiteId'); - $this->product->expects(($this->atLeastOnce()))->method('getStoreId')->willReturn(20); - - $newProductMock = $this->getMockBuilder(\Magento\Catalog\Api\Data\ProductInterface::class) - ->disableOriginalConstructor()->getMock(); - $this->productRepository->expects($this->once())->method('get')->willReturn($newProductMock); - - $this->assertEquals( - $newProductMock, - $this->plugin->afterSave($this->productRepository, $this->savedProduct, $this->product) - ); - } - - public function testAfterSave() - { - $productId = 5494; - $storeId = 2; - $sku = 'my product that needs saving'; - $defaultScopeId = 100; - $this->stockConfiguration->expects($this->exactly(2)) - ->method('getDefaultScopeId') - ->willReturn($defaultScopeId); - $this->stockRegistry->expects($this->once()) - ->method('getStock') - ->with($defaultScopeId) - ->willReturn($this->defaultStock); - - $this->product->expects($this->once()) - ->method('getExtensionAttributes') - ->willReturn($this->productExtension); - $this->productExtension->expects($this->once()) - ->method('getStockItem') - ->willReturn($this->stockItem); - - $storedStockItem = $this->getMockBuilder(StockItemInterface::class) - ->setMethods(['getItemId']) - ->getMockForAbstractClass(); - $storedStockItem->expects($this->once()) - ->method('getItemId') - ->willReturn(500); - $this->stockRegistry->expects($this->once()) - ->method('getStockItem') - ->willReturn($storedStockItem); - - $this->product->expects(($this->exactly(2)))->method('getId')->willReturn($productId); - $this->product->expects(($this->atLeastOnce()))->method('getStoreId')->willReturn($storeId); - $this->product->expects($this->atLeastOnce())->method('getSku')->willReturn($sku); - - $this->stockItem->expects($this->once())->method('setProductId')->with($productId); - $this->stockItem->expects($this->once())->method('setWebsiteId')->with($defaultScopeId); - - $this->stockRegistry->expects($this->once()) - ->method('updateStockItemBySku') - ->with($sku, $this->stockItem); - - $newProductMock = $this->getMockBuilder(\Magento\Catalog\Api\Data\ProductInterface::class) - ->disableOriginalConstructor()->getMock(); - $this->productRepository->expects($this->once()) - ->method('get') - ->with($sku, false, $storeId, true) - ->willReturn($newProductMock); - - $this->assertEquals( - $newProductMock, - $this->plugin->afterSave($this->productRepository, $this->savedProduct, $this->product) - ); - } - - /** - * @expectedException \Magento\Framework\Exception\LocalizedException - * @expectedExceptionMessage Invalid stock id: 100500. Only default stock with id 50 allowed - */ - public function testAfterSaveWithInvalidStockId() - { - $stockId = 100500; - $defaultScopeId = 100; - $defaultStockId = 50; - - $this->stockItem->expects($this->once()) - ->method('getStockId') - ->willReturn($stockId); - $this->stockRegistry->expects($this->once()) - ->method('getStock') - ->with($defaultScopeId) - ->willReturn($this->defaultStock); - $this->stockConfiguration->expects($this->once()) - ->method('getDefaultScopeId') - ->willReturn($defaultScopeId); - $this->defaultStock->expects($this->once()) - ->method('getStockId') - ->willReturn($defaultStockId); - - $this->product->expects($this->once()) - ->method('getExtensionAttributes') - ->willReturn($this->productExtension); - $this->productExtension->expects($this->once()) - ->method('getStockItem') - ->willReturn($this->stockItem); - - $this->plugin->afterSave($this->productRepository, $this->savedProduct, $this->product); - } - - /** - * @expectedException \Magento\Framework\Exception\LocalizedException - * @expectedExceptionMessage Invalid stock item id: 0. Should be null or numeric value greater than 0 - */ - public function testAfterSaveWithInvalidStockItemId() - { - $stockId = 80; - $stockItemId = 0; - $defaultScopeId = 100; - $defaultStockId = 80; - - $this->stockItem->expects($this->once()) - ->method('getStockId') - ->willReturn($stockId); - $this->stockRegistry->expects($this->once()) - ->method('getStock') - ->with($defaultScopeId) - ->willReturn($this->defaultStock); - $this->stockConfiguration->expects($this->once()) - ->method('getDefaultScopeId') - ->willReturn($defaultScopeId); - $this->defaultStock->expects($this->once()) - ->method('getStockId') - ->willReturn($defaultStockId); - - $this->product->expects($this->once()) - ->method('getExtensionAttributes') - ->willReturn($this->productExtension); - $this->productExtension->expects($this->once()) - ->method('getStockItem') - ->willReturn($this->stockItem); - - $this->stockItem->expects($this->once()) - ->method('getItemId') - ->willReturn($stockItemId); - - $this->plugin->afterSave($this->productRepository, $this->savedProduct, $this->product); - } - - /** - * @expectedException \Magento\Framework\Exception\LocalizedException - * @expectedExceptionMessage Invalid stock item id: 35. Assigned stock item id is 40 - */ - public function testAfterSaveWithNotAssignedStockItemId() - { - $stockId = 80; - $stockItemId = 35; - $defaultScopeId = 100; - $defaultStockId = 80; - $storedStockitemId = 40; - - $this->stockItem->expects($this->once()) - ->method('getStockId') - ->willReturn($stockId); - $this->stockRegistry->expects($this->once()) - ->method('getStock') - ->with($defaultScopeId) - ->willReturn($this->defaultStock); - $this->stockConfiguration->expects($this->once()) - ->method('getDefaultScopeId') - ->willReturn($defaultScopeId); - $this->defaultStock->expects($this->once()) - ->method('getStockId') - ->willReturn($defaultStockId); - - $this->product->expects($this->once()) - ->method('getExtensionAttributes') - ->willReturn($this->productExtension); - $this->productExtension->expects($this->once()) - ->method('getStockItem') - ->willReturn($this->stockItem); - - $this->stockItem->expects($this->once()) - ->method('getItemId') - ->willReturn($stockItemId); - - $storedStockItem = $this->getMockBuilder(StockItemInterface::class) - ->setMethods(['getItemId']) - ->getMockForAbstractClass(); - $storedStockItem->expects($this->once()) - ->method('getItemId') - ->willReturn($storedStockitemId); - $this->stockRegistry->expects($this->once()) - ->method('getStockItem') - ->willReturn($storedStockItem); - - $this->plugin->afterSave($this->productRepository, $this->savedProduct, $this->product); - } -} diff --git a/app/code/Magento/CatalogInventory/etc/di.xml b/app/code/Magento/CatalogInventory/etc/di.xml index e62470b3ae0fb..2f64d71595c86 100644 --- a/app/code/Magento/CatalogInventory/etc/di.xml +++ b/app/code/Magento/CatalogInventory/etc/di.xml @@ -71,9 +71,6 @@ - - - Magento\CatalogInventory\Model\Indexer\Stock\Processor diff --git a/app/code/Magento/ConfigurableProduct/Model/Plugin/ProductRepositorySave.php b/app/code/Magento/ConfigurableProduct/Model/Plugin/ProductRepositorySave.php index f6b2623cd9f32..62146a4b343ed 100644 --- a/app/code/Magento/ConfigurableProduct/Model/Plugin/ProductRepositorySave.php +++ b/app/code/Magento/ConfigurableProduct/Model/Plugin/ProductRepositorySave.php @@ -85,9 +85,9 @@ public function afterSave( $attributeCodes[] = $attributeCode; } $this->validateProductLinks($attributeCodes, $configurableLinks); - $product->getTypeInstance()->resetConfigurableAttributes($product); + $result->getTypeInstance()->resetConfigurableAttributes($product); - return $product; + return $result; } /** diff --git a/dev/tests/api-functional/testsuite/Magento/Catalog/Api/CostStorageTest.php b/dev/tests/api-functional/testsuite/Magento/Catalog/Api/CostStorageTest.php index 7cdcf1f0e73ab..0316010b6ec1c 100644 --- a/dev/tests/api-functional/testsuite/Magento/Catalog/Api/CostStorageTest.php +++ b/dev/tests/api-functional/testsuite/Magento/Catalog/Api/CostStorageTest.php @@ -49,7 +49,7 @@ public function testGet() 'soap' => [ 'service' => self::SERVICE_NAME, 'serviceVersion' => self::SERVICE_VERSION, - 'operation' => self::SERVICE_NAME . 'Delete', + 'operation' => self::SERVICE_NAME . 'Get', ], ]; $response = $this->_webApiCall($serviceInfo, ['skus' => [self::SIMPLE_PRODUCT_SKU]]); diff --git a/dev/tests/api-functional/testsuite/Magento/ConfigurableProduct/Api/ProductRepositoryTest.php b/dev/tests/api-functional/testsuite/Magento/ConfigurableProduct/Api/ProductRepositoryTest.php index 6444a857da748..37bdd24e05d92 100644 --- a/dev/tests/api-functional/testsuite/Magento/ConfigurableProduct/Api/ProductRepositoryTest.php +++ b/dev/tests/api-functional/testsuite/Magento/ConfigurableProduct/Api/ProductRepositoryTest.php @@ -265,6 +265,7 @@ public function testUpdateConfigurableProductLinks() ]; $response = $this->saveProduct($response); + $currentOptions = $response[ExtensibleDataInterface::EXTENSION_ATTRIBUTES_KEY]['configurable_product_options']; $this->assertEquals($options, $currentOptions);