ACP2E-2098: fix static error; enhance integration test to return custom product attribute from add to cart mutation.

Author: alzota

app/code/Magento/QuoteGraphQl/Plugin/ProductAttributesExtender.php

@@ -9,9 +9,6 @@
 
 use Magento\Catalog\Model\ResourceModel\Product\Attribute\CollectionFactory as AttributeCollectionFactory;
 use Magento\Framework\GraphQl\Query\Fields;
-use Magento\Framework\Validator\StringLength;
-use Magento\Framework\Validator\ValidateException;
-use Magento\Framework\Validator\ValidatorChain;
 use Magento\Quote\Model\Quote\Config as QuoteConfig;
 
 /**
@@ -65,7 +62,7 @@ public function __construct(
      *
      * @return array
      */
-    private function getValidatedAttributeCodes(): array
+    private function getValidAttributeCodes(): array
     {
         return array_filter($this->fields->getFieldsUsedInQuery(), [$this,'validateAttributeCode']);
     }
@@ -75,7 +72,7 @@ private function getValidatedAttributeCodes(): array
      *
      * @param string|int $attributeCode
      * @return bool
-     * @throws ValidateException
+     * @SuppressWarnings(PHPMD.UnusedPrivateMethod)
      */
     private function validateAttributeCode(string|int $attributeCode): bool
     {
@@ -88,11 +85,15 @@ private function validateAttributeCode(string|int $attributeCode): bool
 
         $minLength = self::ATTRIBUTE_CODE_MIN_LENGTH;
         $maxLength = self::ATTRIBUTE_CODE_MAX_LENGTH;
-        $isAllowedLength = ValidatorChain::is(
-            $attributeCode,
-            StringLength::class,
-            ['min' => $minLength, 'max' => $maxLength]
+
+        $isAllowedLength = filter_var(
+            strlen($attributeCode),
+            FILTER_VALIDATE_INT,
+            ['options' => [
+                'min_range' => $minLength, 'max_range' => $maxLength]
+            ]
         );
+
         if (!$isAllowedLength) {
             return false;
         }
@@ -101,16 +102,16 @@ private function validateAttributeCode(string|int $attributeCode): bool
     }
 
     /**
-     * Get attributes collection based on validated codes
+     * Get attributes based on validated codes
      *
      * @return array
      */
-    private function getAttributeCollection()
+    private function getAttributes(): array
     {
         $attributeCollection = $this->attributeCollectionFactory->create()
             ->removeAllFieldsFromSelect()
             ->addFieldToSelect('attribute_code')
-            ->setCodeFilter($this->getValidatedAttributeCodes())
+            ->setCodeFilter($this->getValidAttributeCodes())
             ->load();
         return $attributeCollection->getColumnValues('attribute_code');
     }
@@ -128,7 +129,7 @@ public function afterGetProductAttributes(QuoteConfig $subject, array $result):
         $hash = hash('sha256', json_encode($this->fields->getFieldsUsedInQuery()));
         if (!$this->fieldsHash || $this->fieldsHash !== $hash) {
             $this->fieldsHash = hash('sha256', json_encode($this->fields->getFieldsUsedInQuery()));
-            $this->attributes = $this->getAttributeCollection();
+            $this->attributes = $this->getAttributes();
         }
         $attributes = $this->attributes;
 

dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/AddProductsToCartWithVariablesTest.php

@@ -8,7 +8,6 @@
 namespace Magento\GraphQl\Quote;
 
 use Magento\Catalog\Api\ProductRepositoryInterface;
-use Magento\Catalog\Model\Product;
 use Magento\Catalog\Test\Fixture\Attribute as AttributeFixture;
 use Magento\Catalog\Test\Fixture\Product as ProductFixture;
 use Magento\Framework\Exception\NoSuchEntityException;
@@ -57,37 +56,43 @@ protected function setUp(): void
      * @throws \Exception
      */
     #[
-        DataFixture(AttributeFixture::class, ['attribute_code' => 'prod_attr'], as: 'attr'),
-        DataFixture(ProductFixture::class, ['attribute_set_id' => 13], as: 'product'),
+        DataFixture(AttributeFixture::class, ['is_visible_on_front' => true], as: 'attr'),
+        DataFixture(ProductFixture::class, ['attribute_set_id' => 4], as: 'product'),
         DataFixture(GuestCartFixture::class, as: 'cart'),
     ]
     public function testAddProductsToEmptyCartWithVariables(): void
     {
-        /** @var Product $product */
+        $attribute = $this->fixtures->get('attr');
         $product = $this->fixtures->get('product');
-        $product->setData('prod_attr', 'default_value');
+        $product->setCustomAttribute($attribute->getAttributeCode(), 'default_value');
         $this->productRepository->save($product);
+
+        $this->cleanCache();
+
         $cart = $this->fixtures->get('cart');
         $maskedQuoteId = $this->quoteIdToMaskedQuoteIdInterface->execute((int) $cart->getId());
-        $query = $this->getAddToCartMutation();
+        $query = $this->getAddToCartMutation($attribute->getAttributeCode());
         $variables = $this->getAddToCartVariables($maskedQuoteId, 1, $product->getSku());
         $response = $this->graphQlMutation($query, $variables);
         $result = $response['addProductsToCart'];
+
         self::assertEmpty($result['user_errors']);
         self::assertCount(1, $result['cart']['items']);
 
         $cartItem = $result['cart']['items'][0];
         self::assertEquals($product->getSku(), $cartItem['product']['sku']);
+        self::assertEquals('default_value', $cartItem['product'][$attribute->getAttributeCode()]);
         self::assertEquals(1, $cartItem['quantity']);
         self::assertEquals($product->getFinalPrice(), $cartItem['prices']['price']['value']);
     }
 
     /**
      * Returns GraphQl mutation for adding item to cart
      *
+     * @param string $customAttributeCode
      * @return string
      */
-    private function getAddToCartMutation(): string
+    private function getAddToCartMutation(string $customAttributeCode): string
     {
         return <<<MUTATION
 mutation (\$cartId: String!, \$products: [CartItemInput!]!) {
@@ -100,6 +105,7 @@ private function getAddToCartMutation(): string
         product {
           sku
           name
+          {$customAttributeCode}
           thumbnail {
             url
             __typename