From adaddba5ceab9bd19d0a8b9dc5feff12a8ed8286 Mon Sep 17 00:00:00 2001 From: Jing Li Date: Thu, 26 Oct 2023 10:18:03 +0800 Subject: [PATCH] Fix --- app/Http/Requestes/MaterielStoreRequest.php | 4 ++-- app/Http/Requestes/MaterielUpdateRequest.php | 4 ++-- app/Http/Requestes/RiceShrimpFlowStoreRequest.php | 2 +- app/Http/Requestes/RiceShrimpFlowUpdateRequest.php | 2 +- app/Http/Requestes/RiceShrimpIndustryStoreRequest.php | 6 +++--- app/Http/Requestes/RiceShrimpIndustryUpdateRequest.php | 6 +++--- app/Http/Requestes/RiceShrimpPriceStoreRequest.php | 2 +- app/Http/Requestes/RiceShrimpPriceUpdateRequest.php | 2 +- app/Http/Requestes/RiceShrimpWeeklyPriceStoreRequest.php | 4 +--- app/Http/Requestes/RiceShrimpWeeklyPriceUpdateRequest.php | 2 +- 10 files changed, 16 insertions(+), 18 deletions(-) diff --git a/app/Http/Requestes/MaterielStoreRequest.php b/app/Http/Requestes/MaterielStoreRequest.php index d25b05f..ad3e3d5 100644 --- a/app/Http/Requestes/MaterielStoreRequest.php +++ b/app/Http/Requestes/MaterielStoreRequest.php @@ -22,8 +22,8 @@ class MaterielStoreRequest extends FormRequest 'quarter' => ['bail', 'required', new Quarter()], 'name' => ['bail', 'required', 'string', 'max:255'], 'type' => ['bail', 'required', new Enum(MaterielType::class)], - 'lowest_price' => ['bail', 'required', 'regex:/^([1-9]\d*|0)(\.\d{1,2})?$/'], - 'highest_price' => ['bail', 'required', 'regex:/^([1-9]\d*|0)(\.\d{1,2})?$/', 'gte:lowest_price'], + 'lowest_price' => ['bail', 'required', 'numeric', 'min:0', 'max:9999999999999999.99', 'regex:/^([1-9]\d*|0)(\.\d{1,2})?$/'], + 'highest_price' => ['bail', 'required', 'numeric', 'min:0', 'max:9999999999999999.99', 'regex:/^([1-9]\d*|0)(\.\d{1,2})?$/', 'gte:lowest_price'], ]; } diff --git a/app/Http/Requestes/MaterielUpdateRequest.php b/app/Http/Requestes/MaterielUpdateRequest.php index bfcb7c6..b394cc6 100644 --- a/app/Http/Requestes/MaterielUpdateRequest.php +++ b/app/Http/Requestes/MaterielUpdateRequest.php @@ -22,8 +22,8 @@ class MaterielUpdateRequest extends FormRequest 'quarter' => ['filled', new Quarter()], 'name' => ['filled', 'string', 'max:255'], 'type' => ['filled', new Enum(MaterielType::class)], - 'lowest_price' => ['filled', 'regex:/^([1-9]\d*|0)(\.\d{1,2})?$/'], - 'highest_price' => ['filled', 'regex:/^([1-9]\d*|0)(\.\d{1,2})?$/', 'gte:lowest_price'], + 'lowest_price' => ['filled', 'numeric', 'min:0', 'max:9999999999999999.99', 'regex:/^([1-9]\d*|0)(\.\d{1,2})?$/'], + 'highest_price' => ['filled', 'numeric', 'min:0', 'max:9999999999999999.99', 'regex:/^([1-9]\d*|0)(\.\d{1,2})?$/', 'gte:lowest_price'], 'unit' => ['filled', 'string'], ]; } diff --git a/app/Http/Requestes/RiceShrimpFlowStoreRequest.php b/app/Http/Requestes/RiceShrimpFlowStoreRequest.php index 72a1a6d..7202c0c 100644 --- a/app/Http/Requestes/RiceShrimpFlowStoreRequest.php +++ b/app/Http/Requestes/RiceShrimpFlowStoreRequest.php @@ -19,7 +19,7 @@ class RiceShrimpFlowStoreRequest extends FormRequest 'year' => ['required', 'int', new Year()], 'quarter' => ['required', new Quarter()], 'area' => ['required', 'string'], - 'sales' => ['required', 'regex:/^([1-9]\d*|0)(\.\d{1,2})?$/'], + 'sales' => ['required', 'numeric', 'min:0', 'max:9999999999999999.99', 'regex:/^([1-9]\d*|0)(\.\d{1,2})?$/'], 'unit' => ['required', 'string'], ]; } diff --git a/app/Http/Requestes/RiceShrimpFlowUpdateRequest.php b/app/Http/Requestes/RiceShrimpFlowUpdateRequest.php index b0e5d82..c372b17 100644 --- a/app/Http/Requestes/RiceShrimpFlowUpdateRequest.php +++ b/app/Http/Requestes/RiceShrimpFlowUpdateRequest.php @@ -19,7 +19,7 @@ class RiceShrimpFlowUpdateRequest extends FormRequest 'year' => ['filled', 'int', new Year()], 'quarter' => ['filled', new Quarter()], 'area' => ['filled', 'string'], - 'sales' => ['filled', 'regex:/^([1-9]\d*|0)(\.\d{1,2})?$/'], + 'sales' => ['filled', 'numeric', 'min:0', 'max:9999999999999999.99', 'regex:/^([1-9]\d*|0)(\.\d{1,2})?$/'], 'unit' => ['filled', 'string'], ]; } diff --git a/app/Http/Requestes/RiceShrimpIndustryStoreRequest.php b/app/Http/Requestes/RiceShrimpIndustryStoreRequest.php index fadeb1c..d1f9f5b 100644 --- a/app/Http/Requestes/RiceShrimpIndustryStoreRequest.php +++ b/app/Http/Requestes/RiceShrimpIndustryStoreRequest.php @@ -18,11 +18,11 @@ class RiceShrimpIndustryStoreRequest extends FormRequest return [ 'year' => ['required', 'int', new Year()], 'quarter' => ['required', new Quarter()], - 'area' => ['required', 'regex:/^([1-9]\d*|0)(\.\d{1,2})?$/'], + 'area' => ['required', 'numeric', 'min:0', 'max:9999999999999999.99', 'regex:/^([1-9]\d*|0)(\.\d{1,2})?$/'], 'area_unit' => ['required', 'string'], - 'product_output' => ['required', 'regex:/^([1-9]\d*|0)(\.\d{1,2})?$/'], + 'product_output' => ['required', 'numeric', 'min:0', 'max:9999999999999999.99', 'regex:/^([1-9]\d*|0)(\.\d{1,2})?$/'], 'product_output_unit' => ['required', 'string'], - 'product_value' => ['required', 'regex:/^([1-9]\d*|0)(\.\d{1,2})?$/'], + 'product_value' => ['required', 'numeric', 'min:0', 'max:9999999999999999.99', 'regex:/^([1-9]\d*|0)(\.\d{1,2})?$/'], 'product_value_unit' => ['required', 'string'], ]; } diff --git a/app/Http/Requestes/RiceShrimpIndustryUpdateRequest.php b/app/Http/Requestes/RiceShrimpIndustryUpdateRequest.php index 1a1f102..61bf741 100644 --- a/app/Http/Requestes/RiceShrimpIndustryUpdateRequest.php +++ b/app/Http/Requestes/RiceShrimpIndustryUpdateRequest.php @@ -18,11 +18,11 @@ class RiceShrimpIndustryUpdateRequest extends FormRequest return [ 'year' => ['filled', 'int', new Year()], 'quarter' => ['filled', new Quarter()], - 'area' => ['filled', 'regex:/^([1-9]\d*|0)(\.\d{1,2})?$/'], + 'area' => ['filled', 'numeric', 'min:0', 'max:9999999999999999.99', 'regex:/^([1-9]\d*|0)(\.\d{1,2})?$/'], 'area_unit' => ['filled', 'string'], - 'product_output' => ['filled', 'regex:/^([1-9]\d*|0)(\.\d{1,2})?$/'], + 'product_output' => ['filled', 'numeric', 'min:0', 'max:9999999999999999.99', 'regex:/^([1-9]\d*|0)(\.\d{1,2})?$/'], 'product_output_unit' => ['filled', 'string'], - 'product_value' => ['filled', 'regex:/^([1-9]\d*|0)(\.\d{1,2})?$/'], + 'product_value' => ['filled', 'numeric', 'min:0', 'max:9999999999999999.99', 'regex:/^([1-9]\d*|0)(\.\d{1,2})?$/'], 'product_value_unit' => ['filled', 'string'], ]; } diff --git a/app/Http/Requestes/RiceShrimpPriceStoreRequest.php b/app/Http/Requestes/RiceShrimpPriceStoreRequest.php index c97b17c..9011185 100644 --- a/app/Http/Requestes/RiceShrimpPriceStoreRequest.php +++ b/app/Http/Requestes/RiceShrimpPriceStoreRequest.php @@ -18,7 +18,7 @@ class RiceShrimpPriceStoreRequest extends FormRequest return [ 'year' => ['required', 'int', new Year()], 'quarter' => ['required', new Quarter()], - 'price' => ['required', 'int', 'gte:0'], + 'price' => ['required', 'int', 'min:0', 'max:2147483647'], ]; } diff --git a/app/Http/Requestes/RiceShrimpPriceUpdateRequest.php b/app/Http/Requestes/RiceShrimpPriceUpdateRequest.php index 947e126..b10484f 100644 --- a/app/Http/Requestes/RiceShrimpPriceUpdateRequest.php +++ b/app/Http/Requestes/RiceShrimpPriceUpdateRequest.php @@ -18,7 +18,7 @@ class RiceShrimpPriceUpdateRequest extends FormRequest return [ 'year' => ['filled', 'int', new Year()], 'quarter' => ['filled', new Quarter()], - 'price' => ['filled', 'int', 'gte:0'], + 'price' => ['filled', 'int', 'min:0', 'max:2147483647'], ]; } diff --git a/app/Http/Requestes/RiceShrimpWeeklyPriceStoreRequest.php b/app/Http/Requestes/RiceShrimpWeeklyPriceStoreRequest.php index 834a78e..8ba1485 100644 --- a/app/Http/Requestes/RiceShrimpWeeklyPriceStoreRequest.php +++ b/app/Http/Requestes/RiceShrimpWeeklyPriceStoreRequest.php @@ -2,8 +2,6 @@ namespace App\Http\Requestes; -use App\Models\RiceShrimpWeeklyPrice; -use App\Rules\Quarter; use App\Rules\Year; use Illuminate\Foundation\Http\FormRequest; use Illuminate\Validation\Rule; @@ -27,7 +25,7 @@ class RiceShrimpWeeklyPriceStoreRequest extends FormRequest return $query->where('type_key', 'weeks-per-year'); }), ], - 'price' => ['required', 'int', 'gte:0'], + 'price' => ['required', 'int', 'min:0', 'max:2147483647'], ]; } diff --git a/app/Http/Requestes/RiceShrimpWeeklyPriceUpdateRequest.php b/app/Http/Requestes/RiceShrimpWeeklyPriceUpdateRequest.php index 1ef5d4f..964eff2 100644 --- a/app/Http/Requestes/RiceShrimpWeeklyPriceUpdateRequest.php +++ b/app/Http/Requestes/RiceShrimpWeeklyPriceUpdateRequest.php @@ -25,7 +25,7 @@ class RiceShrimpWeeklyPriceUpdateRequest extends FormRequest return $query->where('type_key', 'weeks-per-year'); }), ], - 'price' => ['filled', 'int', 'gte:0'], + 'price' => ['filled', 'int', 'min:0', 'max:2147483647'], ]; }