🔃 [Magento Community Engineering] Community Contributions - GraphQL

Accepted Community Pull Requests:
 - magento/graphql-ce#971: Magento 2.3.2 - PWA - graphQl fetching Issue for phtml file called in static block magento#960 (by @XxXgeoXxX)
 - magento/graphql-ce#1028: magento/graphql-ce#1009: [Test Coverage] Cover exception in SalesGraphQl\Model\Resolver\Orders (by @atwixfirster)
 - magento/graphql-ce#943: graphQl-903: deprecated use_for_shipping in billing address schema (by @VitaliyBoyko)
 - magento/graphql-ce#899: graphQl-890: Replaced usage of the CartItemQuantity with the CartItem… (by @VitaliyBoyko)
 - magento/graphql-ce#1030: Extend coverage for CustomerGraphQL (by @TomashKhamlai)


Fixed GitHub Issues:
 - magento/graphql-ce#1009: [Test Coverage] Cover exception in SalesGraphQl\Model\Resolver\Orders (reported by @TomashKhamlai) has been fixed in magento/graphql-ce#1028 by @atwixfirster in 2.3-develop branch
   Related commits:
     1. 7b345f0

 - magento/graphql-ce#890: [Checkout] Replace usage of CartItemQuantity with CartItemInterface (reported by @paliarush) has been fixed in magento/graphql-ce#899 by @VitaliyBoyko in 2.3-develop branch
   Related commits:
     1. b3f510d
     2. f7ab08e
     3. 94e8f14
     4. 77e3a9c
     5. 863d178
     6. 6297199
     7. 795931f
     8. c9c13a6
     9. 8b51315
     10. 344648f
     11. b9f708b

 - magento/graphql-ce#1011: [Test Coverage] Extend coverage for CustomerGraphQL (reported by @TomashKhamlai) has been fixed in magento/graphql-ce#1030 by @TomashKhamlai in 2.3-develop branch
   Related commits:
     1. 56382f1
     2. a97ef07
     3. 461763e

Author: magento-engcom-team

app/code/Magento/CmsGraphQl/Model/Resolver/DataProvider/Block.php

@@ -56,7 +56,7 @@ public function getData(string $blockIdentifier): array
             );
         }
 
-        $renderedContent = $this->widgetFilter->filter($block->getContent());
+        $renderedContent = $this->widgetFilter->filterDirective($block->getContent());
 
         $blockData = [
             BlockInterface::BLOCK_ID => $block->getId(),

app/code/Magento/CustomerGraphQl/Model/Customer/Address/ExtractCustomerAddressData.php

@@ -105,6 +105,7 @@ public function execute(AddressInterface $address): array
             foreach ($addressData[CustomAttributesDataInterface::CUSTOM_ATTRIBUTES] as $attribute) {
                 $isArray = false;
                 if (is_array($attribute['value'])) {
+                    // @ignoreCoverageStart
                     $isArray = true;
                     foreach ($attribute['value'] as $attributeValue) {
                         if (is_array($attributeValue)) {
@@ -116,6 +117,7 @@ public function execute(AddressInterface $address): array
                         $customAttributes[$attribute['attribute_code']] = implode(',', $attribute['value']);
                         continue;
                     }
+                    // @ignoreCoverageEnd
                 }
                 if ($isArray) {
                     continue;

app/code/Magento/QuoteGraphQl/Model/Cart/AssignBillingAddressToCart.php

@@ -39,17 +39,17 @@ public function __construct(
      *
      * @param CartInterface $cart
      * @param AddressInterface $billingAddress
-     * @param bool $useForShipping
+     * @param bool $sameAsShipping
      * @throws GraphQlInputException
      * @throws GraphQlNoSuchEntityException
      */
     public function execute(
         CartInterface $cart,
         AddressInterface $billingAddress,
-        bool $useForShipping
+        bool $sameAsShipping
     ): void {
         try {
-            $this->billingAddressManagement->assign($cart->getId(), $billingAddress, $useForShipping);
+            $this->billingAddressManagement->assign($cart->getId(), $billingAddress, $sameAsShipping);
         } catch (NoSuchEntityException $e) {
             throw new GraphQlNoSuchEntityException(__($e->getMessage()), $e);
         } catch (InputException $e) {

app/code/Magento/QuoteGraphQl/Model/Cart/ExtractQuoteAddressData.php

@@ -61,21 +61,25 @@ public function execute(QuoteAddress $address): array
             return $addressData;
         }
 
-        $addressItemsData = [];
         foreach ($address->getAllItems() as $addressItem) {
             if ($addressItem instanceof \Magento\Quote\Model\Quote\Item) {
                 $itemId = $addressItem->getItemId();
             } else {
                 $itemId = $addressItem->getQuoteItemId();
             }
-
-            $addressItemsData[] = [
+            $productData = $addressItem->getProduct()->getData();
+            $productData['model'] = $addressItem->getProduct();
+            $addressData['cart_items'][] = [
                 'cart_item_id' => $itemId,
                 'quantity' => $addressItem->getQty()
             ];
+            $addressData['cart_items_v2'][] = [
+                'id' => $itemId,
+                'quantity' => $addressItem->getQty(),
+                'product' => $productData,
+                'model' => $addressItem,
+            ];
         }
-        $addressData['cart_items'] = $addressItemsData;
-
         return $addressData;
     }
 }

app/code/Magento/QuoteGraphQl/Model/Cart/SetBillingAddressOnCart.php

@@ -65,8 +65,11 @@ public function execute(ContextInterface $context, CartInterface $cart, array $b
     {
         $customerAddressId = $billingAddressInput['customer_address_id'] ?? null;
         $addressInput = $billingAddressInput['address'] ?? null;
-        $useForShipping = isset($billingAddressInput['use_for_shipping'])
+        // Need to keep this for BC of `use_for_shipping` field
+        $sameAsShipping = isset($billingAddressInput['use_for_shipping'])
             ? (bool)$billingAddressInput['use_for_shipping'] : false;
+        $sameAsShipping = isset($billingAddressInput['same_as_shipping'])
+            ? (bool)$billingAddressInput['same_as_shipping'] : $sameAsShipping;
 
         if (null === $customerAddressId && null === $addressInput) {
             throw new GraphQlInputException(
@@ -81,15 +84,15 @@ public function execute(ContextInterface $context, CartInterface $cart, array $b
         }
 
         $addresses = $cart->getAllShippingAddresses();
-        if ($useForShipping && count($addresses) > 1) {
+        if ($sameAsShipping && count($addresses) > 1) {
             throw new GraphQlInputException(
-                __('Using the "use_for_shipping" option with multishipping is not possible.')
+                __('Using the "same_as_shipping" option with multishipping is not possible.')
             );
         }
 
         $billingAddress = $this->createBillingAddress($context, $customerAddressId, $addressInput);
 
-        $this->assignBillingAddressToCart->execute($cart, $billingAddress, $useForShipping);
+        $this->assignBillingAddressToCart->execute($cart, $billingAddress, $sameAsShipping);
     }
 
     /**

app/code/Magento/QuoteGraphQl/etc/schema.graphqls

@@ -96,7 +96,8 @@ input SetBillingAddressOnCartInput {
 input BillingAddressInput {
     customer_address_id: Int
     address: CartAddressInput
-    use_for_shipping: Boolean
+    use_for_shipping: Boolean @doc(description: "Deprecated: use `same_as_shipping` field instead")
+    same_as_shipping: Boolean @doc(description: "Set billing address same as shipping")
 }
 
 input CartAddressInput {
@@ -219,18 +220,19 @@ interface CartAddressInterface @typeResolver(class: "\\Magento\\QuoteGraphQl\\Mo
 type ShippingCartAddress implements CartAddressInterface {
     available_shipping_methods: [AvailableShippingMethod] @resolver(class: "\\Magento\\QuoteGraphQl\\Model\\Resolver\\ShippingAddress\\AvailableShippingMethods")
     selected_shipping_method: SelectedShippingMethod @resolver(class: "\\Magento\\QuoteGraphQl\\Model\\Resolver\\ShippingAddress\\SelectedShippingMethod")
-    items_weight: Float
-    cart_items: [CartItemQuantity]
     customer_notes: String
+    items_weight: Float @deprecated(reason: "This information shoud not be exposed on frontend")
+    cart_items: [CartItemQuantity] @deprecated(reason: "`cart_items_v2` should be used instead")
+    cart_items_v2: [CartItemInterface]
 }
 
 type BillingCartAddress implements CartAddressInterface {
     customer_notes: String @deprecated (reason: "The field is used only in shipping address")
 }
 
-type CartItemQuantity {
-    cart_item_id: Int!
-    quantity: Float!
+type CartItemQuantity @doc(description:"Deprecated: `cart_items` field of `ShippingCartAddress` returns now  `CartItemInterface` instead of `CartItemQuantity`") {
+    cart_item_id: Int! @deprecated(reason: "`cart_items` field of `ShippingCartAddress` returns now `CartItemInterface` instead of `CartItemQuantity`")
+    quantity: Float! @deprecated(reason: "`cart_items` field of `ShippingCartAddress` returns now `CartItemInterface` instead of `CartItemQuantity`")
 }
 
 type CartAddressRegion {

app/code/Magento/Widget/Model/Template/FilterEmulate.php

@@ -3,18 +3,44 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Widget\Model\Template;
 
+/**
+ * Class FilterEmulate
+ *
+ * @package Magento\Widget\Model\Template
+ */
 class FilterEmulate extends Filter
 {
     /**
      * Generate widget with emulation frontend area
      *
      * @param string[] $construction
-     * @return string
+     *
+     * @return mixed|string
+     * @throws \Exception
      */
     public function widgetDirective($construction)
     {
         return $this->_appState->emulateAreaCode('frontend', [$this, 'generateWidget'], [$construction]);
     }
+
+    /**
+     * Filter the string as template with frontend area emulation
+     *
+     * @param string $value
+     *
+     * @return string
+     * @throws \Exception
+     */
+    public function filterDirective($value) : string
+    {
+        return $this->_appState->emulateAreaCode(
+            \Magento\Framework\App\Area::AREA_FRONTEND,
+            [$this, 'filter'],
+            [$value]
+        );
+    }
 }

dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/UpdateCustomerAddressTest.php

@@ -176,6 +176,49 @@ public function testUpdateCustomerAddressWithMissingAttribute()
         $this->graphQlMutation($mutation, [], '', $this->getCustomerAuthHeaders($userName, $password));
     }
 
+    /**
+     * Test custom attributes of the customer's address
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     * @magentoApiDataFixture Magento/Customer/_files/customer_address.php
+     * @magentoApiDataFixture Magento/Customer/_files/attribute_user_defined_address_custom_attribute.php
+     */
+    public function testUpdateCustomerAddressHasCustomAttributes()
+    {
+        $userName = '[email protected]';
+        $password = 'password';
+        $addressId = 1;
+        $attributes = [
+            [
+                'attribute_code' => 'custom_attribute1',
+                'value'=> '[new-value1,new-value2]'
+            ],
+            [
+                'attribute_code' => 'custom_attribute2',
+                'value'=> '"new-value3"'
+            ]
+        ];
+        $attributesFragment = preg_replace('/"([^"]+)"\s*:\s*/', '$1:', json_encode($attributes));
+        $mutation
+            = <<<MUTATION
+mutation {
+  updateCustomerAddress(
+    id: {$addressId}
+    input: {
+      custom_attributes: {$attributesFragment}
+    }
+  ) {
+    custom_attributes {
+      attribute_code
+      value
+    }
+  }
+}
+MUTATION;
+
+        $response = $this->graphQlMutation($mutation, [], '', $this->getCustomerAuthHeaders($userName, $password));
+        $this->assertEquals($attributes, $response['updateCustomerAddress']['custom_attributes']);
+    }
+
     /**
      * Verify the fields for Customer address
      *

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

@@ -50,8 +50,36 @@ public function testAddSimpleProductToCart()
         $response = $this->graphQlMutation($query, [], '', $this->getHeaderMap());
 
         self::assertArrayHasKey('cart', $response['addSimpleProductsToCart']);
+        self::assertArrayHasKey('shipping_addresses', $response['addSimpleProductsToCart']['cart']);
+        self::assertEmpty($response['addSimpleProductsToCart']['cart']['shipping_addresses']);
         self::assertEquals($quantity, $response['addSimpleProductsToCart']['cart']['items'][0]['quantity']);
         self::assertEquals($sku, $response['addSimpleProductsToCart']['cart']['items'][0]['product']['sku']);
+        self::assertArrayHasKey('prices', $response['addSimpleProductsToCart']['cart']['items'][0]);
+
+        self::assertArrayHasKey('price', $response['addSimpleProductsToCart']['cart']['items'][0]['prices']);
+        $price = $response['addSimpleProductsToCart']['cart']['items'][0]['prices']['price'];
+        self::assertArrayHasKey('value', $price);
+        self::assertEquals(10, $price['value']);
+        self::assertArrayHasKey('currency', $price);
+        self::assertEquals('USD', $price['currency']);
+
+        self::assertArrayHasKey('row_total', $response['addSimpleProductsToCart']['cart']['items'][0]['prices']);
+        $rowTotal = $response['addSimpleProductsToCart']['cart']['items'][0]['prices']['row_total'];
+        self::assertArrayHasKey('value', $rowTotal);
+        self::assertEquals(20, $rowTotal['value']);
+        self::assertArrayHasKey('currency', $rowTotal);
+        self::assertEquals('USD', $rowTotal['currency']);
+
+        self::assertArrayHasKey(
+            'row_total_including_tax',
+            $response['addSimpleProductsToCart']['cart']['items'][0]['prices']
+        );
+        $rowTotalIncludingTax =
+            $response['addSimpleProductsToCart']['cart']['items'][0]['prices']['row_total_including_tax'];
+        self::assertArrayHasKey('value', $rowTotalIncludingTax);
+        self::assertEquals(20, $rowTotalIncludingTax['value']);
+        self::assertArrayHasKey('currency', $rowTotalIncludingTax);
+        self::assertEquals('USD', $rowTotalIncludingTax['currency']);
     }
 
     /**
@@ -262,6 +290,34 @@ private function getQuery(string $maskedQuoteId, string $sku, float $quantity):
         product {
           sku
         }
+        prices {
+          price {
+           value
+           currency
+          }
+          row_total {
+           value
+           currency
+          }
+          row_total_including_tax {
+           value
+           currency
+          }
+        }
+      }
+      shipping_addresses {
+        firstname
+        lastname
+        company
+        street
+        city
+        postcode
+        telephone
+        country {
+          code
+          label
+        }
+        __typename
       }
     }
   }

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

@@ -101,6 +101,7 @@ public function testSetNewBillingAddress()
           country_code: "US"
           telephone: "88776655"
          }
+         same_as_shipping: true
       }
     }
   ) {
@@ -119,6 +120,20 @@ public function testSetNewBillingAddress()
         }
         __typename
       }
+      shipping_addresses {
+        firstname
+        lastname
+        company
+        street
+        city
+        postcode
+        telephone
+        country {
+          code
+          label
+        }
+        __typename
+      }
     }
   }
 }
@@ -129,10 +144,15 @@ public function testSetNewBillingAddress()
         $cartResponse = $response['setBillingAddressOnCart']['cart'];
         self::assertArrayHasKey('billing_address', $cartResponse);
         $billingAddressResponse = $cartResponse['billing_address'];
+        self::assertArrayHasKey('shipping_addresses', $cartResponse);
+        $shippingAddressResponse = current($cartResponse['shipping_addresses']);
         $this->assertNewAddressFields($billingAddressResponse);
+        $this->assertNewAddressFields($shippingAddressResponse, 'ShippingCartAddress');
     }
 
     /**
+     * Test case for deprecated `use_for_shipping` param.
+     *
      * @magentoApiDataFixture Magento/Customer/_files/customer.php
      * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
@@ -389,7 +409,7 @@ public function testSetNewBillingAddressWithoutCustomerAddressIdAndAddress()
     input: {
       cart_id: "$maskedQuoteId"
       billing_address: {
-        use_for_shipping: true
+        same_as_shipping: true
       }
     }
   ) {
@@ -415,7 +435,7 @@ public function testSetNewBillingAddressWithoutCustomerAddressIdAndAddress()
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_multishipping_with_two_shipping_addresses.php
      */
-    public function testSetNewBillingAddressWithUseForShippingAndMultishipping()
+    public function testSetNewBillingAddressWithSameAsShippingAndMultishipping()
     {
         $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
 
@@ -436,7 +456,7 @@ public function testSetNewBillingAddressWithUseForShippingAndMultishipping()
           country_code: "US"
           telephone: "88776655"
         }
-        use_for_shipping: true
+        same_as_shipping: true
       }
     }
   ) {
@@ -450,7 +470,7 @@ public function testSetNewBillingAddressWithUseForShippingAndMultishipping()
 QUERY;
 
         self::expectExceptionMessage(
-            'Using the "use_for_shipping" option with multishipping is not possible.'
+            'Using the "same_as_shipping" option with multishipping is not possible.'
         );
         $this->graphQlMutation($query, [], '', $this->getHeaderMap());
     }