GraphQL-174: Absolute image paths for Products

Author: Valeriy Nayda

app/code/Magento/CatalogGraphQl/Model/Resolver/Product/ProductImage/Label.php

@@ -62,24 +62,33 @@ public function resolve(
 
         /** @var Product $product */
         $product = $value['model'];
+        $imageType = $value['image_type'];
+        $imagePath = $product->getData($imageType);
+        $productId = (int)$product->getEntityId();
+
+        // null if image is not set
+        if (null === $imagePath) {
+            return $this->getAttributeValue($productId, 'name');
+        }
+
+        $imageLabel = $this->getAttributeValue($productId, $imageType . '_label');
+        if (null === $imageLabel) {
+            $imageLabel = $this->getAttributeValue($productId, 'name');
+        }
 
-        $imageLabel = $this->getImageLabel((int)$product->getEntityId(), $value['image_type']);
         return $imageLabel;
     }
 
     /**
      * @param int $productId
-     * @param string $imageType
-     * @return string
+     * @param string $attributeCode
+     * @return null|string Null if attribute value is not exists
      */
-    private function getImageLabel(int $productId, string $imageType): string
+    private function getAttributeValue(int $productId, string $attributeCode): ?string
     {
         $storeId = $this->storeManager->getStore()->getId();
 
-        $imageLabel = $this->productResource->getAttributeRawValue($productId, $imageType . '_label', $storeId);
-        if (empty($imageLabel)) {
-            $imageLabel = $this->productResource->getAttributeRawValue($productId, 'name', $storeId);
-        }
-        return $imageLabel;
+        $value = $this->productResource->getAttributeRawValue($productId, $attributeCode, $storeId);
+        return is_array($value) && empty($value) ? null : $value;
     }
 }

app/code/Magento/CatalogGraphQl/Model/Resolver/Product/ProductImage/Url.php

@@ -61,10 +61,10 @@ public function resolve(
 
     /**
      * @param string $imageType
-     * @param string $imagePath
+     * @param string|null $imagePath Null if image is not set
      * @return string
      */
-    private function getImageUrl(string $imageType, string $imagePath): string
+    private function getImageUrl(string $imageType, ?string $imagePath): string
     {
         $image = $this->productImageFactory->create();
         $image->setDestinationSubdir($imageType)