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

Refactor temporary account storage and fix a bug in the bunq import. #1607

Browse Source
This commit is contained in:
James Cole
2018-10-25 20:03:48 +02:00
parent e1402d5d8a
commit 3a427dd0f4
5 changed files with 85 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
app/Import/Storage/ImportArrayStorage.php
View File

@@ -72,12 +72,12 @@ class ImportArrayStorage
*/
public function setImportJob(ImportJob $importJob): void
{
$this->importJob = $importJob;
$this->countTransfers();
$this->importJob = $importJob;
$this->repository = app(ImportJobRepositoryInterface::class);
$this->repository->setUser($importJob->user);
$this->countTransfers();
$this->journalRepos = app(JournalRepositoryInterface::class);
$this->journalRepos->setUser($importJob->user);
@@ -157,7 +157,9 @@ class ImportArrayStorage
{
Log::debug('Now in countTransfers()');
/** @var array $array */
$array = $this->importJob->transactions;
$array = $this->repository->getTransactions($this->importJob);
$count = 0;
foreach ($array as $index => $transaction) {
if (strtolower(TransactionType::TRANSFER) === strtolower($transaction['type'])) {
@@ -418,7 +420,7 @@ class ImportArrayStorage
private function storeArray(): Collection
{
/** @var array $array */
$array = $this->importJob->transactions;
$array = $this->repository->getTransactions($this->importJob);
$count = \count($array);
$toStore = [];
@@ -541,8 +543,9 @@ class ImportArrayStorage
Log::debug(sprintf('Comparison is a hit! (%s)', $hits));
// compare description:
Log::debug(sprintf('Comparing "%s" to "%s"', $description, $transfer->description));
if ($description !== $transfer->description) {
$comparison = '(empty description)' === $transfer->description ? '' : $transfer->description;
Log::debug(sprintf('Comparing "%s" to "%s" (original: "%s")', $description, $transfer->description, $comparison));
if ($description !== $comparison) {
continue; // @codeCoverageIgnore
}
++$hits;