Skip to content

Commit 54f4cb7

Browse files
balex13balex13
committed
Merge pull request #79 from magento-troll/troll-pr
[Troll] Bugs P0-P1
2 parents 5e4ddd4 + ac84bdc commit 54f4cb7

File tree

11 files changed

+335
-44
lines changed

11 files changed

+335
-44
lines changed

‎app/code/Magento/Catalog/Model/CategoryManagement.php

Lines changed: 49 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,20 @@ class CategoryManagement implements \Magento\Catalog\Api\CategoryManagementInter
2121
*/
2222
protected $categoryTree;
2323

24+
/**
25+
* @var \Magento\Framework\App\ScopeResolverInterface
26+
*/
27+
private $scopeResolver;
28+
29+
/**
30+
* @var \Magento\Catalog\Model\ResourceModel\Category\CollectionFactory
31+
*/
32+
private $categoriesFactory;
33+
2434
/**
2535
* @param \Magento\Catalog\Api\CategoryRepositoryInterface $categoryRepository
2636
* @param Category\Tree $categoryTree
27-
* @param CollectionFactory $categoriesFactory
37+
* @param \Magento\Catalog\Model\ResourceModel\Category\CollectionFactory $categoriesFactory
2838
*/
2939
public function __construct(
3040
\Magento\Catalog\Api\CategoryRepositoryInterface $categoryRepository,
@@ -45,11 +55,49 @@ public function getTree($rootCategoryId = null, $depth = null)
4555
if ($rootCategoryId !== null) {
4656
/** @var \Magento\Catalog\Model\Category $category */
4757
$category = $this->categoryRepository->get($rootCategoryId);
58+
} elseif ($this->isAdminStore()) {
59+
$category = $this->getTopLevelCategory();
4860
}
4961
$result = $this->categoryTree->getTree($this->categoryTree->getRootNode($category), $depth);
5062
return $result;
5163
}
5264

65+
/**
66+
* Check is request use default scope
67+
*
68+
* @return bool
69+
*/
70+
private function isAdminStore()
71+
{
72+
return $this->getScopeResolver()->getScope()->getCode() == \Magento\Store\Model\Store::ADMIN_CODE;
73+
}
74+
75+
/**
76+
* Get store manager for operations with admin code
77+
*
78+
* @return \Magento\Framework\App\ScopeResolverInterface
79+
*/
80+
private function getScopeResolver()
81+
{
82+
if ($this->scopeResolver == null) {
83+
$this->scopeResolver = \Magento\Framework\App\ObjectManager::getInstance()
84+
->get(\Magento\Framework\App\ScopeResolverInterface::class);
85+
}
86+
87+
return $this->scopeResolver;
88+
}
89+
90+
/**
91+
* Get top level hidden root category
92+
*
93+
* @return \Magento\Catalog\Model\Category
94+
*/
95+
private function getTopLevelCategory()
96+
{
97+
$categoriesCollection = $this->categoriesFactory->create();
98+
return $categoriesCollection->addFilter('level', ['eq' => 0])->getFirstItem();
99+
}
100+
53101
/**
54102
* {@inheritdoc}
55103
*/

‎app/code/Magento/Catalog/Model/ImageUploader.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,8 @@ public function saveFileToTmpDir($fileId)
244244
->getStore()
245245
->getBaseUrl(
246246
\Magento\Framework\UrlInterface::URL_TYPE_MEDIA
247-
) . $this->getFilePath($baseTmpPath, $result['name']);
247+
) . $this->getFilePath($baseTmpPath, $result['file']);
248+
$result['name'] = $result['file'];
248249

249250
if (isset($result['file'])) {
250251
try {

‎app/code/Magento/Catalog/Model/Indexer/Category/Product/AbstractAction.php

Lines changed: 96 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,11 @@ abstract class AbstractAction
9797
*/
9898
protected $metadataPool;
9999

100+
/**
101+
* @var string
102+
*/
103+
protected $tempTreeIndexTableName;
104+
100105
/**
101106
* @param ResourceConnection $resource
102107
* @param \Magento\Store\Model\StoreManagerInterface $storeManager
@@ -368,6 +373,8 @@ protected function createAnchorSelect(\Magento\Store\Model\Store $store)
368373
$rootCatIds = explode('/', $this->getPathFromCategoryId($store->getRootCategoryId()));
369374
array_pop($rootCatIds);
370375

376+
$temporaryTreeTable = $this->makeTempCategoryTreeIndex();
377+
371378
$productMetadata = $this->getMetadataPool()->getMetadata(\Magento\Catalog\Api\Data\ProductInterface::class);
372379
$categoryMetadata = $this->getMetadataPool()->getMetadata(\Magento\Catalog\Api\Data\CategoryInterface::class);
373380
$productLinkField = $productMetadata->getLinkField();
@@ -377,17 +384,15 @@ protected function createAnchorSelect(\Magento\Store\Model\Store $store)
377384
['cc' => $this->getTable('catalog_category_entity')],
378385
[]
379386
)->joinInner(
380-
['cc2' => $this->getTable('catalog_category_entity')],
381-
'cc2.path LIKE ' . $this->connection->getConcatSql(
382-
[$this->connection->quoteIdentifier('cc.path'), $this->connection->quote('/%')]
383-
) . ' AND cc.entity_id NOT IN (' . implode(
387+
['cc2' => $temporaryTreeTable],
388+
'cc2.parent_id = cc.entity_id AND cc.entity_id NOT IN (' . implode(
384389
',',
385390
$rootCatIds
386391
) . ')',
387392
[]
388393
)->joinInner(
389394
['ccp' => $this->getTable('catalog_category_product')],
390-
'ccp.category_id = cc2.entity_id',
395+
'ccp.category_id = cc2.child_id',
391396
[]
392397
)->joinInner(
393398
['cpe' => $this->getTable('catalog_product_entity')],
@@ -459,6 +464,92 @@ protected function createAnchorSelect(\Magento\Store\Model\Store $store)
459464
);
460465
}
461466

467+
/**
468+
* Get temporary table name for concurrent indexing in persistent connection
469+
* Temp table name is NOT shared between action instances and each action has it's own temp tree index
470+
*
471+
* @return string
472+
*/
473+
protected function getTemporaryTreeIndexTableName()
474+
{
475+
if (empty($this->tempTreeIndexTableName)) {
476+
$this->tempTreeIndexTableName = $this->connection->getTableName('temp_catalog_category_tree_index')
477+
. '_'
478+
. substr(md5(time() . rand(0, 999999999)), 0, 8);
479+
}
480+
481+
return $this->tempTreeIndexTableName;
482+
}
483+
484+
/**
485+
* Build and populate the temporary category tree index table
486+
*
487+
* Returns the name of the temporary table to use in queries.
488+
*
489+
* @return string
490+
*/
491+
protected function makeTempCategoryTreeIndex()
492+
{
493+
// Note: this temporary table is per-connection, so won't conflict by prefix.
494+
$temporaryName = $this->getTemporaryTreeIndexTableName();
495+
496+
$temporaryTable = $this->connection->newTable($temporaryName);
497+
$temporaryTable->addColumn(
498+
'parent_id',
499+
\Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
500+
null,
501+
['nullable' => false, 'unsigned' => true]
502+
);
503+
$temporaryTable->addColumn(
504+
'child_id',
505+
\Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
506+
null,
507+
['nullable' => false, 'unsigned' => true]
508+
);
509+
// Each entry will be unique.
510+
$temporaryTable->addIndex(
511+
'idx_primary',
512+
['parent_id', 'child_id'],
513+
['type' => \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_PRIMARY]
514+
);
515+
516+
// Drop the temporary table in case it already exists on this (persistent?) connection.
517+
$this->connection->dropTemporaryTable($temporaryName);
518+
$this->connection->createTemporaryTable($temporaryTable);
519+
520+
$this->fillTempCategoryTreeIndex($temporaryName);
521+
522+
return $temporaryName;
523+
}
524+
525+
/**
526+
* Populate the temporary category tree index table
527+
*
528+
* @param string $temporaryName
529+
*/
530+
protected function fillTempCategoryTreeIndex($temporaryName)
531+
{
532+
// This finds all children (cc2) that descend from a parent (cc) by path.
533+
// For example, cc.path may be '1/2', and cc2.path may be '1/2/3/4/5'.
534+
$temporarySelect = $this->connection->select()->from(
535+
['cc' => $this->getTable('catalog_category_entity')],
536+
['parent_id' => 'entity_id']
537+
)->joinInner(
538+
['cc2' => $this->getTable('catalog_category_entity')],
539+
'cc2.path LIKE ' . $this->connection->getConcatSql(
540+
[$this->connection->quoteIdentifier('cc.path'), $this->connection->quote('/%')]
541+
),
542+
['child_id' => 'entity_id']
543+
);
544+
545+
$this->connection->query(
546+
$temporarySelect->insertFromSelect(
547+
$temporaryName,
548+
['parent_id', 'child_id']
549+
)
550+
);
551+
}
552+
462553
/**
463554
* Retrieve select for reindex products of non anchor categories
464555
*

‎app/code/Magento/Catalog/Model/ResourceModel/Collection/AbstractCollection.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,12 +97,12 @@ public function setStore($store)
9797
/**
9898
* Set store scope
9999
*
100-
* @param int|string|\Magento\Store\Model\Store $storeId
100+
* @param int|string|\Magento\Store\Api\Data\StoreInterface $storeId
101101
* @return $this
102102
*/
103103
public function setStoreId($storeId)
104104
{
105-
if ($storeId instanceof \Magento\Store\Model\Store) {
105+
if ($storeId instanceof \Magento\Store\Api\Data\StoreInterface) {
106106
$storeId = $storeId->getId();
107107
}
108108
$this->_storeId = (int)$storeId;

‎app/code/Magento/Catalog/Test/Unit/Model/CategoryManagementTest.php

Lines changed: 117 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,21 +27,52 @@ class CategoryManagementTest extends \PHPUnit_Framework_TestCase
2727
*/
2828
protected $categoriesFactoryMock;
2929

30+
/**
31+
* @var \Magento\Framework\TestFramework\Unit\Helper\ObjectManager
32+
*/
33+
protected $objectManagerHelper;
34+
35+
/**
36+
* @var \Magento\Framework\App\ScopeResolverInterface|\PHPUnit_Framework_MockObject_MockObject
37+
*/
38+
protected $scopeResolverMock;
39+
40+
/**
41+
* @var \Magento\Framework\App\ScopeInterface|\PHPUnit_Framework_MockObject_MockObject
42+
*/
43+
protected $scopeMock;
44+
3045
protected function setUp()
3146
{
47+
48+
$this->objectManagerHelper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
3249
$this->categoryRepositoryMock = $this->getMock('Magento\Catalog\Api\CategoryRepositoryInterface');
3350
$this->categoryTreeMock = $this->getMock('Magento\Catalog\Model\Category\Tree', [], [], '', false);
3451
$this->categoriesFactoryMock = $this->getMock(
3552
'Magento\Catalog\Model\ResourceModel\Category\CollectionFactory',
36-
['create'],
53+
['create', 'addFilter', 'getFirstItem'],
3754
[],
3855
'',
3956
false
4057
);
41-
$this->model = new \Magento\Catalog\Model\CategoryManagement(
42-
$this->categoryRepositoryMock,
43-
$this->categoryTreeMock,
44-
$this->categoriesFactoryMock
58+
59+
$this->model = $this->objectManagerHelper->getObject(
60+
'\Magento\Catalog\Model\CategoryManagement',
61+
[
62+
'categoryRepository' => $this->categoryRepositoryMock,
63+
'categoryTree' => $this->categoryTreeMock,
64+
'categoriesFactory' => $this->categoriesFactoryMock
65+
]
66+
);
67+
68+
$this->scopeResolverMock = $this->getMock('\Magento\Framework\App\ScopeResolverInterface');
69+
70+
$this->scopeMock = $this->getMock('Magento\Framework\App\ScopeInterface');
71+
72+
$this->objectManagerHelper->setBackwardCompatibleProperty(
73+
$this->model,
74+
'scopeResolver',
75+
$this->scopeResolverMock
4576
);
4677
}
4778

@@ -82,12 +113,93 @@ public function testGetTreeWithNullArguments()
82113
$this->categoryRepositoryMock->expects($this->never())->method('get');
83114
$this->categoryTreeMock->expects($this->once())->method('getRootNode')->with($category)->willReturn(null);
84115
$this->categoryTreeMock->expects($this->exactly(2))->method('getTree')->with($category, $depth);
116+
117+
$this->scopeResolverMock
118+
->expects($this->once())
119+
->method('getScope')
120+
->willReturn($this->scopeMock);
121+
122+
$this->scopeMock
123+
->expects($this->once())
124+
->method('getCode')
125+
->willReturn(1);
126+
85127
$this->assertEquals(
86128
$this->model->getTree($rootCategoryId, $depth),
87129
$this->categoryTreeMock->getTree(null, null)
88130
);
89131
}
90132

133+
/**
134+
* Check is possible to get all categories for all store starting from top level root category
135+
*/
136+
public function testGetTreeForAllScope()
137+
{
138+
139+
$rootCategoryId = null;
140+
$depth = null;
141+
$category = null;
142+
$categoriesMock = $this->getMock(
143+
'\Magento\Catalog\Model\ResourceModel\Category\Collection',
144+
[],
145+
[],
146+
'',
147+
false
148+
);
149+
$categoryMock = $this->getMock(
150+
'\Magento\Catalog\Model\Category',
151+
[],
152+
[],
153+
'categoryMock',
154+
false
155+
);
156+
$categoriesMock
157+
->expects($this->once())
158+
->method('getFirstItem')
159+
->willReturn($categoryMock);
160+
$categoriesMock
161+
->expects($this->once())
162+
->method('addFilter')
163+
->with('level', ['eq' => 0])
164+
->willReturnSelf();
165+
$this->categoriesFactoryMock
166+
->expects($this->once())
167+
->method('create')
168+
->willReturn($categoriesMock);
169+
$nodeMock = $this->getMock(
170+
'\Magento\Framework\Data\Tree\Node',
171+
[],
172+
[],
173+
'',
174+
false
175+
);
176+
177+
$this->categoryTreeMock
178+
->expects($this->once())
179+
->method('getTree')
180+
->with($nodeMock, $depth);
181+
$this->categoryRepositoryMock
182+
->expects($this->never())
183+
->method('get');
184+
$this->categoryTreeMock
185+
->expects($this->once())
186+
->method('getRootNode')
187+
->with($categoryMock)
188+
->willReturn($nodeMock);
189+
190+
$this->scopeResolverMock
191+
->expects($this->once())
192+
->method('getScope')
193+
->willReturn($this->scopeMock);
194+
195+
$this->scopeMock
196+
->expects($this->once())
197+
->method('getCode')
198+
->willReturn(\Magento\Store\Model\Store::ADMIN_CODE);
199+
200+
$this->model->getTree();
201+
}
202+
91203
public function testMove()
92204
{
93205
$categoryId = 2;

0 commit comments

Comments
 (0)