Merge pull request #15198 from spencerrlongg/feature/add_trait_to_req…

…uest Add MayContainCustomFields Trait to Asset Update Request
snipe · Aug 13, 2024 · c163d67 · c163d67
2 parents 9e73eaf + 61312c2
commit c163d67
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 3 deletions.
diff --git a/app/Http/Requests/Traits/MayContainCustomFields.php b/app/Http/Requests/Traits/MayContainCustomFields.php
@@ -15,8 +15,7 @@ public function withValidator($validator)
             $asset_model = AssetModel::find($this->model_id);
         }
         if ($this->method() == 'PATCH' || $this->method() == 'PUT') {
-            // this is dependent on the asset update request PR
-            $asset_model = $this->asset;
+            $asset_model = $this->asset->model;
         }
         // collect the custom fields in the request
         $validator->after(function ($validator) use ($asset_model) {
@@ -25,7 +24,7 @@ public function withValidator($validator)
             });
             // if there are custom fields, find the one's that don't exist on the model's fieldset and add an error to the validator's error bag
             if (count($request_fields) > 0) {
-                $request_fields->diff($asset_model->fieldset->fields->pluck('db_column'))
+                $request_fields->diff($asset_model?->fieldset?->fields?->pluck('db_column'))
                         ->each(function ($request_field_name) use ($request_fields, $validator) {
                             if (CustomField::where('db_column', $request_field_name)->exists()) {
                                 $validator->errors()->add($request_field_name, trans('validation.custom.custom_field_not_found_on_model'));

diff --git a/app/Http/Requests/UpdateAssetRequest.php b/app/Http/Requests/UpdateAssetRequest.php
@@ -2,12 +2,14 @@
 
 namespace App\Http\Requests;
 
+use App\Http\Requests\Traits\MayContainCustomFields;
 use App\Models\Asset;
 use Illuminate\Support\Facades\Gate;
 use Illuminate\Validation\Rule;
 
 class UpdateAssetRequest extends ImageUploadRequest
 {
+    use MayContainCustomFields;
     /**
      * Determine if the user is authorized to make this request.
      *

diff --git a/tests/Feature/Assets/Api/UpdateAssetTest.php b/tests/Feature/Assets/Api/UpdateAssetTest.php
@@ -454,4 +454,29 @@ public function testAssetCannotBeUpdatedByUserInSeparateCompany()
             ])
             ->assertStatusMessageIs('success');
     }
+
+    public function testCustomFieldCannotBeUpdatedIfNotOnCurrentAssetModel()
+    {
+        $this->markIncompleteIfMySQL('Custom Field Tests do not work in MySQL');
+
+        $customField = CustomField::factory()->create();
+        $customField2 = CustomField::factory()->create();
+        $asset = Asset::factory()->hasMultipleCustomFields([$customField])->create();
+        $user = User::factory()->editAssets()->create();
+
+        // successful
+        $this->actingAsForApi($user)->patchJson(route('api.assets.update', $asset->id), [
+            $customField->db_column_name() => 'test attribute',
+        ])->assertStatusMessageIs('success');
+
+        // custom field exists, but not on this asset model
+        $this->actingAsForApi($user)->patchJson(route('api.assets.update', $asset->id), [
+            $customField2->db_column_name() => 'test attribute',
+        ])->assertStatusMessageIs('error');
+
+        // custom field does not exist
+        $this->actingAsForApi($user)->patchJson(route('api.assets.update', $asset->id), [
+            '_snipeit_non_existent_custom_field_50' => 'test attribute',
+        ])->assertStatusMessageIs('error');
+    }
 }