IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2024-11-30 20:54:04 -06:00
Code Issues Packages Projects Releases Wiki Activity

Working IBAN account import thing.

Browse Source
This commit is contained in:
James Cole 2016-07-15 22:37:47 +02:00
parent c9e46a4dd1
commit 5130ba7ea4
3 changed files with 47 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -82,6 +82,24 @@ class AccountCrud implements AccountCrudInterface
return $account;
}
/**
* @param string $iban
*
* @return Account
*/
public function findByIban(string $iban): Account
{
$accounts = $this->user->accounts()->where('iban', '!=', "")->get();
/** @var Account $account */
foreach ($accounts as $account) {
if ($account->iban === $iban) {
return $account;
}
}
return new Account;
}
/**
* @param array $accountIds
*

7
app/Crud/Account/AccountCrudInterface.php
View File

@ -37,6 +37,13 @@ interface AccountCrudInterface
*/
public function find(int $accountId): Account;
/**
* @param string $iban
*
* @return Account
*/
public function findByIban(string $iban): Account;
/**
* @param array $accountIds
*

28
app/Import/Converter/AssetAccountIban.php
View File

@ -12,6 +12,7 @@ declare(strict_types = 1);
namespace FireflyIII\Import\Converter;
use FireflyIII\Crud\Account\AccountCrudInterface;
use FireflyIII\Models\Account;
use Log;
/**
@ -25,8 +26,9 @@ class AssetAccountIban extends BasicConverter implements ConverterInterface
/**
* @param $value
*
* @return Account
*/
public function convert($value)
public function convert($value): Account
{
Log::debug('Going to convert value ' . $value);
@ -35,14 +37,28 @@ class AssetAccountIban extends BasicConverter implements ConverterInterface
if (isset($this->mapping[$value])) {
Log::debug('Found account in mapping. Should exist.',['value' => $value]);
$account = $repository->find(intval($value));
Log::debug('Found account ', ['id' => $account->id]);
Log::debug('Found account in mapping. Should exist.', ['value' => $value, 'map' => $this->mapping[$value]]);
$account = $repository->find(intval($this->mapping[$value]));
if (!is_null($account->id)) {
Log::debug('Found account by ID', ['id' => $account->id]);
return $account;
}
}
Log::debug('Given map is ', $this->mapping);
// not mapped? Still try to find it first:
$account = $repository->findByIban($value);
if (!is_null($account->id)) {
Log::debug('Found account by IBAN', ['id' => $account->id]);
exit;
return $account;
}
$account = $repository->store(
['name' => $value, 'iban' => $value, 'user' => $this->user->id, 'accountType' => 'asset', 'virtualBalance' => 0, 'active' => true]
);
return $account;
}
}