Skip to content

Commit 392345e

Browse files
author
mastiuhin-olexandr
committed
MC-33288: [2.4][MSI][MFTF] StorefrontLoggedInCustomerCreateOrderAllOptionQuantityConfigurableProductCustomStockTest fails because of bad design
1 parent 7569b08 commit 392345e

File tree

2 files changed

+41
-18
lines changed
  • app/code/Magento/Catalog/Model/ResourceModel/Product
  • dev/tests/integration/testsuite/Magento/ConfigurableProduct/Model/ResourceModel/Product

2 files changed

+41
-18
lines changed

app/code/Magento/Catalog/Model/ResourceModel/Product/Relation.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -148,12 +148,12 @@ public function getRelationsByChildren(array $childrenIds): array
148148
$select = $connection->select()
149149
->from(
150150
['cpe' => $this->getTable('catalog_product_entity')],
151-
'entity_id'
151+
['relation.child_id', 'cpe.entity_id']
152152
)->join(
153153
['relation' => $this->getTable('catalog_product_relation')],
154154
'relation.parent_id = cpe.' . $linkField
155155
)->where('relation.child_id IN(?)', $childrenIds);
156156

157-
return $connection->fetchCol($select);
157+
return $connection->fetchPairs($select);
158158
}
159159
}

dev/tests/integration/testsuite/Magento/ConfigurableProduct/Model/ResourceModel/Product/RelationTest.php

Lines changed: 39 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -57,30 +57,53 @@ protected function setUp(): void
5757
*/
5858
public function testGetRelationsByChildren(): void
5959
{
60-
// Find configurable products options
61-
$productOptionSkus = ['simple_10', 'simple_20', 'simple_30', 'simple_40'];
62-
$searchCriteria = $this->searchCriteriaBuilder->addFilter('sku', $productOptionSkus, 'in')
60+
$childSkusOfParentSkus = [
61+
'configurable' => ['simple_10', 'simple_20'],
62+
'configurable_12345' => ['simple_30', 'simple_40'],
63+
];
64+
$configurableSkus = [
65+
'configurable',
66+
'configurable_12345',
67+
'simple_10',
68+
'simple_20',
69+
'simple_30',
70+
'simple_40',
71+
];
72+
$configurableIdsOfSkus = [];
73+
74+
$searchCriteria = $this->searchCriteriaBuilder->addFilter('sku', $configurableSkus, 'in')
6375
->create();
64-
$productOptions = $this->productRepository->getList($searchCriteria)
76+
$configurableProducts = $this->productRepository->getList($searchCriteria)
6577
->getItems();
6678

67-
$productOptionsIds = [];
79+
$childIds = [];
6880

69-
foreach ($productOptions as $productOption) {
70-
$productOptionsIds[] = $productOption->getId();
81+
foreach ($configurableProducts as $product) {
82+
$configurableIdsOfSkus[$product->getSku()] = $product->getId();
83+
84+
if ($product->getTypeId() != 'configurable') {
85+
$childIds[] = $product->getId();
86+
}
7187
}
7288

73-
// Find configurable products
74-
$searchCriteria = $this->searchCriteriaBuilder->addFilter('sku', ['configurable', 'configurable_12345'], 'in')
75-
->create();
76-
$configurableProducts = $this->productRepository->getList($searchCriteria)
77-
->getItems();
89+
$parentIdsOfChildIds = [];
90+
91+
foreach ($childSkusOfParentSkus as $parentSku => $childSkus) {
92+
foreach ($childSkus as $childSku) {
93+
$childId = $configurableIdsOfSkus[$childSku];
94+
$parentIdsOfChildIds[$childId][] = $configurableIdsOfSkus[$parentSku];
95+
}
96+
}
7897

79-
// Assert there are configurable products ids in result of getRelationsByChildren method.
80-
$result = $this->model->getRelationsByChildren($productOptionsIds);
98+
/**
99+
* Assert there are parent configurable products ids in result of getRelationsByChildren method
100+
* and they are related to child ids.
101+
*/
102+
$result = $this->model->getRelationsByChildren($childIds);
81103

82-
foreach ($configurableProducts as $configurableProduct) {
83-
$this->assertContains($configurableProduct->getId(), $result);
104+
foreach ($childIds as $childId) {
105+
$this->assertArrayHasKey($childId, $result);
106+
$this->assertContains($result[$childId], $parentIdsOfChildIds[$childId]);
84107
}
85108
}
86109
}

0 commit comments

Comments
 (0)