MC-19746: The shipping address contains null values when there's no shipping address set on a cart

- add validator to check if address was set

Author: cpartica

app/code/Magento/QuoteGraphQl/Model/Resolver/ShippingAddresses.php

@@ -13,6 +13,8 @@
 use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
 use Magento\Quote\Model\Quote;
 use Magento\QuoteGraphQl\Model\Cart\ExtractQuoteAddressData;
+use Magento\Framework\GraphQl\Schema\Type\TypeRegistry;
+use Magento\Framework\App\ObjectManager;
 
 /**
  * @inheritdoc
@@ -24,12 +26,21 @@ class ShippingAddresses implements ResolverInterface
      */
     private $extractQuoteAddressData;
 
+    /**
+     * @var TypeRegistry
+     */
+    private $typeRegistry;
+
     /**
      * @param ExtractQuoteAddressData $extractQuoteAddressData
+     * @param TypeRegistry|null $typeRegistry
      */
-    public function __construct(ExtractQuoteAddressData $extractQuoteAddressData)
-    {
+    public function __construct(
+        ExtractQuoteAddressData $extractQuoteAddressData,
+        TypeRegistry $typeRegistry = null
+    ) {
         $this->extractQuoteAddressData = $extractQuoteAddressData;
+        $this->typeRegistry = $typeRegistry ?: ObjectManager::getInstance()->get(TypeRegistry::class);
     }
 
     /**
@@ -47,9 +58,38 @@ public function resolve(Field $field, $context, ResolveInfo $info, array $value
 
         if (count($shippingAddresses)) {
             foreach ($shippingAddresses as $shippingAddress) {
-                $addressesData[] = $this->extractQuoteAddressData->execute($shippingAddress);
+                $address = $this->extractQuoteAddressData->execute($shippingAddress);
+
+                if ($this->validateAddressFromSchema($address)) {
+                    $addressesData[] = $address;
+                }
             }
         }
         return $addressesData;
     }
+
+    /**
+     * Validate data from address against mandatory fields from graphql schema for address
+     *
+     * @param array $address
+     * @return bool
+     */
+    private function validateAddressFromSchema(array $address) : bool
+    {
+        /** @var \Magento\Framework\GraphQL\Schema\Type\Input\InputObjectType $cartAddressInput */
+        $cartAddressInput = $this->typeRegistry->get('CartAddressInput');
+        $fields = $cartAddressInput->getFields();
+
+        foreach ($fields as $field) {
+            if ($field->getType() instanceof \Magento\Framework\GraphQL\Schema\Type\NonNull) {
+                // an array key has to exist but it's value should not be null
+                if (array_key_exists($field->name, $address)
+                    && !is_array($address[$field->name])
+                    && !isset($address[$field->name])) {
+                    return false;
+                }
+            }
+        }
+        return true;
+    }
 }