IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-02-25 18:45:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

More validation for #3080

Browse Source
This commit is contained in:
James Cole 2020-02-05 20:37:23 +01:00
parent 067246be79
commit e54a011e0c
No known key found for this signature in database
GPG Key ID: C16961E655E74B5E
1 changed files with 109 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

114
app/Validation/TransactionValidation.php
View File

@ -47,6 +47,14 @@ trait TransactionValidation
$transactionType = $data['type'] ?? 'invalid'; $transactionType = $data['type'] ?? 'invalid';
$transactions = $data['transactions'] ?? []; $transactions = $data['transactions'] ?? [];
if (!is_countable($data['transactions'])) {
$validator->errors()->add(
'transactions.0.description', (string)trans('validation.filled', ['attribute' => (string)trans('validation.attributes.description')])
);
return;
}
/** @var AccountValidator $accountValidator */ /** @var AccountValidator $accountValidator */
$accountValidator = app(AccountValidator::class); $accountValidator = app(AccountValidator::class);
@ -91,6 +99,14 @@ trait TransactionValidation
$data = $validator->getData(); $data = $validator->getData();
$transactions = $data['transactions'] ?? []; $transactions = $data['transactions'] ?? [];
if (!is_countable($data['transactions'])) {
$validator->errors()->add(
'transactions.0.description', (string)trans('validation.filled', ['attribute' => (string)trans('validation.attributes.description')])
);
return;
}
/** @var AccountValidator $accountValidator */ /** @var AccountValidator $accountValidator */
$accountValidator = app(AccountValidator::class); $accountValidator = app(AccountValidator::class);
@ -142,8 +158,15 @@ trait TransactionValidation
*/ */
public function validateDescriptions(Validator $validator): void public function validateDescriptions(Validator $validator): void
{ {
$data = $validator->getData(); $data = $validator->getData();
$transactions = $data['transactions'] ?? []; $transactions = $data['transactions'] ?? [];
if (!is_countable($data['transactions'])) {
$validator->errors()->add(
'transactions.0.description', (string)trans('validation.filled', ['attribute' => (string)trans('validation.attributes.description')])
);
return;
}
$validDescriptions = 0; $validDescriptions = 0;
foreach ($transactions as $index => $transaction) { foreach ($transactions as $index => $transaction) {
if ('' !== (string)($transaction['description'] ?? null)) { if ('' !== (string)($transaction['description'] ?? null)) {
@ -168,6 +191,15 @@ trait TransactionValidation
{ {
$data = $validator->getData(); $data = $validator->getData();
$transactions = $data['transactions'] ?? []; $transactions = $data['transactions'] ?? [];
if (!is_countable($data['transactions'])) {
$validator->errors()->add(
'transactions.0.description', (string)trans('validation.filled', ['attribute' => (string)trans('validation.attributes.description')])
);
return;
}
foreach ($transactions as $index => $transaction) { foreach ($transactions as $index => $transaction) {
// if foreign amount is present, then the currency must be as well. // if foreign amount is present, then the currency must be as well.
if (isset($transaction['foreign_amount']) && !(isset($transaction['foreign_currency_id']) || isset($transaction['foreign_currency_code'])) if (isset($transaction['foreign_amount']) && !(isset($transaction['foreign_currency_id']) || isset($transaction['foreign_currency_code']))
@ -195,7 +227,16 @@ trait TransactionValidation
{ {
$data = $validator->getData(); $data = $validator->getData();
$transactions = $data['transactions'] ?? []; $transactions = $data['transactions'] ?? [];
$groupTitle = $data['group_title'] ?? '';
if (!is_countable($data['transactions'])) {
$validator->errors()->add(
'transactions.0.description', (string)trans('validation.filled', ['attribute' => (string)trans('validation.attributes.description')])
);
return;
}
$groupTitle = $data['group_title'] ?? '';
if ('' === $groupTitle && count($transactions) > 1) { if ('' === $groupTitle && count($transactions) > 1) {
$validator->errors()->add('group_title', (string)trans('validation.group_title_mandatory')); $validator->errors()->add('group_title', (string)trans('validation.group_title_mandatory'));
} }
@ -210,6 +251,15 @@ trait TransactionValidation
{ {
$data = $validator->getData(); $data = $validator->getData();
$transactions = $data['transactions'] ?? []; $transactions = $data['transactions'] ?? [];
if (!is_countable($data['transactions'])) {
$validator->errors()->add(
'transactions.0.description', (string)trans('validation.filled', ['attribute' => (string)trans('validation.attributes.description')])
);
return;
}
// need at least one transaction // need at least one transaction
if (0 === count($transactions)) { if (0 === count($transactions)) {
$validator->errors()->add('transactions', (string)trans('validation.at_least_one_transaction')); $validator->errors()->add('transactions', (string)trans('validation.at_least_one_transaction'));
@ -225,6 +275,15 @@ trait TransactionValidation
{ {
$data = $validator->getData(); $data = $validator->getData();
$transactions = $data['transactions'] ?? null; $transactions = $data['transactions'] ?? null;
if (!is_countable($data['transactions'])) {
$validator->errors()->add(
'transactions.0.description', (string)trans('validation.filled', ['attribute' => (string)trans('validation.attributes.description')])
);
return;
}
if (null === $transactions) { if (null === $transactions) {
return; return;
} }
@ -263,7 +322,16 @@ trait TransactionValidation
{ {
$data = $validator->getData(); $data = $validator->getData();
$transactions = $data['transactions'] ?? []; $transactions = $data['transactions'] ?? [];
$types = [];
if (!is_countable($data['transactions'])) {
$validator->errors()->add(
'transactions.0.description', (string)trans('validation.filled', ['attribute' => (string)trans('validation.attributes.description')])
);
return;
}
$types = [];
foreach ($transactions as $index => $transaction) { foreach ($transactions as $index => $transaction) {
$types[] = $transaction['type'] ?? 'invalid'; $types[] = $transaction['type'] ?? 'invalid';
} }
@ -289,7 +357,16 @@ trait TransactionValidation
{ {
$data = $validator->getData(); $data = $validator->getData();
$transactions = $data['transactions'] ?? []; $transactions = $data['transactions'] ?? [];
$types = [];
if (!is_countable($data['transactions'])) {
$validator->errors()->add(
'transactions.0.description', (string)trans('validation.filled', ['attribute' => (string)trans('validation.attributes.description')])
);
return;
}
$types = [];
foreach ($transactions as $index => $transaction) { foreach ($transactions as $index => $transaction) {
$originalType = $this->getOriginalType((int)($transaction['transaction_journal_id'] ?? 0)); $originalType = $this->getOriginalType((int)($transaction['transaction_journal_id'] ?? 0));
// if type is not set, fall back to the type of the journal, if one is given. // if type is not set, fall back to the type of the journal, if one is given.
@ -373,6 +450,15 @@ trait TransactionValidation
{ {
$data = $validator->getData(); $data = $validator->getData();
$transactions = $data['transactions'] ?? []; $transactions = $data['transactions'] ?? [];
if (!is_countable($data['transactions'])) {
$validator->errors()->add(
'transactions.0.description', (string)trans('validation.filled', ['attribute' => (string)trans('validation.attributes.description')])
);
return;
}
// needs to be split // needs to be split
if (count($transactions) < 2) { if (count($transactions) < 2) {
return; return;
@ -414,6 +500,15 @@ trait TransactionValidation
{ {
$data = $validator->getData(); $data = $validator->getData();
$transactions = $data['transactions'] ?? []; $transactions = $data['transactions'] ?? [];
if (!is_countable($data['transactions'])) {
$validator->errors()->add(
'transactions.0.description', (string)trans('validation.filled', ['attribute' => (string)trans('validation.attributes.description')])
);
return;
}
// needs to be split // needs to be split
if (count($transactions) < 2) { if (count($transactions) < 2) {
return; return;
@ -497,6 +592,15 @@ trait TransactionValidation
{ {
$data = $validator->getData(); $data = $validator->getData();
$transactions = $data['transactions'] ?? []; $transactions = $data['transactions'] ?? [];
if (!is_countable($data['transactions'])) {
$validator->errors()->add(
'transactions.0.description', (string)trans('validation.filled', ['attribute' => (string)trans('validation.attributes.description')])
);
return;
}
if (count($transactions) < 2) { if (count($transactions) < 2) {
return; return;
} }