MAGETWO-54184: Url rewrite do not use store view dependent data for product

Author: rganin

app/code/Magento/CatalogUrlRewrite/Observer/ProductProcessUrlRewriteSavingObserver.php

@@ -5,8 +5,11 @@
  */
 namespace Magento\CatalogUrlRewrite\Observer;
 
+use Magento\Catalog\Model\Product;
 use Magento\Catalog\Model\Product\Visibility;
 use Magento\CatalogUrlRewrite\Model\ProductUrlRewriteGenerator;
+use Magento\Framework\EntityManager\HydratorPool;
+use Magento\Store\Model\StoreScopeProvider;
 use Magento\UrlRewrite\Model\UrlPersistInterface;
 use Magento\UrlRewrite\Service\V1\Data\UrlRewrite;
 use Magento\Framework\Event\ObserverInterface;
@@ -37,13 +40,12 @@ public function __construct(
 
     /**
      * Generate urls for UrlRewrite and save it in storage
-     *
      * @param \Magento\Framework\Event\Observer $observer
      * @return void
      */
     public function execute(\Magento\Framework\Event\Observer $observer)
     {
-        /** @var \Magento\Catalog\Model\Product $product */
+        /** @var Product $product */
         $product = $observer->getEvent()->getProduct();
 
         if ($product->dataHasChangedFor('url_key')
@@ -58,11 +60,8 @@ public function execute(\Magento\Framework\Event\Observer $observer)
                 UrlRewrite::STORE_ID => $product->getStoreId()
             ]);
 
-            $savedProduct = clone $product;
-            $savedProduct->load($product->getId());
-
-            if ($savedProduct->isVisibleInSiteVisibility()) {
-                $this->urlPersist->replace($this->productUrlRewriteGenerator->generate($savedProduct));
+            if ($product->isVisibleInSiteVisibility()) {
+                $this->urlPersist->replace($this->productUrlRewriteGenerator->generate($product));
             }
         }
     }

app/code/Magento/CatalogUrlRewrite/Test/Unit/Observer/ProductProcessUrlRewriteSavingObserverTest.php

@@ -69,7 +69,6 @@ protected function setUp()
                 'isVisibleInSiteVisibility',
                 'getIsChangedWebsites',
                 'getIsChangedCategories',
-                'load',
                 'getStoreId'
             ],
             [],
@@ -197,10 +196,6 @@ public function testExecuteUrlKey(
     ) {
         $this->product->expects($this->any())->method('getStoreId')->will($this->returnValue(12));
 
-        $this->product->expects($this->exactly($expectedProdLoadCount))
-            ->method('load')
-            ->with($this->product->getId());
-
         $this->product->expects($this->any())
             ->method('dataHasChangedFor')
             ->will($this->returnValueMap(

app/code/Magento/Eav/Model/ResourceModel/UpdateHandler.php

@@ -5,6 +5,7 @@
  */
 namespace Magento\Eav\Model\ResourceModel;
 
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\EntityManager\MetadataPool;
 use Magento\Eav\Api\AttributeRepositoryInterface as AttributeRepository;
 use Magento\Framework\Api\SearchCriteriaBuilder;
@@ -48,6 +49,11 @@ class UpdateHandler implements AttributeInterface
      */
     private $scopeResolver;
 
+    /**
+     * @var ReadHandler
+     */
+    private $readHandler;
+
     /**
      * UpdateHandler constructor.
      * @param AttributeRepository $attributeRepository
@@ -163,6 +169,21 @@ public function execute($entityType, $entityData, $arguments = [])
             }
             $this->attributePersistor->flush($entityType, $context);
         }
-        return $entityData;
+        return $this->getReadHandler()->execute($entityType, $entityData, $arguments);
+    }
+
+    /**
+     * Get read handler
+     *
+     * @deprecated
+     *
+     * @return ReadHandler
+     */
+    protected function getReadHandler()
+    {
+        if (!$this->readHandler) {
+            $this->readHandler = ObjectManager::getInstance()->get(ReadHandler::class);
+        }
+        return $this->readHandler;
     }
 }

lib/internal/Magento/Framework/EntityManager/Operation/Update/UpdateAttributes.php

@@ -56,7 +56,7 @@ public function execute($entity, $arguments = [])
         $entityData = array_merge($hydrator->extract($entity), $arguments);
         $actions = $this->attributePool->getActions($entityType, 'update');
         foreach ($actions as $action) {
-            $action->execute($entityType, $entityData, $arguments);
+            $entityData = $action->execute($entityType, $entityData, $arguments);
         }
         $entity = $hydrator->hydrate($entity, $entityData);
         return $entity;