Skip to content

Commit 5ed78d7

Browse files
author
Oleksii Korshenko
committed
MAGETWO-55487: Topology config: Utilize RabbitMQ native support of wildcard topics
2 parents e9dcd58 + c800ca3 commit 5ed78d7

File tree

97 files changed

+2901
-359
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

97 files changed

+2901
-359
lines changed

‎app/code/Magento/Captcha/view/frontend/web/js/view/checkout/defaultCaptcha.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@ define(
2626
},
2727
initialize: function() {
2828
this._super();
29-
captchaConfig = window[this.configSource]['captcha'];
3029

31-
if (captchaConfig) {
30+
if (window[this.configSource] && window[this.configSource]['captcha']) {
31+
captchaConfig = window[this.configSource]['captcha'];
3232
$.each(captchaConfig, function(formId, captchaData) {
3333
captchaData.formId = formId;
3434
captchaList.add(Captcha(captchaData));

‎app/code/Magento/Catalog/Api/Data/CategoryLinkInterface.php

+58
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
<?php
2+
/**
3+
* Copyright © 2016 Magento. All rights reserved.
4+
* See COPYING.txt for license details.
5+
*/
6+
7+
namespace Magento\Catalog\Api\Data;
8+
9+
use Magento\Framework\Api\ExtensibleDataInterface;
10+
11+
/**
12+
* @api
13+
*/
14+
interface CategoryLinkInterface extends ExtensibleDataInterface
15+
{
16+
/**
17+
* @return int|null
18+
*/
19+
public function getPosition();
20+
21+
/**
22+
* @param int $position
23+
* @return $this
24+
*/
25+
public function setPosition($position);
26+
27+
/**
28+
* Get category id
29+
*
30+
* @return string
31+
*/
32+
public function getCategoryId();
33+
34+
/**
35+
* Set category id
36+
*
37+
* @param string $categoryId
38+
* @return $this
39+
*/
40+
public function setCategoryId($categoryId);
41+
42+
/**
43+
* Retrieve existing extension attributes object.
44+
*
45+
* @return \Magento\Catalog\Api\Data\CategoryLinkExtensionInterface|null
46+
*/
47+
public function getExtensionAttributes();
48+
49+
/**
50+
* Set an extension attributes object.
51+
*
52+
* @param \Magento\Catalog\Api\Data\CategoryLinkExtensionInterface $extensionAttributes
53+
* @return $this
54+
*/
55+
public function setExtensionAttributes(
56+
\Magento\Catalog\Api\Data\CategoryLinkExtensionInterface $extensionAttributes
57+
);
58+
}

‎app/code/Magento/Catalog/Model/Category/Link/ReadHandler.php

+73
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,73 @@
1+
<?php
2+
/**
3+
* Copyright © 2016 Magento. All rights reserved.
4+
* See COPYING.txt for license details.
5+
*/
6+
namespace Magento\Catalog\Model\Category\Link;
7+
8+
use Magento\Framework\EntityManager\Operation\ExtensionInterface;
9+
10+
/**
11+
* Read handler for catalog product link.
12+
*/
13+
class ReadHandler implements ExtensionInterface
14+
{
15+
/**
16+
* @var \Magento\Catalog\Api\Data\CategoryLinkInterfaceFactory
17+
*/
18+
private $categoryLinkFactory;
19+
20+
/**
21+
* @var \Magento\Catalog\Model\ResourceModel\Product\CategoryLink
22+
*/
23+
private $productCategoryLink;
24+
25+
/**
26+
* @var \Magento\Framework\Api\DataObjectHelper
27+
*/
28+
private $dataObjectHelper;
29+
30+
/**
31+
* ReadHandler constructor.
32+
*
33+
* @param \Magento\Catalog\Api\Data\CategoryLinkInterfaceFactory $categoryLinkFactory
34+
* @param \Magento\Framework\Api\DataObjectHelper $dataObjectHelper
35+
* @param \Magento\Catalog\Model\ResourceModel\Product\CategoryLink $productCategoryLink
36+
*/
37+
public function __construct(
38+
\Magento\Catalog\Api\Data\CategoryLinkInterfaceFactory $categoryLinkFactory,
39+
\Magento\Framework\Api\DataObjectHelper $dataObjectHelper,
40+
\Magento\Catalog\Model\ResourceModel\Product\CategoryLink $productCategoryLink
41+
) {
42+
$this->categoryLinkFactory = $categoryLinkFactory;
43+
$this->dataObjectHelper = $dataObjectHelper;
44+
$this->productCategoryLink = $productCategoryLink;
45+
}
46+
47+
/**
48+
* @param object $entity
49+
* @param array $arguments
50+
* @return object
51+
* @SuppressWarnings(PHPMD.UnusedFormalParameter)
52+
*/
53+
public function execute($entity, $arguments = [])
54+
{
55+
$categoryLinks = [];
56+
foreach ($this->productCategoryLink->getCategoryLinks($entity) as $categoryData) {
57+
/** @var \Magento\Catalog\Api\Data\CategoryLinkInterface $categoryLink */
58+
$categoryLink = $this->categoryLinkFactory->create();
59+
$this->dataObjectHelper->populateWithArray(
60+
$categoryLink,
61+
$categoryData,
62+
\Magento\Catalog\Api\Data\CategoryLinkInterface::class
63+
);
64+
$categoryLinks[] = $categoryLink;
65+
}
66+
67+
$extensionAttributes = $entity->getExtensionAttributes();
68+
$extensionAttributes->setCategoryLinks(!empty($categoryLinks) ? $categoryLinks : null);
69+
$entity->setExtensionAttributes($extensionAttributes);
70+
71+
return $entity;
72+
}
73+
}

‎app/code/Magento/Catalog/Model/Category/Link/SaveHandler.php

+131
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,131 @@
1+
<?php
2+
/**
3+
* Copyright © 2016 Magento. All rights reserved.
4+
* See COPYING.txt for license details.
5+
*/
6+
namespace Magento\Catalog\Model\Category\Link;
7+
8+
use Magento\Catalog\Api\Data\CategoryLinkInterface;
9+
use Magento\Catalog\Model\Indexer\Product\Category;
10+
use Magento\Framework\EntityManager\Operation\ExtensionInterface;
11+
12+
/**
13+
* Save handler for catalog product link.
14+
*/
15+
class SaveHandler implements ExtensionInterface
16+
{
17+
18+
/**
19+
* @var \Magento\Catalog\Model\ResourceModel\Product\CategoryLink
20+
*/
21+
private $productCategoryLink;
22+
23+
/**
24+
* @var \Magento\Framework\EntityManager\HydratorPool
25+
*/
26+
private $hydratorPool;
27+
28+
/**
29+
* SaveHandler constructor.
30+
*
31+
* @param \Magento\Catalog\Model\ResourceModel\Product\CategoryLink $productCategoryLink
32+
* @param \Magento\Framework\EntityManager\HydratorPool $hydratorPool
33+
*/
34+
public function __construct(
35+
\Magento\Catalog\Model\ResourceModel\Product\CategoryLink $productCategoryLink,
36+
\Magento\Framework\EntityManager\HydratorPool $hydratorPool
37+
) {
38+
$this->productCategoryLink = $productCategoryLink;
39+
$this->hydratorPool = $hydratorPool;
40+
}
41+
42+
/**
43+
* @param object $entity
44+
* @param array $arguments
45+
* @return object
46+
* @SuppressWarnings(PHPMD.UnusedFormalParameter)
47+
*/
48+
public function execute($entity, $arguments = [])
49+
{
50+
$entity->setIsChangedCategories(false);
51+
52+
$extensionAttributes = $entity->getExtensionAttributes();
53+
if ($extensionAttributes === null && !$entity->hasCategoryIds()) {
54+
return $entity;
55+
}
56+
57+
$modelCategoryLinks = $this->getCategoryLinksPositions($entity);
58+
59+
$dtoCategoryLinks = $extensionAttributes->getCategoryLinks();
60+
if ($dtoCategoryLinks !== null) {
61+
$hydrator = $this->hydratorPool->getHydrator(CategoryLinkInterface::class);
62+
$dtoCategoryLinks = array_map(function ($categoryLink) use ($hydrator) {
63+
return $hydrator->extract($categoryLink) ;
64+
}, $dtoCategoryLinks);
65+
$processLinks = $this->mergeCategoryLinks($dtoCategoryLinks, $modelCategoryLinks);
66+
} else {
67+
$processLinks = $modelCategoryLinks;
68+
}
69+
70+
$affectedCategoryIds = $this->productCategoryLink->saveCategoryLinks($entity, $processLinks);
71+
72+
if (!empty($affectedCategoryIds)) {
73+
$entity->setAffectedCategoryIds($affectedCategoryIds);
74+
$entity->setIsChangedCategories(true);
75+
}
76+
77+
return $entity;
78+
}
79+
80+
/**
81+
* @param object $entity
82+
* @return array
83+
*/
84+
private function getCategoryLinksPositions($entity)
85+
{
86+
$result = [];
87+
$currentCategoryLinks = $this->productCategoryLink->getCategoryLinks($entity, $entity->getCategoryIds());
88+
foreach ($entity->getCategoryIds() as $categoryId) {
89+
$key = array_search($categoryId, array_column($currentCategoryLinks, 'category_id'));
90+
if ($key === false) {
91+
$result[] = ['category_id' => (int)$categoryId, 'position' => 0];
92+
} else {
93+
$result[] = $currentCategoryLinks[$key];
94+
}
95+
}
96+
97+
return $result;
98+
}
99+
100+
/**
101+
* Merge category links
102+
*
103+
* @param array $newCategoryPositions
104+
* @param array $oldCategoryPositions
105+
* @return array
106+
*/
107+
private function mergeCategoryLinks($newCategoryPositions, $oldCategoryPositions)
108+
{
109+
$result = [];
110+
if (empty($newCategoryPositions)) {
111+
return $result;
112+
}
113+
114+
foreach ($newCategoryPositions as $newCategoryPosition) {
115+
$key = array_search(
116+
$newCategoryPosition['category_id'],
117+
array_column($oldCategoryPositions, 'category_id')
118+
);
119+
120+
if ($key === false) {
121+
$result[] = $newCategoryPosition;
122+
} elseif ($oldCategoryPositions[$key]['position'] != $newCategoryPosition['position']) {
123+
$result[] = $newCategoryPositions[$key];
124+
unset($oldCategoryPositions[$key]);
125+
}
126+
}
127+
$result = array_merge($result, $oldCategoryPositions);
128+
129+
return $result;
130+
}
131+
}

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

+79
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,79 @@
1+
<?php
2+
/**
3+
* Copyright © 2016 Magento. All rights reserved.
4+
* See COPYING.txt for license details.
5+
*/
6+
7+
namespace Magento\Catalog\Model;
8+
9+
/**
10+
* @codeCoverageIgnore
11+
*/
12+
class CategoryLink extends \Magento\Framework\Api\AbstractExtensibleObject implements
13+
\Magento\Catalog\Api\Data\CategoryLinkInterface
14+
{
15+
/**#@+
16+
* Constants
17+
*/
18+
const KEY_POSITION = 'position';
19+
const KEY_CATEGORY_ID = 'category_id';
20+
/**#@-*/
21+
22+
/**
23+
* {@inheritdoc}
24+
*/
25+
public function getPosition()
26+
{
27+
return $this->_get(self::KEY_POSITION);
28+
}
29+
30+
/**
31+
* {@inheritdoc}
32+
*/
33+
public function getCategoryId()
34+
{
35+
return $this->_get(self::KEY_CATEGORY_ID);
36+
}
37+
38+
/**
39+
* @param int $position
40+
* @return $this
41+
*/
42+
public function setPosition($position)
43+
{
44+
return $this->setData(self::KEY_POSITION, $position);
45+
}
46+
47+
/**
48+
* Set category id
49+
*
50+
* @param string $categoryId
51+
* @return $this
52+
*/
53+
public function setCategoryId($categoryId)
54+
{
55+
return $this->setData(self::KEY_CATEGORY_ID, $categoryId);
56+
}
57+
58+
/**
59+
* {@inheritdoc}
60+
*
61+
* @return \Magento\Catalog\Api\Data\CategoryLinkExtensionInterface|null
62+
*/
63+
public function getExtensionAttributes()
64+
{
65+
return $this->_getExtensionAttributes();
66+
}
67+
68+
/**
69+
* {@inheritdoc}
70+
*
71+
* @param \Magento\Catalog\Api\Data\CategoryLinkExtensionInterface $extensionAttributes
72+
* @return $this
73+
*/
74+
public function setExtensionAttributes(
75+
\Magento\Catalog\Api\Data\CategoryLinkExtensionInterface $extensionAttributes
76+
) {
77+
return $this->_setExtensionAttributes($extensionAttributes);
78+
}
79+
}

0 commit comments

Comments
 (0)