Merge branch 'ACP2E-499' of https://github.com/magento-l3/magento2ce into PR-2022-03-11

Author: Anna Bukatar

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

@@ -100,6 +100,10 @@ public function createBasedOnInputData(array $addressInput): QuoteAddress
             throw new GraphQlInputException(__('Country is not available'));
         }
 
+        if (!empty($addressInput['region'])) {
+            $this->normalizeRegion($addressInput);
+        }
+
         $this->validateRegion($addressInput);
 
         $maxAllowedLineCount = $this->addressHelper->getStreetLines();
@@ -144,6 +148,26 @@ private function validateRegion(array $addressInput): void
         }
     }
 
+    /**
+     * Normalize region code to region id while requesting to setShippingAddress
+     *
+     * @param array $addressInput
+     */
+    private function normalizeRegion(array &$addressInput)
+    {
+        $shippingAddressRegion = $addressInput['region'];
+        if (is_numeric($shippingAddressRegion)) {
+            $regionCollection = $this->regionCollectionFactory
+                ->create()
+                ->addCountryFilter($addressInput['country_code']);
+            $allRegions = $regionCollection->toOptionArray();
+            $regionId = (int) $addressInput['region'];
+            if (array_key_exists($regionId, $allRegions)) {
+                $addressInput['region'] = $allRegions[$regionId]['value'];
+            }
+        }
+    }
+
     /**
      * Validate the address region when region is required for the country
      *

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

@@ -139,6 +139,70 @@ public function testSetNewShippingAddressOnCartWithSimpleProduct()
         $this->assertNewShippingAddressFields($shippingAddressResponse);
     }
 
+    /**
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
+     */
+    public function testSetShippingAddressOnCartWithRegionIdForSimpleProduct()
+    {
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
+
+        $query = <<<QUERY
+mutation {
+  setShippingAddressesOnCart(
+    input: {
+      cart_id: "$maskedQuoteId"
+      shipping_addresses: [
+        {
+          address: {
+            firstname: "Francesco"
+            lastname: "Alba"
+            company: "Magento"
+            street: ["Via Solferino", "45"]
+            city: "Ceriano Laghetto"
+            region: "1"
+            postcode: "20816"
+            country_code: "FR"
+            telephone: "3273581975",
+            save_in_address_book: false
+          }
+        }
+      ]
+    }
+  ) {
+    cart {
+      shipping_addresses {
+        firstname
+        lastname
+        company
+        street
+        city
+        region {
+          code
+          label
+        }
+        postcode
+        telephone
+        country {
+          label
+          code
+        }
+      }
+    }
+  }
+}
+QUERY;
+        $response = $this->graphQlMutation($query, [], '', $this->getHeaderMap());
+
+        self::assertArrayHasKey('cart', $response['setShippingAddressesOnCart']);
+        $cartResponse = $response['setShippingAddressesOnCart']['cart'];
+        self::assertArrayHasKey('shipping_addresses', $cartResponse);
+        $shippingAddressResponse = current($cartResponse['shipping_addresses']);
+        $this->assertShippingAddressWithRegionIdFields($shippingAddressResponse);
+    }
+
     /**
      * @magentoApiDataFixture Magento/Customer/_files/customer.php
      * @magentoApiDataFixture Magento/Catalog/_files/product_virtual.php
@@ -1819,6 +1883,28 @@ private function assertNewShippingAddressFields(array $shippingAddressResponse):
         $this->assertResponseFields($shippingAddressResponse, $assertionMap);
     }
 
+    /**
+     * Verify the all the whitelisted fields for a New Address with region id Object
+     *
+     * @param array $shippingAddressResponse
+     */
+    private function assertShippingAddressWithRegionIdFields(array $shippingAddressResponse): void
+    {
+        $assertionMap = [
+            ['response_field' => 'firstname', 'expected_value' => 'Francesco'],
+            ['response_field' => 'lastname', 'expected_value' => 'Alba'],
+            ['response_field' => 'company', 'expected_value' => 'Magento'],
+            ['response_field' => 'street', 'expected_value' => [0 => 'Via Solferino', 1 => '45']],
+            ['response_field' => 'city', 'expected_value' => 'Ceriano Laghetto'],
+            ['response_field' => 'postcode', 'expected_value' => '20816'],
+            ['response_field' => 'telephone', 'expected_value' => '3273581975'],
+            ['response_field' => 'region', 'expected_value' => ['code' => '1', 'label' => 'Ain']],
+            ['response_field' => 'country', 'expected_value' => ['code' => 'FR', 'label' => 'FR']]
+        ];
+
+        $this->assertResponseFields($shippingAddressResponse, $assertionMap);
+    }
+
     /**
      * Verify the all the whitelisted fields for a Address Object
      *