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

Move findByIban

Browse Source
This commit is contained in:
James Cole 2016-10-10 07:16:05 +02:00
parent d1b56c2afa
commit 0ae9afd325
7 changed files with 45 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -51,32 +51,6 @@ class AccountCrud implements AccountCrudInterface
$this->user = $user;
}
/**
* @param string $iban
* @param array $types
*
* @return Account
*/
public function findByIban(string $iban, array $types): Account
{
$query = $this->user->accounts()->where('iban', '!=', '')->whereNotNull('iban');
if (count($types) > 0) {
$query->leftJoin('account_types', 'accounts.account_type_id', '=', 'account_types.id');
$query->whereIn('account_types.type', $types);
}
$accounts = $query->get(['accounts.*']);
/** @var Account $account */
foreach ($accounts as $account) {
if ($account->iban === $iban) {
return $account;
}
}
return new Account;
}
/**
* @param string $name
* @param array $types

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

@ -25,14 +25,6 @@ use Illuminate\Support\Collection;
interface AccountCrudInterface
{
/**
* @param string $iban
* @param array $types
*
* @return Account
*/
public function findByIban(string $iban, array $types): Account;
/**
* @param string $name
* @param array $types

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

@ -62,7 +62,7 @@ class AssetAccountIban extends BasicConverter implements ConverterInterface
}
// not mapped? Still try to find it first:
$account = $crud->findByIban($value, [AccountType::ASSET]);
$account = $repository->findByIban($value, [AccountType::ASSET]);
if (!is_null($account->id)) {
Log::debug('Found account by IBAN', ['id' => $account->id]);
$this->setCertainty(50);

2
app/Import/Converter/OpposingAccountIban.php
View File

@ -61,7 +61,7 @@ class OpposingAccountIban extends BasicConverter implements ConverterInterface
}
// not mapped? Still try to find it first:
$account = $crud->findByIban($value, []);
$account = $repository->findByIban($value, []);
if (!is_null($account->id)) {
Log::debug('Found account by IBAN', ['id' => $account->id]);
Log::info(

10
app/Import/Setup/CsvSetup.php
View File

@ -23,6 +23,7 @@ use FireflyIII\Import\Specifics\SpecificInterface;
use FireflyIII\Models\Account;
use FireflyIII\Models\AccountType;
use FireflyIII\Models\ImportJob;
use FireflyIII\Repositories\Account\AccountRepositoryInterface;
use Illuminate\Http\Request;
use League\Csv\Reader;
use Log;
@ -177,8 +178,9 @@ class CsvSetup implements SetupInterface
*/
public function saveImportConfiguration(array $data, FileBag $files): bool
{
/** @var AccountCrud $repository */
$repository = app(AccountCrud::class, [auth()->user()]);
/** @var AccountRepositoryInterface $repository */
$repository = app(AccountRepositoryInterface::class, [auth()->user()]);
$importId = $data['csv_import_account'] ?? 0;
$account = $repository->find(intval($importId));
@ -384,6 +386,10 @@ class CsvSetup implements SetupInterface
//do something here
foreach ($indexes as $index) { // this is simply 1, 2, 3, etc.
if (!isset($row[$index])) {
// don't really know how to handle this. Just skip, for now.
continue;
}
$value = $row[$index];
if (strlen($value) > 0) {

27
app/Repositories/Account/AccountRepository.php
View File

@ -19,6 +19,7 @@ use DB;
use FireflyIII\Models\Account;
use FireflyIII\Models\Transaction;
use FireflyIII\User;
use Illuminate\Support\Collection;
/**
@ -119,6 +120,32 @@ class AccountRepository implements AccountRepositoryInterface
return new Account;
}
/**
* @param string $iban
* @param array $types
*
* @return Account
*/
public function findByIban(string $iban, array $types): Account
{
$query = $this->user->accounts()->where('iban', '!=', '')->whereNotNull('iban');
if (count($types) > 0) {
$query->leftJoin('account_types', 'accounts.account_type_id', '=', 'account_types.id');
$query->whereIn('account_types.type', $types);
}
$accounts = $query->get(['accounts.*']);
/** @var Account $account */
foreach ($accounts as $account) {
if ($account->iban === $iban) {
return $account;
}
}
return new Account;
}
/**
* Returns the date of the very first transaction in this account.
*

8
app/Repositories/Account/AccountRepositoryInterface.php
View File

@ -58,6 +58,14 @@ interface AccountRepositoryInterface
*/
public function findByAccountNumber(string $number, array $types): Account;
/**
* @param string $iban
* @param array $types
*
* @return Account
*/
public function findByIban(string $iban, array $types): Account;
/**
* Returns the date of the very first transaction in this account.
*