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

Improve foreign currency routine for #746

Browse Source
This commit is contained in:
James Cole 2017-08-12 07:38:22 +02:00
parent cd2c8acdb2
commit 12624cab5b
No known key found for this signature in database
GPG Key ID: C16961E655E74B5E
1 changed files with 68 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

87
app/Import/Storage/ImportStorage.php
View File

@ -154,27 +154,26 @@ class ImportStorage
} }
/** /**
* @param int $journalId * @param array $parameters
* @param int $accountId
* @param int $currencyId
* @param string $amount
* *
* @return bool * @return bool
* @throws FireflyException * @throws FireflyException
*/ */
private function createTransaction(int $journalId, int $accountId, int $currencyId, string $amount): bool private function createTransaction(array $parameters): bool
{ {
$transaction = new Transaction; $transaction = new Transaction;
$transaction->account_id = $accountId; $transaction->account_id = $parameters['account'];
$transaction->transaction_journal_id = $journalId; $transaction->transaction_journal_id = $parameters['id'];
$transaction->transaction_currency_id = $currencyId; $transaction->transaction_currency_id = $parameters['currency'];
$transaction->amount = $amount; $transaction->amount = $parameters['amount'];
$transaction->foreign_currency_id = $parameters['foreign_currency'];
$transaction->foreign_amount = $parameters['foreign_amount'];
$transaction->save(); $transaction->save();
if (is_null($transaction->id)) { if (is_null($transaction->id)) {
$errorText = join(', ', $transaction->getErrors()->all()); $errorText = join(', ', $transaction->getErrors()->all());
throw new FireflyException($errorText); throw new FireflyException($errorText);
} }
Log::debug(sprintf('Created transaction with ID #%d, account #%d, amount %s', $transaction->id, $accountId, $amount)); Log::debug(sprintf('Created transaction with ID #%d, account #%d, amount %s', $transaction->id, $parameters['account'], $parameters['amount']));
return true; return true;
} }
@ -248,6 +247,39 @@ class ImportStorage
$currency = $this->defaultCurrency; $currency = $this->defaultCurrency;
return $currency; return $currency;
}
/**
* @param ImportJournal $importJournal
* @param Account $account
* @param TransactionCurrency $localCurrency
*
* @return int|null
*/
private function getForeignCurrencyId(ImportJournal $importJournal, Account $account, TransactionCurrency $localCurrency): ?int
{
// get journal currency, if any:
$currency = $importJournal->getCurrency()->getTransactionCurrency();
if (is_null($currency->id)) {
Log::debug('getForeignCurrencyId: Journal has no currency, so can\'t be foreign either way.');
// journal has no currency, so can't be foreign either way:
return null;
}
if ($currency->id !== $localCurrency->id) {
Log::debug(
sprintf('getForeignCurrencyId: journal is %s, but account is %s. Return id of journal currency.', $currency->code, $localCurrency->code)
);
// journal has different currency than account does, return its ID:
return $currency->id;
}
Log::debug('getForeignCurrencyId: journal has no foreign currency.');
// return null in other cases.
return null;
} }
/** /**
@ -358,12 +390,13 @@ class ImportStorage
{ {
Log::debug(sprintf('Going to store object #%d with description "%s"', $index, $importJournal->getDescription())); Log::debug(sprintf('Going to store object #%d with description "%s"', $index, $importJournal->getDescription()));
$importJournal->asset->setDefaultAccountId($this->job->configuration['import-account']); $importJournal->asset->setDefaultAccountId($this->job->configuration['import-account']);
$asset = $importJournal->asset->getAccount(); $asset = $importJournal->asset->getAccount();
$amount = $importJournal->getAmount(); $amount = $importJournal->getAmount();
$currency = $this->getCurrency($importJournal, $asset); $currency = $this->getCurrency($importJournal, $asset);
$date = $importJournal->getDate($this->dateFormat); $foreignCurrencyId = $this->getForeignCurrencyId($importJournal, $asset, $currency);
$transactionType = $this->getTransactionType($amount); $date = $importJournal->getDate($this->dateFormat);
$opposing = $this->getOpposingAccount($importJournal->opposing, $amount); $transactionType = $this->getTransactionType($amount);
$opposing = $this->getOpposingAccount($importJournal->opposing, $amount);
// if opposing is an asset account, it's a transfer: // if opposing is an asset account, it's a transfer:
if ($opposing->accountType->type === AccountType::ASSET) { if ($opposing->accountType->type === AccountType::ASSET) {
@ -395,7 +428,7 @@ class ImportStorage
$journal = new TransactionJournal; $journal = new TransactionJournal;
$journal->user_id = $this->job->user_id; $journal->user_id = $this->job->user_id;
$journal->transaction_type_id = $transactionType->id; $journal->transaction_type_id = $transactionType->id;
$journal->transaction_currency_id = $currency->id; $journal->transaction_currency_id = $currency->id;// always currency of account
$journal->description = $importJournal->getDescription(); $journal->description = $importJournal->getDescription();
$journal->date = $date->format('Y-m-d'); $journal->date = $date->format('Y-m-d');
$journal->order = 0; $journal->order = 0;
@ -415,8 +448,24 @@ class ImportStorage
Log::debug(sprintf('Created journal with ID #%d', $journal->id)); Log::debug(sprintf('Created journal with ID #%d', $journal->id));
// create transactions: // create transactions:
$this->createTransaction($journal->id, $asset->id, $currency->id, $amount); $one = [
$this->createTransaction($journal->id, $opposing->id, $currency->id, Steam::opposite($amount)); 'id' => $journal->id,
'account' => $asset->id,
'currency' => $currency->id,
'amount' => $amount,
'foreign_currency' => $foreignCurrencyId,
'foreign_amount' => is_null($foreignCurrencyId) ? null : $amount,
];
$two = [
'id' => $journal->id,
'account' => $opposing->id,
'currency' => $currency->id,
'amount' => Steam::opposite($amount),
'foreign_currency' => $foreignCurrencyId,
'foreign_amount' => is_null($foreignCurrencyId) ? null : Steam::opposite($amount),
];
$this->createTransaction($one);
$this->createTransaction($two);
/*** Another step done! */ /*** Another step done! */
$this->job->addStepsDone(1); $this->job->addStepsDone(1);