ACP2E-2568: Image file is Case insensitive in Pagebuilder(Image not showing in Media Gallery when upload both lowercase and uppercase image with same name)

Author: thiaramus

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

@@ -20,6 +20,7 @@ class DeleteAssetsByPaths implements DeleteAssetsByPathsInterface
 {
     private const TABLE_MEDIA_GALLERY_ASSET = 'media_gallery_asset';
     private const MEDIA_GALLERY_ASSET_PATH = 'path';
+    private const MEDIA_GALLERY_ASSET_ID = 'id';
 
     /**
      * @var ResourceConnection
@@ -78,13 +79,39 @@ public function execute(array $paths): void
      * Delete assets from database based on the first part (beginning) of the path
      *
      * @param string $path
+     * @throws \Zend_Db_Statement_Exception
      */
     private function deleteAssetsByDirectoryPath(string $path): void
+    {
+        /** @var AdapterInterface $connection */
+        $connection = $this->resourceConnection->getConnection();
+
+        $select = $connection->select()
+            ->from($this->resourceConnection->getTableName(self::TABLE_MEDIA_GALLERY_ASSET))
+            ->where(self::MEDIA_GALLERY_ASSET_PATH . ' LIKE ?', $path . '%');
+
+        $assets = $connection->query($select)->fetchAll();
+
+        // Filter out assets with mixed case that doesn't match the paths
+        foreach ($assets as $asset) {
+            if (str_starts_with($asset[self::MEDIA_GALLERY_ASSET_PATH], $path)) {
+                $this->deleteAssetById((int)$asset[self::MEDIA_GALLERY_ASSET_ID]);
+            }
+        }
+    }
+
+    /**
+     * Delete assets from database by asset id
+     *
+     * @param int $id
+     * @return void
+     */
+    private function deleteAssetById(int $id): void
     {
         /** @var AdapterInterface $connection */
         $connection = $this->resourceConnection->getConnection();
         $tableName = $this->resourceConnection->getTableName(self::TABLE_MEDIA_GALLERY_ASSET);
-        $connection->delete($tableName, [self::MEDIA_GALLERY_ASSET_PATH . ' LIKE ?' => $path . '%']);
+        $connection->delete($tableName, [self::MEDIA_GALLERY_ASSET_ID . ' = ?' => $id]);
     }
 
     /**

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

@@ -105,6 +105,29 @@ private function getAssetsData(array $paths): array
         $select = $connection->select()
             ->from($this->resourceConnection->getTableName(self::TABLE_MEDIA_GALLERY_ASSET))
             ->where(self::MEDIA_GALLERY_ASSET_PATH . ' IN (?)', $paths);
-        return $connection->query($select)->fetchAll();
+        $assets = $connection->query($select)->fetchAll();
+
+        return $this->filterCaseSensitiveAssets($assets, $paths);
+    }
+
+    /**
+     * Filter out assets with mixed case that doesn't match the paths
+     *
+     * @param array $assets
+     * @param array $paths
+     * @return array
+     */
+    private function filterCaseSensitiveAssets(array $assets, array $paths): array
+    {
+        $filteredAssets = [];
+        foreach ($assets as $asset) {
+            foreach ($paths as $path) {
+                if ($asset[self::MEDIA_GALLERY_ASSET_PATH] === $path) {
+                    $filteredAssets[] = $asset;
+                }
+            }
+        }
+
+        return $filteredAssets;
     }
 }