magento/graphql-ce#41: get user info from resolver context

Author: sheepfy

app/code/Magento/SalesGraphQl/Model/Resolver/Orders.php

@@ -15,15 +15,10 @@
 use Magento\CustomerGraphQl\Model\Customer\CheckCustomerAccountInterface;
 
 /**
- * {@inheritdoc}
+ * Class Orders
  */
 class Orders implements ResolverInterface
 {
-	/**
-	 * @var UserContextInterface
-	 */
-	private $userContext;
-
 	/**
 	 * @var CollectionFactoryInterface
 	 */
@@ -36,15 +31,13 @@ class Orders implements ResolverInterface
 
 	/**
 	 * Orders constructor.
-	 * @param UserContextInterface $userContext
 	 * @param CollectionFactoryInterface $collectionFactory
+	 * @param CheckCustomerAccountInterface $checkCustomerAccount
 	 */
 	public function __construct(
-		UserContextInterface $userContext,
 		CollectionFactoryInterface $collectionFactory,
 		CheckCustomerAccountInterface $checkCustomerAccount
 	) {
-		$this->userContext = $userContext;
 		$this->collectionFactory = $collectionFactory;
 		$this->checkCustomerAccount = $checkCustomerAccount;
 
@@ -55,18 +48,17 @@ public function __construct(
 	 */
 	public function resolve(
 		Field $field,
-        $context,
-        ResolveInfo $info,
-        array $value = null,
-        array $args = null
+		$context,
+		ResolveInfo $info,
+		array $value = null,
+		array $args = null
 	) {
+		$customerId = $context->getUserId();
 
-		$customerId = $this->userContext->getUserId();
+		$this->checkCustomerAccount->execute($customerId, $context->getUserType());
 
-		$this->checkCustomerAccount->execute($customerId, $this->userContext->getUserType());
-
-		$orders = $this->collectionFactory->create($customerId);
 		$items = [];
+		$orders = $this->collectionFactory->create($customerId);
 
 		/** @var \Magento\Sales\Model\Order $order */
 		foreach ($orders as $order) {
@@ -75,11 +67,10 @@ public function resolve(
 				'increment_id' => $order->getIncrementId(),
 				'created_at' => $order->getCreatedAt(),
 				'grand_total' => $order->getGrandTotal(),
-				'state' => $order->getState(),
 				'status' => $order->getStatus()
 			];
 		}
 
 		return ['items' => $items];
 	}
-}
+}

dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/OrdersTest.php

@@ -40,16 +40,15 @@ public function testOrdersQuery()
 	    $query =
 		    <<<QUERY
 query {
-	customerOrders {
-		items {
-			id
-			increment_id
-			created_at
-		    grant_total
-		    state
-		    status
-		}
+  customerOrders {
+    items {
+	  id
+	  increment_id
+	  created_at
+	  grand_total
+	  status
 	}
+  }
 }
 QUERY;
 
@@ -61,31 +60,26 @@ public function testOrdersQuery()
 	    $expectedData = [
 		    [
 			    'increment_id' => '100000002',
-			    'state' => \Magento\Sales\Model\Order::STATE_NEW,
 			    'status' => 'processing',
 			    'grand_total' => 120.00
 		    ],
 		    [
 			    'increment_id' => '100000003',
-			    'state' => \Magento\Sales\Model\Order::STATE_PROCESSING,
 			    'status' => 'processing',
 			    'grand_total' => 130.00
 		    ],
 		    [
 			    'increment_id' => '100000004',
-			    'state' => \Magento\Sales\Model\Order::STATE_PROCESSING,
 			    'status' => 'closed',
 			    'grand_total' => 140.00
 		    ],
 		    [
 			    'increment_id' => '100000005',
-			    'state' => \Magento\Sales\Model\Order::STATE_COMPLETE,
 			    'status' => 'complete',
 			    'grand_total' => 150.00
 		    ],
 		    [
 			    'increment_id' => '100000006',
-			    'state' => \Magento\Sales\Model\Order::STATE_COMPLETE,
 			    'status' => 'complete',
 			    'grand_total' => 160.00
 		    ]
@@ -96,7 +90,6 @@ public function testOrdersQuery()
 	    foreach ($expectedData as $key => $data) {
 		    $this->assertEquals($data['increment_id'], $actualData[$key]['increment_id']);
 		    $this->assertEquals($data['grand_total'], $actualData[$key]['grand_total']);
-		    $this->assertEquals($data['state'], $actualData[$key]['state']);
 		    $this->assertEquals($data['status'], $actualData[$key]['status']);
 	    }
     }