A free open source IT asset/license management system
Moved the sync-mimicking logic into AssetSeeder::getState() so seeded assets get location_id = rtd_location_id explicitly
snipec0442f6f0e06
diff --git a/database/factories/AssetFactory.php b/database/factories/AssetFactory.phpindex 7d2b2d4ddb..fab04b687c 100644--- a/database/factories/AssetFactory.php+++ b/database/factories/AssetFactory.php@@ -60,23 +60,6 @@ class AssetFactory extends Factory$asset->asset_eol_date = $this->faker->boolean(5)? CarbonImmutable::parse($asset->purchase_date)->addMonths(rand(0, 20))->format('Y-m-d'): CarbonImmutable::parse($asset->purchase_date)->addMonths($asset->model?->eol ?? rand(12, 60))->format('Y-m-d');-- // Set location_id to match the asset's current allocation. Mirrors- // the four cases in App\Console\Commands\SyncAssetLocations so a- // fresh db:seed doesn't need to run that command as post-processing- // (which allocated ~130 MB scanning every asset). Any state that- // pre-sets location_id (e.g., a seeder passes it explicitly) wins.- if ($asset->location_id !== null) {- return;- }-- $asset->location_id = match (true) {- $asset->assigned_to === null => $asset->rtd_location_id,- $asset->assigned_type === User::class => User::find($asset->assigned_to)?->location_id ?? $asset->rtd_location_id,- $asset->assigned_type === Location::class => $asset->assigned_to,- $asset->assigned_type === Asset::class => Asset::find($asset->assigned_to)?->location_id ?? $asset->rtd_location_id,- default => $asset->rtd_location_id,- };});}diff --git a/database/factories/MaintenanceFactory.php b/database/factories/MaintenanceFactory.phpindex e4b9df3298..210e044d5f 100644--- a/database/factories/MaintenanceFactory.php+++ b/database/factories/MaintenanceFactory.php@@ -28,7 +28,14 @@ class MaintenanceFactory extends Factory$maintenanceType = MaintenanceType::factory()->create();return [- 'asset_id' => Asset::factory()->laptopZenbook(),+ // Set location_id to rtd_location_id on the generated asset so+ // seeded maintenance rows point at assets with a real location,+ // matching what snipeit:sync-asset-locations would have set.+ 'asset_id' => Asset::factory()->laptopZenbook()->afterMaking(function (Asset $asset) {+ if ($asset->location_id === null) {+ $asset->location_id = $asset->rtd_location_id;+ }+ }),'supplier_id' => Supplier::factory(),'maintenance_type_id' => $maintenanceType->id,'asset_maintenance_type' => $maintenanceType->name,diff --git a/database/seeders/AssetSeeder.php b/database/seeders/AssetSeeder.phpindex d425dedd2f..610e19c142 100644--- a/database/seeders/AssetSeeder.php+++ b/database/seeders/AssetSeeder.php@@ -98,10 +98,20 @@ class AssetSeeder extends Seederprivate function getState(){- return fn () => [- 'rtd_location_id' => $this->locationIds->random(),- 'supplier_id' => $this->supplierIds->random(),- 'created_by' => $this->adminuser->id,- ];+ return function () {+ // Seeded assets are unassigned at creation, so location_id matches+ // rtd_location_id. Setting both here removes the need to run+ // snipeit:sync-asset-locations after seeding (that command exists+ // as a manual maintenance tool for production drift, not as a seed+ // dependency).+ $locationId = $this->locationIds->random();++ return [+ 'rtd_location_id' => $locationId,+ 'location_id' => $locationId,+ 'supplier_id' => $this->supplierIds->random(),+ 'created_by' => $this->adminuser->id,+ ];+ };}}