From 8aaa46756e372dea81c280d161931c38718c2bf5 Mon Sep 17 00:00:00 2001
From: hongwei <hongwei@tesobe.com>
Date: Mon, 11 Aug 2025 14:43:29 +0200
Subject: [PATCH 1/6] refactor/uncomment the soap plugin

---
 obp-api/pom.xml | 36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/obp-api/pom.xml b/obp-api/pom.xml
index 9955f4ad7d..3113454c72 100644
--- a/obp-api/pom.xml
+++ b/obp-api/pom.xml
@@ -693,24 +693,24 @@
         </configuration>
       </plugin>
       <!--soap related plugin begin-->
-<!--      <plugin>-->
-<!--        <groupId>org.scalaxb</groupId>-->
-<!--        <artifactId>scalaxb-maven-plugin</artifactId>-->
-<!--        <version>1.7.5</version>-->
-<!--        <configuration>-->
-<!--          <packageName>code.adapter.soap</packageName>-->
-<!--          <wsdlDirectory>src/main/resources/custom_webapp/wsdl</wsdlDirectory>-->
-<!--          <xsdDirectory>src/main/resources/custom_webapp/xsd</xsdDirectory>-->
-<!--        </configuration>-->
-<!--        <executions>-->
-<!--          <execution>-->
-<!--            <id>scalaxb</id>-->
-<!--            <goals>-->
-<!--              <goal>generate</goal>-->
-<!--            </goals>-->
-<!--          </execution>-->
-<!--        </executions>-->
-<!--      </plugin>-->
+      <plugin>
+        <groupId>org.scalaxb</groupId>
+        <artifactId>scalaxb-maven-plugin</artifactId>
+        <version>1.7.5</version>
+        <configuration>
+          <packageName>code.adapter.soap</packageName>
+          <wsdlDirectory>src/main/resources/custom_webapp/wsdl</wsdlDirectory>
+          <xsdDirectory>src/main/resources/custom_webapp/xsd</xsdDirectory>
+        </configuration>
+        <executions>
+          <execution>
+            <id>scalaxb</id>
+            <goals>
+              <goal>generate</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
       <!--grpc related plugin begin-->
       <!-- currently not need, enable this plugin when need generate new grpc code.
       <plugin>

From 68e413076f19b242fccfb3a2b4bf53a09dccbadb Mon Sep 17 00:00:00 2001
From: hongwei <hongwei@tesobe.com>
Date: Mon, 18 Aug 2025 16:25:55 +0200
Subject: [PATCH 2/6] refactor/improve error handling in LocalMappedConnector
 for account number validation

---
 .../scala/code/bankconnectors/LocalMappedConnector.scala  | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/obp-api/src/main/scala/code/bankconnectors/LocalMappedConnector.scala b/obp-api/src/main/scala/code/bankconnectors/LocalMappedConnector.scala
index 8c112f5eec..f4c1aa79ae 100644
--- a/obp-api/src/main/scala/code/bankconnectors/LocalMappedConnector.scala
+++ b/obp-api/src/main/scala/code/bankconnectors/LocalMappedConnector.scala
@@ -1026,12 +1026,12 @@ object LocalMappedConnector extends Connector with MdcLoggable {
         else
           s"$AccountNumberNotUniqueError, current BankId is ${bankId.head.value}, AccountNumber is $accountNumber"
           
-      if(bankAccounts.length > 1){
+      if(bankAccounts.length > 1){ // If the account number is not unique, return the error message
         (Failure(errorMessage), callContext)
-      }else if (bankAccounts.length == 1){
+      }else if (bankAccounts.length == 1){  // If the account number is unique, return the account
         (Full(bankAccounts.head), callContext)
-      }else{
-        (Failure(errorMessage), callContext)
+      }else{ // If the account number is not found, return the error message
+        (Failure(s"$InvalidAccountNumber, current AccountNumber is $accountNumber"), callContext)
       }
     }
 

From 192603d652c6b684fdc96edd6e86973bad4fe905 Mon Sep 17 00:00:00 2001
From: hongwei <hongwei@tesobe.com>
Date: Tue, 19 Aug 2025 09:47:33 +0200
Subject: [PATCH 3/6] refactor/comment the soap plugin

---
 obp-api/pom.xml | 36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/obp-api/pom.xml b/obp-api/pom.xml
index 3113454c72..9955f4ad7d 100644
--- a/obp-api/pom.xml
+++ b/obp-api/pom.xml
@@ -693,24 +693,24 @@
         </configuration>
       </plugin>
       <!--soap related plugin begin-->
-      <plugin>
-        <groupId>org.scalaxb</groupId>
-        <artifactId>scalaxb-maven-plugin</artifactId>
-        <version>1.7.5</version>
-        <configuration>
-          <packageName>code.adapter.soap</packageName>
-          <wsdlDirectory>src/main/resources/custom_webapp/wsdl</wsdlDirectory>
-          <xsdDirectory>src/main/resources/custom_webapp/xsd</xsdDirectory>
-        </configuration>
-        <executions>
-          <execution>
-            <id>scalaxb</id>
-            <goals>
-              <goal>generate</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
+<!--      <plugin>-->
+<!--        <groupId>org.scalaxb</groupId>-->
+<!--        <artifactId>scalaxb-maven-plugin</artifactId>-->
+<!--        <version>1.7.5</version>-->
+<!--        <configuration>-->
+<!--          <packageName>code.adapter.soap</packageName>-->
+<!--          <wsdlDirectory>src/main/resources/custom_webapp/wsdl</wsdlDirectory>-->
+<!--          <xsdDirectory>src/main/resources/custom_webapp/xsd</xsdDirectory>-->
+<!--        </configuration>-->
+<!--        <executions>-->
+<!--          <execution>-->
+<!--            <id>scalaxb</id>-->
+<!--            <goals>-->
+<!--              <goal>generate</goal>-->
+<!--            </goals>-->
+<!--          </execution>-->
+<!--        </executions>-->
+<!--      </plugin>-->
       <!--grpc related plugin begin-->
       <!-- currently not need, enable this plugin when need generate new grpc code.
       <plugin>

From 417fcd1e372a5e65dcf1bcec04f4bec1d9646d33 Mon Sep 17 00:00:00 2001
From: hongwei <hongwei@tesobe.com>
Date: Tue, 19 Aug 2025 09:55:31 +0200
Subject: [PATCH 4/6] feature/add getOtherBankAccountByNumber method to handle
 external bank accounts and create in-memory accounts for payments

---
 .../main/scala/code/api/util/NewStyle.scala   |  6 ++
 .../scala/code/bankconnectors/Connector.scala |  4 ++
 .../bankconnectors/LocalMappedConnector.scala | 56 +++++++++++++++++++
 3 files changed, 66 insertions(+)

diff --git a/obp-api/src/main/scala/code/api/util/NewStyle.scala b/obp-api/src/main/scala/code/api/util/NewStyle.scala
index 41797fa888..a9825b53f8 100644
--- a/obp-api/src/main/scala/code/api/util/NewStyle.scala
+++ b/obp-api/src/main/scala/code/api/util/NewStyle.scala
@@ -450,6 +450,12 @@ object NewStyle extends MdcLoggable{
         (unboxFullOrFail(i._1, callContext, s"$BankAccountNotFound Current BankId is $bankId and Current AccountNumber is $accountNumber", 404), i._2)
       }
 
+    // this is for the bankAccount from external, maybe can not get any account, so we will create a in-memory account for payments.
+    def getOtherBankAccountByNumber(bankId : Option[BankId], accountNumber : String, counterparty: Option[CounterpartyTrait], callContext: Option[CallContext]) : OBPReturnType[(BankAccount)] = {
+      Connector.connector.vend.getOtherBankAccountByNumber(bankId, accountNumber, counterparty, callContext) } map { i =>
+        (unboxFullOrFail(i._1, callContext, s"$BankAccountNotFound Current BankId is $bankId and Current AccountNumber is $accountNumber", 404), i._2)
+      }
+
     def getBankSettlementAccounts(bankId: BankId, callContext: Option[CallContext]): OBPReturnType[List[BankAccount]] = {
       Connector.connector.vend.getBankSettlementAccounts(bankId: BankId, callContext: Option[CallContext]) map { i =>
         (unboxFullOrFail(i._1, callContext,s"$BankNotFound Current BankId is $bankId", 404 ), i._2)
diff --git a/obp-api/src/main/scala/code/bankconnectors/Connector.scala b/obp-api/src/main/scala/code/bankconnectors/Connector.scala
index 2d3a8ae3e7..a822d23d19 100644
--- a/obp-api/src/main/scala/code/bankconnectors/Connector.scala
+++ b/obp-api/src/main/scala/code/bankconnectors/Connector.scala
@@ -530,6 +530,10 @@ trait Connector extends MdcLoggable {
   
   def getBankAccountByNumber(bankId : Option[BankId], accountNumber : String, callContext: Option[CallContext]) : OBPReturnType[Box[(BankAccount)]] = Future {(Failure(setUnimplementedError(nameOf(getBankAccountByNumber _))), callContext)}
 
+  // This method handles external bank accounts that may not exist in our database.
+  // If the account is not found, we create an in-memory account using counterparty information for payment processing.
+  def getOtherBankAccountByNumber(bankId : Option[BankId], accountNumber : String, counterparty: Option[CounterpartyTrait], callContext: Option[CallContext]) : OBPReturnType[Box[(BankAccount)]] = Future {(Failure(setUnimplementedError(nameOf(getOtherBankAccountByNumber _))), callContext)}
+
   def getBankAccountByRoutings(bankAccountRoutings: BankAccountRoutings, callContext: Option[CallContext]) : OBPReturnType[Box[(BankAccount)]] = Future {(Failure(setUnimplementedError(nameOf(getBankAccountByRoutings _))), callContext)}
   
   def getCounterpartyFromTransaction(bankId: BankId, accountId: AccountId, counterpartyId: String, callContext: Option[CallContext]): OBPReturnType[Box[Counterparty]] = Future {(Failure(setUnimplementedError(nameOf(checkBankAccountExists _))), callContext)}
diff --git a/obp-api/src/main/scala/code/bankconnectors/LocalMappedConnector.scala b/obp-api/src/main/scala/code/bankconnectors/LocalMappedConnector.scala
index f4c1aa79ae..05ed44ead3 100644
--- a/obp-api/src/main/scala/code/bankconnectors/LocalMappedConnector.scala
+++ b/obp-api/src/main/scala/code/bankconnectors/LocalMappedConnector.scala
@@ -1035,6 +1035,62 @@ object LocalMappedConnector extends Connector with MdcLoggable {
       }
     }
 
+  // this is for the bankAccount from external, maybe can not get any account, so we will create a in-memory account for payments.
+  override def getOtherBankAccountByNumber(bankId : Option[BankId], accountNumber : String, counterparty: Option[CounterpartyTrait], callContext: Option[CallContext]) : OBPReturnType[Box[(BankAccount)]] = 
+    Future {
+      // First try to get the account using existing method
+      val existingAccount = getBankAccountByNumber(bankId, accountNumber, callContext)
+      
+      Await.result(existingAccount, 5.seconds)._1 match {
+        case Full(account) => 
+          // If account found, return it
+          (Full(account), callContext)
+        case _ => 
+          // If account not found, create in-memory account from counterparty if available
+          counterparty match {
+            case Some(cp) =>
+              // Create in-memory account similar to BankingData.getBankAccountFromCounterparty
+              val accountRouting1 =
+                if (cp.otherAccountRoutingScheme.isEmpty) Nil
+                else List(AccountRouting(cp.otherAccountRoutingScheme, cp.otherAccountRoutingAddress))
+              val accountRouting2 =
+                if (cp.otherAccountSecondaryRoutingScheme.isEmpty) Nil
+                else List(AccountRouting(cp.otherAccountSecondaryRoutingScheme, cp.otherAccountSecondaryRoutingAddress))
+
+              // Due to the new field in the database, old counterparty have void currency, so by default, we set it to EUR
+              val counterpartyCurrency = if (cp.currency.nonEmpty) cp.currency else "EUR"
+
+              val inMemoryAccount = BankAccountCommons(
+                AccountId(if (cp.otherAccountSecondaryRoutingAddress.nonEmpty) cp.otherAccountSecondaryRoutingAddress else accountNumber), 
+                "", 0,
+                currency = counterpartyCurrency,
+                name = cp.name,
+                "", accountNumber, 
+                BankId(cp.otherBankRoutingAddress), 
+                new Date(), "",
+                accountRoutings = accountRouting1 ++ accountRouting2,
+                List.empty, 
+                accountHolder = cp.name,
+                Some(List(Attribute(
+                  name = "BANK_ROUTING_SCHEME",
+                  `type` = "STRING",
+                  value = cp.otherBankRoutingScheme
+                ),
+                  Attribute(
+                    name = "BANK_ROUTING_ADDRESS",
+                    `type` = "STRING",
+                    value = cp.otherBankRoutingAddress
+                  ),
+                ))
+              )
+              (Full(inMemoryAccount), callContext)
+            case None =>
+              // No counterparty provided, return failure
+              (Failure(s"$InvalidAccountNumber, current AccountNumber is $accountNumber and no counterparty provided for creating in-memory account"), callContext)
+          }
+      }
+    }
+
   override def getBankAccountByRoutings(
     bankAccountRoutings: BankAccountRoutings,
     callContext: Option[CallContext]

From 448aec29c619da2d60782b46fd60a0844b08cbe2 Mon Sep 17 00:00:00 2001
From: hongwei <hongwei@tesobe.com>
Date: Tue, 19 Aug 2025 10:09:21 +0200
Subject: [PATCH 5/6] refactor/update getOtherBankAccountByNumber method to
 improve handling of external bank accounts and in-memory account creation

---
 .../main/scala/code/api/util/NewStyle.scala   |  3 +-
 .../bankconnectors/LocalMappedConnector.scala | 93 ++++++++++---------
 .../main/scala/code/model/BankingData.scala   |  3 +-
 3 files changed, 53 insertions(+), 46 deletions(-)

diff --git a/obp-api/src/main/scala/code/api/util/NewStyle.scala b/obp-api/src/main/scala/code/api/util/NewStyle.scala
index a9825b53f8..24c9bc80e2 100644
--- a/obp-api/src/main/scala/code/api/util/NewStyle.scala
+++ b/obp-api/src/main/scala/code/api/util/NewStyle.scala
@@ -450,7 +450,8 @@ object NewStyle extends MdcLoggable{
         (unboxFullOrFail(i._1, callContext, s"$BankAccountNotFound Current BankId is $bankId and Current AccountNumber is $accountNumber", 404), i._2)
       }
 
-    // this is for the bankAccount from external, maybe can not get any account, so we will create a in-memory account for payments.
+    // This method handles external bank accounts that may not exist in our database.
+    // If the account is not found, we create an in-memory account using counterparty information for payment processing.
     def getOtherBankAccountByNumber(bankId : Option[BankId], accountNumber : String, counterparty: Option[CounterpartyTrait], callContext: Option[CallContext]) : OBPReturnType[(BankAccount)] = {
       Connector.connector.vend.getOtherBankAccountByNumber(bankId, accountNumber, counterparty, callContext) } map { i =>
         (unboxFullOrFail(i._1, callContext, s"$BankAccountNotFound Current BankId is $bankId and Current AccountNumber is $accountNumber", 404), i._2)
diff --git a/obp-api/src/main/scala/code/bankconnectors/LocalMappedConnector.scala b/obp-api/src/main/scala/code/bankconnectors/LocalMappedConnector.scala
index 05ed44ead3..0bfe96e38c 100644
--- a/obp-api/src/main/scala/code/bankconnectors/LocalMappedConnector.scala
+++ b/obp-api/src/main/scala/code/bankconnectors/LocalMappedConnector.scala
@@ -1035,61 +1035,66 @@ object LocalMappedConnector extends Connector with MdcLoggable {
       }
     }
 
-  // this is for the bankAccount from external, maybe can not get any account, so we will create a in-memory account for payments.
-  override def getOtherBankAccountByNumber(bankId : Option[BankId], accountNumber : String, counterparty: Option[CounterpartyTrait], callContext: Option[CallContext]) : OBPReturnType[Box[(BankAccount)]] = 
-    Future {
-      // First try to get the account using existing method
-      val existingAccount = getBankAccountByNumber(bankId, accountNumber, callContext)
-      
-      Await.result(existingAccount, 5.seconds)._1 match {
+  // This method handles external bank accounts that may not exist in our database.
+  // If the account is not found, we create an in-memory account using counterparty information for payment processing.
+  override def getOtherBankAccountByNumber(bankId : Option[BankId], accountNumber : String, counterparty: Option[CounterpartyTrait], callContext: Option[CallContext]) : OBPReturnType[Box[(BankAccount)]] = {
+    
+    for {
+      (existingAccountBox, updatedCallContext) <- getBankAccountByNumber(bankId, accountNumber, callContext)
+      (finalAccountBox, finalCallContext) <- existingAccountBox match {
         case Full(account) => 
-          // If account found, return it
-          (Full(account), callContext)
+          // If account found in database, return it
+          Future.successful((Full(account), updatedCallContext))
         case _ => 
-          // If account not found, create in-memory account from counterparty if available
+          // If account not found, check if we can create in-memory account
           counterparty match {
             case Some(cp) =>
-              // Create in-memory account similar to BankingData.getBankAccountFromCounterparty
-              val accountRouting1 =
-                if (cp.otherAccountRoutingScheme.isEmpty) Nil
-                else List(AccountRouting(cp.otherAccountRoutingScheme, cp.otherAccountRoutingAddress))
-              val accountRouting2 =
-                if (cp.otherAccountSecondaryRoutingScheme.isEmpty) Nil
-                else List(AccountRouting(cp.otherAccountSecondaryRoutingScheme, cp.otherAccountSecondaryRoutingAddress))
-
-              // Due to the new field in the database, old counterparty have void currency, so by default, we set it to EUR
-              val counterpartyCurrency = if (cp.currency.nonEmpty) cp.currency else "EUR"
-
-              val inMemoryAccount = BankAccountCommons(
-                AccountId(if (cp.otherAccountSecondaryRoutingAddress.nonEmpty) cp.otherAccountSecondaryRoutingAddress else accountNumber), 
-                "", 0,
-                currency = counterpartyCurrency,
-                name = cp.name,
-                "", accountNumber, 
-                BankId(cp.otherBankRoutingAddress), 
-                new Date(), "",
-                accountRoutings = accountRouting1 ++ accountRouting2,
-                List.empty, 
-                accountHolder = cp.name,
-                Some(List(Attribute(
-                  name = "BANK_ROUTING_SCHEME",
-                  `type` = "STRING",
-                  value = cp.otherBankRoutingScheme
-                ),
-                  Attribute(
-                    name = "BANK_ROUTING_ADDRESS",
+              // Create in-memory account using counterparty information
+              Future {
+                val accountRouting1 =
+                  if (cp.otherAccountRoutingScheme.isEmpty) Nil
+                  else List(AccountRouting(cp.otherAccountRoutingScheme, cp.otherAccountRoutingAddress))
+                val accountRouting2 =
+                  if (cp.otherAccountSecondaryRoutingScheme.isEmpty) Nil
+                  else List(AccountRouting(cp.otherAccountSecondaryRoutingScheme, cp.otherAccountSecondaryRoutingAddress))
+
+                // Due to the new field in the database, old counterparty have void currency, so by default, we set it to EUR
+                val counterpartyCurrency = if (cp.currency.nonEmpty) cp.currency else "EUR"
+
+                val inMemoryAccount = BankAccountCommons(
+                  AccountId(if (cp.otherAccountSecondaryRoutingAddress.nonEmpty) cp.otherAccountSecondaryRoutingAddress else accountNumber), 
+                  "", 0,
+                  currency = counterpartyCurrency,
+                  name = cp.name,
+                  "", accountNumber, 
+                  BankId(cp.otherBankRoutingAddress), 
+                  new Date(), "",
+                  accountRoutings = accountRouting1 ++ accountRouting2,
+                  List.empty, 
+                  accountHolder = cp.name,
+                  Some(List(Attribute(
+                    name = "BANK_ROUTING_SCHEME",
                     `type` = "STRING",
-                    value = cp.otherBankRoutingAddress
+                    value = cp.otherBankRoutingScheme
                   ),
-                ))
-              )
-              (Full(inMemoryAccount), callContext)
+                    Attribute(
+                      name = "BANK_ROUTING_ADDRESS",
+                      `type` = "STRING",
+                      value = cp.otherBankRoutingAddress
+                    ),
+                  ))
+                )
+                (Full(inMemoryAccount), updatedCallContext)
+              }
             case None =>
               // No counterparty provided, return failure
-              (Failure(s"$InvalidAccountNumber, current AccountNumber is $accountNumber and no counterparty provided for creating in-memory account"), callContext)
+              Future.successful((Failure(s"$InvalidAccountNumber, current AccountNumber is $accountNumber and no counterparty provided for creating in-memory account"), updatedCallContext))
           }
       }
+    } yield {
+      (finalAccountBox, finalCallContext)
     }
+  }
 
   override def getBankAccountByRoutings(
     bankAccountRoutings: BankAccountRoutings,
diff --git a/obp-api/src/main/scala/code/model/BankingData.scala b/obp-api/src/main/scala/code/model/BankingData.scala
index 89d770d978..1976fb38ab 100644
--- a/obp-api/src/main/scala/code/model/BankingData.scala
+++ b/obp-api/src/main/scala/code/model/BankingData.scala
@@ -476,9 +476,10 @@ object BankAccountX {
     else if (counterparty.otherAccountRoutingScheme.equalsIgnoreCase("ACCOUNT_NUMBER")|| counterparty.otherAccountRoutingScheme.equalsIgnoreCase("ACCOUNT_NO")){
       for{
         bankIdOption <- Future.successful(if(counterparty.otherBankRoutingAddress.isEmpty) None else Some(counterparty.otherBankRoutingAddress))
-        (account, callContext) <- NewStyle.function.getBankAccountByNumber(
+        (account, callContext) <- NewStyle.function.getOtherBankAccountByNumber(
           bankIdOption.map(BankId(_)),
           counterparty.otherAccountRoutingAddress,
+          Some(counterparty),
           callContext)
       } yield {
         (Full(account), callContext)

From 8077ac0116bb07a2a9a7e11ed6ae39469387f2ac Mon Sep 17 00:00:00 2001
From: hongwei <hongwei@tesobe.com>
Date: Tue, 19 Aug 2025 11:46:23 +0200
Subject: [PATCH 6/6] refactor/add TODO comment to getOtherBankAccountByNumber
 method for further understanding of external bank account handling

---
 obp-api/src/main/scala/code/bankconnectors/Connector.scala | 1 +
 1 file changed, 1 insertion(+)

diff --git a/obp-api/src/main/scala/code/bankconnectors/Connector.scala b/obp-api/src/main/scala/code/bankconnectors/Connector.scala
index a822d23d19..131e8ed6eb 100644
--- a/obp-api/src/main/scala/code/bankconnectors/Connector.scala
+++ b/obp-api/src/main/scala/code/bankconnectors/Connector.scala
@@ -532,6 +532,7 @@ trait Connector extends MdcLoggable {
 
   // This method handles external bank accounts that may not exist in our database.
   // If the account is not found, we create an in-memory account using counterparty information for payment processing.
+  //TODO understand more about this method.
   def getOtherBankAccountByNumber(bankId : Option[BankId], accountNumber : String, counterparty: Option[CounterpartyTrait], callContext: Option[CallContext]) : OBPReturnType[Box[(BankAccount)]] = Future {(Failure(setUnimplementedError(nameOf(getOtherBankAccountByNumber _))), callContext)}
 
   def getBankAccountByRoutings(bankAccountRoutings: BankAccountRoutings, callContext: Option[CallContext]) : OBPReturnType[Box[(BankAccount)]] = Future {(Failure(setUnimplementedError(nameOf(getBankAccountByRoutings _))), callContext)}