Merge pull request #11 from searchspring/fix-issue-with-layout-update…

…-attribute fixed issue with invalid processing of option text for the layout upd…
searchspring · Oct 5, 2023 · 22b88b6 · 22b88b6
2 parents efecadd + f79ae69
commit 22b88b6
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 10 deletions.
diff --git a/Model/Feed/DataProvider/Attribute/ValueProcessor.php b/Model/Feed/DataProvider/Attribute/ValueProcessor.php
@@ -19,7 +19,9 @@
 namespace SearchSpring\Feed\Model\Feed\DataProvider\Attribute;
 
 use Exception;
+use Magento\Catalog\Model\Product;
 use Magento\Catalog\Model\ResourceModel\Eav\Attribute;
+use Magento\Eav\Model\Entity\Attribute\Source\SpecificSourceInterface;
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Phrase;
 
@@ -35,7 +37,7 @@ class ValueProcessor
      * @throws LocalizedException
      * @throws Exception
      */
-    public function getValue(Attribute $attribute, $value)
+    public function getValue(Attribute $attribute, $value, Product $product)
     {
         $key = null;
         $code = $attribute->getAttributeCode();
@@ -48,7 +50,14 @@ public function getValue(Attribute $attribute, $value)
 
         $result = null;
         if ($this->isSourceAttribute($attribute)) {
-            $result = $attribute->getSource()->getOptionText($value);
+            $source = $attribute->getSource();
+            if ($source instanceof SpecificSourceInterface) {
+                $sourceClone = clone $source;
+                $sourceClone->getOptionsFor($product);
+                $result = $sourceClone->getOptionText($value);
+            } else {
+                $result = $source->getOptionText($value);
+            }
         } else {
             $result = $value;
         }

diff --git a/Model/Feed/DataProvider/AttributesProvider.php b/Model/Feed/DataProvider/AttributesProvider.php
@@ -107,7 +107,7 @@ private function getProductData(Product $product) : array
             }
             /** @var Attribute $attribute */
             $attribute = $this->attributes[$key];
-            $result[$key] = $this->valueProcessor->getValue($attribute, $fieldValue);
+            $result[$key] = $this->valueProcessor->getValue($attribute, $fieldValue, $product);
         }
 
         return $result;

diff --git a/Model/Feed/DataProvider/Product/GetChildProductsData.php b/Model/Feed/DataProvider/Product/GetChildProductsData.php
@@ -65,7 +65,7 @@ public function getProductData(
                     continue;
                 }
 
-                $value = $this->valueProcessor->getValue($childAttribute, $child->getData($code));
+                $value = $this->valueProcessor->getValue($childAttribute, $child->getData($code), $child);
                 if ($value != '' && !empty($value)) {
                     $result[$code][] = $value;
                 }

diff --git a/Test/Unit/Model/Feed/DataProvider/Attribute/ValueProcessorTest.php b/Test/Unit/Model/Feed/DataProvider/Attribute/ValueProcessorTest.php
@@ -16,6 +16,7 @@
 
 namespace SearchSpring\Feed\Test\Unit\Model\Feed\DataProvider\Attribute;
 
+use Magento\Catalog\Model\Product;
 use Magento\Catalog\Model\ResourceModel\Eav\Attribute;
 use Magento\Eav\Model\Entity\Attribute\Source\AbstractSource;
 use Magento\Framework\Exception\LocalizedException;
@@ -39,6 +40,9 @@ public function setUp(): void
      */
     public function testGetValue()
     {
+        $productMock = $this->getMockBuilder(Product::class)
+            ->disableOriginalConstructor()
+            ->getMock();
         $attributeMock = $this->getMockBuilder(Attribute::class)
             ->disableOriginalConstructor()
             ->getMock();
@@ -51,12 +55,15 @@ public function testGetValue()
 
         $this->assertSame(
             'test',
-            $this->valueProcessor->getValue($attributeMock, 'test')
+            $this->valueProcessor->getValue($attributeMock, 'test', $productMock)
         );
     }
 
     public function testGetValueOnCache()
     {
+        $productMock = $this->getMockBuilder(Product::class)
+            ->disableOriginalConstructor()
+            ->getMock();
         $abstractSourceMock = $this->createMock(AbstractSource::class);
         $attributeMock = $this->getMockBuilder(Attribute::class)
             ->disableOriginalConstructor()
@@ -74,8 +81,8 @@ public function testGetValueOnCache()
             ->method('getOptionText')
             ->willReturn('test_option_text');
 
-        $this->valueProcessor->getValue($attributeMock, 'test');
-        $this->valueProcessor->getValue($attributeMock, 'test');
+        $this->valueProcessor->getValue($attributeMock, 'test', $productMock);
+        $this->valueProcessor->getValue($attributeMock, 'test', $productMock);
     }
 
     /**
@@ -84,6 +91,9 @@ public function testGetValueOnCache()
      */
     public function testGetValueException()
     {
+        $productMock = $this->getMockBuilder(Product::class)
+            ->disableOriginalConstructor()
+            ->getMock();
         $attributeMock = $this->getMockBuilder(Attribute::class)
             ->disableOriginalConstructor()
             ->getMock();
@@ -102,6 +112,6 @@ public function testGetValueException()
 
         $this->expectException(\Exception::class);
 
-        $this->valueProcessor->getValue($attributeMock, $attributeMock);
+        $this->valueProcessor->getValue($attributeMock, $attributeMock, $productMock);
     }
 }
diff --git a/composer.json b/composer.json
@@ -1,7 +1,7 @@
 {
     "name": "searchspring/magento2-module",
     "type": "magento2-module",
-    "version": "2.0.0",
+    "version": "2.0.1",
     "license": "GPL-3.0-only",
     "require": {
         "magento/module-customer": "^103.0"

diff --git a/etc/module.xml b/etc/module.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" ?>
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-	<module name="SearchSpring_Feed" setup_version="2.0.0">
+	<module name="SearchSpring_Feed" setup_version="2.0.1">
         <sequence>
             <module name="Magento_Store"/>
             <module name="Magento_Customer"/>