Improved heuristic for single-transaction VOP results

Proposed by ampaze@ in #513 (comment).

Co-authored-by: ampaze <[email protected]>
Co-authored-by: Philipp Keck <[email protected]>

Author: Philipp91

lib/Fhp/Segment/VPP/VopHelper.php

@@ -109,18 +109,31 @@ public static function checkVopConfirmationRequired(
             if ($hivpp->ergebnisVopPruefungEinzeltransaktion === null) {
                 throw new UnsupportedException('Missing paymentStatusReport and ergebnisVopPruefungEinzeltransaktion');
             }
-            $verificationResultCode = $hivpp->ergebnisVopPruefungEinzeltransaktion->vopPruefergebnis;
+            $verificationResult = VopVerificationResult::parse(
+                $hivpp->ergebnisVopPruefungEinzeltransaktion->vopPruefergebnis
+            );
             $verificationNotApplicableReason = $hivpp->ergebnisVopPruefungEinzeltransaktion->grundRVNA;
         } else {
             $report = simplexml_load_string($hivpp->paymentStatusReport->getData());
-            $verificationResultCode = $report->CstmrPmtStsRpt->OrgnlGrpInfAndSts->GrpSts ?: null;
+            $verificationResult = VopVerificationResult::parse(
+                $report->CstmrPmtStsRpt->OrgnlGrpInfAndSts->GrpSts ?: null
+            );
+
+            // For a single transaction, we can do better than "CompletedPartialMatch",
+            // which can indicate either CompletedCloseMatch or CompletedNoMatch
+            if (intval($report->CstmrPmtStsRpt->OrgnlGrpInfAndSts->OrgnlNbOfTxs ?: 0) === 1
+                && $verificationResult === VopVerificationResult::CompletedPartialMatch
+                && $verificationResultCode = $report->CstmrPmtStsRpt->OrgnlPmtInfAndSts->TxInfAndSts?->TxSts
+            ) {
+                $verificationResult = VopVerificationResult::parse($verificationResultCode);
+            }
         }
 
         return new VopConfirmationRequestImpl(
             $hivpp->vopId,
             $hivpp->vopIdGueltigBis?->asDateTime(),
             $hivpp->aufklaerungstextAutorisierungTrotzAbweichung,
-            VopVerificationResult::parse($verificationResultCode),
+            $verificationResult,
             $verificationNotApplicableReason,
         );
     }

lib/Tests/Fhp/Integration/Atruvia/SendTransferVoPTest.php

@@ -125,7 +125,7 @@ public function testVopWithResultPartialMatch(): void
         $this->assertFalse($action->needsTan());
         $this->assertFalse($action->isDone());
         $this->assertEquals(
-            VopVerificationResult::CompletedPartialMatch,
+            VopVerificationResult::CompletedNoMatch,
             $action->getVopConfirmationRequest()->getVerificationResult()
         );