MC-20636: Order Details : Order Details by Order Number

- fix static

Author: cpartica

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

@@ -56,7 +56,7 @@ public function __construct(
     }
 
     /**
-     * @inheritdoc
+     * @inheritDoc
      */
     public function resolve(
         Field $field,
@@ -77,59 +77,68 @@ public function resolve(
         $userId = $context->getUserId();
         /** @var StoreInterface $store */
         $store = $context->getExtensionAttributes()->getStore();
-        try {
-            $filterGroups = $this->orderFilter->createFilterGroups($args, $userId, (int)$store->getId());
-            $this->searchCriteriaBuilder->setFilterGroups($filterGroups);
-            if (isset($args['currentPage'])) {
-                $this->searchCriteriaBuilder->setCurrentPage($args['currentPage']);
-            }
-            if (isset($args['pageSize'])) {
-                $this->searchCriteriaBuilder->setPageSize($args['pageSize']);
-            }
-
-            $searchCriteria = $this->searchCriteriaBuilder->create();
-            $searchResult = $this->orderRepository->getList($searchCriteria);
-            $orderArray = [];
-            /** @var OrderInterface $order */
-            foreach ($searchResult->getItems() as $key => $order) {
-                $orderArray[$key] = $order->getData();
-                $orderArray[$key]['model'] = $order;
-            }
 
+        try {
+            $searchResult = $this->getSearchResult($args, (int) $userId, (int)$store->getId());
             $maxPages = (int)ceil($searchResult->getTotalCount() / $searchResult->getPageSize());
         } catch (InputException $e) {
             throw new GraphQlInputException(__($e->getMessage()));
         }
 
-        $orders = [];
-        foreach ($orderArray as $order) {
-            if (!($order['model'] ?? null instanceof OrderInterface)) {
-                throw new LocalizedException(__('"model" value should be specified'));
-            }
-            /** @var OrderInterface $orderModel */
-            $orderModel = $order['model'];
-            $orders[] = [
-                'created_at' => $order['created_at'],
-                'grand_total' => $order['grand_total'],
-                'id' => base64_encode($order['entity_id']),
-                'increment_id' => $order['increment_id'],
-                'number' => $order['increment_id'],
-                'order_date' => $order['created_at'],
-                'order_number' => $order['increment_id'],
-                'status' => $orderModel->getStatusLabel(),
-                'shipping_method' => $orderModel->getShippingDescription(),
-                'model' => $orderModel,
-            ];
-        }
-
         return [
             'total_count' => $searchResult->getTotalCount(),
-            'items' => $orders,
+            'items' => $this->formatOrdersArray($searchResult->getItems()),
             'page_info'   => [
                 'page_size'    => $searchResult->getPageSize(),
                 'current_page' => $searchResult->getCurPage(),
                 'total_pages' => $maxPages,
             ]
         ];
     }
+
+    /**
+     * Format order models for graphql schema
+     *
+     * @param OrderInterface[] $orderModels
+     * @return array
+     */
+    private function formatOrdersArray(array $orderModels) {
+        $ordersArray = [];
+        foreach ($orderModels as $orderModel) {
+            $ordersArray[] = [
+                'created_at' => $orderModel->getCreatedAt(),
+                'grand_total' => $orderModel->getGrandTotal(),
+                'id' => base64_encode($orderModel->getEntityId()),
+                'increment_id' => $orderModel->getIncrementId(),
+                'number' => $orderModel->getIncrementId(),
+                'order_date' => $orderModel->getCreatedAt(),
+                'order_number' => $orderModel->getIncrementId(),
+                'status' => $orderModel->getStatusLabel(),
+                'shipping_method' => $orderModel->getShippingDescription(),
+                'model' => $orderModel,
+            ];
+        }
+        return $ordersArray;
+    }
+
+    /**
+     * Get search result from graphql query arguments
+     *
+     * @param array $args
+     * @param int $userId
+     * @param int $storeId
+     * @return \Magento\Sales\Api\Data\OrderSearchResultInterface
+     * @throws InputException
+     */
+    private function getSearchResult(array $args, int $userId, int $storeId) {
+        $filterGroups = $this->orderFilter->createFilterGroups($args, $userId, (int)$storeId);
+        $this->searchCriteriaBuilder->setFilterGroups($filterGroups);
+        if (isset($args['currentPage'])) {
+            $this->searchCriteriaBuilder->setCurrentPage($args['currentPage']);
+        }
+        if (isset($args['pageSize'])) {
+            $this->searchCriteriaBuilder->setPageSize($args['pageSize']);
+        }
+        return $this->orderRepository->getList($this->searchCriteriaBuilder->create());
+    }
 }

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

@@ -46,7 +46,7 @@ public function __construct(
     }
 
     /**
-     * @inheritdoc
+     * @inheritDoc
      */
     public function resolve(
         Field $field,

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

@@ -20,7 +20,7 @@
 class InvoiceTotal implements ResolverInterface
 {
     /**
-     * @inheritdoc
+     * @inheritDoc
      */
     public function resolve(
         Field $field,

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

@@ -20,7 +20,7 @@
 class Invoices implements ResolverInterface
 {
     /**
-     * @inheritdoc
+     * @inheritDoc
      */
     public function resolve(
         Field $field,

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

@@ -17,7 +17,7 @@
 class OrderTotal implements ResolverInterface
 {
     /**
-     * @inheritdoc
+     * @inheritDoc
      */
     public function resolve(
         Field $field,

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

@@ -35,7 +35,7 @@ public function __construct(
     }
 
     /**
-     * @inheritdoc
+     * @inheritDoc
      */
     public function resolve(
         Field $field,

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

@@ -49,7 +49,7 @@ public function __construct(
     }
 
     /**
-     * @inheritdoc
+     * @inheritDoc
      */
     public function resolve(
         Field $field,

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

@@ -485,65 +485,6 @@ private function placeOrder(string $cartId): string
         return $response['placeOrder']['order']['order_number'];
     }
 
-    /**
-     * Get customer order query
-     *
-     * @param string $orderNumber
-     * @return array
-     */
-    private function getCustomerOrderQuery($orderNumber):array
-    {
-        $query =
-            <<<QUERY
-{
-     customer {
-       email
-       orders(filter:{number:{eq:"{$orderNumber}"}}) {
-         total_count
-         items {
-           id
-           number
-           order_date
-           status
-           items{product_name product_sku quantity_ordered discounts {amount{value currency} label}}
-           total {
-             base_grand_total{value currency}
-             grand_total{value currency}
-             total_tax{value}
-             subtotal { value currency }
-             taxes {amount{value currency} title rate}
-             discounts {amount{value currency} label}
-             total_shipping{value}
-             shipping_handling
-             {
-               amount_including_tax{value}
-               amount_excluding_tax{value}
-               total_amount{value currency}
-               taxes {amount{value} title rate}
-               discounts {amount{value currency} label}
-             }
-
-           }
-         }
-       }
-     }
-   }
-QUERY;
-        $currentEmail = 'customer@example.com';
-        $currentPassword = 'password';
-        $response = $this->graphQlQuery(
-            $query,
-            [],
-            '',
-            $this->customerAuthenticationHeader->execute($currentEmail, $currentPassword)
-        );
-
-        $this->assertArrayHasKey('orders', $response['customer']);
-        $this->assertArrayHasKey('items', $response['customer']['orders']);
-        $customerOrderItemsInResponse = $response['customer']['orders']['items'];
-        return $customerOrderItemsInResponse;
-    }
-
     /**
      * Get customer order query for bundle order items
      *