magento/graphql-ce#961: ShippingAddressInput.postcode: String, is not required by Schema

Author: lenaorobei

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

@@ -11,6 +11,7 @@
 use Magento\CustomerGraphQl\Model\Customer\Address\GetCustomerAddress;
 use Magento\Directory\Api\CountryInformationAcquirerInterface;
 use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Framework\GraphQl\Exception\GraphQlAuthorizationException;
 use Magento\Framework\GraphQl\Exception\GraphQlInputException;
 use Magento\Framework\GraphQl\Exception\GraphQlNoSuchEntityException;
@@ -58,7 +59,6 @@ public function __construct(
         $this->getCustomerAddress = $getCustomerAddress;
         $this->addressHelper = $addressHelper;
         $this->countryInformationAcquirer = $countryInformationAcquirer;
-        $this->countryInformationAcquirer = $countryInformationAcquirer;
     }
 
     /**
@@ -78,7 +78,11 @@ public function createBasedOnInputData(array $addressInput): QuoteAddress
         }
 
         if ($addressInput['country_id'] && isset($addressInput['region'])) {
-            $countryInformation = $this->countryInformationAcquirer->getCountryInfo($addressInput['country_id']);
+            try {
+                $countryInformation = $this->countryInformationAcquirer->getCountryInfo($addressInput['country_id']);
+            } catch (NoSuchEntityException $e) {
+                throw new GraphQlInputException(__('The country isn\'t available.'));
+            }
             $availableRegions = $countryInformation->getAvailableRegions();
             if (null !== $availableRegions) {
                 $addressInput['region_code'] = $addressInput['region'];

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

@@ -798,7 +798,7 @@ public function testSetNewBillingAddressWithSaveInAddressBook()
             company: "test company"
             street: ["test street 1", "test street 2"]
             city: "test city"
-            region: "test region"
+            region: "AZ"
             postcode: "887766"
             country_code: "US"
             telephone: "88776655"
@@ -865,7 +865,7 @@ public function testSetNewBillingAddressWithNotSaveInAddressBook()
             company: "test company"
             street: ["test street 1", "test street 2"]
             city: "test city"
-            region: "test region"
+            region: "AZ"
             postcode: "887766"
             country_code: "US"
             telephone: "88776655"
@@ -933,7 +933,7 @@ public function testWithInvalidBillingAddressInput()
           company: "test company"
           street: ["test street 1", "test street 2"]
           city: "test city"
-          region: "test region"
+          region: "AZ"
           postcode: "887766"
           country_code: "USS"
           telephone: "88776655"
@@ -960,7 +960,7 @@ public function testWithInvalidBillingAddressInput()
   }
 }
 QUERY;
-        $this->expectExceptionMessage('The address failed to save. Verify the address and try again.');
+        $this->expectExceptionMessage('The country isn\'t available.');
         $this->graphQlMutation($query, [], '', $this->getHeaderMap());
     }
 

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

@@ -780,7 +780,7 @@ public function testWithInvalidShippingAddressesInput()
   }
 }
 QUERY;
-        $this->expectExceptionMessage('The address failed to save. Verify the address and try again.');
+        $this->expectExceptionMessage('The country isn\'t available.');
         $this->graphQlMutation($query, [], '', $this->getHeaderMap());
     }
 
@@ -806,7 +806,7 @@ public function testSetNewShippingAddressWithSaveInAddressBook()
             company: "test company"
             street: ["test street 1", "test street 2"]
             city: "test city"
-            region: "test region"
+            region: "AZ"
             postcode: "887766"
             country_code: "US"
             telephone: "88776655"
@@ -877,7 +877,7 @@ public function testSetNewShippingAddressWithNotSaveInAddressBook()
             company: "test company"
             street: ["test street 1", "test street 2"]
             city: "test city"
-            region: "test region"
+            region: "AZ"
             postcode: "887766"
             country_code: "US"
             telephone: "88776655"