GOV 287 Enabled liveness and readiness for the key auth story (#102)

* Enabled liveness and readiness

* Removed the actuator camel api

* Set the isvalid file tot true

* Added log to publish zeebe variable

* Bug fixed for passing budget account related header to camel

* Clientcorrelation id bug fixed

* Publishing client correlation id zeebe variable

* Info log changed to debug

* Zeebe publish variable log changed to info

* Updated the connector common

Author: danishjamal104

build.gradle

@@ -84,6 +84,7 @@ dependencies {
     implementation "org.springframework.boot:spring-boot-starter-web:$springBootVersion"
     implementation "org.springframework:spring-web:5.3.14"
     implementation 'org.springframework.kafka:spring-kafka:2.8.1'
+    implementation "org.springframework.boot:spring-boot-starter-actuator:$springBootVersion"
 
     // spring test dependency
     testImplementation "org.springframework.boot:spring-boot-starter-test:$springBootVersion"
@@ -107,7 +108,7 @@ dependencies {
     // miscellaneous dependency
     implementation 'com.google.code.gson:gson:2.8.9'
     implementation 'org.json:json:20210307'
-    implementation 'org.mifos:ph-ee-connector-common:1.5.0-SNAPSHOT'
+    implementation 'org.mifos:ph-ee-connector-common:1.6.0-rc.1'
     implementation 'org.apache.camel.springboot:camel-spring-boot-starter:3.4.0'
     implementation 'org.apache.camel:camel-undertow:3.4.0'
     implementation 'org.springframework.boot:spring-boot-starter:2.5.2'

src/main/java/org/mifos/processor/bulk/API/definition/BatchTransactions.java

@@ -12,6 +12,7 @@
 
 import java.io.IOException;
 
+import static org.mifos.processor.bulk.camel.config.CamelProperties.*;
 import static org.mifos.processor.bulk.zeebe.ZeebeVariables.*;
 
 public interface BatchTransactions {
@@ -22,5 +23,7 @@ String batchTransactions(HttpServletResponse httpServletResponse, @RequestHeader
                              @RequestHeader(value = FILE_NAME) String fileName,
                              @RequestHeader(value = PURPOSE) String purpose,
                              @RequestHeader(value = "Type") String type,
-                             @RequestHeader(value = "Platform-TenantId") String tenant) throws IOException;
+                             @RequestHeader(value = HEADER_PLATFORM_TENANT_ID) String tenant,
+                             @RequestHeader(value = HEADER_REGISTERING_INSTITUTE_ID, required = false) String registeringInstitutionId,
+                             @RequestHeader(value = HEADER_PROGRAM_ID, required = false) String programId) throws IOException;
 }

src/main/java/org/mifos/processor/bulk/API/implementation/BatchTransactionsController.java

@@ -12,11 +12,14 @@
 import org.mifos.processor.bulk.utility.SpringWrapperUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.ExceptionHandler;
+import org.springframework.web.bind.annotation.RequestHeader;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartException;
 import org.springframework.web.multipart.MultipartFile;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
+
+import static org.mifos.processor.bulk.camel.config.CamelProperties.*;
 import static org.mifos.processor.bulk.zeebe.ZeebeVariables.PURPOSE;
 import static org.mifos.processor.bulk.zeebe.ZeebeVariables.FILE_NAME;
 
@@ -37,19 +40,23 @@ public class BatchTransactionsController implements BatchTransactions {
     @Override
     public String batchTransactions(HttpServletResponse httpServletResponse,
                                     String requestId, MultipartFile file, String fileName,
-                                    String purpose, String type, String tenant) throws IOException {
-        log.info("Inside api logic");
+                                    String purpose, String type, String tenant,
+                                    String registeringInstitutionId, String programId) throws IOException {
+        log.debug("Inside api logic");
         String localFileName = fileStorageService.save(file);
         Headers headers = new Headers.HeaderBuilder()
-                .addHeader("X-CorrelationID", requestId)
+                .addHeader(HEADER_CLIENT_CORRELATION_ID, requestId)
                 .addHeader(PURPOSE,purpose)
                 .addHeader(FILE_NAME,localFileName)
                 .addHeader("Type",type)
-                .addHeader("Platform-TenantId",tenant)
+                .addHeader(HEADER_PLATFORM_TENANT_ID,tenant)
+                .addHeader(HEADER_REGISTERING_INSTITUTE_ID, registeringInstitutionId)
+                .addHeader(HEADER_PROGRAM_ID, programId)
                 .build();
-
+		log.debug("Headers passed: {}", headers);
         Exchange exchange = SpringWrapperUtil.getDefaultWrappedExchange(producerTemplate.getCamelContext(),
               headers);
+        log.debug("Header in exchange: {}", exchange.getIn().getHeaders());
         exchange = producerTemplate.send("direct:post-batch-transactions", exchange);
         int statusCode = exchange.getIn().getHeader(Exchange.HTTP_RESPONSE_CODE, Integer.class);
 		httpServletResponse.setStatus(statusCode);

src/main/java/org/mifos/processor/bulk/API/implementation/BulkTransferController.java

@@ -13,6 +13,7 @@
 
 import java.io.IOException;
 
+import static org.mifos.processor.bulk.camel.config.CamelProperties.HEADER_PLATFORM_TENANT_ID;
 import static org.mifos.processor.bulk.zeebe.ZeebeVariables.FILE_NAME;
 import static org.mifos.processor.bulk.zeebe.ZeebeVariables.PURPOSE;
 
@@ -34,7 +35,7 @@ public String bulkTransfer(String requestId, MultipartFile file, String fileName
                 .addHeader(PURPOSE,purpose)
                 .addHeader(FILE_NAME,fileName)
                 .addHeader("Type",type)
-                .addHeader("Platform-TenantId",tenant)
+                .addHeader(HEADER_PLATFORM_TENANT_ID,tenant)
                 .build();
         Exchange exchange = SpringWrapperUtil.getDefaultWrappedExchange(producerTemplate.getCamelContext(),
                 headers);

src/main/java/org/mifos/processor/bulk/api/ApiOriginFilter.java

@@ -13,14 +13,17 @@
 import org.springframework.stereotype.Component;
 import org.springframework.web.filter.GenericFilterBean;
 
+import static org.mifos.processor.bulk.camel.config.CamelProperties.HEADER_PLATFORM_TENANT_ID;
+
 public class ApiOriginFilter extends GenericFilterBean {
 
     private Logger logger = LoggerFactory.getLogger(this.getClass());
 
     @Override
     public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, ServletException {
         HttpServletRequest req = (HttpServletRequest) request;
-        String tenant = req.getHeader("Platform-TenantId");
+        String tenant = req.getHeader("" +
+                HEADER_PLATFORM_TENANT_ID);
         logger.debug("Tenant Name is : {}", tenant);
         logger.info("Client IP Address: {}", req.getRemoteHost());
     }

src/main/java/org/mifos/processor/bulk/camel/config/CamelProperties.java

@@ -75,5 +75,8 @@ private CamelProperties() {}
     public static final String REGISTERING_INSTITUTE_ID = "registeringInstituteId";
     public static final String PROGRAM_ID = "programId";
     public static final String IS_UPDATED = "isUpdated";
+    public static final String HEADER_PLATFORM_TENANT_ID = "Platform-TenantId";
+    public static final String HEADER_CLIENT_CORRELATION_ID = "X-CorrelationID";
+    public static final String CLIENT_CORRELATION_ID = "clientCorrelationId";
 
 }

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

@@ -1,7 +1,6 @@
 package org.mifos.processor.bulk.camel.routes;
 
-import static org.mifos.processor.bulk.camel.config.CamelProperties.BATCH_STATUS_FAILED;
-import static org.mifos.processor.bulk.camel.config.CamelProperties.OPS_APP_ACCESS_TOKEN;
+import static org.mifos.processor.bulk.camel.config.CamelProperties.*;
 import static org.mifos.processor.bulk.zeebe.ZeebeVariables.BATCH_ID;
 import static org.mifos.processor.bulk.zeebe.ZeebeVariables.COMPLETION_RATE;
 import static org.mifos.processor.bulk.zeebe.ZeebeVariables.ERROR_CODE;
@@ -40,7 +39,7 @@ public void configure() throws Exception {
         getBaseExternalApiRequestRouteDefinition("batch-summary", HttpRequestMethod.GET)
                 .setHeader(Exchange.REST_HTTP_QUERY, simple("batchId=${exchangeProperty." + BATCH_ID + "}"))
                 .setHeader("Authorization", simple("Bearer ${exchangeProperty." + OPS_APP_ACCESS_TOKEN + "}"))
-                .setHeader("Platform-TenantId", simple("${exchangeProperty." + TENANT_ID + "}")).process(exchange -> {
+                .setHeader(HEADER_PLATFORM_TENANT_ID, simple("${exchangeProperty." + TENANT_ID + "}")).process(exchange -> {
                     logger.info(exchange.getIn().getHeaders().toString());
                 }).toD(operationsAppConfig.batchSummaryUrl + "?bridgeEndpoint=true")
                 .log(LoggingLevel.INFO, "Batch summary API response: \n\n ${body}");

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

@@ -1,5 +1,6 @@
 package org.mifos.processor.bulk.camel.routes;
 
+import static org.mifos.processor.bulk.camel.config.CamelProperties.HEADER_PLATFORM_TENANT_ID;
 import static org.mifos.processor.bulk.camel.config.CamelProperties.OPS_APP_ACCESS_TOKEN;
 import static org.mifos.processor.bulk.zeebe.ZeebeVariables.TENANT_ID;
 
@@ -44,7 +45,7 @@ public void configure() throws Exception {
                         simpleF("username=%s&password=%s&grant_type=%s", operationsAppConfig.username, operationsAppConfig.password,
                                 "password"))
                 .setHeader("Authorization", constant("Basic Y2xpZW50Og=="))
-                .setHeader("Platform-TenantId", simple("${exchangeProperty." + TENANT_ID + "}"))
+                .setHeader(HEADER_PLATFORM_TENANT_ID, simple("${exchangeProperty." + TENANT_ID + "}"))
                 .toD(operationsAppConfig.authUrl + "?bridgeEndpoint=true").log(LoggingLevel.INFO, "Auth response: \n\n ${body}");
 
         /**