Merge conflicts

Author: avattam06

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;
 

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

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();
-    }
 }

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

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;

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(),

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": "*"
     },

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()
     {