Fixed schema, type coercions.

scandipwa · Oct 1, 2019 · 33f30cf · 33f30cf
1 parent 9621510
commit 33f30cf
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 10 deletions.
diff --git a/src/Model/Customer/CheckCustomerAccount.php b/src/Model/Customer/CheckCustomerAccount.php
@@ -68,10 +68,11 @@ public function __construct(
      * @throws GraphQlNoSuchEntityException
      * @throws GraphQlAuthenticationException
      */
-    public function execute(?int $customerId, ?int $customerType): void
+    public function execute(?int $customerId, ?int $customerType): bool
     {
         if ($this->isCustomerGuest($customerId, $customerType)) {
             throw new GraphQlAuthorizationException(__('The current customer isn\'t authorized.'));
+            return false;
         }
 
         try {
@@ -81,16 +82,21 @@ public function execute(?int $customerId, ?int $customerType): void
                 __('Customer with id "%customer_id" does not exist.', ['customer_id' => $customerId]),
                 $e
             );
+            return false;
         }
 
         if ($this->authentication->isLocked($customerId)) {
             throw new GraphQlAuthenticationException(__('The account is locked.'));
+            return false;
         }
 
         $confirmationStatus = $this->accountManagement->getConfirmationStatus($customerId);
         if ($confirmationStatus === AccountManagementInterface::ACCOUNT_CONFIRMATION_REQUIRED) {
             throw new GraphQlAuthenticationException(__("This account isn't confirmed. Verify and try again."));
+            return false;
         }
+
+        return true;
     }
 
     /**
@@ -105,6 +111,6 @@ private function isCustomerGuest(?int $customerId, ?int $customerType): bool
         if ($customerId === null || $customerType === null) {
             return true;
         }
-        return (int)$customerId === 0 || (int)$customerType === UserContextInterface::USER_TYPE_GUEST;
+        return $customerId == 0 || $customerType == UserContextInterface::USER_TYPE_GUEST;
     }
 }
diff --git a/src/Model/Resolver/ExpandedOrderResolver.php b/src/Model/Resolver/ExpandedOrderResolver.php
@@ -42,7 +42,7 @@ class ExpandedOrderResolver implements ResolverInterface
     /**
      * @var OrderRepository
      */
-    protected $orderRepository;
+    private $orderRepository;
 
     /**
      * @param CollectionFactoryInterface $collectionFactory
@@ -69,10 +69,6 @@ public function resolve(
         array $value = null,
         array $args = null
     ) {
-        if (!isset($args['id'])) {
-            throw new GraphQlInputException(__('Please specify valid order ID.'));
-        }
-
         $itemsData = [];
         $trackNumbers = [];
 
@@ -86,8 +82,8 @@ public function resolve(
             throw new GraphQlNoSuchEntityException(__('Customer ID is invalid.'));
         }
 
-        foreach ($order->getAllVisibleItems() as $_item) {
-            $itemsData[] = $_item;
+        foreach ($order->getAllVisibleItems() as $item) {
+            $itemsData[] = $item;
         }
 
         $tracksCollection = $order->getTracksCollection();

diff --git a/src/etc/schema.graphqls b/src/etc/schema.graphqls
@@ -24,7 +24,7 @@ type Mutation {
 type Query {
     getCartForCustomer(guestCartId: String): QuoteData @resolver(class: "\\ScandiPWA\\QuoteGraphQl\\Model\\Resolver\\GetCartForCustomer")
     getOrderList: OrderList @resolver(class: "\\ScandiPWA\\QuoteGraphQl\\Model\\Resolver\\OrderListResolver") @doc(description: "The Sales Order query returns information about a Sales order")
-    getOrderById(id: Int): Order @resolver(class: "\\ScandiPWA\\QuoteGraphQl\\Model\\Resolver\\ExpandedOrderResolver") @doc(description: "The Sales Order query returns information about a Sales order")
+    getOrderById(id: Int!): Order @resolver(class: "\\ScandiPWA\\QuoteGraphQl\\Model\\Resolver\\ExpandedOrderResolver") @doc(description: "The Sales Order query returns information about a Sales order")
 }
 
 input CartItemInput {