Merge remote-tracking branch '38264/bugfix/36947_orders_graphql_date_timezone' into commprs_dec

Author: engcom-Charlie

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

@@ -1,12 +1,15 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
 namespace Magento\SalesGraphQl\Model\Formatter;
 
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Stdlib\DateTime;
+use Magento\Framework\Stdlib\DateTime\TimezoneInterface;
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Sales\Api\Data\OrderInterface;
 use Magento\SalesGraphQl\Model\Order\OrderAddress;
@@ -20,11 +23,14 @@ class Order
     /**
      * @param OrderAddress $orderAddress
      * @param OrderPayments $orderPayments
+     * @param TimezoneInterface|null $timezone
      */
     public function __construct(
         private readonly OrderAddress $orderAddress,
-        private readonly OrderPayments $orderPayments
+        private readonly OrderPayments $orderPayments,
+        private ?TimezoneInterface $timezone = null
     ) {
+        $this->timezone = $timezone ?: ObjectManager::getInstance()->get(TimezoneInterface::class);
     }
 
     /**
@@ -42,7 +48,8 @@ public function format(OrderInterface $orderModel): array
             'id' => base64_encode((string)$orderModel->getEntityId()),
             'increment_id' => $orderModel->getIncrementId(),
             'number' => $orderModel->getIncrementId(),
-            'order_date' => $orderModel->getCreatedAt(),
+            'order_date' => $this->timezone->date($orderModel->getCreatedAt())
+                ->format(DateTime::DATETIME_PHP_FORMAT),
             'order_number' => $orderModel->getIncrementId(),
             'status' => $orderModel->getStatusLabel(),
             'email' => $orderModel->getCustomerEmail(),

app/code/Magento/SalesGraphQl/Model/Resolver/CreditMemo/CreditMemoComments.php

@@ -1,23 +1,35 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
 namespace Magento\SalesGraphQl\Model\Resolver\CreditMemo;
 
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\GraphQl\Config\Element\Field;
 use Magento\Framework\GraphQl\Query\ResolverInterface;
 use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
+use Magento\Framework\Stdlib\DateTime;
+use Magento\Framework\Stdlib\DateTime\TimezoneInterface;
 use Magento\Sales\Api\Data\CreditmemoInterface;
 
 /**
  * Resolve credit memo comments
  */
 class CreditMemoComments implements ResolverInterface
 {
+    /**
+     * @param TimezoneInterface|null $timezone
+     */
+    public function __construct(
+        private ?TimezoneInterface $timezone = null
+    ) {
+        $this->timezone = $timezone ?: ObjectManager::getInstance()->get(TimezoneInterface::class);
+    }
+
     /**
      * @inheritDoc
      */
@@ -40,7 +52,8 @@ public function resolve(
             if ($comment->getIsVisibleOnFront()) {
                 $comments[] = [
                     'message' => $comment->getComment(),
-                    'timestamp' => $comment->getCreatedAt()
+                    'timestamp' => $this->timezone->date($comment->getCreatedAt())
+                        ->format(DateTime::DATETIME_PHP_FORMAT)
                 ];
             }
         }

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

@@ -1,16 +1,19 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
 namespace Magento\SalesGraphQl\Model\Resolver;
 
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\GraphQl\Config\Element\Field;
 use Magento\Framework\GraphQl\Query\ResolverInterface;
 use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
+use Magento\Framework\Stdlib\DateTime;
+use Magento\Framework\Stdlib\DateTime\TimezoneInterface;
 use Magento\Sales\Api\Data\OrderInterface;
 use Magento\Sales\Api\Data\InvoiceInterface;
 
@@ -19,6 +22,15 @@
  */
 class Invoices implements ResolverInterface
 {
+    /**
+     * @param TimezoneInterface|null $timezone
+     */
+    public function __construct(
+        private ?TimezoneInterface $timezone = null
+    ) {
+        $this->timezone = $timezone ?: ObjectManager::getInstance()->get(TimezoneInterface::class);
+    }
+
     /**
      * @inheritDoc
      */
@@ -61,7 +73,8 @@ private function getInvoiceComments(InvoiceInterface $invoice): array
         foreach ($invoice->getComments() as $comment) {
             if ($comment->getIsVisibleOnFront()) {
                 $comments[] = [
-                    'timestamp' => $comment->getCreatedAt(),
+                    'timestamp' => $this->timezone->date($comment->getCreatedAt())
+                        ->format(DateTime::DATETIME_PHP_FORMAT),
                     'message' => $comment->getComment()
                 ];
             }

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

@@ -1,16 +1,19 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
 namespace Magento\SalesGraphQl\Model\Resolver;
 
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\GraphQl\Config\Element\Field;
 use Magento\Framework\GraphQl\Query\ResolverInterface;
 use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
+use Magento\Framework\Stdlib\DateTime;
+use Magento\Framework\Stdlib\DateTime\TimezoneInterface;
 use Magento\Sales\Api\Data\ShipmentInterface;
 use Magento\Sales\Model\Order;
 
@@ -19,6 +22,15 @@
  */
 class Shipments implements ResolverInterface
 {
+    /**
+     * @param TimezoneInterface|null $timezone
+     */
+    public function __construct(
+        private ?TimezoneInterface $timezone = null
+    ) {
+        $this->timezone = $timezone ?: ObjectManager::getInstance()->get(TimezoneInterface::class);
+    }
+
     /**
      * @inheritDoc
      */
@@ -62,7 +74,8 @@ private function getShipmentComments(ShipmentInterface $shipment): array
         foreach ($shipment->getComments() as $comment) {
             if ($comment->getIsVisibleOnFront()) {
                 $comments[] = [
-                    'timestamp' => $comment->getCreatedAt(),
+                    'timestamp' => $this->timezone->date($comment->getCreatedAt())
+                        ->format(DateTime::DATETIME_PHP_FORMAT),
                     'message' => $comment->getComment()
                 ];
             }

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

@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
@@ -11,6 +11,8 @@
 use Magento\Framework\Api\SearchCriteriaBuilder;
 use Magento\Framework\Exception\AuthenticationException;
 use Magento\Framework\Registry;
+use Magento\Framework\Stdlib\DateTime;
+use Magento\Framework\Stdlib\DateTime\TimezoneInterface;
 use Magento\GraphQl\GetCustomerAuthenticationHeader;
 use Magento\Sales\Api\OrderRepositoryInterface;
 use Magento\Sales\Model\ResourceModel\Order\Collection;
@@ -33,6 +35,8 @@
 
 /**
  * Class RetrieveOrdersTest
+ *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class RetrieveOrdersByOrderNumberTest extends GraphQlAbstract
 {
@@ -48,6 +52,9 @@ class RetrieveOrdersByOrderNumberTest extends GraphQlAbstract
     /** @var ProductRepositoryInterface */
     private $productRepository;
 
+    /** @var TimezoneInterface */
+    private $timezone;
+
     /**
      * @var DataFixtureStorage
      */
@@ -61,6 +68,7 @@ protected function setUp():void
         $this->orderRepository = $objectManager->get(OrderRepositoryInterface::class);
         $this->searchCriteriaBuilder = $objectManager->get(SearchCriteriaBuilder::class);
         $this->productRepository = $objectManager->get(ProductRepositoryInterface::class);
+        $this->timezone = $objectManager->get(TimezoneInterface::class);
         $this->fixtures = $objectManager->get(DataFixtureStorageManager::class)->getStorage();
     }
 
@@ -500,7 +508,8 @@ public function testGetCustomerDescendingSortedOrders()
         $orderNumberCreatedAtExpected = [];
         for ($i = 1; $i <= 3; $i++) {
             $orderNumber = $this->fixtures->get('or' . $i)->getIncrementId();
-            $orderCreatedAt = $this->fixtures->get('or' . $i)->getCreatedAt();
+            $orderCreatedAt = $this->timezone->date($this->fixtures->get('or' . $i)->getCreatedAt())
+                ->format(DateTime::DATETIME_PHP_FORMAT);
             $orderNumberCreatedAtExpected[$orderNumber] = $orderCreatedAt;
         }