kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-09-30 02:26:58 +00:00
Code Issues Projects Releases Wiki Activity

Fix validation for #3532

Browse Source
This commit is contained in:
James Cole
2020-07-06 06:55:27 +02:00
parent 26d19fab32
commit 32e0a5bd80
13 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Api/V1/Requests/AvailableBudgetRequest.php
View File

@@ -67,7 +67,7 @@ class AvailableBudgetRequest extends Request
return [ return [
'currency_id' => 'numeric|exists:transaction_currencies,id', 'currency_id' => 'numeric|exists:transaction_currencies,id',
'currency_code' => 'min:3|max:3|exists:transaction_currencies,code', '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', 'start' => 'required|date|before:end',
'end' => 'required|date|after:start', 'end' => 'required|date|after:start',
]; ];

4
app/Api/V1/Requests/BillRequest.php
View File

@@ -85,8 +85,8 @@ class BillRequest extends Request
{ {
$rules = [ $rules = [
'name' => 'between:1,255|uniqueObjectForUser:bills,name', 'name' => 'between:1,255|uniqueObjectForUser:bills,name',
'amount_min' => 'numeric|more:0', 'amount_min' => 'numeric|gt:0',
'amount_max' => 'numeric|more:0', 'amount_max' => 'numeric|gt:0',
'currency_id' => 'numeric|exists:transaction_currencies,id', 'currency_id' => 'numeric|exists:transaction_currencies,id',
'currency_code' => 'min:3|max:3|exists:transaction_currencies,code', 'currency_code' => 'min:3|max:3|exists:transaction_currencies,code',
'date' => 'date', 'date' => 'date',

2
app/Api/V1/Requests/BudgetLimitRequest.php
View File

@@ -70,7 +70,7 @@ class BudgetLimitRequest extends Request
'budget_id' => 'required|exists:budgets,id|belongsToUser:budgets,id', 'budget_id' => 'required|exists:budgets,id|belongsToUser:budgets,id',
'start' => 'required|before:end|date', 'start' => 'required|before:end|date',
'end' => 'required|after:start|date', 'end' => 'required|after:start|date',
'amount' => 'required|more:0', 'amount' => 'required|gt:0',
'currency_id' => 'numeric|exists:transaction_currencies,id', 'currency_id' => 'numeric|exists:transaction_currencies,id',
'currency_code' => 'min:3|max:3|exists:transaction_currencies,code', 'currency_code' => 'min:3|max:3|exists:transaction_currencies,code',
]; ];

2
app/Api/V1/Requests/PiggyBankRequest.php
View File

@@ -91,7 +91,7 @@ class PiggyBankRequest extends Request
$piggyBank = $this->route()->parameter('piggyBank'); $piggyBank = $this->route()->parameter('piggyBank');
$rules['name'] = 'between:1,255|uniquePiggyBankForUser:' . $piggyBank->id; $rules['name'] = 'between:1,255|uniquePiggyBankForUser:' . $piggyBank->id;
$rules['account_id'] = ['belongsToUser:accounts', new IsAssetAccountId]; $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]; $rules['current_amount'] = ['numeric', new ZeroOrMore, new LessThanPiggyTarget];
break; break;
} }

4
app/Api/V1/Requests/RecurrenceStoreRequest.php
View File

@@ -104,8 +104,8 @@ class RecurrenceStoreRequest extends Request
'repetitions.*.skip' => 'required|numeric|between:0,31', 'repetitions.*.skip' => 'required|numeric|between:0,31',
'repetitions.*.weekend' => 'required|numeric|min:1|max:4', 'repetitions.*.weekend' => 'required|numeric|min:1|max:4',
'transactions.*.description' => 'required|between:1,255', 'transactions.*.description' => 'required|between:1,255',
'transactions.*.amount' => 'required|numeric|more:0', 'transactions.*.amount' => 'required|numeric|gt:0',
'transactions.*.foreign_amount' => 'numeric|more:0', 'transactions.*.foreign_amount' => 'numeric|gt:0',
'transactions.*.currency_id' => 'numeric|exists:transaction_currencies,id', 'transactions.*.currency_id' => 'numeric|exists:transaction_currencies,id',
'transactions.*.currency_code' => 'min:3|max:3|exists:transaction_currencies,code', 'transactions.*.currency_code' => 'min:3|max:3|exists:transaction_currencies,code',
'transactions.*.foreign_currency_id' => 'numeric|exists:transaction_currencies,id', 'transactions.*.foreign_currency_id' => 'numeric|exists:transaction_currencies,id',

4
app/Api/V1/Requests/RecurrenceUpdateRequest.php
View File

@@ -107,8 +107,8 @@ class RecurrenceUpdateRequest extends Request
'repetitions.*.weekend' => 'required|numeric|min:1|max:4', 'repetitions.*.weekend' => 'required|numeric|min:1|max:4',
'transactions.*.description' => 'required|between:1,255', 'transactions.*.description' => 'required|between:1,255',
'transactions.*.amount' => 'required|numeric|more:0', 'transactions.*.amount' => 'required|numeric|gt:0',
'transactions.*.foreign_amount' => 'numeric|more:0', 'transactions.*.foreign_amount' => 'numeric|gt:0',
'transactions.*.currency_id' => 'numeric|exists:transaction_currencies,id', 'transactions.*.currency_id' => 'numeric|exists:transaction_currencies,id',
'transactions.*.currency_code' => 'min:3|max:3|exists:transaction_currencies,code', 'transactions.*.currency_code' => 'min:3|max:3|exists:transaction_currencies,code',
'transactions.*.foreign_currency_id' => 'numeric|exists:transaction_currencies,id', 'transactions.*.foreign_currency_id' => 'numeric|exists:transaction_currencies,id',

2
app/Api/V1/Requests/Search/TransferRequest.php
View File

@@ -51,7 +51,7 @@ class TransferRequest extends Request
return [ return [
'source' => ['required', new IsTransferAccount], 'source' => ['required', new IsTransferAccount],
'destination' => ['required', new IsTransferAccount], 'destination' => ['required', new IsTransferAccount],
'amount' => 'required|numeric|more:0', 'amount' => 'required|numeric|gt:0',
'description' => 'required|min:1', 'description' => 'required|min:1',
'date' => 'required|date', 'date' => 'required|date',
]; ];

2
app/Api/V1/Requests/TransactionStoreRequest.php
View File

@@ -98,7 +98,7 @@ class TransactionStoreRequest extends Request
'transactions.*.foreign_currency_code' => 'min:3|max:3|exists:transaction_currencies,code|nullable', 'transactions.*.foreign_currency_code' => 'min:3|max:3|exists:transaction_currencies,code|nullable',
// amount // amount
'transactions.*.amount' => 'required|numeric|more:0', 'transactions.*.amount' => 'required|numeric|gt:0',
'transactions.*.foreign_amount' => 'numeric', 'transactions.*.foreign_amount' => 'numeric',
// description // description

2
app/Api/V1/Requests/TransactionUpdateRequest.php
View File

@@ -172,7 +172,7 @@ class TransactionUpdateRequest extends Request
'transactions.*.foreign_currency_code' => 'min:3|max:3|exists:transaction_currencies,code', 'transactions.*.foreign_currency_code' => 'min:3|max:3|exists:transaction_currencies,code',
// amount // amount
'transactions.*.amount' => 'numeric|more:0|max:100000000000', 'transactions.*.amount' => 'numeric|gt:0|max:100000000000',
'transactions.*.foreign_amount' => 'numeric|gte:0', 'transactions.*.foreign_amount' => 'numeric|gte:0',
// description // description

4
app/Http/Requests/BillStoreRequest.php
View File

@@ -69,8 +69,8 @@ class BillStoreRequest extends Request
{ {
return [ return [
'name' => 'required|between:1,255|uniqueObjectForUser:bills,name', 'name' => 'required|between:1,255|uniqueObjectForUser:bills,name',
'amount_min' => 'required|numeric|more:0|max:1000000000', 'amount_min' => 'required|numeric|gt:0|max:1000000000',
'amount_max' => 'required|numeric|more:0|max:1000000000', 'amount_max' => 'required|numeric|gt:0|max:1000000000',
'transaction_currency_id' => 'required|exists:transaction_currencies,id', 'transaction_currency_id' => 'required|exists:transaction_currencies,id',
'date' => 'required|date', 'date' => 'required|date',
'repeat_freq' => 'required|in:weekly,monthly,quarterly,half-year,yearly', 'repeat_freq' => 'required|in:weekly,monthly,quarterly,half-year,yearly',

4
app/Http/Requests/BillUpdateRequest.php
View File

@@ -74,8 +74,8 @@ class BillUpdateRequest extends Request
return [ return [
'name' => sprintf('required|between:1,255|uniqueObjectForUser:bills,name,%d', $bill->id), 'name' => sprintf('required|between:1,255|uniqueObjectForUser:bills,name,%d', $bill->id),
'amount_min' => 'required|numeric|more:0|max:1000000000', 'amount_min' => 'required|numeric|gt:0|max:1000000000',
'amount_max' => 'required|numeric|more:0|max:1000000000', 'amount_max' => 'required|numeric|gt:0|max:1000000000',
'transaction_currency_id' => 'required|exists:transaction_currencies,id', 'transaction_currency_id' => 'required|exists:transaction_currencies,id',
'date' => 'required|date', 'date' => 'required|date',
'repeat_freq' => 'required|in:weekly,monthly,quarterly,half-year,yearly', 'repeat_freq' => 'required|in:weekly,monthly,quarterly,half-year,yearly',

4
app/Http/Requests/RecurrenceFormRequest.php
View File

@@ -160,7 +160,7 @@ class RecurrenceFormRequest extends Request
'transaction_description' => 'required|between:1,255', 'transaction_description' => 'required|between:1,255',
'transaction_type' => 'required|in:withdrawal,deposit,transfer', 'transaction_type' => 'required|in:withdrawal,deposit,transfer',
'transaction_currency_id' => 'required|exists:transaction_currencies,id', '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: // mandatory account info:
'source_id' => 'numeric|belongsToUser:accounts,id|nullable', 'source_id' => 'numeric|belongsToUser:accounts,id|nullable',
'source_name' => 'between:1,255|nullable', 'source_name' => 'between:1,255|nullable',
@@ -168,7 +168,7 @@ class RecurrenceFormRequest extends Request
'destination_name' => 'between:1,255|nullable', 'destination_name' => 'between:1,255|nullable',
// foreign amount data: // foreign amount data:
'foreign_amount' => 'nullable|more:0|max:1000000000', 'foreign_amount' => 'nullable|gt:0|max:1000000000',
// optional fields: // optional fields:
'budget_id' => 'mustExist:budgets,id|belongsToUser:budgets,id|nullable', 'budget_id' => 'mustExist:budgets,id|belongsToUser:budgets,id|nullable',

2
resources/lang/en_US/validation.php
View File

@@ -57,7 +57,6 @@ return [
'at_least_one_action' => 'Rule must have at least one action.', 'at_least_one_action' => 'Rule must have at least one action.',
'base64' => 'This is not valid base64 encoded data.', 'base64' => 'This is not valid base64 encoded data.',
'model_id_invalid' => 'The given ID seems invalid for this model.', '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', 'less' => ':attribute must be less than 10,000,000',
'active_url' => 'The :attribute is not a valid URL.', 'active_url' => 'The :attribute is not a valid URL.',
'after' => 'The :attribute must be a date after :date.', '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.', '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.', '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.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.string' => 'The :attribute must be greater than or equal to :value characters.',
'gte.array' => 'The :attribute must have :value items or more.', 'gte.array' => 'The :attribute must have :value items or more.',