OC notifications partyBankId

Author: simonredfern

obp-api/src/main/scala/code/bankconnectors/opencorridor/OpenCorridorSettlement.scala

@@ -260,22 +260,25 @@ object OpenCorridorSettlement extends MdcLoggable {
 
       // Enqueue the Interface C messages in this same DB transaction (the outbox).
       // Credit notifications went to each beneficiary at promise-report-back time
-      // (OpenCorridorProcessor); settlement sends each beneficiary an advice so
-      // its already-paid-out credits get marked settled.
+      // (OpenCorridorProcessor); settlement sends BOTH party banks an advice with
+      // the FULL covered list, so each node stamps its already-paid-out credits
+      // AND its own outbound promises settled — including the party that did not
+      // trigger the settle, which otherwise never learns of the coverage (the
+      // instruction only moves money, and at net zero it is not sent at all).
       settlementAdviceCount <- Future {
-        covered.groupBy(_.mTo_BankId.get).map { case (beneficiaryBankId, rows) =>
-          val advice = OutBoundOpenCorridorSettlementAdvice(
-            settlement_id = settlementTrId,
-            currency = currency,
-            net_amount = netAbs.toString(),
-            debtor_bank_id = debtorBankId,
-            creditor_bank_id = creditorBankId,
-            covered_transaction_request_ids = rows.map(_.mTransactionRequestId.get),
-            idempotency_key = settlementTrId
-          )
+        val advice = OutBoundOpenCorridorSettlementAdvice(
+          settlement_id = settlementTrId,
+          currency = currency,
+          net_amount = netAbs.toString(),
+          debtor_bank_id = debtorBankId,
+          creditor_bank_id = creditorBankId,
+          covered_transaction_request_ids = covered.map(_.mTransactionRequestId.get),
+          idempotency_key = settlementTrId
+        )
+        Set(bankIdA, bankIdB).map { partyBankId =>
           MessageOutbox.enqueue(
             MessageOutbox.TYPE_OPEN_CORRIDOR, settlementTrId, MessageOutbox.SUBJECT_TYPE_SETTLEMENT_ID,
-            "obp_settlement_advice", beneficiaryBankId, Serialization.write(advice))
+            "obp_settlement_advice", partyBankId, Serialization.write(advice))
         }.size
       }
       settlementInstructionCount <- Future {

obp-api/src/test/scala/code/api/v7_0_0/Http4s700RoutesTest.scala

@@ -2643,13 +2643,15 @@ class Http4s700RoutesTest extends ServerSetupWithTestData {
       outboxRows.size shouldBe 3
       val adviceRows = outboxRows.filter(_.operationName == "obp_settlement_advice")
       adviceRows.map(_.targetId).sorted shouldBe List(testBankId1.value, testBankId2.value).sorted
-      val bank2Advice = adviceRows.find(_.targetId == testBankId2.value)
-        .map(row => parse(row.payloadJson))
-        .getOrElse(fail("bank2's settlement advice should be enqueued"))
-      (bank2Advice \ "settlement_id") shouldBe JString(settlementId)
-      (bank2Advice \ "covered_transaction_request_ids") match {
-        case JArray(ids) => ids.collect { case JString(id) => id }.toSet shouldBe Set(promise1, promise2)
-        case _ => fail("covered_transaction_request_ids should be an array")
+      // Both party banks get the advice with the FULL covered list (both
+      // directions): each node stamps its credits AND its own promises from it.
+      adviceRows.foreach { row =>
+        val advice = parse(row.payloadJson)
+        (advice \ "settlement_id") shouldBe JString(settlementId)
+        (advice \ "covered_transaction_request_ids") match {
+          case JArray(ids) => ids.collect { case JString(id) => id }.toSet shouldBe Set(promise1, promise2, promise3)
+          case _ => fail("covered_transaction_request_ids should be an array")
+        }
       }
       val instructionRow = outboxRows.filter(_.operationName == "obp_settlement_instruction") match {
         case row :: Nil => row

obp-commons/src/main/scala/com/openbankproject/commons/dto/OpenCorridorInterfaceC.scala

@@ -107,11 +107,15 @@ case class OutBoundOpenCorridorSettlementInstruction(
 )
 
 /**
- * `obp_settlement_advice` — published to each BENEFICIARY bank's vhost after a
- * netted settle: "the promises you already paid out against are now covered".
- * Purely reconciliatory — no money moves on this message (the debtor's
- * `obp_settlement_instruction` does that). One advice per beneficiary bank,
- * listing exactly the covered promise ids where that bank was the creditor.
+ * `obp_settlement_advice` — published to BOTH party banks' vhosts after a
+ * netted settle: "these promises are now covered". Purely reconciliatory — no
+ * money moves on this message (the debtor's `obp_settlement_instruction` does
+ * that, and at net zero no instruction exists at all — this advice is then the
+ * only settle-time message either bank receives).
+ * `covered_transaction_request_ids` is the FULL covered list of the pair, both
+ * directions: each node stamps whatever matches its own records (credits it
+ * paid out AND its own outbound promises); ids of the counterparty's records
+ * match nothing there and are ignored.
  * Credit notifications themselves travel at promise-report-back time, not here.
  */
 case class OutBoundOpenCorridorSettlementAdvice(