From 87f52cbfec0269425729985daa3bd48987270646 Mon Sep 17 00:00:00 2001 From: snipe Date: Fri, 24 Dec 2021 10:47:06 -0800 Subject: [PATCH] Seeder fixes Signed-off-by: snipe --- database/factories/ActionlogFactory.php | 3 +- database/factories/AssetFactory.php | 3 +- database/seeds/AssetModelSeeder.php | 72 ------------------------- 3 files changed, 2 insertions(+), 76 deletions(-) delete mode 100755 database/seeds/AssetModelSeeder.php diff --git a/database/factories/ActionlogFactory.php b/database/factories/ActionlogFactory.php index 005e975de4..33cc83ead4 100644 --- a/database/factories/ActionlogFactory.php +++ b/database/factories/ActionlogFactory.php @@ -39,7 +39,6 @@ class ActionlogFactory extends Factory 'item_type' => get_class($asset), 'item_id' => 1, 'user_id' => 1, - 'filename' => $this->faker->word, 'action_type' => 'uploaded', ]; } @@ -49,7 +48,7 @@ class ActionlogFactory extends Factory { return $this->state(function () { $target = \App\Models\User::inRandomOrder()->first(); - $item = \App\Models\Asset::inRandomOrder()->RTD()->first(); + $item = \App\Models\Asset::RTD()->inRandomOrder()->first(); $user_id = rand(1, 2); // keep it simple - make it one of the two superadmins $asset = Asset::where('id', $item->id) ->update( diff --git a/database/factories/AssetFactory.php b/database/factories/AssetFactory.php index cdc5e29d96..e99789bfc5 100644 --- a/database/factories/AssetFactory.php +++ b/database/factories/AssetFactory.php @@ -41,14 +41,13 @@ class AssetFactory extends Factory 'name' => null, 'rtd_location_id' => Location::factory()->create(), 'serial' => $this->faker->uuid, - 'status_id' => StatusLabel::factory()->create()->id, + 'status_id' => $this->faker->numberBetween(1,5), 'user_id' => 1, 'asset_tag' => $this->faker->unixTime('now'), 'notes' => 'Created by DB seeder', 'purchase_date' => $this->faker->dateTimeBetween('-1 years', 'now', date_default_timezone_get()), 'purchase_cost' => $this->faker->randomFloat(2, '299.99', '2999.99'), 'order_number' => $this->faker->numberBetween(1000000, 50000000), - 'supplier_id' => Supplier::factory()->create(), 'requestable' => $this->faker->boolean(), 'assigned_to' => null, 'assigned_type' => null, diff --git a/database/seeds/AssetModelSeeder.php b/database/seeds/AssetModelSeeder.php deleted file mode 100755 index 79e0747af0..0000000000 --- a/database/seeds/AssetModelSeeder.php +++ /dev/null @@ -1,72 +0,0 @@ -states('mbp-13-model')->create(); // 1 - factory(AssetModel::class, 1)->states('mbp-air-model')->create(); // 2 - factory(AssetModel::class, 1)->states('surface-model')->create(); // 3 - factory(AssetModel::class, 1)->states('xps13-model')->create(); // 4 - factory(AssetModel::class, 1)->states('spectre-model')->create(); // 5 - factory(AssetModel::class, 1)->states('zenbook-model')->create(); // 6 - factory(AssetModel::class, 1)->states('yoga-model')->create(); // 7 - - // Desktops - factory(AssetModel::class, 1)->states('macpro-model')->create(); // 8 - factory(AssetModel::class, 1)->states('lenovo-i5-model')->create(); // 9 - factory(AssetModel::class, 1)->states('optiplex-model')->create(); // 10 - - // Conference Phones - factory(AssetModel::class, 1)->states('polycom-model')->create(); // 11 - factory(AssetModel::class, 1)->states('polycomcx-model')->create(); // 12 - - // Tablets - factory(AssetModel::class, 1)->states('ipad-model')->create(); // 13 - factory(AssetModel::class, 1)->states('tab3-model')->create(); // 14 - - // Phones - factory(AssetModel::class, 1)->states('iphone11-model')->create(); // 15 - factory(AssetModel::class, 1)->states('iphone12-model')->create(); // 16 - - // Displays - factory(AssetModel::class, 1)->states('ultrafine')->create(); // 17 - factory(AssetModel::class, 1)->states('ultrasharp')->create(); // 18 - - $src = public_path('/img/demo/models/'); - $dst = 'models'.'/'; - $del_files = Storage::files($dst); - - foreach($del_files as $del_file){ // iterate files - $file_to_delete = str_replace($src,'',$del_file); - \Log::debug('Deleting: '.$file_to_delete); - try { - Storage::disk('public')->delete($dst.$del_file); - } catch (\Exception $e) { - \Log::debug($e); - } - } - - - $add_files = glob($src."/*.*"); - foreach($add_files as $add_file){ - $file_to_copy = str_replace($src,'',$add_file); - \Log::debug('Copying: '.$file_to_copy); - try { - Storage::disk('public')->put($dst.$file_to_copy, file_get_contents($src.$file_to_copy)); - } catch (\Exception $e) { - \Log::debug($e); - } - } - - - } - -}