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

Refactored pardsing of description for FinTS import.

Browse Source 
Added some tests.
This commit is contained in:
Ben
2018-10-20 15:50:53 +02:00
parent 4e48961c2b
commit 9abedf3160
3 changed files with 113 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
app/Support/Import/Routine/FinTS/StageImportDataHandler.php
View File

@@ -34,6 +34,7 @@ use FireflyIII\Models\TransactionType;
use FireflyIII\Repositories\Account\AccountRepositoryInterface;
use FireflyIII\Repositories\ImportJob\ImportJobRepositoryInterface;
use FireflyIII\Support\FinTS\FinTS;
use FireflyIII\Support\FinTS\MetadataParser;
use FireflyIII\Support\Import\Routine\File\OpposingAccountMapper;
use Illuminate\Support\Facades\Log;
@@ -141,11 +142,14 @@ class StageImportDataHandler
Log::debug('Both are assets, will make transfer.');
}
$metadataParser = new MetadataParser();
$description = $metadataParser->getDescription($transaction);
$storeData = [
'user' => $this->importJob->user_id,
'type' => $type,
'date' => $transaction->getValutaDate()->format('Y-m-d'),
'description' => $this->getDescription($transaction),
'description' => $description,
'piggy_bank_id' => null,
'piggy_bank_name' => null,
'bill_id' => null,
@@ -182,14 +186,4 @@ class StageImportDataHandler
return $storeData;
}
private function getDescription(FinTSTransaction $transaction)
{
//Given a description like 'EREF+AbcCRED+DE123SVWZ+DefABWA+Ghi' or 'EREF+AbcCRED+DE123SVWZ+Def' return 'Def'
$finTSDescription = $transaction->getDescription1();
if (preg_match('/SVWZ\+([^\+]*)([A-Z]{4}\+|$)/', $finTSDescription, $matches) === 1) {
return $matches[1];
}
return $finTSDescription;
}
}