kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-12 15:35:15 +00:00
Code Issues Projects Releases Wiki Activity

Fix #1564

Browse Source
This commit is contained in:
James Cole
2018-08-16 16:42:58 +02:00
parent 6bd4fa1c0a
commit 566be8dc63
4 changed files with 70 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
app/Support/Import/JobConfiguration/Bunq/ChooseAccountsHandler.php
View File

@@ -81,6 +81,17 @@ class ChooseAccountsHandler implements BunqJobConfigurationInterface
$mapping = $data['account_mapping'] ?? [];
$applyRules = 1 === (int)$data['apply_rules'];
$final = [];
/*
* $ibanToAsset is used to map bunq IBAN's to Firefly III asset accounts. The array is structured like this:
* 12BUNQ123456.. => 1,
* 12BUNQ928811.. => 4,
*
* And contains the bunq asset account iban (left) and the FF3 asset ID (right).
*
* This is used to properly map transfers.
*/
$ibanToAsset = [];
if (0 === \count($accounts)) {
throw new FireflyException('No bunq accounts found. Import cannot continue.'); // @codeCoverageIgnore
}
@@ -95,11 +106,16 @@ class ChooseAccountsHandler implements BunqJobConfigurationInterface
$localId = (int)$localId;
// validate each
$bunqId = $this->validBunqAccount($bunqId);
$accountId = $this->validLocalAccount($localId);
$bunqId = $this->validBunqAccount($bunqId);
$accountId = $this->validLocalAccount($localId);
$bunqIban = $this->getBunqIban($bunqId);
if (null !== $bunqIban) {
$ibanToAsset[$bunqIban] = $accountId;
}
$final[$bunqId] = $accountId;
}
$config['mapping'] = $final;
$config['bunq-iban'] = $ibanToAsset;
$config['apply-rules'] = $applyRules;
$this->repository->setConfiguration($this->importJob, $config);
@@ -169,6 +185,25 @@ class ChooseAccountsHandler implements BunqJobConfigurationInterface
$this->accountRepository->setUser($importJob->user);
}
/**
* @param int $bunqId
*
* @return null|string
*/
private function getBunqIban(int $bunqId): ?string
{
$config = $this->repository->getConfiguration($this->importJob);
$accounts = $config['accounts'] ?? [];
/** @var array $bunqAccount */
foreach ($accounts as $bunqAccount) {
if ((int)$bunqAccount['id'] === $bunqId) {
return $bunqAccount['iban'] ?? null;
}
}
return null;
}
/**
* @param int $currencyId
*