A free open source IT asset/license management system
Use enums in filter request
snipe9e30e8e9aa87
diff --git a/app/Http/Requests/FilterRequest.php b/app/Http/Requests/FilterRequest.phpindex 6eca7a634c..44235e176c 100644--- a/app/Http/Requests/FilterRequest.php+++ b/app/Http/Requests/FilterRequest.php@@ -2,20 +2,11 @@namespace App\Http\Requests;-use App\Models\Accessory;-use App\Models\Asset;-use App\Models\AssetModel;-use App\Models\Component;-use App\Models\Consumable;-use App\Models\License;-use App\Models\LicenseSeat;-use App\Models\Location;-use App\Models\Maintenance;-use App\Models\User;+use App\Enums\ActivityItemType;use App\Rules\ValidJson;+use Closure;use Illuminate\Contracts\Validation\ValidationRule;use Illuminate\Foundation\Http\FormRequest;-use Illuminate\Validation\Rule;class FilterRequest extends FormRequest{@@ -51,39 +42,33 @@ class FilterRequest extends FormRequestpublic function rules(): array{- $allowedTypes = [- 'accessory',- Accessory::class,- 'asset',- Asset::class,- 'assetmodel',- 'assetModel',- 'AssetModel',- AssetModel::class,- 'component',- Component::class,- 'consumable',- Consumable::class,- 'license',- License::class,- 'licenseseat',- 'licenseSeat',- 'LicenseSeat',- LicenseSeat::class,- 'location',- Location::class,- 'maintenance',- Maintenance::class,- 'user',- User::class,- ];+ // Case-insensitive match against ActivityItemType short names+ // (asset / assetmodel / ...) and fully-qualified model class+ // strings (App\Models\Asset / ...) via the ActivityItemType::tryFromAny helper. This allows the activity report to accept either shape in the filter payload, and also allows future expansion of the enum without needing to update the validation rules here.+ $typeRule = function (string $attribute, mixed $value, Closure $fail): void {+ if (!is_string($value) || ActivityItemType::tryFromAny($value) === null) {+ $fail(trans('validation.in', ['attribute' => $attribute]));+ }+ };return [- 'filter' => ['nullable', new ValidJson],+ // Accept either array-form (?filter[field]=value, which+ // Laravel parses to an array) or the JSON-string form+ // (?filter={"field":"value"}).+ // Both converge in Searchable::scopeTextSearch,+ // which routes them to the same applySearchFilters method.+ 'filter' => [+ 'nullable', function (string $attribute, mixed $value, Closure $fail): void {+ if (is_array($value)) {+ return;+ }+ (new ValidJson)->validate($attribute, $value, $fail);+ },+ ],'item_type' => ['nullable', 'array'],- 'item_type.*' => [Rule::in($allowedTypes)],+ 'item_type.*' => [$typeRule],'target_type' => ['nullable', 'array'],- 'target_type.*' => [Rule::in($allowedTypes)],+ 'target_type.*' => [$typeRule],];}}