Merge pull request #7886 from magento-gl/spartans_2_4_6_graphql_backlog

Spartans 2 4 6 graphql backlog

Author: sidolov

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

@@ -61,6 +61,7 @@ public function resolve(
                 'created_at' => $order->getCreatedAt(),
                 'grand_total' => $order->getGrandTotal(),
                 'status' => $order->getStatus(),
+                'model' => $order
             ];
         }
         return ['items' => $items];

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

@@ -0,0 +1,126 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\GraphQl\Sales\CustomerOrders;
+
+use Exception;
+use Magento\Integration\Api\CustomerTokenServiceInterface;
+use Magento\TestFramework\TestCase\GraphQlAbstract;
+use Magento\TestFramework\Helper\Bootstrap;
+
+/**
+ * Class OrdersTest
+ */
+class CustomerOrdersTest extends GraphQlAbstract
+{
+    /**
+     * @var CustomerTokenServiceInterface
+     */
+    private $customerTokenService;
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+        $this->customerTokenService = Bootstrap::getObjectManager()->get(CustomerTokenServiceInterface::class);
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     * @magentoApiDataFixture Magento/Sales/_files/orders_with_customer.php
+     */
+    public function testOrdersQuery()
+    {
+        $query =
+            <<<QUERY
+            query {
+                customer {
+                    orders(filter: {}) { 
+                        items { 
+                            number  
+                            status 
+                            created_at
+                        }
+                    }
+                }
+            }
+QUERY;
+
+        $currentEmail = 'customer@example.com';
+        $currentPassword = 'password';
+        $response = $this->graphQlQuery($query, [], '', $this->getCustomerAuthHeaders($currentEmail, $currentPassword));
+
+        $expectedData = [
+            [
+                'number' => '100000002',
+                'status' => 'Processing',
+                'created_at' => "2022-09-04 00:00:00"
+            ],
+            [
+                'number' => '100000004',
+                'status' => 'Closed',
+                'created_at' => "2022-09-05 00:00:00"
+            ],
+            [
+                'number' => '100000005',
+                'status' => 'Complete',
+                'created_at' => "2022-09-08 00:00:00"
+            ],
+            [
+                'number' => '100000006',
+                'status' => 'Complete',
+                'created_at' => "2022-09-09 00:00:00"
+            ]
+        ];
+  
+        $actualData = $response['customer']['orders']['items'];
+        foreach ($expectedData as $key => $data) {
+            $this->assertEquals(
+                $data['number'],
+                $actualData[$key]['number'],
+                "order_number is different than the expected for order - " . $data['number']
+            );
+        
+            $this->assertEquals(
+                $data['created_at'],
+                $actualData[$key]['created_at'],
+                "created_at is different than the expected for order - " . $data['created_at']
+            );
+        }
+    }
+
+    /**
+     */
+    public function testCustomerOrdersQueryNotAuthorized()
+    {
+        $this->expectException(\Exception::class);
+        $this->expectExceptionMessage('The current customer isn\'t authorized.');
+
+        $query = <<<QUERY
+            {
+                customerOrders {
+                    items {
+                    increment_id
+                    grand_total
+                    }
+                }
+            }
+QUERY;
+        $this->graphQlQuery($query);
+    }
+
+    /**
+     * @param string $email
+     * @param string $password
+     * @return array
+     * @throws \Magento\Framework\Exception\AuthenticationException
+     */
+    private function getCustomerAuthHeaders(string $email, string $password): array
+    {
+        $customerToken = $this->customerTokenService->createCustomerAccessToken($email, $password);
+        return ['Authorization' => 'Bearer ' . $customerToken];
+    }
+}

dev/tests/integration/testsuite/Magento/Sales/_files/orders_with_customer.php

@@ -34,6 +34,7 @@
         'base_grand_total' => 120.00,
         'store_id' => 1,
         'website_id' => 1,
+        'created_at' => '2022-09-04'
     ],
     [
         'increment_id' => '100000003',
@@ -45,6 +46,7 @@
         'total_paid' => 130.00,
         'store_id' => 0,
         'website_id' => 0,
+        'created_at' => '2022-09-10'
     ],
     [
         'increment_id' => '100000004',
@@ -55,6 +57,7 @@
         'subtotal' => 140.00,
         'store_id' => 1,
         'website_id' => 1,
+        'created_at' => '2022-09-05'
     ],
     [
         'increment_id' => '100000005',
@@ -66,6 +69,7 @@
         'total_paid' => 150.00,
         'store_id' => 1,
         'website_id' => 1,
+        'created_at' => '2022-09-08'
     ],
     [
         'increment_id' => '100000006',
@@ -77,6 +81,7 @@
         'total_paid' => 160.00,
         'store_id' => 1,
         'website_id' => 1,
+        'created_at' => '2022-09-09'
     ],
 ];
 

lib/internal/Magento/Framework/Api/SearchCriteria/CollectionProcessor/FilterProcessor.php

@@ -85,6 +85,8 @@ private function addFilterGroupToCollection(
             }
         }
 
+        $this->checkFromTo($fields, $conditions);
+
         if ($fields) {
             $collection->addFieldToFilter($fields, $conditions);
         }
@@ -125,4 +127,26 @@ private function getFieldMapping($field)
     {
         return $this->fieldMapping[$field] ?? $field;
     }
+
+    /**
+     * Check filtergoup for type from & to
+     *
+     * @param string[] $fields
+     * @param array<string[]> $conditions
+     * @return void
+     */
+    private function checkFromTo(&$fields, &$conditions)
+    {
+        $_fields = array_unique($fields);
+        $_conditions = [];
+        foreach ($conditions as $condition) {
+            $_conditions[array_key_first($condition)] = array_first($condition);
+        }
+        if ((count($_fields) == 1) && (count($_conditions) == 2)
+            && isset($_conditions['from']) && isset($_conditions['to'])
+        ) {
+            $fields = $_fields;
+            $conditions = [$_conditions];
+        }
+    }
 }