diff --git a/app/code/Magento/MediaGallerySynchronization/Model/CreateAssetFromFile.php b/app/code/Magento/MediaGallerySynchronization/Model/CreateAssetFromFile.php
index 3305c5e54b861..a76cb8b3b9971 100644
--- a/app/code/Magento/MediaGallerySynchronization/Model/CreateAssetFromFile.php
+++ b/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 GetContentHashInterface $getContentHash
* @param ExtractMetadataInterface $extractMetadata
@@ -76,7 +64,6 @@ class CreateAssetFromFile
public function __construct(
Filesystem $filesystem,
File $driver,
- TimezoneInterface $date,
AssetInterfaceFactory $assetFactory,
GetContentHashInterface $getContentHash,
ExtractMetadataInterface $extractMetadata,
@@ -84,7 +71,6 @@ public function __construct(
) {
$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('.' . $file->getExtension()),
'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),
diff --git a/app/code/Magento/MediaGalleryUi/Model/UpdateAsset.php b/app/code/Magento/MediaGalleryUi/Model/UpdateAsset.php
index ff82b990d2a01..85522c6b07e00 100644
--- a/app/code/Magento/MediaGalleryUi/Model/UpdateAsset.php
+++ b/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()
]
);
diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AssertAdminEnhancedMediaGalleryImageCreatedAtNotEqualsUpdatedAtTimeActionGroup.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AssertAdminEnhancedMediaGalleryImageCreatedAtNotEqualsUpdatedAtTimeActionGroup.xml
new file mode 100644
index 0000000000000..9460d0b339ca4
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AssertAdminEnhancedMediaGalleryImageCreatedAtNotEqualsUpdatedAtTimeActionGroup.xml
@@ -0,0 +1,24 @@
+
+
+
+
+
+
+ Assert that created_at updated_at time NOT equals
+
+
+
+
+
+ grabCreatedTime
+ grabModifietTime
+
+
+
+
diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AssertAdminEnhancedMediaGalleryUploadedImageDateTimeEqualsActionGroup.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AssertAdminEnhancedMediaGalleryUploadedImageDateTimeEqualsActionGroup.xml
new file mode 100644
index 0000000000000..076885ddaf8b6
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AssertAdminEnhancedMediaGalleryUploadedImageDateTimeEqualsActionGroup.xml
@@ -0,0 +1,24 @@
+
+
+
+
+
+
+ Assert that created_at updated_at time are the same for newly uploaded image
+
+
+
+
+
+ grabCreatedTime
+ grabModifietTime
+
+
+
+
diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/Section/AdminEnhancedMediaGalleryViewDetailsSection.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/Section/AdminEnhancedMediaGalleryViewDetailsSection.xml
index 0bcbeb0d7a00f..c2bf6e8f29661 100644
--- a/app/code/Magento/MediaGalleryUi/Test/Mftf/Section/AdminEnhancedMediaGalleryViewDetailsSection.xml
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/Section/AdminEnhancedMediaGalleryViewDetailsSection.xml
@@ -18,6 +18,8 @@
+
+
diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminStandaloneMediaGalleryEditImageDetailsTest.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminStandaloneMediaGalleryEditImageDetailsTest.xml
index ede3a452e4ca5..58c6f32b8d72f 100644
--- a/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminStandaloneMediaGalleryEditImageDetailsTest.xml
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminStandaloneMediaGalleryEditImageDetailsTest.xml
@@ -29,6 +29,10 @@
+
+
+
+
@@ -40,6 +44,7 @@
+