Skip to content

Commit e3ea27d

Browse files
author
Stanislav Idolov
committed
#27499: Code review fixes.
1 parent a77e990 commit e3ea27d

File tree

3 files changed

+42
-30
lines changed

3 files changed

+42
-30
lines changed

app/code/Magento/MediaGallery/Model/Asset/Command/Save.php

Lines changed: 19 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -61,22 +61,26 @@ public function execute(AssetInterface $mediaAsset): int
6161
/** @var \Magento\Framework\DB\Adapter\Pdo\Mysql $connection */
6262
$connection = $this->resourceConnection->getConnection();
6363
$tableName = $this->resourceConnection->getTableName(self::TABLE_MEDIA_GALLERY_ASSET);
64+
$record = [
65+
'id' => $mediaAsset->getId(),
66+
'path' => $mediaAsset->getPath(),
67+
'title' => $mediaAsset->getTitle(),
68+
'source' => $mediaAsset->getSource(),
69+
'content_type' => $mediaAsset->getContentType(),
70+
'width' => $mediaAsset->getWidth(),
71+
'height' => $mediaAsset->getHeight(),
72+
'size' => $mediaAsset->getSize(),
73+
];
6474

65-
$connection->insertOnDuplicate(
66-
$tableName,
67-
[
68-
'id' => $mediaAsset->getId(),
69-
'path' => $mediaAsset->getPath(),
70-
'title' => $mediaAsset->getTitle(),
71-
'source' => $mediaAsset->getSource(),
72-
'content_type' => $mediaAsset->getContentType(),
73-
'width' => $mediaAsset->getWidth(),
74-
'height' => $mediaAsset->getHeight(),
75-
'size' => $mediaAsset->getSize(),
76-
'created_at' => $mediaAsset->getCreatedAt(),
77-
'updated_at' => $mediaAsset->getUpdatedAt(),
78-
]
79-
);
75+
if ($mediaAsset->getCreatedAt()) {
76+
$record['created_at'] = $mediaAsset->getCreatedAt();
77+
}
78+
79+
if ($mediaAsset->getUpdatedAt()) {
80+
$record['updated_at'] = $mediaAsset->getUpdatedAt();
81+
}
82+
83+
$connection->insertOnDuplicate($tableName, $record);
8084
return (int)$connection->lastInsertId($tableName);
8185
} catch (\Exception $exception) {
8286
$this->logger->critical($exception);

app/code/Magento/MediaGallery/Model/ResourceModel/SaveAssets.php

Lines changed: 20 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -56,21 +56,26 @@ public function execute(array $assets): void
5656
$failedAssets = [];
5757
foreach ($assets as $asset) {
5858
try {
59-
$connection->insertOnDuplicate(
60-
$tableName,
61-
[
62-
'id' => $asset->getId(),
63-
'path' => $asset->getPath(),
64-
'title' => $asset->getTitle(),
65-
'source' => $asset->getSource(),
66-
'content_type' => $asset->getContentType(),
67-
'width' => $asset->getWidth(),
68-
'height' => $asset->getHeight(),
69-
'size' => $asset->getSize(),
70-
'created_at' => $asset->getCreatedAt(),
71-
'updated_at' => $asset->getUpdatedAt(),
72-
]
73-
);
59+
$record = [
60+
'id' => $asset->getId(),
61+
'path' => $asset->getPath(),
62+
'title' => $asset->getTitle(),
63+
'source' => $asset->getSource(),
64+
'content_type' => $asset->getContentType(),
65+
'width' => $asset->getWidth(),
66+
'height' => $asset->getHeight(),
67+
'size' => $asset->getSize(),
68+
];
69+
70+
if ($asset->getCreatedAt()) {
71+
$record['created_at'] = $asset->getCreatedAt();
72+
}
73+
74+
if ($asset->getUpdatedAt()) {
75+
$record['updated_at'] = $asset->getUpdatedAt();
76+
}
77+
78+
$connection->insertOnDuplicate($tableName, $record);
7479
} catch (\Exception $exception) {
7580
$this->logger->critical($exception);
7681
$failedAssets[] = $asset;

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,9 @@
2626
<constraint xsi:type="unique" referenceId="MEDIA_GALLERY_ID_PATH_TITLE_CONTENT_TYPE_WIDTH_HEIGHT">
2727
<column name="path"/>
2828
</constraint>
29+
<index referenceId="MEDIA_GALLERY_ASSET_TITLE" indexType="fulltext">
30+
<column name="title"/>
31+
</index>
2932
</table>
3033
<table name="media_gallery_keyword" resource="default" engine="innodb" comment="Media Gallery Keyword">
3134
<column xsi:type="int" name="id" padding="10" unsigned="true" nullable="false" identity="true" comment="Keyword ID"/>

0 commit comments

Comments
 (0)