IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2024-12-28 18:01:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

Moved findByAccountNumber

Browse Source
This commit is contained in:
James Cole 2016-10-10 07:14:01 +02:00
parent 8ef7c5ac33
commit d1b56c2afa
6 changed files with 37 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -51,34 +51,6 @@ class AccountCrud implements AccountCrudInterface
$this->user = $user;
}
/**
* @param string $number
* @param array $types
*
* @return Account
*/
public function findByAccountNumber(string $number, array $types): Account
{
$query = $this->user->accounts()
->leftJoin('account_meta', 'account_meta.account_id', '=', 'accounts.id')
->where('account_meta.name', 'accountNumber')
->where('account_meta.data', json_encode($number));
if (count($types) > 0) {
$query->leftJoin('account_types', 'accounts.account_type_id', '=', 'account_types.id');
$query->whereIn('account_types.type', $types);
}
/** @var Collection $accounts */
$accounts = $query->get(['accounts.*']);
if ($accounts->count() > 0) {
return $accounts->first();
}
return new Account;
}
/**
* @param string $iban
* @param array $types

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

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

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

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

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

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

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

@ -92,6 +92,33 @@ class AccountRepository implements AccountRepositoryInterface
return $account;
}
/**
* @param string $number
* @param array $types
*
* @return Account
*/
public function findByAccountNumber(string $number, array $types): Account
{
$query = $this->user->accounts()
->leftJoin('account_meta', 'account_meta.account_id', '=', 'accounts.id')
->where('account_meta.name', 'accountNumber')
->where('account_meta.data', json_encode($number));
if (count($types) > 0) {
$query->leftJoin('account_types', 'accounts.account_type_id', '=', 'account_types.id');
$query->whereIn('account_types.type', $types);
}
/** @var Collection $accounts */
$accounts = $query->get(['accounts.*']);
if ($accounts->count() > 0) {
return $accounts->first();
}
return new Account;
}
/**
* Returns the date of the very first transaction in this account.
*

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

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