Merge pull request #15 from arko-betersport/master

Added attribute group information

Author: alfredsgenkins

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

@@ -23,6 +23,8 @@
 use Magento\Swatches\Helper\Data;
 use ScandiPWA\Performance\Api\ProductsDataPostProcessorInterface;
 use ScandiPWA\Performance\Model\Resolver\ResolveInfoFieldsTrait;
+use Magento\Eav\Api\Data\AttributeGroupInterface;
+use Magento\Eav\Model\ResourceModel\Entity\Attribute\Group\CollectionFactory as GroupCollectionFactory;
 
 /**
  * Class Attributes
@@ -54,6 +56,11 @@ class Attributes implements ProductsDataPostProcessorInterface
      */
     protected $attributeRepository;
 
+    /**
+     * @var GroupCollectionFactory
+     */
+    protected $groupCollection;
+
     /**
      * Attributes constructor.
      * @param Data $swatchHelper
@@ -65,12 +72,14 @@ public function __construct(
         Data $swatchHelper,
         CollectionFactory $productCollection,
         SearchCriteriaBuilder $searchCriteriaBuilder,
-        ProductAttributeRepositoryInterface $attributeRepository
+        ProductAttributeRepositoryInterface $attributeRepository,
+        GroupCollectionFactory $groupCollection
     ) {
         $this->swatchHelper = $swatchHelper;
         $this->productCollection = $productCollection;
         $this->searchCriteriaBuilder = $searchCriteriaBuilder;
         $this->attributeRepository = $attributeRepository;
+        $this->groupCollection = $groupCollection;
     }
 
     /**
@@ -137,6 +146,49 @@ protected function appendWithValue(
         }
     }
 
+    /**
+     * Append product attribute data with value, if value not found, strip the attribute from response
+     * @param $attributes ProductAttributeInterface[]
+     * @param $products array
+     * @param $productAttributes
+     * @throws LocalizedException
+     */
+    protected function appendWithGroup(
+        array $attributes,
+        array $products,
+        array &$productAttributes
+    ): void {
+
+        /** @var Product $product */
+        $setIds = array_map(function ($product) {
+            return $product->getAttributeSetId();
+        }, $products);
+
+        // Retrieve all groups with used product Set Ids
+        $groupCollection = $this->groupCollection->create()
+            ->addFieldToFilter('attribute_set_id', ['in' => $setIds])
+            ->load();
+
+        foreach ($products as $product) {
+            $productId = $product->getId();
+            $setId = $product->getAttributeSetId();
+
+            /** @var Attribute $attribute */
+            foreach ($attributes as $attributeCode => $attribute) {
+
+                // Find the correct group for every attribute
+                /** @var AttributeGroupInterface $group */
+                foreach ($groupCollection as $group) {
+                    if ($attribute->isInGroup($setId, $group->getAttributeGroupId())) {
+                        $productAttributes[$productId][$attributeCode]['attribute_group_name'] = $group->getAttributeGroupName();
+                        $productAttributes[$productId][$attributeCode]['attribute_group_id'] = $group->getAttributeGroupId();
+                        $productAttributes[$productId][$attributeCode]['attribute_group_code'] = $group->getAttributeGroupCode();
+                    }
+                }
+            }
+        }
+    }
+
     /**
      * Append options to attribute options
      *
@@ -381,6 +433,12 @@ public function process(
             $productAttributes
         );
 
+        $this->appendWithGroup(
+            $attributes,
+            $products,
+            $productAttributes
+        );
+
         if ($isCollectOptions) {
             $this->appendWithOptions(
                 $attributes,

src/etc/schema.graphqls

@@ -19,6 +19,9 @@ type AttributeWithValue {
     attribute_value: String
     attribute_label: String
     attribute_id: Int
+    attribute_group_name: String
+    attribute_group_code: String
+    attribute_group_id: String
     attribute_options: [AttributeWithValueOption]
 }