Merge pull request #4624 from neos/bugfix/batch-load-thumbnails-for-a…

…sset BUGFIX: Load all thumbnails for an asset to skip further requests
neos · Oct 17, 2023 · db63fe0 · db63fe0
2 parents 115030e + 71aaba7
commit db63fe0
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/Neos.Media/Classes/Domain/Model/Thumbnail.php b/Neos.Media/Classes/Domain/Model/Thumbnail.php
@@ -224,4 +224,9 @@ public function refresh()
     {
         $this->generatorStrategy->refresh($this);
     }
+
+    public function getConfigurationHash(): string
+    {
+        return $this->configurationHash;
+    }
 }
diff --git a/Neos.Media/Classes/Domain/Service/ThumbnailService.php b/Neos.Media/Classes/Domain/Service/ThumbnailService.php
@@ -132,8 +132,16 @@ public function getThumbnail(AssetInterface $asset, ThumbnailConfiguration $conf
         if (isset($this->thumbnailCache[$assetIdentifier][$configurationHash])) {
             $thumbnail = $this->thumbnailCache[$assetIdentifier][$configurationHash];
         } else {
-            $thumbnail = $this->thumbnailRepository->findOneByAssetAndThumbnailConfiguration($asset, $configuration);
-            $this->thumbnailCache[$assetIdentifier][$configurationHash] = $thumbnail;
+            $thumbnail = null;
+            // Load all thumbnails for the asset and cache them to prevent further db requests for the same asset
+            $thumbnailsForAsset = $this->thumbnailRepository->findByOriginalAsset($asset);
+            /** @var Thumbnail $thumbnailVariant */
+            foreach ($thumbnailsForAsset as $thumbnailVariant) {
+                $this->thumbnailCache[$assetIdentifier][$thumbnailVariant->getConfigurationHash()] = $thumbnailVariant;
+                if ($thumbnailVariant->getConfigurationHash() === $configurationHash) {
+                    $thumbnail = $thumbnailVariant;
+                }
+            }
         }
         $async = $configuration->isAsync();
         if ($thumbnail === null) {