Merge pull request #115 from magento-troll/MAGETWO-54184

[Troll] Bugfix

Author: MomotenkoNatalia

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

@@ -5,7 +5,7 @@
  */
 namespace Magento\CatalogUrlRewrite\Observer;
 
-use Magento\Catalog\Model\Product\Visibility;
+use Magento\Catalog\Model\Product;
 use Magento\CatalogUrlRewrite\Model\ProductUrlRewriteGenerator;
 use Magento\UrlRewrite\Model\UrlPersistInterface;
 use Magento\UrlRewrite\Service\V1\Data\UrlRewrite;
@@ -37,13 +37,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')
@@ -55,7 +54,9 @@ public function execute(\Magento\Framework\Event\Observer $observer)
                 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));
             }

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

@@ -68,7 +68,8 @@ protected function setUp()
                 'dataHasChangedFor',
                 'isVisibleInSiteVisibility',
                 'getIsChangedWebsites',
-                'getIsChangedCategories'
+                'getIsChangedCategories',
+                'getStoreId'
             ],
             [],
             '',
@@ -114,7 +115,8 @@ public function testUrlKeyDataProvider()
                 'isChangedCategories'   => false,
                 'visibilityResult'      => true,
                 'expectedDeleteCount'   => 1,
-                'expectedReplaceCount'  => 1
+                'expectedReplaceCount'  => 1,
+
             ],
             'no chnages' => [
                 'isChangedUrlKey'       => false,
@@ -184,6 +186,8 @@ public function testExecuteUrlKey(
         $expectedDeleteCount,
         $expectedReplaceCount
     ) {
+        $this->product->expects($this->any())->method('getStoreId')->will($this->returnValue(12));
+
         $this->product->expects($this->any())
             ->method('dataHasChangedFor')
             ->will($this->returnValueMap(
@@ -205,6 +209,7 @@ public function testExecuteUrlKey(
             UrlRewrite::ENTITY_ID => $this->product->getId(),
             UrlRewrite::ENTITY_TYPE => ProductUrlRewriteGenerator::ENTITY_TYPE,
             UrlRewrite::REDIRECT_TYPE => 0,
+            UrlRewrite::STORE_ID => $this->product->getStoreId()
         ]);
 
         $this->product->expects($this->any())

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;
     }
 }

dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductAttributeMediaGalleryManagementInterfaceTest.php

@@ -275,8 +275,6 @@ public function testUpdateWithNotDefaultStoreId()
 
         $targetProduct = $this->getTargetSimpleProduct();
         $this->assertEquals('/m/a/magento_image.jpg', $targetProduct->getData('thumbnail'));
-        $this->assertNull($targetProduct->getData('image'));
-        $this->assertNull($targetProduct->getData('small_image'));
         $mediaGallery = $targetProduct->getData('media_gallery');
         $this->assertCount(1, $mediaGallery['images']);
         $updatedImage = array_shift($mediaGallery['images']);

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;