Merge pull request #14565 from spencerrlongg/bug/sc-23936

Checks that custom fields exist before saving

app/Http/Requests/StoreAssetRequest.php

@@ -2,6 +2,7 @@
 
 namespace App\Http\Requests;
 
+use App\Http\Requests\Traits\MayContainCustomFields;
 use App\Models\Asset;
 use App\Models\Company;
 use App\Models\Setting;
@@ -11,6 +12,7 @@ use Illuminate\Support\Facades\Gate;
 
 class StoreAssetRequest extends ImageUploadRequest
 {
+    use MayContainCustomFields;
     /**
      * Determine if the user is authorized to make this request.
      *

app/Http/Requests/Traits/MayContainCustomFields.php

@@ -0,0 +1,40 @@
+<?php
+
+namespace App\Http\Requests\Traits;
+
+use App\Models\AssetModel;
+use App\Models\CustomField;
+
+trait MayContainCustomFields
+{
+    // this gets called automatically on a form request
+    public function withValidator($validator)
+    {
+        // find the model
+        if ($this->method() == 'POST') {
+            $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;
+        }
+        // collect the custom fields in the request
+        $validator->after(function ($validator) use ($asset_model) {
+            $request_fields = $this->collect()->keys()->filter(function ($attributes) {
+                return str_starts_with($attributes, '_snipeit_');
+            });
+            // 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'))
+                        ->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'));
+                            } else {
+                                $validator->errors()->add($request_field_name, trans('validation.custom.custom_field_not_found'));
+                            }
+                        });
+            }
+        });
+    }
+}
+

resources/lang/en-US/validation.php

@@ -188,6 +188,8 @@ return [
         'hashed_pass'      => 'Your current password is incorrect',
         'dumbpwd'          => 'That password is too common.',
         'statuslabel_type' => 'You must select a valid status label type',
+        'custom_field_not_found'          => 'This field does not seem to exist, please double check your custom field names.',
+        'custom_field_not_found_on_model' => 'This field seems to exist, but is not available on this Asset Model\'s fieldset.',
 
         // date_format validation with slightly less stupid messages. It duplicates a lot, but it gets the job done :(
         // We use this because the default error message for date_format is reflects php Y-m-d, which non-PHP