Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refs #10725 removing and creating url rewrites #10939

Closed
wants to merge 1 commit into from
Closed

refs #10725 removing and creating url rewrites #10939

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 8 additions & 5 deletions app/code/Magento/CatalogUrlRewrite/Model/ProductUrlRewriteGenerator.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,15 +123,18 @@ private function getProductScopeRewriteGenerator()
*
* @param \Magento\Catalog\Model\Product $product
* @param int|null $rootCategoryId
* @param int|null $storeId
* @return \Magento\UrlRewrite\Service\V1\Data\UrlRewrite[]
*/
public function generate(Product $product, $rootCategoryId = null)
public function generate(Product $product, $rootCategoryId = null,$storeId = null)
{
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

please add space after comma

if ($product->getVisibility() == Visibility::VISIBILITY_NOT_VISIBLE) {
return [];
if (is_null($storeId)) {
if ($product->getVisibility() == Visibility::VISIBILITY_NOT_VISIBLE) {
return [];
}
$storeId = $product->getStoreId();
}

$storeId = $product->getStoreId();


$productCategories = $product->getCategoryCollection()
->addAttributeToSelect('url_key')
Expand Down
36 changes: 28 additions & 8 deletions app/code/Magento/CatalogUrlRewrite/Observer/ProductProcessUrlRewriteSavingObserver.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,21 +44,41 @@ public function execute(\Magento\Framework\Event\Observer $observer)
{
/** @var Product $product */
$product = $observer->getEvent()->getProduct();

if ($product->dataHasChangedFor('url_key')
|| $product->getIsChangedCategories()
|| $product->getIsChangedWebsites()
|| $product->dataHasChangedFor('visibility')
) {
$this->urlPersist->deleteByData([
$params = [
UrlRewrite::ENTITY_ID => $product->getId(),
UrlRewrite::ENTITY_TYPE => ProductUrlRewriteGenerator::ENTITY_TYPE,
UrlRewrite::REDIRECT_TYPE => 0,
UrlRewrite::STORE_ID => $product->getStoreId()
]);

if ($product->isVisibleInSiteVisibility()) {
$this->urlPersist->replace($this->productUrlRewriteGenerator->generate($product));
UrlRewrite::REDIRECT_TYPE => 0
];
// category and websites are global - but we can change it from store view
// @todo getIsChangedCategories() works wrong. [works only after add category, after remove returns false]
if ($product->getIsChangedCategories() ||
$product->getIsChangedWebsites()) {
$store = 0;
} else {
if ($store = $product->getStoreId()) {
$params[UrlRewrite::STORE_ID] = $store; // we are in specific store
}
}
$this->urlPersist->deleteByData($params);
if (!$store) {
$stores = $product->getStoreIds(); // after global change, we should rebuild url for all visible stores
} else {
$stores = [$store];
}
$productResource = $product->getResource();
$siteVisibilities = $product->getVisibleInSiteVisibilities();
$productId = $product->getId();
foreach ($stores as $storeId) {
$visible = $productResource->getAttributeRawValue($productId,'visibility',$storeId);
if (in_array($visible,$siteVisibilities)) {
$this->urlPersist->replace($this->productUrlRewriteGenerator->generate($product,null,$storeId));
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

please add spaces after commas

}
}
}
}
Expand Down
67 changes: 46 additions & 21 deletions ...gento/CatalogUrlRewrite/Test/Unit/Observer/ProductProcessUrlRewriteSavingObserverTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,10 @@ class ProductProcessUrlRewriteSavingObserverTest extends \PHPUnit\Framework\Test
*/
protected $product;

/**
* @var \Magento\Catalog\Model\ResourceModel\Product | \PHPUnit_Framework_MockObject_MockObject
*/
protected $resourceProduct;
/**
* @var \Magento\CatalogUrlRewrite\Model\ProductUrlRewriteGenerator|\PHPUnit_Framework_MockObject_MockObject
*/
Expand All @@ -62,12 +66,19 @@ protected function setUp()
$this->product = $this->createPartialMock(\Magento\Catalog\Model\Product::class, [
'getId',
'dataHasChangedFor',
'isVisibleInSiteVisibility',
'getVisibleInSiteVisibilities',
'getIsChangedWebsites',
'getIsChangedCategories',
'getStoreId'
'getStoreId',
'getStoreIds',
'getResource'

]);
$this->resourceProduct = $this->createPartialMock(\Magento\Catalog\Model\ResourceModel\Product::class, [
'getAttributeRawValue'
]);
$this->product->expects($this->any())->method('getId')->will($this->returnValue(3));
$this->product->expects($this->any())->method('getResource')->willReturn($this->resourceProduct);
$this->event = $this->createPartialMock(\Magento\Framework\Event::class, ['getProduct']);
$this->event->expects($this->any())->method('getProduct')->willReturn($this->product);
$this->observer = $this->createPartialMock(\Magento\Framework\Event\Observer::class, ['getEvent']);
Expand All @@ -76,6 +87,10 @@ protected function setUp()
\Magento\CatalogUrlRewrite\Model\ProductUrlRewriteGenerator::class,
['generate']
);
$this->product->expects($this->any())
->method('getVisibleInSiteVisibilities')
->will($this->returnValue([2,3,4]));

$this->productUrlRewriteGenerator->expects($this->any())
->method('generate')
->will($this->returnValue([3 => 'rewrite']));
Expand All @@ -102,55 +117,61 @@ public function urlKeyDataProvider()
'isChangedVisibility' => false,
'isChangedWebsites' => false,
'isChangedCategories' => false,
'visibilityResult' => true,
'visibilityResult' => 3,
'expectedDeleteCount' => 1,
'expectedReplaceCount' => 1,
'global' => false

],
'no chnages' => [
'isChangedUrlKey' => false,
'isChangedVisibility' => false,
'isChangedWebsites' => false,
'isChangedCategories' => false,
'visibilityResult' => true,
'visibilityResult' => 3,
'expectedDeleteCount' => 0,
'expectedReplaceCount' => 0
'expectedReplaceCount' => 0,
'global' => false,
],
'visibility changed' => [
'isChangedUrlKey' => false,
'isChangedVisibility' => true,
'isChangedWebsites' => false,
'isChangedCategories' => false,
'visibilityResult' => true,
'visibilityResult' => 3,
'expectedDeleteCount' => 1,
'expectedReplaceCount' => 1
'expectedReplaceCount' => 1,
'global' => false
],
'websites changed' => [
'isChangedUrlKey' => false,
'isChangedVisibility' => false,
'isChangedWebsites' => true,
'isChangedCategories' => false,
'visibilityResult' => true,
'visibilityResult' => 3,
'expectedDeleteCount' => 1,
'expectedReplaceCount' => 1
'expectedReplaceCount' => 2,
'global' => true
],
'categories changed' => [
'isChangedUrlKey' => false,
'isChangedVisibility' => false,
'isChangedWebsites' => false,
'isChangedCategories' => true,
'visibilityResult' => true,
'visibilityResult' => 3,
'expectedDeleteCount' => 1,
'expectedReplaceCount' => 1
'expectedReplaceCount' => 2,
'global' => true
],
'url changed invisible' => [
'isChangedUrlKey' => true,
'isChangedVisibility' => false,
'isChangedWebsites' => false,
'isChangedCategories' => false,
'visibilityResult' => false,
'visibilityResult' => 0,
'expectedDeleteCount' => 1,
'expectedReplaceCount' => 0
'expectedReplaceCount' => 0,
'global' => false
],
];
}
Expand All @@ -160,9 +181,10 @@ public function urlKeyDataProvider()
* @param bool $isChangedVisibility
* @param bool $isChangedWebsites
* @param bool $isChangedCategories
* @param bool $visibilityResult
* @param int $visibilityResult
* @param int $expectedDeleteCount
* @param int $expectedReplaceCount
* @param bool $global
*
* @dataProvider urlKeyDataProvider
*/
Expand All @@ -173,9 +195,11 @@ public function testExecuteUrlKey(
$isChangedCategories,
$visibilityResult,
$expectedDeleteCount,
$expectedReplaceCount
$expectedReplaceCount,
$global
) {
$this->product->expects($this->any())->method('getStoreId')->will($this->returnValue(12));
$this->product->expects($this->any())->method('getStoreIds')->will($this->returnValue([12,13]));

$this->product->expects($this->any())
->method('dataHasChangedFor')
Expand All @@ -194,16 +218,17 @@ public function testExecuteUrlKey(
->method('getIsChangedCategories')
->will($this->returnValue($isChangedCategories));

$this->urlPersist->expects($this->exactly($expectedDeleteCount))->method('deleteByData')->with([
$params = [
UrlRewrite::ENTITY_ID => $this->product->getId(),
UrlRewrite::ENTITY_TYPE => ProductUrlRewriteGenerator::ENTITY_TYPE,
UrlRewrite::REDIRECT_TYPE => 0,
UrlRewrite::STORE_ID => $this->product->getStoreId()
]);
];
if (!$global) {
$params[UrlRewrite::STORE_ID] = $this->product->getStoreId();
}
$this->urlPersist->expects($this->exactly($expectedDeleteCount))->method('deleteByData')->with($params);
$this->resourceProduct->expects($this->any())->method('getAttributeRawValue')->will($this->returnValue($visibilityResult));

$this->product->expects($this->any())
->method('isVisibleInSiteVisibility')
->will($this->returnValue($visibilityResult));

$this->urlPersist->expects($this->exactly($expectedReplaceCount))
->method('replace')
Expand Down