Called the NOTE variale via zeebeworker from deposit API (#18)

* conflicts resolved * Removed grouping imports and tested the API with note field * Removed the unnescessary grouping imports * Added the nescessary variable import * Removed unnescesary group imports * changed the logger to debug for sensitive info
openMF · Feb 7, 2023 · 135fc2e · 135fc2e
1 parent 44a4850
commit 135fc2e
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 3 deletions.
diff --git a/src/main/java/org/mifos/connector/ams/interop/PrepareTransferRequest.java b/src/main/java/org/mifos/connector/ams/interop/PrepareTransferRequest.java
@@ -28,6 +28,7 @@
 import static org.mifos.connector.ams.zeebe.ZeebeVariables.EXTERNAL_ACCOUNT_ID;
 import static org.mifos.connector.ams.zeebe.ZeebeVariables.TRANSACTION_ID;
 import static org.mifos.connector.ams.zeebe.ZeebeVariables.TRANSFER_CODE;
+import static org.mifos.connector.ams.zeebe.ZeebeVariables.NOTE;
 
 @Component
 @ConditionalOnExpression("${ams.local.enabled}")
@@ -50,7 +51,7 @@ public void process(Exchange exchange) throws Exception {
         transactionType.setInitiatorType(InitiatorType.valueOf(initiatorType));
         transactionType.setScenario(Scenario.valueOf(scenario));
 
-        String note = zeebeVariable(exchange, "note", String.class);
+        String note = zeebeVariable(exchange,NOTE, String.class);
         FspMoneyData amount = zeebeVariable(exchange, "amount", FspMoneyData.class);
         FspMoneyData fspFee = zeebeVariable(exchange, "fspFee", FspMoneyData.class);
         FspMoneyData fspCommission = zeebeVariable(exchange, "fspCommission", FspMoneyData.class);

diff --git a/src/main/java/org/mifos/connector/ams/zeebe/ZeebeVariables.java b/src/main/java/org/mifos/connector/ams/zeebe/ZeebeVariables.java
@@ -36,7 +36,7 @@ public class ZeebeVariables {
     public static final String ERROR_CODE = "errorCode";
     public static final String ERROR_PAYLOAD = "errorPayload";
     public static final String IS_ERROR_HANDLED = "isErrorHandled";
-
+    public static final String NOTE = "note";
 
     static {
         ACTION_FAILURE_MAP.put(TransferActionType.PREPARE.name(), TRANSFER_PREPARE_FAILED);

diff --git a/src/main/java/org/mifos/connector/ams/zeebe/ZeebeeWorkers.java b/src/main/java/org/mifos/connector/ams/zeebe/ZeebeeWorkers.java
@@ -37,7 +37,24 @@
 import static org.mifos.connector.ams.camel.config.CamelProperties.*;
 import static org.mifos.connector.ams.zeebe.ZeebeUtil.zeebeVariable;
 import static org.mifos.connector.ams.zeebe.ZeebeUtil.zeebeVariablesToCamelProperties;
-import static org.mifos.connector.ams.zeebe.ZeebeVariables.*;
+import static org.mifos.connector.ams.zeebe.ZeebeVariables.ACCOUNT;
+import static org.mifos.connector.ams.zeebe.ZeebeVariables.ACCOUNT_CURRENCY;
+import static org.mifos.connector.ams.zeebe.ZeebeVariables.BOOK_TRANSACTION_ID;
+import static org.mifos.connector.ams.zeebe.ZeebeVariables.CHANNEL_REQUEST;
+import static org.mifos.connector.ams.zeebe.ZeebeVariables.EXTERNAL_ACCOUNT_ID;
+import static org.mifos.connector.ams.zeebe.ZeebeVariables.LOCAL_QUOTE_FAILED;
+import static org.mifos.connector.ams.zeebe.ZeebeVariables.LOCAL_QUOTE_RESPONSE;
+import static org.mifos.connector.ams.zeebe.ZeebeVariables.PARTY_ID;
+import static org.mifos.connector.ams.zeebe.ZeebeVariables.PARTY_ID_TYPE;
+import static org.mifos.connector.ams.zeebe.ZeebeVariables.PAYEE_PARTY_RESPONSE;
+import static org.mifos.connector.ams.zeebe.ZeebeVariables.QUOTE_FAILED;
+import static org.mifos.connector.ams.zeebe.ZeebeVariables.QUOTE_SWITCH_REQUEST;
+import static org.mifos.connector.ams.zeebe.ZeebeVariables.QUOTE_SWITCH_REQUEST_AMOUNT;
+import static org.mifos.connector.ams.zeebe.ZeebeVariables.TENANT_ID;
+import static org.mifos.connector.ams.zeebe.ZeebeVariables.TRANSACTION_ID;
+import static org.mifos.connector.ams.zeebe.ZeebeVariables.TRANSFER_CODE;
+import static org.mifos.connector.ams.zeebe.ZeebeVariables.TRANSFER_PREPARE_FAILED;
+import static org.mifos.connector.ams.zeebe.ZeebeVariables.NOTE;
 import static org.mifos.connector.common.ams.dto.TransferActionType.CREATE;
 import static org.mifos.connector.common.ams.dto.TransferActionType.PREPARE;
 import static org.mifos.connector.common.ams.dto.TransferActionType.RELEASE;
@@ -443,6 +460,7 @@ public void setupWorkers() {
                                 variables.put("initiator", transactionType.getInitiator().name());
                                 variables.put("initiatorType", transactionType.getInitiatorType().name());
                                 variables.put("scenario", transactionType.getScenario().name());
+                                variables.get(NOTE);
                                 variables.put("amount", new FspMoneyData(transactionRequest.getAmount().getAmountDecimal(),
                                         transactionRequest.getAmount().getCurrency()));
                                 variables.put("processType", "api");