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

Experimental fix for #2031

Browse Source
This commit is contained in:
James Cole
2019-01-27 21:23:18 +01:00
parent 968505ac0e
commit d905849b71
6 changed files with 98 additions and 218 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
app/Import/Converter/RabobankDebitCredit.php → app/Import/Converter/BankDebitCredit.php
View File

@@ -1,7 +1,7 @@
<?php <?php
/** /**
* RabobankDebitCredit.php * BankDebitCredit.php
* Copyright (c) 2017 thegrumpydictator@gmail.com * Copyright (c) 2019 thegrumpydictator@gmail.com
* *
* This file is part of Firefly III. * This file is part of Firefly III.
* *
@@ -18,41 +18,40 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with Firefly III. If not, see <http://www.gnu.org/licenses/>. * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
*/ */
declare(strict_types=1); declare(strict_types=1);
namespace FireflyIII\Import\Converter; namespace FireflyIII\Import\Converter;
use Log; use Log;
/** /**
* Class RabobankDebitCredit. *
* Class BankDebitCredit
*/ */
class RabobankDebitCredit implements ConverterInterface class BankDebitCredit implements ConverterInterface
{ {
/** /**
* Convert D or A to integer values. * Convert a value.
*
* @return mixed
* *
* @param $value * @param $value
*
* @return int
*/ */
public function convert($value): int public function convert($value): int
{ {
Log::debug('Going to convert ', ['value' => $value]); Log::debug('Going to convert ', ['value' => $value]);
$negative = [
if ('D' === $value) { 'D', // Old style Rabobank (NL). Short for "Debit"
Log::debug('Return -1'); 'A', // New style Rabobank (NL). Short for "Af"
'Af', // ING (NL).
'Debet', // Triodos (NL)
];
if (\in_array(trim($value), $negative, true)) {
return -1; return -1;
} }
// old format:
if ('A' === $value) {
Log::debug('Return -1');
return -1;
}
Log::debug('Return 1');
return 1; return 1;
} }

53
app/Import/Converter/INGDebitCredit.php
View File

@@ -1,53 +0,0 @@
<?php
/**
* INGDebitCredit.php
* Copyright (c) 2017 thegrumpydictator@gmail.com
*
* This file is part of Firefly III.
*
* Firefly III is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* Firefly III is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
*/
declare(strict_types=1);
namespace FireflyIII\Import\Converter;
use Log;
/**
* Class INGDebitCredit.
*/
class INGDebitCredit implements ConverterInterface
{
/**
* Convert Af or Bij to correct integer values.
*
* @param $value
*
* @return int
*/
public function convert($value): int
{
Log::debug('Going to convert ing debit credit', ['value' => $value]);
if ('Af' === $value) {
Log::debug('Return -1');
return -1;
}
Log::debug('Return 1');
return 1;
}
}

10
config/csv.php
View File

@@ -213,13 +213,19 @@ return [
'rabo-debit-credit' => [ 'rabo-debit-credit' => [
'mappable' => false, 'mappable' => false,
'pre-process-map' => false, 'pre-process-map' => false,
'converter' => 'RabobankDebitCredit', 'converter' => 'BankDebitCredit',
'field' => 'amount-modifier', 'field' => 'amount-modifier',
], ],
'ing-debit-credit' => [ 'ing-debit-credit' => [
'mappable' => false, 'mappable' => false,
'pre-process-map' => false, 'pre-process-map' => false,
'converter' => 'INGDebitCredit', 'converter' => 'BankDebitCredit',
'field' => 'amount-modifier',
],
'generic-debit-credit' => [
'mappable' => false,
'pre-process-map' => false,
'converter' => 'BankDebitCredit',
'field' => 'amount-modifier', 'field' => 'amount-modifier',
], ],
'category-id' => [ 'category-id' => [

1
resources/lang/en_US/import.php
View File

@@ -307,6 +307,7 @@ return [
'column_opposing-name' => 'Opposing account (name)', 'column_opposing-name' => 'Opposing account (name)',
'column_rabo-debit-credit' => 'Rabobank specific debit/credit indicator', 'column_rabo-debit-credit' => 'Rabobank specific debit/credit indicator',
'column_ing-debit-credit' => 'ING specific debit/credit indicator', 'column_ing-debit-credit' => 'ING specific debit/credit indicator',
'column_generic-debit-credit' => 'Generic bank debit/credit indicator',
'column_sepa-ct-id' => 'SEPA end-to-end Identifier', 'column_sepa-ct-id' => 'SEPA end-to-end Identifier',
'column_sepa-ct-op' => 'SEPA Opposing Account Identifier', 'column_sepa-ct-op' => 'SEPA Opposing Account Identifier',
'column_sepa-db' => 'SEPA Mandate Identifier', 'column_sepa-db' => 'SEPA Mandate Identifier',

37
tests/Unit/Import/Converter/INGDebitCreditTest.php → tests/Unit/Import/Converter/BankDebitCreditTest.php
View File

@@ -23,14 +23,16 @@ declare(strict_types=1);
namespace Tests\Unit\Import\Converter; namespace Tests\Unit\Import\Converter;
use FireflyIII\Import\Converter\BankDebitCredit;
use FireflyIII\Import\Converter\INGDebitCredit; use FireflyIII\Import\Converter\INGDebitCredit;
use Log; use Log;
use Tests\TestCase; use Tests\TestCase;
/** /**
* Class INGDebitCreditTest *
* Class BankDebitCreditTest
*/ */
class INGDebitCreditTest extends TestCase class BankDebitCreditTest extends TestCase
{ {
/** /**
* *
@@ -41,34 +43,53 @@ class INGDebitCreditTest extends TestCase
Log::info(sprintf('Now in %s.', \get_class($this))); Log::info(sprintf('Now in %s.', \get_class($this)));
} }
/**
* @covers \FireflyIII\Import\Converter\BankDebitCredit
*/
public function testConvertA(): void
{
$converter = new BankDebitCredit;
$result = $converter->convert('A');
$this->assertEquals(-1, $result);
}
/** /**
* @covers \FireflyIII\Import\Converter\INGDebitCredit * @covers \FireflyIII\Import\Converter\BankDebitCredit
*/ */
public function testConvertAf(): void public function testConvertAf(): void
{ {
$converter = new INGDebitCredit; $converter = new BankDebitCredit;
$result = $converter->convert('Af'); $result = $converter->convert('Af');
$this->assertEquals(-1, $result); $this->assertEquals(-1, $result);
} }
/** /**
* @covers \FireflyIII\Import\Converter\INGDebitCredit * @covers \FireflyIII\Import\Converter\BankDebitCredit
*/ */
public function testConvertAnything(): void public function testConvertAnything(): void
{ {
$converter = new INGDebitCredit; $converter = new BankDebitCredit;
$result = $converter->convert('9083jkdkj'); $result = $converter->convert('9083jkdkj');
$this->assertEquals(1, $result); $this->assertEquals(1, $result);
} }
/** /**
* @covers \FireflyIII\Import\Converter\INGDebitCredit * @covers \FireflyIII\Import\Converter\BankDebitCredit
*/ */
public function testConvertBij(): void public function testConvertBij(): void
{ {
$converter = new INGDebitCredit; $converter = new BankDebitCredit;
$result = $converter->convert('Bij'); $result = $converter->convert('Bij');
$this->assertEquals(1, $result); $this->assertEquals(1, $result);
} }
/**
* @covers \FireflyIII\Import\Converter\BankDebitCredit
*/
public function testConvertDebet(): void
{
$converter = new BankDebitCredit;
$result = $converter->convert('Debet');
$this->assertEquals(-1, $result);
}
} }

94
tests/Unit/Import/Converter/RabobankDebitCreditTest.php
View File

@@ -1,94 +0,0 @@
<?php
/**
* RabobankDebitCreditTest.php
* Copyright (c) 2017 thegrumpydictator@gmail.com
*
* This file is part of Firefly III.
*
* Firefly III is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* Firefly III is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
*/
declare(strict_types=1);
namespace Tests\Unit\Import\Converter;
use FireflyIII\Import\Converter\RabobankDebitCredit;
use Log;
use Tests\TestCase;
/**
* Class RabobankDebitCredit
*/
class RabobankDebitCreditTest extends TestCase
{
/**
*
*/
public function setUp(): void
{
parent::setUp();
Log::info(sprintf('Now in %s.', \get_class($this)));
}
/**
* @covers \FireflyIII\Import\Converter\RabobankDebitCredit
*/
public function testConvertAnything(): void
{
$converter = new RabobankDebitCredit;
$result = $converter->convert('9083jkdkj');
$this->assertEquals(1, $result);
}
/**
* @covers \FireflyIII\Import\Converter\RabobankDebitCredit
*/
public function testConvertCredit(): void
{
$converter = new RabobankDebitCredit;
$result = $converter->convert('C');
$this->assertEquals(1, $result);
}
/**
* @covers \FireflyIII\Import\Converter\RabobankDebitCredit
*/
public function testConvertCreditOld(): void
{
$converter = new RabobankDebitCredit;
$result = $converter->convert('B');
$this->assertEquals(1, $result);
}
/**
* @covers \FireflyIII\Import\Converter\RabobankDebitCredit
*/
public function testConvertDebit(): void
{
$converter = new RabobankDebitCredit;
$result = $converter->convert('D');
$this->assertEquals(-1, $result);
}
/**
* @covers \FireflyIII\Import\Converter\RabobankDebitCredit
*/
public function testConvertDebitOld(): void
{
$converter = new RabobankDebitCredit;
$result = $converter->convert('A');
$this->assertEquals(-1, $result);
}
}