apply some fixes related with failed tests

magento · Jul 17, 2020 · 3cfc907 · 3cfc907
1 parent 0d904ab
commit 3cfc907
Showing 1 changed file with 18 additions and 7 deletions.
diff --git a/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/Query/Search.php b/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/Query/Search.php
@@ -14,6 +14,7 @@
 use Magento\CatalogGraphQl\Model\Resolver\Products\SearchResultFactory;
 use Magento\Framework\Api\Search\SearchCriteriaInterface;
 use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
+use Magento\Framework\Phrase;
 use Magento\Search\Api\SearchInterface;
 use Magento\Search\Model\Search\PageSizeProvider;
 
@@ -112,7 +113,11 @@ public function getResult(
             $productArray[$product->getId()] = $product->getData();
             $productArray[$product->getId()]['model'] = $product;
             foreach ($queryFields as $field) {
-                $productArray[$product->getId()][$field] = $this->getAttributeLabel($product, $field);
+                $productArray[$product->getId()][$field] = $this->getAttributeValue(
+                    $product,
+                    $productArray,
+                    $field
+                );
             }
         }
 
@@ -144,19 +149,25 @@ private function buildSearchCriteria(array $args, ResolveInfo $info): SearchCrit
         return $searchCriteria;
     }
 
+
     /**
-     * Get frontend label of product attribute
+     * Get product attribute value
      *
      * @param Product $product
+     * @param $productArray
      * @param $field
      *
-     * @return mixed
+     * @return string|null
      */
-    private function getAttributeLabel(Product $product, $field)
+    private function getAttributeValue(Product $product, $productArray, $field)
     {
-        $attribute = $product->getResource()->getAttribute($field);
-        if ($attribute) {
-            return $attribute->getFrontend()->getValue($product);
+        if ($attribute = $product->getResource()->getAttribute($field)) {
+            $attributeValue =  $attribute->getFrontend()->getValue($product);
+            if ($attributeValue && !($attributeValue instanceof Phrase) ) {
+               return $attributeValue;
+            } else {
+                return isset($productArray[$product->getId()][$field])? $productArray[$product->getId()][$field] : null;
+            }
         }
     }
 }