Merge remote-tracking branch 'origin/MC-36219' into 2.4-develop-pr42

Author: serhii-balko

app/code/Magento/Sales/etc/db_schema.xml

@@ -769,7 +769,7 @@
         <column xsi:type="varchar" name="order_increment_id" nullable="false" length="32" comment="Order Increment ID"/>
         <column xsi:type="int" name="order_id" unsigned="true" nullable="false" identity="false"
                 comment="Order ID"/>
-        <column xsi:type="timestamp" name="order_created_at" on_update="true" nullable="false"
+        <column xsi:type="timestamp" name="order_created_at" on_update="false" nullable="false"
                 default="CURRENT_TIMESTAMP" comment="Order Increment ID"/>
         <column xsi:type="varchar" name="customer_name" nullable="false" length="128" comment="Customer Name"/>
         <column xsi:type="decimal" name="total_qty" scale="4" precision="12" unsigned="false" nullable="true"

dev/tests/integration/testsuite/Magento/Sales/Model/ResourceModel/Report/Shipping/Collection/ShipmentTest.php

@@ -5,26 +5,35 @@
  */
 namespace Magento\Sales\Model\ResourceModel\Report\Shipping\Collection;
 
+use Magento\Framework\ObjectManagerInterface;
+use Magento\Framework\Stdlib\DateTime\DateTime;
+use Magento\Framework\Stdlib\DateTime\DateTimeFactory;
+use Magento\Framework\Stdlib\DateTime\TimezoneInterface;
+use Magento\Reports\Model\Item;
+use Magento\Sales\Model\ResourceModel\Order\Shipment\Grid\Collection as ShipmentGridCollection;
+use Magento\TestFramework\Helper\Bootstrap;
+use PHPUnit\Framework\TestCase;
+
 /**
  * Integration tests for shipments reports collection which is used to obtain shipment reports by shipment date.
  */
-class ShipmentTest extends \PHPUnit\Framework\TestCase
+class ShipmentTest extends TestCase
 {
     /**
-     * @var \Magento\Sales\Model\ResourceModel\Report\Shipping\Collection\Shipment
+     * @var Shipment
      */
     private $collection;
 
     /**
-     * @var \Magento\Framework\ObjectManagerInterface
+     * @var ObjectManagerInterface
      */
     private $objectManager;
 
     protected function setUp(): void
     {
-        $this->objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+        $this->objectManager = Bootstrap::getObjectManager();
         $this->collection = $this->objectManager->create(
-            \Magento\Sales\Model\ResourceModel\Report\Shipping\Collection\Shipment::class
+            Shipment::class
         );
         $this->collection->setPeriod('day')
             ->setDateRange(null, null)
@@ -43,11 +52,11 @@ public function testGetItems()
         $order = $this->objectManager->create(\Magento\Sales\Model\Order::class);
         $order->loadByIncrementId('100000001');
         $shipmentCreatedAt = $order->getShipmentsCollection()->getFirstItem()->getCreatedAt();
-        /** @var \Magento\Framework\Stdlib\DateTime\DateTime $dateTime */
-        $dateTime = $this->objectManager->create(\Magento\Framework\Stdlib\DateTime\DateTimeFactory::class)
+        /** @var DateTime $dateTime */
+        $dateTime = $this->objectManager->create(DateTimeFactory::class)
             ->create();
-        /** @var \Magento\Framework\Stdlib\DateTime\TimezoneInterface $timezone */
-        $timezone = $this->objectManager->create(\Magento\Framework\Stdlib\DateTime\TimezoneInterface::class);
+        /** @var TimezoneInterface $timezone */
+        $timezone = $this->objectManager->create(TimezoneInterface::class);
         $shipmentCreatedAt = $timezone->formatDateTime(
             $shipmentCreatedAt,
             \IntlDateFormatter::SHORT,
@@ -67,10 +76,44 @@ public function testGetItems()
             ],
         ];
         $actualResult = [];
-        /** @var \Magento\Reports\Model\Item $reportItem */
+        /** @var Item $reportItem */
         foreach ($this->collection->getItems() as $reportItem) {
             $actualResult[] = array_intersect_key($reportItem->getData(), $expectedResult[0]);
         }
         $this->assertEquals($expectedResult, $actualResult);
     }
+
+    /**
+     * Checks that order_created_at field does not change after sales_shipment_grid row update
+     *
+     * @magentoDataFixture Magento/Sales/_files/order_shipping.php
+     * @return void
+     */
+    public function testOrderShipmentGridOrderCreatedAt(): void
+    {
+        $incrementId = '100000001';
+        /** @var \Magento\Sales\Model\Order $order */
+        $order = $this->objectManager->create(\Magento\Sales\Model\Order::class);
+        $order->loadByIncrementId($incrementId);
+        /** @var ShipmentGridCollection $grid */
+        $grid = $this->objectManager->get(ShipmentGridCollection::class);
+        $grid->getSelect()
+            ->where('order_increment_id', $incrementId);
+        $itemId = $grid->getFirstItem()
+            ->getEntityId();
+        $connection = $grid->getResource()
+            ->getConnection();
+        $tableName = $grid->getMainTable();
+        $connection->update(
+            $tableName,
+            ['customer_name' => 'Test'],
+            $connection->quoteInto('entity_id = ?', $itemId)
+        );
+        $updatedRow = $connection->select()
+            ->where('entity_id = ?', $itemId)
+            ->from($tableName, ['order_created_at']);
+        $orderCreatedAt = $connection->fetchOne($updatedRow);
+
+        $this->assertEquals($order->getCreatedAt(), $orderCreatedAt);
+    }
 }