ENGCOM-5602: Query.country doesn't work #801

Author: lenaorobei

app/code/Magento/DirectoryGraphQl/Model/Resolver/Country.php

@@ -15,6 +15,7 @@
 use Magento\Framework\Reflection\DataObjectProcessor;
 use Magento\Directory\Api\CountryInformationAcquirerInterface;
 use Magento\Directory\Api\Data\CountryInformationInterface;
+use Magento\Framework\GraphQl\Exception\GraphQlInputException;
 
 /**
  * Country field resolver, used for GraphQL request processing.
@@ -53,6 +54,10 @@ public function resolve(
         array $value = null,
         array $args = null
     ) {
+        if (empty($args['id'])) {
+            throw new GraphQlInputException(__('Country "id" value should be specified'));
+        }
+
         try {
             $country = $this->countryInformationAcquirer->getCountryInfo($args['id']);
         } catch (NoSuchEntityException $exception) {

dev/tests/api-functional/testsuite/Magento/GraphQl/Directory/CountryTest.php

@@ -67,6 +67,27 @@ public function testGetCountryNotFoundException()
         }
     }
 }
+QUERY;
+
+        $this->graphQlQuery($query);
+    }
+
+    /**
+     * @expectedException \Exception
+     * @expectedExceptionMessage Country "id" value should be specified
+     */
+    public function testMissedInputParameterException()
+    {
+        $query = <<<QUERY
+{
+  country {
+    available_regions {
+      code
+      id
+      name
+    }
+  }
+}
 QUERY;
 
         $this->graphQlQuery($query);