Code optimisation and minor big fixes

build.gradle

@@ -15,7 +15,7 @@ repositories {
         url = uri('https://repo.maven.apache.org/maven2')
 
     }
-    maven { 
+    maven {
         url "https://fynarfin.jfrog.io/artifactory/fyn-libs-release-local"
     }
 

src/main/java/org/mifos/processor/bulk/OperationsAppConfig.java

@@ -0,0 +1,23 @@
+package org.mifos.processor.bulk;
+
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.PostConstruct;
+
+@Component
+public class OperationsAppConfig {
+
+    @Value("${operations-app.contactpoint}")
+    public String operationAppContactPoint;
+
+    @Value("${operations-app.endpoints.batch-transaction}")
+    public String batchTransactionEndpoint;
+
+    public String batchTransactionUrl;
+
+    @PostConstruct
+    private void setup() {
+        batchTransactionUrl = operationAppContactPoint + batchTransactionEndpoint;
+    }
+}

src/main/java/org/mifos/processor/bulk/camel/routes/BaseRouteBuilder.java

@@ -0,0 +1,57 @@
+package org.mifos.processor.bulk.camel.routes;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import io.camunda.zeebe.client.ZeebeClient;
+import org.apache.camel.Exchange;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.model.RouteDefinition;
+import org.mifos.processor.bulk.OperationsAppConfig;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import java.time.ZoneOffset;
+import java.time.ZonedDateTime;
+import java.time.format.DateTimeFormatter;
+
+public abstract class BaseRouteBuilder extends RouteBuilder {
+
+    @Autowired
+    public ObjectMapper objectMapper;
+
+    @Autowired
+    public OperationsAppConfig operationsAppConfig;
+
+    @Autowired
+    ZeebeClient zeebeClient;
+
+    public Logger logger = LoggerFactory.getLogger(this.getClass());
+
+    public RouteDefinition getBaseExternalApiRequestRouteDefinition(String routeId, HttpRequestMethod httpMethod) {
+        return from(String.format("direct:%s", routeId))
+                .id(routeId)
+                .log("Starting external API request route: " + routeId)
+                .removeHeader("*")
+                .setHeader(Exchange.HTTP_METHOD, constant(httpMethod.text))
+                .setHeader("X-Date", simple(ZonedDateTime.now( ZoneOffset.UTC ).format( DateTimeFormatter.ISO_INSTANT )))
+                .setHeader("Content-Type", constant("application/json"));
+    }
+
+    protected enum HttpRequestMethod {
+        GET("GET"),
+        POST("POST"),
+        PUT("PUT"),
+        DELETE("DELETE")
+        ;
+
+        private final String text;
+
+        HttpRequestMethod(String text) {
+            this.text = text;
+        }
+
+        @Override
+        public String toString() {
+            return text;
+        }
+    }
+}

src/main/java/org/mifos/processor/bulk/camel/routes/ProcessorStartRoute.java

@@ -0,0 +1,50 @@
+package org.mifos.processor.bulk.camel.routes;
+
+import org.mifos.processor.bulk.zeebe.ZeebeProcessStarter;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.UUID;
+
+import static org.mifos.processor.bulk.zeebe.ZeebeVariables.BATCH_ID;
+
+@Component
+public class ProcessorStartRoute extends BaseRouteBuilder{
+
+    @Autowired
+    private ZeebeProcessStarter zeebeProcessStarter;
+
+    @Value("${bpmn.flows.bulk-processor}")
+    private String workflowId;
+
+    private Logger logger = LoggerFactory.getLogger(this.getClass());
+
+    @Override
+    public void configure() throws Exception {
+        setup();
+    }
+
+    private void setup() {
+        from("rest:POST:/bulk/transfer/{requestId}/{fileName}")
+                .process(exchange -> {
+                    String fileName = exchange.getIn().getHeader("fileName", String.class);
+                    String requestId = exchange.getIn().getHeader("requestId", String.class);
+                    String batchId = UUID.randomUUID().toString();
+
+                    logger.info("\n\n Filename: " + fileName + " \n\n");
+                    logger.info("\n\n BatchId: " + batchId + " \n\n");
+
+                    Map<String, Object> variables = new HashMap<>();
+                    variables.put(BATCH_ID, batchId);
+                    variables.put("fileName", fileName);
+                    variables.put("requestId", requestId);
+
+                    zeebeProcessStarter.startZeebeWorkflow(workflowId, "", variables);
+                });
+    }
+}

src/main/java/org/mifos/processor/bulk/camel/routes/Routes.java

@@ -19,13 +19,7 @@
 import static org.mifos.processor.bulk.zeebe.ZeebeVariables.*;
 
 @Component
-public class Routes extends RouteBuilder {
-
-    @Autowired
-    ZeebeClient zeebeClient;
-
-    @Value("${operations-app-config.host}")
-    String operationsAppHost;
+public class Routes extends BaseRouteBuilder {
 
     @Value("${config.minimum-successful-tx-ratio}")
     double minimumSuccessfulTxRatio;
@@ -42,7 +36,7 @@ private void routeCheckTransactions() {
                 .id(id)
                 .log("Fetching transaction details")
                 //set request params
-                .to(operationsAppHost+ "/api/v1/batch/transactions")
+                .toD(operationsAppConfig.batchTransactionEndpoint)
                 .process(exchange -> {
                     // get response body
                     JSONObject transfers = new JSONObject(exchange.getIn().getBody(String.class));
@@ -80,7 +74,7 @@ private void routeSampleTransactions() {
                 .process(exchange -> {
                     exchange.getIn().setHeader("batchId", exchange.getProperty(BATCH_ID));
                 })
-                .toD(operationsAppHost + "/api/v1/batch/transactions")
+                .toD(operationsAppConfig.batchTransactionEndpoint)
                 .process(exchange -> {
                     // get response body
 

src/main/resources/application.yaml

@@ -27,12 +27,17 @@ zeebe:
   broker:
     contactpoint: "zeebe-zeebe-gateway:26500"
 
+operations-app:
+  contactpoint: "https://ops-bk.ibank.financial"
+  endpoints:
+    batch-transaction: "/api/v1/batch/transactions"
+
 cloud:
   aws:
     enabled: true
     credentials:
-      access-key: ${AWS_ACCESS_KEY:AKIAX32JM37TYOG3QUJU}
-      secret-key: ${AWS_SECRET_KEY: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}
+      access-key: ${AWS_ACCESS_KEY:AKIAX32JM37TZOJ5AKFB}
+      secret-key: ${AWS_SECRET_KEY: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}
     region:
       static: us-east-2
     stack:
@@ -58,9 +63,7 @@ bpmn:
     international-remittance-payee: "international_remittance_payee_process-{dfspid}"
     international-remittance-payer: "international_remittance_payer_process-{dfspid}"
     debit-party-process: "debit_party_process-{dfspid}"
-
-operations-app-config:
-  host: ""
+    bulk-processor: "bulk_processor-ibank-usa"
 
 config:
-  minimum-successful-tx-ratio: 0.90
+  minimum-successful-tx-ratio: 0.90

src/test/java/org/mifos/pheeprocessorbulk/BulkProcessorApplicationTests.java → src/test/java/org/mifos/processor/BulkProcessorApplicationTests.java

@@ -1,4 +1,4 @@
-package org.mifos.pheeprocessorbulk;
+package org.mifos.processor;
 
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;