From 32e0a5bd8058a1f1a33201acbd82db6c2597f22b Mon Sep 17 00:00:00 2001 From: James Cole Date: Mon, 6 Jul 2020 06:55:27 +0200 Subject: [PATCH] Fix validation for #3532 --- app/Api/V1/Requests/AvailableBudgetRequest.php | 2 +- app/Api/V1/Requests/BillRequest.php | 4 ++-- app/Api/V1/Requests/BudgetLimitRequest.php | 2 +- app/Api/V1/Requests/PiggyBankRequest.php | 2 +- app/Api/V1/Requests/RecurrenceStoreRequest.php | 4 ++-- app/Api/V1/Requests/RecurrenceUpdateRequest.php | 4 ++-- app/Api/V1/Requests/Search/TransferRequest.php | 2 +- app/Api/V1/Requests/TransactionStoreRequest.php | 2 +- app/Api/V1/Requests/TransactionUpdateRequest.php | 2 +- app/Http/Requests/BillStoreRequest.php | 4 ++-- app/Http/Requests/BillUpdateRequest.php | 4 ++-- app/Http/Requests/RecurrenceFormRequest.php | 4 ++-- resources/lang/en_US/validation.php | 2 +- 13 files changed, 19 insertions(+), 19 deletions(-) diff --git a/app/Api/V1/Requests/AvailableBudgetRequest.php b/app/Api/V1/Requests/AvailableBudgetRequest.php index 077d077a44..93bac0676a 100644 --- a/app/Api/V1/Requests/AvailableBudgetRequest.php +++ b/app/Api/V1/Requests/AvailableBudgetRequest.php @@ -67,7 +67,7 @@ class AvailableBudgetRequest extends Request return [ 'currency_id' => 'numeric|exists:transaction_currencies,id', 'currency_code' => 'min:3|max:3|exists:transaction_currencies,code', - 'amount' => 'required|numeric|more:0', + 'amount' => 'required|numeric|gt:0', 'start' => 'required|date|before:end', 'end' => 'required|date|after:start', ]; diff --git a/app/Api/V1/Requests/BillRequest.php b/app/Api/V1/Requests/BillRequest.php index 9600af660e..27f014a4ca 100644 --- a/app/Api/V1/Requests/BillRequest.php +++ b/app/Api/V1/Requests/BillRequest.php @@ -85,8 +85,8 @@ class BillRequest extends Request { $rules = [ 'name' => 'between:1,255|uniqueObjectForUser:bills,name', - 'amount_min' => 'numeric|more:0', - 'amount_max' => 'numeric|more:0', + 'amount_min' => 'numeric|gt:0', + 'amount_max' => 'numeric|gt:0', 'currency_id' => 'numeric|exists:transaction_currencies,id', 'currency_code' => 'min:3|max:3|exists:transaction_currencies,code', 'date' => 'date', diff --git a/app/Api/V1/Requests/BudgetLimitRequest.php b/app/Api/V1/Requests/BudgetLimitRequest.php index 7469b246ec..85ab848b1a 100644 --- a/app/Api/V1/Requests/BudgetLimitRequest.php +++ b/app/Api/V1/Requests/BudgetLimitRequest.php @@ -70,7 +70,7 @@ class BudgetLimitRequest extends Request 'budget_id' => 'required|exists:budgets,id|belongsToUser:budgets,id', 'start' => 'required|before:end|date', 'end' => 'required|after:start|date', - 'amount' => 'required|more:0', + 'amount' => 'required|gt:0', 'currency_id' => 'numeric|exists:transaction_currencies,id', 'currency_code' => 'min:3|max:3|exists:transaction_currencies,code', ]; diff --git a/app/Api/V1/Requests/PiggyBankRequest.php b/app/Api/V1/Requests/PiggyBankRequest.php index 5c61da6e20..68934d4475 100644 --- a/app/Api/V1/Requests/PiggyBankRequest.php +++ b/app/Api/V1/Requests/PiggyBankRequest.php @@ -91,7 +91,7 @@ class PiggyBankRequest extends Request $piggyBank = $this->route()->parameter('piggyBank'); $rules['name'] = 'between:1,255|uniquePiggyBankForUser:' . $piggyBank->id; $rules['account_id'] = ['belongsToUser:accounts', new IsAssetAccountId]; - $rules['target_amount'] = 'numeric|more:0'; + $rules['target_amount'] = 'numeric|gt:0'; $rules['current_amount'] = ['numeric', new ZeroOrMore, new LessThanPiggyTarget]; break; } diff --git a/app/Api/V1/Requests/RecurrenceStoreRequest.php b/app/Api/V1/Requests/RecurrenceStoreRequest.php index ced87a5087..3e739976ab 100644 --- a/app/Api/V1/Requests/RecurrenceStoreRequest.php +++ b/app/Api/V1/Requests/RecurrenceStoreRequest.php @@ -104,8 +104,8 @@ class RecurrenceStoreRequest extends Request 'repetitions.*.skip' => 'required|numeric|between:0,31', 'repetitions.*.weekend' => 'required|numeric|min:1|max:4', 'transactions.*.description' => 'required|between:1,255', - 'transactions.*.amount' => 'required|numeric|more:0', - 'transactions.*.foreign_amount' => 'numeric|more:0', + 'transactions.*.amount' => 'required|numeric|gt:0', + 'transactions.*.foreign_amount' => 'numeric|gt:0', 'transactions.*.currency_id' => 'numeric|exists:transaction_currencies,id', 'transactions.*.currency_code' => 'min:3|max:3|exists:transaction_currencies,code', 'transactions.*.foreign_currency_id' => 'numeric|exists:transaction_currencies,id', diff --git a/app/Api/V1/Requests/RecurrenceUpdateRequest.php b/app/Api/V1/Requests/RecurrenceUpdateRequest.php index 22304a39cb..aaa2b1e766 100644 --- a/app/Api/V1/Requests/RecurrenceUpdateRequest.php +++ b/app/Api/V1/Requests/RecurrenceUpdateRequest.php @@ -107,8 +107,8 @@ class RecurrenceUpdateRequest extends Request 'repetitions.*.weekend' => 'required|numeric|min:1|max:4', 'transactions.*.description' => 'required|between:1,255', - 'transactions.*.amount' => 'required|numeric|more:0', - 'transactions.*.foreign_amount' => 'numeric|more:0', + 'transactions.*.amount' => 'required|numeric|gt:0', + 'transactions.*.foreign_amount' => 'numeric|gt:0', 'transactions.*.currency_id' => 'numeric|exists:transaction_currencies,id', 'transactions.*.currency_code' => 'min:3|max:3|exists:transaction_currencies,code', 'transactions.*.foreign_currency_id' => 'numeric|exists:transaction_currencies,id', diff --git a/app/Api/V1/Requests/Search/TransferRequest.php b/app/Api/V1/Requests/Search/TransferRequest.php index 2fd5e96c9d..be910f9c39 100644 --- a/app/Api/V1/Requests/Search/TransferRequest.php +++ b/app/Api/V1/Requests/Search/TransferRequest.php @@ -51,7 +51,7 @@ class TransferRequest extends Request return [ 'source' => ['required', new IsTransferAccount], 'destination' => ['required', new IsTransferAccount], - 'amount' => 'required|numeric|more:0', + 'amount' => 'required|numeric|gt:0', 'description' => 'required|min:1', 'date' => 'required|date', ]; diff --git a/app/Api/V1/Requests/TransactionStoreRequest.php b/app/Api/V1/Requests/TransactionStoreRequest.php index bb90d31712..5355928588 100644 --- a/app/Api/V1/Requests/TransactionStoreRequest.php +++ b/app/Api/V1/Requests/TransactionStoreRequest.php @@ -98,7 +98,7 @@ class TransactionStoreRequest extends Request 'transactions.*.foreign_currency_code' => 'min:3|max:3|exists:transaction_currencies,code|nullable', // amount - 'transactions.*.amount' => 'required|numeric|more:0', + 'transactions.*.amount' => 'required|numeric|gt:0', 'transactions.*.foreign_amount' => 'numeric', // description diff --git a/app/Api/V1/Requests/TransactionUpdateRequest.php b/app/Api/V1/Requests/TransactionUpdateRequest.php index 709419ab1f..88d44b13af 100644 --- a/app/Api/V1/Requests/TransactionUpdateRequest.php +++ b/app/Api/V1/Requests/TransactionUpdateRequest.php @@ -172,7 +172,7 @@ class TransactionUpdateRequest extends Request 'transactions.*.foreign_currency_code' => 'min:3|max:3|exists:transaction_currencies,code', // amount - 'transactions.*.amount' => 'numeric|more:0|max:100000000000', + 'transactions.*.amount' => 'numeric|gt:0|max:100000000000', 'transactions.*.foreign_amount' => 'numeric|gte:0', // description diff --git a/app/Http/Requests/BillStoreRequest.php b/app/Http/Requests/BillStoreRequest.php index 2ddfefd373..b727f8e1ac 100644 --- a/app/Http/Requests/BillStoreRequest.php +++ b/app/Http/Requests/BillStoreRequest.php @@ -69,8 +69,8 @@ class BillStoreRequest extends Request { return [ 'name' => 'required|between:1,255|uniqueObjectForUser:bills,name', - 'amount_min' => 'required|numeric|more:0|max:1000000000', - 'amount_max' => 'required|numeric|more:0|max:1000000000', + 'amount_min' => 'required|numeric|gt:0|max:1000000000', + 'amount_max' => 'required|numeric|gt:0|max:1000000000', 'transaction_currency_id' => 'required|exists:transaction_currencies,id', 'date' => 'required|date', 'repeat_freq' => 'required|in:weekly,monthly,quarterly,half-year,yearly', diff --git a/app/Http/Requests/BillUpdateRequest.php b/app/Http/Requests/BillUpdateRequest.php index 49a5ed6c9a..ef1a683269 100644 --- a/app/Http/Requests/BillUpdateRequest.php +++ b/app/Http/Requests/BillUpdateRequest.php @@ -74,8 +74,8 @@ class BillUpdateRequest extends Request return [ 'name' => sprintf('required|between:1,255|uniqueObjectForUser:bills,name,%d', $bill->id), - 'amount_min' => 'required|numeric|more:0|max:1000000000', - 'amount_max' => 'required|numeric|more:0|max:1000000000', + 'amount_min' => 'required|numeric|gt:0|max:1000000000', + 'amount_max' => 'required|numeric|gt:0|max:1000000000', 'transaction_currency_id' => 'required|exists:transaction_currencies,id', 'date' => 'required|date', 'repeat_freq' => 'required|in:weekly,monthly,quarterly,half-year,yearly', diff --git a/app/Http/Requests/RecurrenceFormRequest.php b/app/Http/Requests/RecurrenceFormRequest.php index 49495d0d55..40b729e24e 100644 --- a/app/Http/Requests/RecurrenceFormRequest.php +++ b/app/Http/Requests/RecurrenceFormRequest.php @@ -160,7 +160,7 @@ class RecurrenceFormRequest extends Request 'transaction_description' => 'required|between:1,255', 'transaction_type' => 'required|in:withdrawal,deposit,transfer', 'transaction_currency_id' => 'required|exists:transaction_currencies,id', - 'amount' => 'numeric|required|more:0|max:1000000000', + 'amount' => 'numeric|required|gt:0|max:1000000000', // mandatory account info: 'source_id' => 'numeric|belongsToUser:accounts,id|nullable', 'source_name' => 'between:1,255|nullable', @@ -168,7 +168,7 @@ class RecurrenceFormRequest extends Request 'destination_name' => 'between:1,255|nullable', // foreign amount data: - 'foreign_amount' => 'nullable|more:0|max:1000000000', + 'foreign_amount' => 'nullable|gt:0|max:1000000000', // optional fields: 'budget_id' => 'mustExist:budgets,id|belongsToUser:budgets,id|nullable', diff --git a/resources/lang/en_US/validation.php b/resources/lang/en_US/validation.php index 64edfe4ba3..6181bcf6b9 100644 --- a/resources/lang/en_US/validation.php +++ b/resources/lang/en_US/validation.php @@ -57,7 +57,6 @@ return [ 'at_least_one_action' => 'Rule must have at least one action.', 'base64' => 'This is not valid base64 encoded data.', 'model_id_invalid' => 'The given ID seems invalid for this model.', - 'more' => ':attribute must be larger than ":more".', 'less' => ':attribute must be less than 10,000,000', 'active_url' => 'The :attribute is not a valid URL.', 'after' => 'The :attribute must be a date after :date.', @@ -199,6 +198,7 @@ return [ 'generic_invalid_destination' => 'You can\'t use this account as the destination account.', 'gte.numeric' => 'The :attribute must be greater than or equal to :value.', + 'gt.numeric' => 'The :attribute must be greater than :value.', 'gte.file' => 'The :attribute must be greater than or equal to :value kilobytes.', 'gte.string' => 'The :attribute must be greater than or equal to :value characters.', 'gte.array' => 'The :attribute must have :value items or more.',