fix performance problem

spatie · Jul 26, 2015 · 74a9689 · 74a9689
1 parent 330bd89
commit 74a9689
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 6 deletions.
diff --git a/src/Conversion/ConversionCollection.php b/src/Conversion/ConversionCollection.php
@@ -55,11 +55,21 @@ public function getByName($name)
      */
     protected function addConversionsFromRelatedModel(Media $media)
     {
-        if ($media->model instanceof HasMedia) {
-            $media->model->registerMediaConversions();
+        static $cachedRegistrations = [];
+
+        $cacheKey = $media->model_type;
+
+        if (! isset($cachedRegistrations[$cacheKey])) {
+
+            $cachedRegistrations[$cacheKey] = [];
+
+            if ($media->model instanceof HasMedia) {
+                $media->model->registerMediaConversions();
+                $cachedRegistrations[$cacheKey] = $media->model->mediaConversions;
+            }
         }
 
-        $this->items = $media->model->mediaConversions;
+        $this->items = $cachedRegistrations[$cacheKey];
     }
 
     /**

diff --git a/tests/Performance/PerformanceTest.php b/tests/Performance/PerformanceTest.php
@@ -10,11 +10,11 @@ class PerformanceTest extends TestCase
     /**
      * @test
      */
-    public function it_will_not_reload_media_if_it_is_eagerly_loaded()
+    public function it_will_can_use_eagerly_loaded_media()
     {
         foreach (range(1, 10) as $index) {
             $testModel = $this->testModelWithConversion->create(['name' => "test{$index}"]);
-            $testModel->addMedia($this->getTestFilesDirectory('test.jpg'), 'default', false);
+            $testModel->addMedia($this->getTestFilesDirectory('test.jpg'), 'images', false);
         }
 
         DB::connection()->enableQueryLog();
@@ -23,7 +23,7 @@ public function it_will_not_reload_media_if_it_is_eagerly_loaded()
         $testModels->load("media");
 
         foreach ($testModels as $testModel) {
-            $testModel->getFirstMediaUrl();
+            $testModel->getFirstMediaUrl('images', 'thumb');
         }
 
         $this->assertCount(2, DB::getQueryLog());