From e177993bcce298dd6cff730324bea7d5084e39c0 Mon Sep 17 00:00:00 2001 From: spencerrlongg Date: Wed, 1 May 2024 16:57:11 -0500 Subject: [PATCH] notes and some playing around, push for eod --- app/Http/Controllers/Assets/BulkAssetsController.php | 1 + database/factories/CustomFieldsetFactory.php | 1 + tests/Feature/Assets/AssetsBulkEditTest.php | 10 +++++----- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/app/Http/Controllers/Assets/BulkAssetsController.php b/app/Http/Controllers/Assets/BulkAssetsController.php index d60507527f..66e0f75715 100644 --- a/app/Http/Controllers/Assets/BulkAssetsController.php +++ b/app/Http/Controllers/Assets/BulkAssetsController.php @@ -195,6 +195,7 @@ class BulkAssetsController extends Controller */ public function update(Request $request) { + //dd($request->all()); $this->authorize('update', Asset::class); $has_errors = 0; $error_array = array(); diff --git a/database/factories/CustomFieldsetFactory.php b/database/factories/CustomFieldsetFactory.php index 9f02c8e457..66d7591aa5 100644 --- a/database/factories/CustomFieldsetFactory.php +++ b/database/factories/CustomFieldsetFactory.php @@ -58,6 +58,7 @@ class CustomFieldsetFactory extends Factory { return $this->afterCreating(function (CustomFieldset $fieldset) { if (empty($fields)) { + //why are there two after creating and why does it break if i remove one return $this->afterCreating(function (CustomFieldset $fieldset) { $mac_address = CustomField::factory()->macAddress()->create(); $ram = CustomField::factory()->ram()->create(); diff --git a/tests/Feature/Assets/AssetsBulkEditTest.php b/tests/Feature/Assets/AssetsBulkEditTest.php index 34bd58bfb8..7a72c44636 100644 --- a/tests/Feature/Assets/AssetsBulkEditTest.php +++ b/tests/Feature/Assets/AssetsBulkEditTest.php @@ -86,17 +86,17 @@ class AssetsBulkEditTest extends TestCase $ram = CustomField::factory()->ram()->create(); $cpu = CustomField::factory()->cpu()->create(); - $assets = Asset::factory()->laptopMbp()->count(10)->hasMultipleCustomFields([$mac_address, $ram, $cpu])->create([ + $assets = Asset::factory()->count(10)->hasMultipleCustomFields([$mac_address, $ram, $cpu])->create([ $ram->db_column => 8, $cpu->db_column => '2.1', ]); + // seems like the fieldset is random, so bulkedit isn't working because assets don't have the "correct" fieldset + // look into more tomorrow + dd(Asset::find(1)->model->fieldset); + $id_array = $assets->pluck('id')->toArray(); - // submits the ids and new values for each attribute - $asset = Asset::find(1); - - $this->assertEquals(8, $asset->{$ram->db_column}); $this->actingAs(User::factory()->editAssets()->create())->post(route('hardware/bulksave'), [ 'ids' => $id_array, $ram->db_column => 16,