Merge pull request #11 from riha112/1650

#1650 Remove empty attributes from response

Author: alfredsgenkins

src/Model/Resolver/Products/DataPostProcessor/Attributes.php

@@ -126,8 +126,13 @@ protected function appendWithValue(
             foreach ($attributes as $attributeCode => $attribute) {
                 $attributeValue = $product->getData($attributeCode);
 
+                // Remove all empty attributes
                 if (!$attributeValue) {
-                    // Remove all empty attributes
+                    // If attribute does not contain both value nor options then we remove it from output
+                    if (!isset($productAttributes[$productId][$attributeCode]) ||
+                        !$productAttributes[$productId][$attributeCode]['attribute_options']) {
+                        unset($productAttributes[$productId][$attributeCode]);
+                    }
                     continue;
                 }
 
@@ -289,8 +294,11 @@ protected function isAttributeSkipped(
         /**
          * On PLP, KEEP attribute if it is used on PLP.
          * This means if not visible on PLP we should SKIP it.
+         * 
+         * On PDP, If attribute has no label then it shouldn't be
+         * visible.
          */
-        return !$attribute->getUsedInProductListing();
+        return !$attribute->getUsedInProductListing() || !$attribute->getStoreLabel();
     }
 
     /**
@@ -358,12 +366,6 @@ public function process(
             }
         }
 
-        $this->appendWithValue(
-            $attributes,
-            $productIds,
-            $productAttributes
-        );
-
         if ($isCollectOptions) {
             $this->appendWithOptions(
                 $attributes,
@@ -373,6 +375,12 @@ public function process(
             );
         }
 
+        $this->appendWithValue(
+            $attributes,
+            $productIds,
+            $productAttributes
+        );
+
         return function (&$productData) use ($productAttributes) {
             if (!isset($productData['entity_id'])) {
                 return;