kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-28 14:20:47 +00:00
Code Issues Projects Releases Wiki Activity

Fix transaction journals that may be broken.

Browse Source
This commit is contained in:
James Cole
2017-04-15 08:13:05 +02:00
parent 490733bdd1
commit 41dc4d994e
1 changed files with 55 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

76
app/Console/Commands/UpgradeDatabase.php
View File

@@ -262,41 +262,75 @@ class UpgradeDatabase extends Command
*/ */
private function updateJournalCurrencies() private function updateJournalCurrencies()
{ {
$types = [ $types = [
TransactionType::WITHDRAWAL => '<', TransactionType::WITHDRAWAL => '<',
TransactionType::DEPOSIT => '>', TransactionType::DEPOSIT => '>',
]; ];
$repository = app(CurrencyRepositoryInterface::class); $repository = app(CurrencyRepositoryInterface::class);
$notification = '%s #%d uses %s but should use %s. It has been updated. Please verify this in Firefly III.';
$transfer = 'Transfer #%d has been updated to use the correct currencies. Please verify this in Firefly III.';
foreach ($types as $type => $operator) { foreach ($types as $type => $operator) {
$set = TransactionJournal::leftJoin('transaction_types', 'transaction_types.id', '=', 'transaction_journals.transaction_type_id')->leftJoin( $set = TransactionJournal
'transactions', function (JoinClause $join) use ($operator) { ::leftJoin('transaction_types', 'transaction_types.id', '=', 'transaction_journals.transaction_type_id')->leftJoin(
$join->on('transaction_journals.id', '=', 'transactions.transaction_journal_id')->where('transactions.amount', $operator, '0'); 'transactions', function (JoinClause $join) use ($operator) {
} $join->on('transaction_journals.id', '=', 'transactions.transaction_journal_id')->where('transactions.amount', $operator, '0');
) }
->leftJoin('accounts', 'accounts.id', '=', 'transactions.account_id') )
->leftJoin('account_meta', 'account_meta.account_id', '=', 'accounts.id') ->leftJoin('accounts', 'accounts.id', '=', 'transactions.account_id')
->where('transaction_types.type', $type) ->leftJoin('account_meta', 'account_meta.account_id', '=', 'accounts.id')
->where('account_meta.name', 'currency_id') ->where('transaction_types.type', $type)
->where('transaction_journals.transaction_currency_id', '!=', DB::raw('account_meta.data')) ->where('account_meta.name', 'currency_id')
->get( ->where('transaction_journals.transaction_currency_id', '!=', DB::raw('account_meta.data'))
['transaction_journals.*', 'account_meta.data as expected_currency_id', 'transactions.amount as transaction_amount'] ->get(['transaction_journals.*', 'account_meta.data as expected_currency_id', 'transactions.amount as transaction_amount']);
);
/** @var TransactionJournal $journal */ /** @var TransactionJournal $journal */
foreach ($set as $journal) { foreach ($set as $journal) {
$expectedCurrency = $repository->find(intval($journal->expected_currency_id)); $expectedCurrency = $repository->find(intval($journal->expected_currency_id));
$this->line( $line = sprintf($notification, $type, $journal->id, $journal->transactionCurrency->code, $expectedCurrency->code);
sprintf(
'%s #%d uses %s but should use %s. It has been updated to do so, please verify the amounts.', $type, $journal->id,
$journal->transactionCurrency->code, $expectedCurrency->code
)
);
$journal->setMeta('foreign_amount', $journal->transaction_amount); $journal->setMeta('foreign_amount', $journal->transaction_amount);
$journal->setMeta('foreign_currency_id', $journal->transaction_currency_id); $journal->setMeta('foreign_currency_id', $journal->transaction_currency_id);
$journal->transaction_currency_id = $expectedCurrency->id; $journal->transaction_currency_id = $expectedCurrency->id;
$journal->save(); $journal->save();
$this->line($line);
}
}
/*
* For transfers it's slightly different. Both source and destination
* must match the respective currency preference. So we must verify ALL
* transactions.
*/
$set = TransactionJournal
::leftJoin('transaction_types', 'transaction_types.id', '=', 'transaction_journals.transaction_type_id')
->where('transaction_types.type', TransactionType::TRANSFER)
->get(['transaction_journals.*']);
/** @var TransactionJournal $journal */
foreach ($set as $journal) {
$updated = false;
/** @var Transaction $sourceTransaction */
$sourceTransaction = $journal->transactions()->where('amount', '<', 0)->first();
$sourceCurrency = $repository->find(intval($sourceTransaction->account->getMeta('currency_id')));
if ($sourceCurrency->id !== $journal->transaction_currency_id) {
$updated = true;
$journal->transaction_currency_id = $sourceCurrency->id;
$journal->save();
}
// destination
$destinationTransaction = $journal->transactions()->where('amount', '>', 0)->first();
$destinationCurrency = $repository->find(intval($destinationTransaction->account->getMeta('currency_id')));
if ($destinationCurrency->id !== $journal->transaction_currency_id) {
$updated = true;
$journal->deleteMeta('foreign_amount');
$journal->deleteMeta('foreign_currency_id');
$journal->setMeta('foreign_amount', $destinationTransaction->amount);
$journal->setMeta('foreign_currency_id', $destinationCurrency->id);
}
if ($updated) {
$line = sprintf($transfer, $journal->id);
$this->line($line);
} }
} }
} }