Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 36 additions & 0 deletions Tests/Unit/Segment/HKWPDTest.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
<?php

namespace Fhp\Tests\Unit\Segment;

use Fhp\Segment\Common\Kik;
use Fhp\Segment\Common\KtvV3;
use Fhp\Segment\WPD\HIWPDSv6;
use Fhp\Segment\WPD\HKWPDv6;
use Fhp\Syntax\Parser;
use PHPUnit\Framework\TestCase;

/**
* Depotaufstellung in Version 6, wie sie die DKB in ihren Bankparametern meldet.
*/
class HKWPDTest extends TestCase
{
public function testParametersOfVersion6()
{
/** @var HIWPDSv6 $hiwpds */
$hiwpds = Parser::parseSegment("HIWPDS:60:6:3+1+1+0+N:N:N'", HIWPDSv6::class);
$this->assertEquals(6, $hiwpds->getVersion());
$this->assertFalse($hiwpds->getParameter()->getEingabeAnzahlEintraegeErlaubt());
$this->assertFalse($hiwpds->getParameter()->getWaehrungDepotaufstellungWaehlbar());
$this->assertFalse($hiwpds->getParameter()->getKursqualitaetWaehlbar());
}

public function testRequestOfVersion6()
{
$hkwpd = HKWPDv6::create(KtvV3::create('502022353', null, Kik::create('12030000')));
$hkwpd->setSegmentNumber(3);
$this->assertEquals("HKWPD:3:6+502022353::280:12030000'", $hkwpd->serialize());

$hkwpd->setPaginationToken('TOKEN');
$this->assertEquals("HKWPD:3:6+502022353::280:12030000++++TOKEN'", $hkwpd->serialize());
}
}
9 changes: 8 additions & 1 deletion src/Action/GetDepotAufstellung.php
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,9 @@
use Fhp\Segment\WPD\HIWPD;
use Fhp\Segment\WPD\HIWPDS;
use Fhp\Segment\WPD\HIWPDv5;
use Fhp\Segment\WPD\HIWPDv6;
use Fhp\Segment\WPD\HKWPDv5;
use Fhp\Segment\WPD\HKWPDv6;
use Fhp\UnsupportedException;

/**
Expand Down Expand Up @@ -119,6 +121,8 @@ protected function createRequest(BPD $bpd, ?UPD $upd)
switch ($hiwpds->getVersion()) {
case 5:
return HKWPDv5::create(KtvV3::fromAccount($this->account));
case 6:
return HKWPDv6::create(KtvV3::fromAccount($this->account));
default:
throw new UnsupportedException('Unsupported HKWPD version: ' . $hiwpds->getVersion());
}
Expand All @@ -129,7 +133,10 @@ public function processResponse(Message $response)
parent::processResponse($response);

$isUnavailable = $response->findRueckmeldung(Rueckmeldungscode::NICHT_VERFUEGBAR) !== null;
$responseHiwpd = $response->findSegments(HIWPDv5::class);
$responseHiwpd = array_merge(
$response->findSegments(HIWPDv5::class),
$response->findSegments(HIWPDv6::class)
);

$numResponseSegments = count($responseHiwpd);
if (!$isUnavailable && $numResponseSegments < count($this->getRequestSegmentNumbers())) {
Expand Down
22 changes: 22 additions & 0 deletions src/Segment/WPD/HIWPDSv6.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
<?php
/** @noinspection PhpUnused */

namespace Fhp\Segment\WPD;

use Fhp\Segment\BaseGeschaeftsvorfallparameter;

/**
* Segment: Parameter Depotaufstellung
*
* @link https://www.hbci-zka.de/dokumente/spezifikation_deutsch/fintsv3/FinTS_3.0_Messages_Geschaeftsvorfaelle_2015-08-07_final_version.pdf
* Section: O - Parameter Depotaufstellung
*/
class HIWPDSv6 extends BaseGeschaeftsvorfallparameter implements HIWPDS
{
public ParameterDepotaufstellungV2 $parameter;

public function getParameter(): ParameterDepotaufstellung
{
return $this->parameter;
}
}
24 changes: 24 additions & 0 deletions src/Segment/WPD/HIWPDv6.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
<?php
/** @noinspection PhpUnused */

namespace Fhp\Segment\WPD;

use Fhp\Segment\BaseSegment;
use Fhp\Syntax\Bin;

/**
* Segment: Depotaufstellung Kreditinstitutsrückmledung (Version 6)
*
* @link https://www.hbci-zka.de/dokumente/spezifikation_deutsch/fintsv3/FinTS_3.0_Messages_Geschaeftsvorfaelle_2015-08-07_final_version.pdf
* Section: C.4.3.1b
*/
class HIWPDv6 extends BaseSegment implements HIWPD
{
/** Uses SWIFT format MT353, version SRG 1998 */
public Bin $depotaufstellung;

public function getDepotaufstellung(): Bin
{
return $this->depotaufstellung;
}
}
35 changes: 35 additions & 0 deletions src/Segment/WPD/HKWPDv6.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
<?php
/** @noinspection PhpUnused */

namespace Fhp\Segment\WPD;

use Fhp\Segment\BaseSegment;
use Fhp\Segment\Paginateable;

/**
* Segment: Depotaufstellung anfordern (Version 6)
*
* @link https://www.hbci-zka.de/dokumente/spezifikation_deutsch/fintsv3/FinTS_3.0_Messages_Geschaeftsvorfaelle_2015-08-07_final_version.pdf
* Section: C.4.3.1a
*/
class HKWPDv6 extends BaseSegment implements Paginateable
{
public \Fhp\Segment\Common\KtvV3 $depot;
public ?string $waehrungDerDepotaufstellung = null;
public ?\Fhp\Segment\Common\Kursqualitaet $kursqualitaet = null;
/** Only allowed if {@link ParameterDepotaufstellungV2::$eingabeAnzahlEintraegeErlaubt} says so. */
public ?int $maximaleAnzahlEintraege = null;
public ?string $aufsetzpunkt = null;

public static function create(\Fhp\Segment\Common\KtvV3 $ktv): HKWPDv6
{
$result = HKWPDv6::createEmpty();
$result->depot = $ktv;
return $result;
}

public function setPaginationToken(string $paginationToken)
{
$this->aufsetzpunkt = $paginationToken;
}
}
Loading