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

cpartica · cpartica · commit 8282c5ca1377 · 2020-06-16T15:17:35.000-05:00
- fix static
diff --git a/app/code/Magento/SalesGraphQl/Model/InvoiceItemInterfaceTypeResolverComposite.php b/app/code/Magento/SalesGraphQl/Model/InvoiceItemInterfaceTypeResolverComposite.php
@@ -11,7 +11,7 @@
 use Magento\Framework\GraphQl\Query\Resolver\TypeResolverInterface;
 
 /**
- * @inheritdoc
+ * @inheritDoc
  */
 class InvoiceItemInterfaceTypeResolverComposite implements TypeResolverInterface
 {
@@ -29,10 +29,10 @@ public function __construct(array $productTypeNameResolvers = [])
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      * @throws GraphQlInputException
      */
-    public function resolveType(array $data) : string
+    public function resolveType(array $data): string
     {
         $resolvedType = null;
 
diff --git a/app/code/Magento/SalesGraphQl/Model/Resolver/CustomerOrders.php b/app/code/Magento/SalesGraphQl/Model/Resolver/CustomerOrders.php
@@ -30,7 +30,7 @@ class CustomerOrders implements ResolverInterface
     private $searchQuery;
 
     /**
-     * @param SearchQuery $orderRepository
+     * @param SearchQuery $searchQuery
      */
     public function __construct(
         SearchQuery $searchQuery
diff --git a/app/code/Magento/SalesGraphQl/Model/Resolver/CustomerOrders/Query/OrderFilter.php b/app/code/Magento/SalesGraphQl/Model/Resolver/CustomerOrders/Query/OrderFilter.php
@@ -74,7 +74,6 @@ public function __construct(
      * @param array $args
      * @param StoreInterface $store
      * @param SearchCriteriaBuilder $searchCriteriaBuilder
-     * @throws InputException
      */
     public function applyFilter(
         int $userId,
@@ -104,7 +103,11 @@ public function applyFilter(
                         if (is_array($value)) {
                             throw new InputException(__('Invalid match filter'));
                         }
-                        $filters[] = $this->addMatchFilter($field, $value, $store);
+                        $searchValue = str_replace('%', '', $value);
+                        $filters[] = $this->filterBuilder->setField($field)
+                            ->setValue("%{$searchValue}%")
+                            ->setConditionType('like')
+                            ->create();
                     } else {
                         $filters[] = $this->filterBuilder->setField($field)
                             ->setValue($value)
@@ -116,39 +119,7 @@ public function applyFilter(
 
             $this->filterGroupBuilder->setFilters($filters);
             $filterGroups[] = $this->filterGroupBuilder->create();
-
         }
         $searchCriteriaBuilder->setFilterGroups($filterGroups);
     }
-
-    /**
-     * Add match filter to collection
-     *
-     * @param Collection $orderCollection
-     * @param string $field
-     * @param string $value
-     * @param StoreInterface $store
-     * @throws InputException
-     */
-    private function addMatchFilter(
-        string $field,
-        string $value,
-        StoreInterface $store
-    ): Filter {
-        $minQueryLength = $this->scopeConfig->getValue(
-            'catalog/search/min_query_length',
-            ScopeInterface::SCOPE_STORE,
-            $store
-        ) ?? self::DEFAULT_MIN_QUERY_LENGTH;
-        $searchValue = str_replace('%', '', $value);
-        $matchLength = strlen($searchValue);
-        if ($matchLength < $minQueryLength) {
-            throw new InputException(__('Invalid match filter. Minimum length is %1.', $minQueryLength));
-        }
-
-        return $this->filterBuilder->setField($field)
-            ->setValue("%{$searchValue}%")
-            ->setConditionType('like')
-            ->create();
-    }
 }
diff --git a/app/code/Magento/SalesGraphQl/Model/Resolver/CustomerOrders/Query/SearchQuery.php b/app/code/Magento/SalesGraphQl/Model/Resolver/CustomerOrders/Query/SearchQuery.php
@@ -62,7 +62,7 @@ public function __construct(
      * Filter order data based off given search criteria
      *
      * @param array $args
-     * @param int $userId,
+     * @param int $userId
      * @param StoreInterface $store
      * @return DataObject
      * @throws InputException
diff --git a/app/code/Magento/SalesGraphQl/Model/Resolver/LineItem/DataProvider.php b/app/code/Magento/SalesGraphQl/Model/Resolver/LineItem/DataProvider.php
@@ -1,4 +1,9 @@
 <?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
 
 namespace Magento\SalesGraphQl\Model\Resolver\LineItem;
 
diff --git a/app/code/Magento/SalesGraphQl/Model/Resolver/OrderItem/OptionsProcessor.php b/app/code/Magento/SalesGraphQl/Model/Resolver/OrderItem/OptionsProcessor.php
@@ -30,8 +30,6 @@ public function getItemOptions(OrderItemInterface $orderItem): array
                 $optionsTypes = $this->processOptions($options['options']);
             } elseif (isset($options['attributes_info'])) {
                 $optionsTypes = $this->processAttributesInfo($options['attributes_info']);
-            } elseif (isset($options['additional_options'])) {
-                // TODO $options['additional_options']
             }
         }
         return $optionsTypes;
diff --git a/app/code/Magento/SalesGraphQl/Model/Resolver/OrderTotal.php b/app/code/Magento/SalesGraphQl/Model/Resolver/OrderTotal.php
@@ -69,7 +69,10 @@ public function resolve(
             'discounts' => $this->getDiscountDetails($order),
             'total_shipping' => ['value' => $order->getShippingAmount(), 'currency' => $currency],
             'shipping_handling' => [
-                'amount_excluding_tax' => ['value' => $order->getShippingAmount(), 'currency' => $order->getOrderCurrencyCode()],
+                'amount_excluding_tax' => [
+                    'value' => $order->getShippingAmount(),
+                    'currency' => $order->getOrderCurrencyCode()
+                ],
                 'amount_including_tax' => ['value' => $order->getShippingInclTax(), 'currency' => $currency],
                 'total_amount' => ['value' => $order->getBaseShippingAmount(), 'currency' => $currency],
                 'taxes' => $this->getAppliedTaxesDetails($order, $appliedShippingTaxesForItemsData),
diff --git a/app/code/Magento/SalesGraphQl/Model/Resolver/Orders.php b/app/code/Magento/SalesGraphQl/Model/Resolver/Orders.php
@@ -55,7 +55,7 @@ public function resolve(
         /** @var Order $order */
         foreach ($orders as $order) {
             $items[] = [
-                'id' => $order->getId(),
+                'id' => base64_encode($order->getId()),
                 'increment_id' => $order->getIncrementId(),
                 'order_number' => $order->getIncrementId(),
                 'created_at' => $order->getCreatedAt(),
diff --git a/app/code/Magento/SalesGraphQl/Model/SalesTotalAmountTypeResolver.php b/app/code/Magento/SalesGraphQl/Model/SalesTotalAmountTypeResolver.php
@@ -16,6 +16,6 @@ class SalesTotalAmountTypeResolver implements TypeResolverInterface
      */
     public function resolveType(array $data): string
     {
-        // TODO: Implement resolveType() method.
+        return 'OrderTotal';
     }
 }
diff --git a/app/code/Magento/SalesGraphQl/composer.json b/app/code/Magento/SalesGraphQl/composer.json
@@ -6,6 +6,8 @@
         "php": "~7.3.0||~7.4.0",
         "magento/framework": "*",
         "magento/module-sales": "*",
+        "magento/module-store": "*",
+        "magento/module-catalog": "*",
         "magento/module-shipping": "*",
         "magento/module-graph-ql": "*"
     },
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/InvoiceTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/InvoiceTest.php
@@ -12,7 +12,7 @@
 use Magento\TestFramework\TestCase\GraphQlAbstract;
 
 /**
- * Class Invoice Test
+ * Tests the Invoice query
  */
 class InvoiceTest extends GraphQlAbstract
 {
@@ -29,6 +29,7 @@ protected function setUp(): void
 
     /**
      * @magentoApiDataFixture Magento/Sales/_files/customer_invoice_with_two_products_and_custom_options.php
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
      */
     public function testSingleInvoiceForLoggedInCustomerQuery()
     {
@@ -150,6 +151,7 @@ public function testSingleInvoiceForLoggedInCustomerQuery()
 
     /**
      * @magentoApiDataFixture Magento/Sales/_files/customer_multiple_invoices_with_two_products_and_custom_options.php
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
      */
     public function testMultipleInvoiceForLoggedInCustomerQuery()
     {
@@ -291,6 +293,7 @@ public function testMultipleInvoiceForLoggedInCustomerQuery()
 
     /**
      * @magentoApiDataFixture Magento/Sales/_files/customers_with_invoices.php
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
      */
     public function testMultipleCustomersWithInvoicesQuery()
     {
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/RetrieveOrdersByOrderNumberTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/RetrieveOrdersByOrderNumberTest.php
diff --git a/dev/tests/integration/testsuite/Magento/GraphQl/Tax/_files/tax_calculation_shipping_and_order_display_settings.php b/dev/tests/integration/testsuite/Magento/GraphQl/Tax/_files/tax_calculation_shipping_and_order_display_settings.php
diff --git a/dev/tests/integration/testsuite/Magento/GraphQl/Tax/_files/tax_calculation_shipping_excludeTax_order_display_settings.php b/dev/tests/integration/testsuite/Magento/GraphQl/Tax/_files/tax_calculation_shipping_excludeTax_order_display_settings.php

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@`
`11`	`11`	`use Magento\Framework\GraphQl\Query\Resolver\TypeResolverInterface;`
`12`	`12`
`13`	`13`	`/**`
`14`		`- * @inheritdoc`
	`14`	`+ * @inheritDoc`
`15`	`15`	`*/`
`16`	`16`	`class InvoiceItemInterfaceTypeResolverComposite implements TypeResolverInterface`
`17`	`17`	`{`
`@@ -29,10 +29,10 @@ public function __construct(array $productTypeNameResolvers = [])`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`/**`
`32`		`- * {@inheritdoc}`
	`32`	`+ * @inheritdoc`
`33`	`33`	`* @throws GraphQlInputException`
`34`	`34`	`*/`
`35`		`- public function resolveType(array $data) : string`
	`35`	`+ public function resolveType(array $data): string`
`36`	`36`	`{`
`37`	`37`	`$resolvedType = null;`
`38`	`38`
Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ public function __construct(`
`62`	`62`	`* Filter order data based off given search criteria`
`63`	`63`	`*`
`64`	`64`	`* @param array $args`
`65`		`- * @param int $userId,`
	`65`	`+ * @param int $userId`
`66`	`66`	`* @param StoreInterface $store`
`67`	`67`	`* @return DataObject`
`68`	`68`	`* @throws InputException`
Original file line number	Diff line number	Diff line change
`@@ -30,8 +30,6 @@ public function getItemOptions(OrderItemInterface $orderItem): array`
`30`	`30`	`$optionsTypes = $this->processOptions($options['options']);`
`31`	`31`	`} elseif (isset($options['attributes_info'])) {`
`32`	`32`	`$optionsTypes = $this->processAttributesInfo($options['attributes_info']);`
`33`		`- } elseif (isset($options['additional_options'])) {`
`34`		`- // TODO $options['additional_options']`
`35`	`33`	`}`
`36`	`34`	`}`
`37`	`35`	`return $optionsTypes;`
Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,6 @@ class SalesTotalAmountTypeResolver implements TypeResolverInterface`
`16`	`16`	`*/`
`17`	`17`	`public function resolveType(array $data): string`
`18`	`18`	`{`
`19`		`- // TODO: Implement resolveType() method.`
	`19`	`+ return 'OrderTotal';`
`20`	`20`	`}`
`21`	`21`	`}`