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

Fix for issue #328. Turns out the import routine converts accounts back and forth instead of creating new entries.

Browse Source
This commit is contained in:
James Cole 2016-09-24 18:59:31 +02:00
parent abc4f856ce
commit ad2b254be0
4 changed files with 24 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Crud/Account/AccountCrud.php
View File

@ -148,16 +148,20 @@ class AccountCrud implements AccountCrudInterface
if (count($types) > 0) { if (count($types) > 0) {
$query->leftJoin('account_types', 'accounts.account_type_id', '=', 'account_types.id'); $query->leftJoin('account_types', 'accounts.account_type_id', '=', 'account_types.id');
$query->whereIn('account_types.type', $types); $query->whereIn('account_types.type', $types);
} }
Log::debug(sprintf('Searching for account named %s of the following type(s)', $name), ['types' => $types]);
$accounts = $query->get(['accounts.*']); $accounts = $query->get(['accounts.*']);
/** @var Account $account */ /** @var Account $account */
foreach ($accounts as $account) { foreach ($accounts as $account) {
if ($account->name === $name) { if ($account->name === $name) {
Log::debug(sprintf('Found #%d (%s) with type id %d', $account->id, $account->name, $account->account_type_id));
return $account; return $account;
} }
} }
Log::debug('Found nothing.');
return new Account; return new Account;
} }

4
app/Import/ImportStorage.php
View File

@ -293,7 +293,7 @@ class ImportStorage
private function storeJournal($entry): TransactionJournal private function storeJournal($entry): TransactionJournal
{ {
$billId = is_null($entry->fields['bill']) ? null : $entry->fields['bill']->id; $billId = is_null($entry->fields['bill']) || intval($entry->fields['bill']->id) === 0 ? null : intval($entry->fields['bill']->id);
$journalData = [ $journalData = [
'user_id' => $entry->user->id, 'user_id' => $entry->user->id,
'transaction_type_id' => $entry->fields['transaction-type']->id, 'transaction_type_id' => $entry->fields['transaction-type']->id,
@ -310,7 +310,7 @@ class ImportStorage
$journal = TransactionJournal::create($journalData); $journal = TransactionJournal::create($journalData);
foreach ($journal->getErrors()->all() as $err) { foreach ($journal->getErrors()->all() as $err) {
Log::error($err); Log::error('Error when storing journal: ' . $err);
} }
Log::debug('Created journal', ['id' => $journal->id]); Log::debug('Created journal', ['id' => $journal->id]);

21
app/Import/ImportValidator.php
View File

@ -178,10 +178,25 @@ class ImportValidator
$result = $repository->findByName($account->name, [$type]); $result = $repository->findByName($account->name, [$type]);
if (is_null($result->id)) { if (is_null($result->id)) {
// can convert account: // can convert account:
Log::debug(sprintf('No account named %s of type %s, will convert.', $account->name, $type)); Log::debug(sprintf('No account named %s of type %s, create new account.', $account->name, $type));
$result = $repository->updateAccountType($account, $type); $result = $repository->store(
[
'user' => $this->user->id,
'accountType' => config('firefly.shortNamesByFullName.' . $type),
'name' => $account->name,
'virtualBalance' => 0,
'active' => true,
'iban' => null,
'openingBalance' => 0,
]
);
} }
Log::debug(
sprintf(
'Using another account named %s (#%d) of type %s, will use that one instead of %s (#%d)', $account->name, $result->id, $type, $account->name,
$account->id
)
);
return $result; return $result;

1
app/Models/TransactionJournal.php
View File

@ -111,7 +111,6 @@ class TransactionJournal extends TransactionJournalSupport
= [ = [
'user_id' => 'required|exists:users,id', 'user_id' => 'required|exists:users,id',
'transaction_type_id' => 'required|exists:transaction_types,id', 'transaction_type_id' => 'required|exists:transaction_types,id',
'bill_id' => 'exists:bills,id',
'transaction_currency_id' => 'required|exists:transaction_currencies,id', 'transaction_currency_id' => 'required|exists:transaction_currencies,id',
'description' => 'required|between:1,1024', 'description' => 'required|between:1,1024',
'completed' => 'required|boolean', 'completed' => 'required|boolean',