ENGCOM-7988: Fix date timestamp typo ( Created and Modified date are different for newly saved Image Preview) #29452

Author: gabrieldagama

app/code/Magento/MediaGallerySynchronization/Model/CreateAssetFromFile.php

@@ -12,7 +12,6 @@
 use Magento\Framework\Filesystem;
 use Magento\Framework\Filesystem\Directory\ReadInterface;
 use Magento\Framework\Filesystem\Driver\File;
-use Magento\Framework\Stdlib\DateTime\TimezoneInterface;
 use Magento\MediaGalleryApi\Api\Data\AssetInterface;
 use Magento\MediaGalleryApi\Api\Data\AssetInterfaceFactory;
 use Magento\MediaGalleryMetadataApi\Api\ExtractMetadataInterface;
@@ -24,11 +23,6 @@
  */
 class CreateAssetFromFile
 {
-    /**
-     * Date format
-     */
-    private const DATE_FORMAT = 'Y-m-d H:i:s';
-
     /**
      * @var Filesystem
      */
@@ -39,11 +33,6 @@ class CreateAssetFromFile
      */
     private $driver;
 
-    /**
-     * @var TimezoneInterface;
-     */
-    private $date;
-
     /**
      * @var AssetInterfaceFactory
      */
@@ -67,7 +56,6 @@ class CreateAssetFromFile
     /**
      * @param Filesystem $filesystem
      * @param File $driver
-     * @param TimezoneInterface $date
      * @param AssetInterfaceFactory $assetFactory
      * @param GetContentHash $getContentHash
      * @param ExtractMetadataInterface $extractMetadata
@@ -76,15 +64,13 @@ class CreateAssetFromFile
     public function __construct(
         Filesystem $filesystem,
         File $driver,
-        TimezoneInterface $date,
         AssetInterfaceFactory $assetFactory,
         GetContentHash $getContentHash,
         ExtractMetadataInterface $extractMetadata,
         GetFileInfo $getFileInfo
     ) {
         $this->filesystem = $filesystem;
         $this->driver = $driver;
-        $this->date = $date;
         $this->assetFactory = $assetFactory;
         $this->getContentHash = $getContentHash;
         $this->extractMetadata = $extractMetadata;
@@ -112,8 +98,6 @@ public function execute(string $path): AssetInterface
                 'path' => $path,
                 'title' => $metadata->getTitle() ?: $file->getBasename(),
                 'description' => $metadata->getDescription(),
-                'createdAt' => $this->date->date($file->getCTime())->format(self::DATE_FORMAT),
-                'updatedAt' => $this->date->date($file->getMTime())->format(self::DATE_FORMAT),
                 'width' => $width,
                 'height' => $height,
                 'hash' => $this->getHash($path),

app/code/Magento/MediaGalleryUi/Model/UpdateAsset.php

@@ -76,18 +76,16 @@ public function execute(int $id, MetadataInterface $data): void
 
         $updatedAsset = $this->assetFactory->create(
             [
+                'id' => $asset->getId(),
                 'path' => $asset->getPath(),
-                'contentType' => $asset->getContentType(),
+                'title' => $data->getTitle() ?? $asset->getTitle(),
+                'description' => $data->getDescription() ?? $asset->getDescription(),
                 'width' => $asset->getWidth(),
                 'height' => $asset->getHeight(),
                 'size' => $asset->getSize(),
-                'id' => $asset->getId(),
-                'title' => $data->getTitle() ?? $asset->getTitle(),
-                'description' => $data->getDescription() ?? $asset->getDescription(),
-                'source' => $asset->getSource(),
                 'hash' => $asset->getHash(),
-                'created_at' => $asset->getCreatedAt(),
-                'updated_at' => $asset->getUpdatedAt()
+                'contentType' => $asset->getContentType(),
+                'source' => $asset->getSource()
             ]
         );
 

app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AssertAdminEnhancedMediaGalleryImageCreatedAtNotEqualsUpdatedAtTimeActionGroup.xml

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="AssertAdminEnhancedMediaGalleryImageCreatedAtNotEqualsUpdatedAtTimeActionGroup">
+        <annotations>
+            <description>Assert that created_at updated_at time NOT equals</description>
+        </annotations>
+
+        <grabTextFrom selector="{{AdminEnhancedMediaGalleryViewDetailsSection.createdAtDate}}" stepKey="grabCreatedTime"/>
+        <grabTextFrom selector="{{AdminEnhancedMediaGalleryViewDetailsSection.updatedAtDate}}" stepKey="grabModifietTime"/>
+        <assertNotEquals stepKey="verifyContentType">
+            <actualResult type="variable">grabCreatedTime</actualResult>
+            <expectedResult type="variable">grabModifietTime</expectedResult>
+        </assertNotEquals>
+
+    </actionGroup>
+</actionGroups>

app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AssertAdminEnhancedMediaGalleryUploadedImageDateTimeEqualsActionGroup.xml

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="AssertAdminEnhancedMediaGalleryUploadedImageDateTimeEqualsActionGroup">
+        <annotations>
+            <description>Assert that created_at updated_at time are the same for newly uploaded image </description>
+        </annotations>
+
+        <grabTextFrom selector="{{AdminEnhancedMediaGalleryViewDetailsSection.createdAtDate}}" stepKey="grabCreatedTime"/>
+        <grabTextFrom selector="{{AdminEnhancedMediaGalleryViewDetailsSection.updatedAtDate}}" stepKey="grabModifietTime"/>
+        <assertEquals stepKey="verifyContentType">
+            <actualResult type="variable">grabCreatedTime</actualResult>
+            <expectedResult type="variable">grabModifietTime</expectedResult>
+        </assertEquals>
+
+    </actionGroup>
+</actionGroups>

app/code/Magento/MediaGalleryUi/Test/Mftf/Section/AdminEnhancedMediaGalleryViewDetailsSection.xml

@@ -18,6 +18,8 @@
         <element name="edit" type="button" selector="//div[@class='media-gallery-image-details-modal']//button[contains(@class, 'edit')]"/>
         <element name="delete" type="button" selector="//div[@class='media-gallery-image-details-modal']//button[contains(@class, 'delete')]"/>
         <element name="confirmDelete" type="button" selector=".action-accept"/>
+        <element name="createdAtDate" type="button" selector="//div[@class='attribute']/span[contains(text(), 'Created')]/following-sibling::div"/>
+        <element name="updatedAtDate" type="button" selector="//div[@class='attribute']/span[contains(text(), 'Modified')]/following-sibling::div"/>
         <element name="addImage" type="button" selector=".add-image-action"/>
         <element name="cancel" type="button" selector="#image-details-action-cancel"/>
         <element name="usedInLink" type="button" parameterized="true" selector="//div[@class='attribute']/span[contains(text(), 'Used In')]/following-sibling::div/a[contains(text(), '{{entityName}}')]"/>

app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminStandaloneMediaGalleryEditImageDetailsTest.xml

@@ -29,6 +29,10 @@
         <actionGroup ref="AdminEnhancedMediaGalleryUploadImageActionGroup" stepKey="uploadImage">
             <argument name="image" value="ImageUpload"/>
         </actionGroup>
+        <actionGroup ref="AdminEnhancedMediaGalleryViewImageDetails" stepKey="clickViewDetails"/>
+        <actionGroup ref="AssertAdminEnhancedMediaGalleryUploadedImageDateTimeEqualsActionGroup" stepKey="verifyCreatedAndUpdatedAtDate" />
+        <wait time="100" stepKey="waitForUpdateTimeToBeGreater"/>
+        <actionGroup ref="AdminEnhancedMediaGalleryCloseViewDetailsActionGroup" stepKey="closeViewDetails"/>
         <actionGroup ref="AdminEnhancedMediaGalleryEditImageDetailsActionGroup" stepKey="editImageDetails"/>
         <actionGroup ref="AdminEnhancedMediaGalleryImageDetailsSaveActionGroup" stepKey="saveImage">
             <argument name="image" value="UpdatedImageDetails"/>
@@ -40,6 +44,7 @@
         <actionGroup ref="AdminEnhancedMediaGalleryVerifyImageDetailsActionGroup" stepKey="verifyImageDetails">
             <argument name="image" value="UpdatedImageDetails"/>
         </actionGroup>
+        <actionGroup ref="AssertAdminEnhancedMediaGalleryImageCreatedAtNotEqualsUpdatedAtTimeActionGroup" stepKey="assertUpdatedAtTimeChanged" />
         <actionGroup ref="AdminEnhancedMediaGalleryVerifyImageDescriptionActionGroup" stepKey="verifyImageDescription">
             <argument name="description" value="UpdatedImageDetails.description"/>
         </actionGroup>