IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-01-01 03:37:06 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix #1199 in API

Browse Source
This commit is contained in:
James Cole 2018-03-10 09:39:49 +01:00
parent 30e49846e0
commit ce10036a27
No known key found for this signature in database
GPG Key ID: C16961E655E74B5E
1 changed files with 45 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

77
app/Api/V1/Requests/TransactionRequest.php
View File

@ -192,8 +192,10 @@ class TransactionRequest extends Request
* @param null|string $accountName * @param null|string $accountName
* @param string $idField * @param string $idField
* @param string $nameField * @param string $nameField
*
* @return null|Account
*/ */
protected function assetAccountExists(Validator $validator, ?int $accountId, ?string $accountName, string $idField, string $nameField): void protected function assetAccountExists(Validator $validator, ?int $accountId, ?string $accountName, string $idField, string $nameField): ?Account
{ {
$accountId = intval($accountId); $accountId = intval($accountId);
@ -202,7 +204,7 @@ class TransactionRequest extends Request
if ($accountId < 1 && strlen($accountName) === 0) { if ($accountId < 1 && strlen($accountName) === 0) {
$validator->errors()->add($idField, trans('validation.filled', ['attribute' => $idField])); $validator->errors()->add($idField, trans('validation.filled', ['attribute' => $idField]));
return; return null;
} }
// ID belongs to user and is asset account: // ID belongs to user and is asset account:
/** @var AccountRepositoryInterface $repository */ /** @var AccountRepositoryInterface $repository */
@ -215,19 +217,21 @@ class TransactionRequest extends Request
if ($first->accountType->type !== AccountType::ASSET) { if ($first->accountType->type !== AccountType::ASSET) {
$validator->errors()->add($idField, trans('validation.belongs_user')); $validator->errors()->add($idField, trans('validation.belongs_user'));
return; return null;
} }
// we ignore the account name at this point. // we ignore the account name at this point.
return; return $first;
} }
$account = $repository->findByName($accountName, [AccountType::ASSET]); $account = $repository->findByName($accountName, [AccountType::ASSET]);
if (is_null($account)) { if (is_null($account)) {
$validator->errors()->add($nameField, trans('validation.belongs_user')); $validator->errors()->add($nameField, trans('validation.belongs_user'));
return null;
} }
return; return $account;
} }
/** /**
@ -342,13 +346,16 @@ class TransactionRequest extends Request
* @param int|null $accountId * @param int|null $accountId
* @param null|string $accountName * @param null|string $accountName
* @param string $idField * @param string $idField
*
* @return null|Account
*/ */
protected function opposingAccountExists(Validator $validator, string $type, ?int $accountId, ?string $accountName, string $idField): void { protected function opposingAccountExists(Validator $validator, string $type, ?int $accountId, ?string $accountName, string $idField): ?Account
{
$accountId = intval($accountId); $accountId = intval($accountId);
$accountName = strval($accountName); $accountName = strval($accountName);
// both empty? done! // both empty? done!
if ($accountId < 1 && strlen($accountName) === 0) { if ($accountId < 1 && strlen($accountName) === 0) {
return; return null;
} }
if ($accountId !== 0) { if ($accountId !== 0) {
// ID belongs to user and is $type account: // ID belongs to user and is $type account:
@ -362,16 +369,16 @@ class TransactionRequest extends Request
if ($first->accountType->type !== $type) { if ($first->accountType->type !== $type) {
$validator->errors()->add($idField, trans('validation.belongs_user')); $validator->errors()->add($idField, trans('validation.belongs_user'));
return; return null;
} }
// we ignore the account name at this point. // we ignore the account name at this point.
return; return $first;
} }
} }
// not having an opposing account by this name is NOT a problem. // not having an opposing account by this name is NOT a problem.
return; return null;
} }
/** /**
@ -395,41 +402,47 @@ class TransactionRequest extends Request
$data['type'] = strtolower($transaction->transactionJournal->transactionType->type); $data['type'] = strtolower($transaction->transactionJournal->transactionType->type);
} }
foreach ($transactions as $index => $transaction) { foreach ($transactions as $index => $transaction) {
$sourceId = isset($transaction['source_id']) ? intval($transaction['source_id']) : null; $sourceId = isset($transaction['source_id']) ? intval($transaction['source_id']) : null;
$sourceName = $transaction['source_name'] ?? null; $sourceName = $transaction['source_name'] ?? null;
$destinationId = isset($transaction['destination_id']) ? intval($transaction['destination_id']) : null; $destinationId = isset($transaction['destination_id']) ? intval($transaction['destination_id']) : null;
$destinationName = $transaction['destination_name'] ?? null; $destinationName = $transaction['destination_name'] ?? null;
$sourceAccount = null;
$destinationAccount = null;
switch ($data['type']) { switch ($data['type']) {
case 'withdrawal': case 'withdrawal':
$idField = 'transactions.' . $index . '.source_id'; $idField = 'transactions.' . $index . '.source_id';
$nameField = 'transactions.' . $index . '.source_name'; $nameField = 'transactions.' . $index . '.source_name';
$this->assetAccountExists($validator, $sourceId, $sourceName, $idField, $nameField); $sourceAccount = $this->assetAccountExists($validator, $sourceId, $sourceName, $idField, $nameField);
$idField = 'transactions.' . $index . '.destination_id';
$idField = 'transactions.' . $index . '.destination_id'; $destinationAccount = $this->opposingAccountExists($validator, AccountType::EXPENSE, $destinationId, $destinationName, $idField);
$this->opposingAccountExists($validator, AccountType::EXPENSE, $destinationId, $destinationName, $idField);
break; break;
case 'deposit': case 'deposit':
$idField = 'transactions.' . $index . '.source_id'; $idField = 'transactions.' . $index . '.source_id';
$this->opposingAccountExists($validator, AccountType::REVENUE, $sourceId, $sourceName, $idField); $sourceAccount = $this->opposingAccountExists($validator, AccountType::REVENUE, $sourceId, $sourceName, $idField);
$idField = 'transactions.' . $index . '.destination_id'; $idField = 'transactions.' . $index . '.destination_id';
$nameField = 'transactions.' . $index . '.destination_name'; $nameField = 'transactions.' . $index . '.destination_name';
$this->assetAccountExists($validator, $destinationId, $destinationName, $idField, $nameField); $destinationAccount = $this->assetAccountExists($validator, $destinationId, $destinationName, $idField, $nameField);
break; break;
case 'transfer': case 'transfer':
$idField = 'transactions.' . $index . '.source_id'; $idField = 'transactions.' . $index . '.source_id';
$nameField = 'transactions.' . $index . '.source_name'; $nameField = 'transactions.' . $index . '.source_name';
$this->assetAccountExists($validator, $sourceId, $sourceName, $idField, $nameField); $sourceAccount = $this->assetAccountExists($validator, $sourceId, $sourceName, $idField, $nameField);
$idField = 'transactions.' . $index . '.destination_id'; $idField = 'transactions.' . $index . '.destination_id';
$nameField = 'transactions.' . $index . '.destination_name'; $nameField = 'transactions.' . $index . '.destination_name';
$this->assetAccountExists($validator, $destinationId, $destinationName, $idField, $nameField); $destinationAccount = $this->assetAccountExists($validator, $destinationId, $destinationName, $idField, $nameField);
break; break;
default: default:
throw new FireflyException(sprintf('The validator cannot handle transaction type "%s" in validateAccountInformation().', $data['type'])); throw new FireflyException(sprintf('The validator cannot handle transaction type "%s" in validateAccountInformation().', $data['type']));
} }
// add some errors in case of same account submitted:
if (!is_null($sourceAccount) && !is_null($destinationAccount)) {
if ($sourceAccount->id === $destinationAccount->id) {
$validator->errors()->add($idField, trans('validation.source_equals_destination'));
}
}
} }
} }