[4.x] Always load model for assets (#479)

* Always load model for assets

* Fixing test

* Fix test, attempt 2

* Fixing test, attempt 3

* Nitpicks - early return and formatting

* Update test to be more meaningful with explanation

* Revert test changes and make a separate test

---------

Co-authored-by: Ryan Mitchell <ryan@thoughtcollective.com>

Author: godismyjudge95

src/Assets/Asset.php

@@ -173,6 +173,18 @@ public static function makeModelFromContract(AssetContract $source, $meta = [])
     public function model($model = null)
     {
         if (func_num_args() === 0) {
+            if ($this->model) {
+                return $this->model;
+            }
+
+            $this->model = app('statamic.eloquent.assets.model')::query()
+                ->where([
+                    'container' => $this->containerHandle(),
+                    'folder' => $this->folder(),
+                    'basename' => $this->basename(),
+                ])
+                ->first();
+
             return $this->model;
         }
 

tests/Assets/AssetTest.php

@@ -58,6 +58,8 @@ protected function setUp(): void
 
         Storage::disk('test')->put('f.jpg', '');
         Facades\Asset::make()->container('test')->path('f.jpg')->save();
+
+        Storage::disk('test')->put('test-folder/test.jpg', '');
     }
 
     #[Test]
@@ -70,7 +72,7 @@ public function it_loads_from_asset_model()
             'basename' => 'test.jpg',
             'filename' => 'test',
             'extension' => 'jpg',
-            'meta' => ['width' => 100, 'height' => 100, 'data' => []],
+            'meta' => ['width' => 100, 'height' => 100, 'data' => ['focus' => '50-50-1']],
         ]);
 
         $asset = (new Asset)->fromModel($model);
@@ -81,7 +83,33 @@ public function it_loads_from_asset_model()
         $this->assertSame('test.jpg', $asset->basename());
         $this->assertSame('test', $asset->filename());
         $this->assertSame('jpg', $asset->extension());
-        $this->assertSame(['width' => 100, 'height' => 100, 'data' => []], $asset->meta());
+        $this->assertSame(['width' => 100, 'height' => 100, 'data' => ['focus' => '50-50-1']], $asset->meta());
+    }
+
+    #[Test]
+    public function it_loads_from_an_existing_model_outside_the_query_builder()
+    {
+        $model = new AssetModel([
+            'container' => 'test',
+            'path' => 'test-folder/test.jpg',
+            'folder' => 'test-folder',
+            'basename' => 'test.jpg',
+            'filename' => 'test',
+            'extension' => 'jpg',
+            'meta' => ['width' => 100, 'height' => 100, 'data' => ['focus' => '50-50-1']],
+        ]);
+
+        $model->save();
+
+        $asset = $this->container->asset($model->path);
+
+        $this->assertSame($model->getKey(), $asset->model()->getKey());
+        $this->assertSame('test-folder/test.jpg', $asset->path());
+        $this->assertSame('test-folder', $asset->folder());
+        $this->assertSame('test.jpg', $asset->basename());
+        $this->assertSame('test', $asset->filename());
+        $this->assertSame('jpg', $asset->extension());
+        $this->assertSame(['width' => 100, 'height' => 100, 'data' => ['focus' => '50-50-1']], $asset->meta());
     }
 
     #[Test]
@@ -216,11 +244,13 @@ public function can_save_an_asset_made_on_the_container()
 
         $asset = $this->container->makeAsset('a.jpg');
 
-        $this->assertNull($asset->model());
+        $model = $asset->model(); // it should find the existing model meta
+        $this->assertNotNull($model);
 
         $asset->save();
 
         $this->assertNotNull($asset->model());
+        $this->assertSame($model, $asset->model());
 
         Event::assertDispatched(AssetSaved::class, fn ($event) => $event->asset === $asset);