MC-31497: Aggregations do not match ProductAttributeFilterInput

Author: danielrenaud

app/code/Magento/CatalogGraphQl/Model/Resolver/Products/FilterArgument/ProductEntityAttributesForAst.php

@@ -17,6 +17,10 @@
  */
 class ProductEntityAttributesForAst implements FieldEntityAttributesInterface
 {
+    private const PRODUCT_BASE_TYPE = 'SimpleProduct';
+
+    private const PRODUCT_FILTER_INPUT = 'ProductAttributeFilterInput';
+
     /**
      * @var ConfigInterface
      */
@@ -51,9 +55,9 @@ public function __construct(
      */
     public function getEntityAttributes() : array
     {
-        $productTypeSchema = $this->config->getConfigElement('SimpleProduct');
+        $productTypeSchema = $this->config->getConfigElement(self::PRODUCT_BASE_TYPE);
         if (!$productTypeSchema instanceof Type) {
-            throw new \LogicException(__("SimpleProduct type not defined in schema."));
+            throw new \LogicException(__(self::PRODUCT_BASE_TYPE . " type not defined in schema."));
         }
 
         $fields = [];
@@ -69,6 +73,9 @@ public function getEntityAttributes() : array
             }
         }
 
+        $productAttributeFilterFields = $this->getProductAttributeFilterFields();
+        $fields = array_merge($fields, $productAttributeFilterFields);
+
         foreach ($this->additionalAttributes as $attributeName) {
             $fields[$attributeName] = [
                 'type' => 'String',
@@ -78,4 +85,24 @@ public function getEntityAttributes() : array
 
         return $fields;
     }
+
+    /**
+     * Get fields from ProductAttributeFilterInput
+     *
+     * @return array
+     */
+    private function getProductAttributeFilterFields()
+    {
+        $filterFields = [];
+
+        $productAttributeFilterSchema = $this->config->getConfigElement(self::PRODUCT_FILTER_INPUT);
+        $productAttributeFilterFields = $productAttributeFilterSchema->getFields();
+        foreach ($productAttributeFilterFields as $filterField) {
+            $filterFields[$filterField->getName()] = [
+                'type' => 'String',
+                'fieldName' => $filterField->getName(),
+            ];
+        }
+        return $filterFields;
+    }
 }