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

Clean up validation

Browse Source
This commit is contained in:
James Cole 2020-03-15 15:31:59 +01:00
parent 16f918a294
commit 208bece7ea
No known key found for this signature in database
GPG Key ID: C16961E655E74B5E
1 changed files with 86 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

147
app/Validation/TransactionValidation.php
View File

@ -48,37 +48,52 @@ trait TransactionValidation
$transactionType = $data['type'] ?? 'invalid'; $transactionType = $data['type'] ?? 'invalid';
Log::debug(sprintf('Going to loop %d transaction(s)', count($transactions)));
/**
* @var int $index
* @var array $transaction
*/
foreach ($transactions as $index => $transaction) {
$this->validateSingleAccount($validator, $index, $transactionType, $transaction);
}
}
/**
* @param Validator $validator
* @param int $index
* @param string $transactionType
* @param array $transaction
*/
protected function validateSingleAccount(Validator $validator, int $index, string $transactionType, array $transaction): void
{
/** @var AccountValidator $accountValidator */ /** @var AccountValidator $accountValidator */
$accountValidator = app(AccountValidator::class); $accountValidator = app(AccountValidator::class);
Log::debug(sprintf('Going to loop %d transaction(s)', count($transactions))); $transactionType = $transaction['type'] ?? $transactionType;
foreach ($transactions as $index => $transaction) { $accountValidator->setTransactionType($transactionType);
$transactionType = $transaction['type'] ?? $transactionType;
$accountValidator->setTransactionType($transactionType);
// validate source account. // validate source account.
$sourceId = isset($transaction['source_id']) ? (int)$transaction['source_id'] : null; $sourceId = isset($transaction['source_id']) ? (int)$transaction['source_id'] : null;
$sourceName = $transaction['source_name'] ?? null; $sourceName = $transaction['source_name'] ?? null;
$validSource = $accountValidator->validateSource($sourceId, $sourceName); $validSource = $accountValidator->validateSource($sourceId, $sourceName);
// do something with result: // do something with result:
if (false === $validSource) { if (false === $validSource) {
$validator->errors()->add(sprintf('transactions.%d.source_id', $index), $accountValidator->sourceError); $validator->errors()->add(sprintf('transactions.%d.source_id', $index), $accountValidator->sourceError);
$validator->errors()->add(sprintf('transactions.%d.source_name', $index), $accountValidator->sourceError); $validator->errors()->add(sprintf('transactions.%d.source_name', $index), $accountValidator->sourceError);
return; return;
} }
// validate destination account // validate destination account
$destinationId = isset($transaction['destination_id']) ? (int)$transaction['destination_id'] : null; $destinationId = isset($transaction['destination_id']) ? (int)$transaction['destination_id'] : null;
$destinationName = $transaction['destination_name'] ?? null; $destinationName = $transaction['destination_name'] ?? null;
$validDestination = $accountValidator->validateDestination($destinationId, $destinationName); $validDestination = $accountValidator->validateDestination($destinationId, $destinationName);
// do something with result: // do something with result:
if (false === $validDestination) { if (false === $validDestination) {
$validator->errors()->add(sprintf('transactions.%d.destination_id', $index), $accountValidator->destError); $validator->errors()->add(sprintf('transactions.%d.destination_id', $index), $accountValidator->destError);
$validator->errors()->add(sprintf('transactions.%d.destination_name', $index), $accountValidator->destError); $validator->errors()->add(sprintf('transactions.%d.destination_name', $index), $accountValidator->destError);
return; return;
}
} }
} }
@ -92,46 +107,57 @@ trait TransactionValidation
Log::debug('Now in validateAccountInformationUpdate()'); Log::debug('Now in validateAccountInformationUpdate()');
$transactions = $this->getTransactionsArray($validator); $transactions = $this->getTransactionsArray($validator);
/**
* @var int $index
* @var array $transaction
*/
foreach ($transactions as $index => $transaction) {
$this->validateSingleUpdate($validator, $index, $transaction);
}
}
/**
* @param Validator $validator
* @param int $index
* @param array $transaction
*/
protected function validateSingleUpdate(Validator $validator, int $index, array $transaction): void
{
/** @var AccountValidator $accountValidator */ /** @var AccountValidator $accountValidator */
$accountValidator = app(AccountValidator::class); $accountValidator = app(AccountValidator::class);
$originalType = $this->getOriginalType((int)($transaction['transaction_journal_id'] ?? 0));
$originalData = $this->getOriginalData((int)($transaction['transaction_journal_id'] ?? 0));
$transactionType = $transaction['type'] ?? $originalType;
$accountValidator->setTransactionType($transactionType);
foreach ($transactions as $index => $transaction) { // if no account types are given, just skip the check.
$originalType = $this->getOriginalType((int)($transaction['transaction_journal_id'] ?? 0)); if (!isset($transaction['source_id'])
$originalData = $this->getOriginalData((int)($transaction['transaction_journal_id'] ?? 0)); && !isset($transaction['source_name'])
$transactionType = $transaction['type'] ?? $originalType; && !isset($transaction['destination_id'])
$accountValidator->setTransactionType($transactionType); && !isset($transaction['destination_name'])) {
return;
}
// if no account types are given, just skip the check. // validate source account.
if (!isset($transaction['source_id']) $sourceId = isset($transaction['source_id']) ? (int)$transaction['source_id'] : $originalData['source_id'];
&& !isset($transaction['source_name']) $sourceName = $transaction['source_name'] ?? $originalData['source_name'];
&& !isset($transaction['destination_id']) $validSource = $accountValidator->validateSource($sourceId, $sourceName);
&& !isset($transaction['destination_name'])) {
continue;
}
// validate source account. // do something with result:
$sourceId = isset($transaction['source_id']) ? (int)$transaction['source_id'] : $originalData['source_id']; if (false === $validSource) {
$sourceName = $transaction['source_name'] ?? $originalData['source_name']; $validator->errors()->add(sprintf('transactions.%d.source_id', $index), $accountValidator->sourceError);
$validSource = $accountValidator->validateSource($sourceId, $sourceName); $validator->errors()->add(sprintf('transactions.%d.source_name', $index), $accountValidator->sourceError);
// do something with result: return;
if (false === $validSource) { }
$validator->errors()->add(sprintf('transactions.%d.source_id', $index), $accountValidator->sourceError); // validate destination account
$validator->errors()->add(sprintf('transactions.%d.source_name', $index), $accountValidator->sourceError); $destinationId = isset($transaction['destination_id']) ? (int)$transaction['destination_id'] : $originalData['destination_id'];
$destinationName = $transaction['destination_name'] ?? $originalData['destination_name'];
continue; $validDestination = $accountValidator->validateDestination($destinationId, $destinationName);
} // do something with result:
// validate destination account if (false === $validDestination) {
$destinationId = isset($transaction['destination_id']) ? (int)$transaction['destination_id'] : $originalData['destination_id']; $validator->errors()->add(sprintf('transactions.%d.destination_id', $index), $accountValidator->destError);
$destinationName = $transaction['destination_name'] ?? $originalData['destination_name']; $validator->errors()->add(sprintf('transactions.%d.destination_name', $index), $accountValidator->destError);
$validDestination = $accountValidator->validateDestination($destinationId, $destinationName);
// do something with result:
if (false === $validDestination) {
$validator->errors()->add(sprintf('transactions.%d.destination_id', $index), $accountValidator->destError);
$validator->errors()->add(sprintf('transactions.%d.destination_name', $index), $accountValidator->destError);
continue;
}
} }
} }
@ -265,7 +291,7 @@ trait TransactionValidation
$transactions = $this->getTransactionsArray($validator); $transactions = $this->getTransactionsArray($validator);
$types = []; $types = [];
foreach ($transactions as $index => $transaction) { foreach ($transactions as $transaction) {
$types[] = $transaction['type'] ?? 'invalid'; $types[] = $transaction['type'] ?? 'invalid';
} }
$unique = array_unique($types); $unique = array_unique($types);
@ -277,7 +303,6 @@ trait TransactionValidation
$first = $unique[0] ?? 'invalid'; $first = $unique[0] ?? 'invalid';
if ('invalid' === $first) { if ('invalid' === $first) {
$validator->errors()->add('transactions.0.type', (string)trans('validation.invalid_transaction_type')); $validator->errors()->add('transactions.0.type', (string)trans('validation.invalid_transaction_type'));
} }
} }
@ -291,7 +316,7 @@ trait TransactionValidation
Log::debug('Now in validateTransactionTypesForUpdate()'); Log::debug('Now in validateTransactionTypesForUpdate()');
$transactions = $this->getTransactionsArray($validator); $transactions = $this->getTransactionsArray($validator);
$types = []; $types = [];
foreach ($transactions as $index => $transaction) { foreach ($transactions as $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.