Merge remote-tracking branch 'oleksandr/29479_returns_graphql_implementation_new' into HB-PR-delivery-Nov

Author: cpartica

app/code/Magento/Eav/Model/ResourceModel/Entity/Attribute/OptionValueProvider.php

@@ -0,0 +1,52 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Eav\Model\ResourceModel\Entity\Attribute;
+
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\DB\Adapter\AdapterInterface;
+
+/**
+ * Provide option value
+ */
+class OptionValueProvider
+{
+    /**
+     * @var AdapterInterface
+     */
+    private $connection;
+
+    /**
+     * @param ResourceConnection $connection
+     */
+    public function __construct(ResourceConnection $connection)
+    {
+        $this->connection = $connection->getConnection();
+    }
+
+    /**
+     * Get EAV attribute option value by option id
+     *
+     * @param int $valueId
+     * @return string|null
+     */
+    public function get(int $valueId): ?string
+    {
+        $select = $this->connection->select()
+            ->from($this->connection->getTableName('eav_attribute_option_value'), 'value')
+            ->where('value_id = ?', $valueId);
+
+        $result = $this->connection->fetchOne($select);
+
+        if ($result !== false) {
+            return $result;
+        }
+
+        return null;
+    }
+}

app/code/Magento/SalesGraphQl/Model/Formatter/Order.php

@@ -0,0 +1,65 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\SalesGraphQl\Model\Formatter;
+
+use Magento\Sales\Api\Data\OrderInterface;
+use Magento\SalesGraphQl\Model\Order\OrderAddress;
+use Magento\SalesGraphQl\Model\Order\OrderPayments;
+
+/**
+ * Format order model for graphql schema
+ */
+class Order
+{
+    /**
+     * @var OrderAddress
+     */
+    private $orderAddress;
+
+    /**
+     * @var OrderPayments
+     */
+    private $orderPayments;
+
+    /**
+     * @param OrderAddress $orderAddress
+     * @param OrderPayments $orderPayments
+     */
+    public function __construct(
+        OrderAddress $orderAddress,
+        OrderPayments $orderPayments
+    ) {
+        $this->orderAddress = $orderAddress;
+        $this->orderPayments = $orderPayments;
+    }
+
+    /**
+     * Format order model for graphql schema
+     *
+     * @param OrderInterface $orderModel
+     * @return array
+     */
+    public function format(OrderInterface $orderModel): array
+    {
+        return [
+            '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(),
+            'shipping_address' => $this->orderAddress->getOrderShippingAddress($orderModel),
+            'billing_address' => $this->orderAddress->getOrderBillingAddress($orderModel),
+            'payment_methods' => $this->orderPayments->getOrderPaymentMethod($orderModel),
+            'model' => $orderModel,
+        ];
+    }
+}

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

@@ -14,10 +14,8 @@
 use Magento\Framework\GraphQl\Exception\GraphQlInputException;
 use Magento\Framework\GraphQl\Query\ResolverInterface;
 use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
-use Magento\Sales\Api\Data\OrderInterface;
 use Magento\Sales\Api\OrderRepositoryInterface;
-use Magento\SalesGraphQl\Model\Order\OrderAddress;
-use Magento\SalesGraphQl\Model\Order\OrderPayments;
+use Magento\SalesGraphQl\Model\Formatter\Order as OrderFormatter;
 use Magento\SalesGraphQl\Model\Resolver\CustomerOrders\Query\OrderFilter;
 use Magento\Store\Api\Data\StoreInterface;
 
@@ -31,16 +29,6 @@ class CustomerOrders implements ResolverInterface
      */
     private $searchCriteriaBuilder;
 
-    /**
-     * @var OrderAddress
-     */
-    private $orderAddress;
-
-    /**
-     * @var OrderPayments
-     */
-    private $orderPayments;
-
     /**
      * @var OrderRepositoryInterface
      */
@@ -51,25 +39,27 @@ class CustomerOrders implements ResolverInterface
      */
     private $orderFilter;
 
+    /**
+     * @var OrderFormatter
+     */
+    private $orderFormatter;
+
     /**
      * @param OrderRepositoryInterface $orderRepository
-     * @param OrderAddress $orderAddress
-     * @param OrderPayments $orderPayments
      * @param SearchCriteriaBuilder $searchCriteriaBuilder
      * @param OrderFilter $orderFilter
+     * @param OrderFormatter $orderFormatter
      */
     public function __construct(
         OrderRepositoryInterface $orderRepository,
-        OrderAddress $orderAddress,
-        OrderPayments $orderPayments,
         SearchCriteriaBuilder $searchCriteriaBuilder,
-        OrderFilter $orderFilter
+        OrderFilter $orderFilter,
+        OrderFormatter $orderFormatter
     ) {
         $this->orderRepository = $orderRepository;
-        $this->orderAddress = $orderAddress;
-        $this->orderPayments = $orderPayments;
         $this->searchCriteriaBuilder = $searchCriteriaBuilder;
         $this->orderFilter = $orderFilter;
+        $this->orderFormatter = $orderFormatter;
     }
 
     /**
@@ -101,9 +91,14 @@ public function resolve(
             throw new GraphQlInputException(__($e->getMessage()));
         }
 
+        $ordersArray = [];
+        foreach ($searchResult->getItems() as $orderModel) {
+            $ordersArray[] = $this->orderFormatter->format($orderModel);
+        }
+
         return [
             'total_count' => $searchResult->getTotalCount(),
-            'items' => $this->formatOrdersArray($searchResult->getItems()),
+            'items' => $ordersArray,
             'page_info' => [
                 'page_size' => $searchResult->getPageSize(),
                 'current_page' => $searchResult->getCurPage(),
@@ -112,35 +107,6 @@ public function resolve(
         ];
     }
 
-    /**
-     * 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(),
-                'shipping_address' => $this->orderAddress->getOrderShippingAddress($orderModel),
-                'billing_address' => $this->orderAddress->getOrderBillingAddress($orderModel),
-                'payment_methods' => $this->orderPayments->getOrderPaymentMethod($orderModel),
-                'model' => $orderModel,
-            ];
-        }
-        return $ordersArray;
-    }
-
     /**
      * Get search result from graphql query arguments
      *

app/code/Magento/Shipping/Model/Tracking/Result/Error.php

@@ -5,9 +5,18 @@
  */
 namespace Magento\Shipping\Model\Tracking\Result;
 
-class Error extends \Magento\Shipping\Model\Tracking\Result\AbstractResult
+use Magento\Framework\Phrase;
+
+/**
+ * Class to get data from error shipping tracking result
+ */
+class Error extends AbstractResult
 {
+    public const STATUS_TYPE = 1;
+
     /**
+     * Gets all data of shipping tracking result
+     *
      * @return array
      */
     public function getAllData()
@@ -16,7 +25,9 @@ public function getAllData()
     }
 
     /**
-     * @return \Magento\Framework\Phrase
+     * Gets error message
+     *
+     * @return Phrase
      */
     public function getErrorMessage()
     {

app/code/Magento/Shipping/Model/Tracking/Result/Status.php

@@ -18,6 +18,8 @@
  */
 class Status extends AbstractResult
 {
+    public const STATUS_TYPE = 0;
+
     /**
      * Returns all Status data
      *

lib/internal/Magento/Framework/GraphQl/Query/Uid.php

@@ -0,0 +1,63 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Framework\GraphQl\Query;
+
+use Magento\Framework\GraphQl\Exception\GraphQlInputException;
+
+/**
+ * Encodes and decodes id and uid values
+ */
+class Uid
+{
+    /**
+     * Decode UID value to ID
+     *
+     * @param string $uid
+     * @return null|string
+     * @phpcs:disable Magento2.Functions.DiscouragedFunction
+     * @throws GraphQlInputException
+     */
+    public function decode(string $uid): ?string
+    {
+        if ($this->isValidBase64($uid)) {
+            $result = base64_decode($uid, true);
+            return ($result !== false) ? $result : null;
+        }
+        throw new GraphQlInputException(__('Value of uid "%1" is incorrect.', $uid));
+    }
+
+    /**
+     * Encode ID value to UID
+     *
+     * @param string $id
+     * @return string
+     * @phpcs:disable Magento2.Functions.DiscouragedFunction
+     */
+    public function encode(string $id): string
+    {
+        return base64_encode($id);
+    }
+
+    /**
+     * Validate base64 encoded value
+     *
+     * @param string $data
+     * @return bool
+     * @phpcs:disable Magento2.Functions.DiscouragedFunction
+     */
+    public function isValidBase64(string $data): bool
+    {
+        $decodedValue = base64_decode($data, true);
+        if ($decodedValue === false) {
+            return false;
+        }
+
+        return base64_encode($decodedValue) === $data;
+    }
+}