Fix factory

Author: riasvdv

database/Factories/AssetFactory.php

@@ -5,6 +5,7 @@
 namespace CraftCms\Cms\Database\Factories;
 
 use CraftCms\Cms\Asset\Models\Asset;
+use CraftCms\Cms\Asset\Models\Volume;
 use CraftCms\Cms\Asset\Models\VolumeFolder;
 use CraftCms\Cms\Element\Models\Element;
 use Illuminate\Database\Eloquent\Factories\Factory;
@@ -19,6 +20,7 @@ public function definition(): array
     {
         return [
             'id' => Element::factory()->set('type', \CraftCms\Cms\Element\Elements\Asset::class),
+            'volumeId' => Volume::factory(),
             'folderId' => VolumeFolder::factory(),
             'filename' => fake()->word().'.jpg',
             'kind' => 'image',
@@ -29,12 +31,16 @@ public function definition(): array
     public function configure(): self
     {
         return $this->afterCreating(function (Asset $asset) {
-            $asset->element->update([
-                'dateCreated' => $asset->dateCreated,
-                'dateUpdated' => $asset->dateCreated,
-            ]);
-
-            $asset->update(['volumeId' => $asset->folder->volume?->id]);
+            // For some reason the element factory doesn't get saved properly
+            if ($asset->id === 0) {
+                $asset->update([
+                    'id' => Element::query()
+                        ->where('type', \CraftCms\Cms\Element\Elements\Asset::class)
+                        ->latest('id')
+                        ->first()
+                        ->id,
+                ]);
+            }
         });
     }
 }

src/Asset/Models/Asset.php

@@ -12,6 +12,7 @@
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\Relations\BelongsToMany;
+use Illuminate\Database\Eloquent\Relations\Pivot;
 
 final class Asset extends BaseModel
 {
@@ -32,15 +33,15 @@ protected function casts(): array
     }
 
     /**
-     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo<\CraftCms\Cms\Element\Models\Element, $this>
+     * @return BelongsTo<Element, $this>
      */
     public function element(): BelongsTo
     {
         return $this->belongsTo(Element::class, 'id');
     }
 
     /**
-     * @return \Illuminate\Database\Eloquent\Relations\BelongsToMany<\CraftCms\Cms\Site\Models\Site, $this, \Illuminate\Database\Eloquent\Relations\Pivot>
+     * @return BelongsToMany<Site, $this, Pivot>
      */
     public function sites(): BelongsToMany
     {
@@ -49,23 +50,23 @@ public function sites(): BelongsToMany
     }
 
     /**
-     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo<\CraftCms\Cms\Asset\Models\Volume, $this>
+     * @return BelongsTo<Volume, $this>
      */
     public function volume(): BelongsTo
     {
         return $this->belongsTo(Volume::class, 'volumeId');
     }
 
     /**
-     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo<\CraftCms\Cms\Asset\Models\VolumeFolder, $this>
+     * @return BelongsTo<VolumeFolder, $this>
      */
     public function folder(): BelongsTo
     {
         return $this->belongsTo(VolumeFolder::class, 'folderId');
     }
 
     /**
-     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo<\CraftCms\Cms\User\Models\User, $this>
+     * @return BelongsTo<User, $this>
      */
     public function uploader(): BelongsTo
     {

src/Asset/Models/Volume.php

@@ -28,7 +28,7 @@ protected function casts(): array
     }
 
     /**
-     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo<\CraftCms\Cms\FieldLayout\Models\FieldLayout, $this>
+     * @return BelongsTo<FieldLayout, $this>
      */
     public function fieldLayout(): BelongsTo
     {

src/Asset/Models/VolumeFolder.php

@@ -19,23 +19,23 @@ final class VolumeFolder extends BaseModel
     protected $table = Table::VOLUMEFOLDERS;
 
     /**
-     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo<\CraftCms\Cms\Asset\Models\VolumeFolder, $this>
+     * @return BelongsTo<VolumeFolder, $this>
      */
     public function parent(): BelongsTo
     {
         return $this->belongsTo(self::class, 'parentId');
     }
 
     /**
-     * @return \Illuminate\Database\Eloquent\Relations\HasMany<\CraftCms\Cms\Asset\Models\VolumeFolder, $this>
+     * @return HasMany<VolumeFolder, $this>
      */
     public function children(): HasMany
     {
         return $this->hasMany(self::class, 'parentId');
     }
 
     /**
-     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo<\CraftCms\Cms\Asset\Models\Volume, $this>
+     * @return BelongsTo<Volume, $this>
      */
     public function volume(): BelongsTo
     {