Addressing review commnents

openMF · Jul 5, 2024 · 770cf38 · 770cf38
1 parent 82412a3
commit 770cf38
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/src/main/java/org/mifos/connector/channel/api/implementation/TransferApiController.java b/src/main/java/org/mifos/connector/channel/api/implementation/TransferApiController.java
@@ -43,7 +43,7 @@ public GsmaP2PResponseDto transfer(String tenant, String batchId, String correla
                 objectMapper.writeValueAsString(requestBody));
         logger.info("Client correlation id: " + correlationId);
         logger.info("Batch id: " + batchId);
-        logger.info("Payee DFSP Id: " + payeeDFSPId);
+        logger.debug("Payee DFSP Id: {}", payeeDFSPId);
         producerTemplate.send("direct:post-transfer", exchange);
         Exception cause = exchange.getProperty(Exchange.EXCEPTION_CAUGHT, Exception.class);
         if (cause instanceof ClientStatusException) {

diff --git a/src/main/java/org/mifos/connector/channel/camel/routes/ChannelRouteBuilder.java b/src/main/java/org/mifos/connector/channel/camel/routes/ChannelRouteBuilder.java
@@ -6,7 +6,6 @@
 import static org.mifos.connector.channel.camel.config.CamelProperties.AUTH_TYPE;
 import static org.mifos.connector.channel.camel.config.CamelProperties.BATCH_ID;
 import static org.mifos.connector.channel.camel.config.CamelProperties.CLIENTCORRELATIONID;
-import static org.mifos.connector.channel.camel.config.CamelProperties.PAYEE_DFSP_ID;
 import static org.mifos.connector.channel.camel.config.CamelProperties.PAYMENT_SCHEME_HEADER;
 import static org.mifos.connector.channel.camel.config.CamelProperties.REGISTERING_INSTITUTION_ID;
 import static org.mifos.connector.channel.zeebe.ZeebeMessages.OPERATOR_MANUAL_RECOVERY;
@@ -59,6 +58,7 @@
 import org.mifos.connector.channel.utils.AMSUtils;
 import org.mifos.connector.channel.utils.Constants;
 import org.mifos.connector.channel.zeebe.ZeebeProcessStarter;
+import org.mifos.connector.channel.zeebe.ZeebeVariables;
 import org.mifos.connector.common.camel.AuthProcessor;
 import org.mifos.connector.common.camel.AuthProperties;
 import org.mifos.connector.common.camel.ErrorHandlerRouteBuilder;
@@ -322,7 +322,7 @@ private void transferRoutes() {
                     }
                     extraVariables.put(TENANT_ID, tenantId);
                     extraVariables.put(REGISTERING_INSTITUTION_ID, registeringInstitutionId);
-                    extraVariables.put(PAYEE_DFSP_ID, payeeDFSPId);
+                    extraVariables.put(ZeebeVariables.PAYEE_DFSP_ID, payeeDFSPId);
 
                     TransactionChannelRequestDTO channelRequest = exchange.getIn().getBody(TransactionChannelRequestDTO.class);
                     TransactionType transactionType = new TransactionType();
@@ -331,6 +331,7 @@ private void transferRoutes() {
                     transactionType.setScenario(TRANSFER);
                     channelRequest.setTransactionType(transactionType);
                     channelRequest.getPayer().getPartyIdInfo().setFspId(destinationDfspId);
+                    channelRequest.getPayee().getPartyIdInfo().setFspId(payeeDFSPId);
                     String customDataString = String.valueOf(channelRequest.getCustomData());
                     String currency = channelRequest.getAmount().getCurrency();
 

diff --git a/src/main/java/org/mifos/connector/channel/zeebe/ZeebeVariables.java b/src/main/java/org/mifos/connector/channel/zeebe/ZeebeVariables.java
@@ -28,5 +28,6 @@ private ZeebeVariables() {}
     public static final String TRANSFER_CREATE_FAILED = "transferCreateFailed";
     public static final String TRANSACTION_VALID = "isTxnValid";
     public static final String PAYMENT_SCHEME = "paymentScheme";
+    public static final String PAYEE_DFSP_ID = "payeeDFSPId";
 
 }