Enhance the mock service for handling incoming on response flows

pom.xml

@@ -35,7 +35,7 @@
 		<dependency>
 			<groupId>io.hcxprotocol</groupId>
 			<artifactId>hcx-integrator-sdk</artifactId>
-			<version>1.0.5</version>
+			<version>1.0.7</version>
 		</dependency>
 		<dependency>
 			<groupId>com.nimbusds</groupId>
@@ -73,6 +73,11 @@
 			<artifactId>postgresql</artifactId>
 			<version>42.3.1</version>
 		</dependency>
+		<dependency>
+			<groupId>com.amazonaws</groupId>
+			<artifactId>aws-java-sdk</artifactId>
+			<version>1.12.353</version>
+		</dependency>
 	</dependencies>
 
 	<build>

src/main/java/org/swasth/hcx/HCXApplication.java

@@ -8,6 +8,7 @@
 import org.springframework.scheduling.annotation.EnableAsync;
 
 @SpringBootApplication
+@EnableAsync
 public class HCXApplication {
 
 	public static void main(String[] args) {

src/main/java/org/swasth/hcx/controllers/v1/BeneficiaryController.java

@@ -0,0 +1,118 @@
+package org.swasth.hcx.controllers.v1;
+
+import io.hcxprotocol.utils.Operations;
+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.http.HttpHeaders;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import org.swasth.hcx.controllers.BaseController;
+import org.swasth.hcx.exception.ClientException;
+import org.swasth.hcx.service.BeneficiaryService;
+import org.swasth.hcx.service.CloudStorageClient;
+import org.swasth.hcx.service.GenerateOutgoingRequest;
+import org.swasth.hcx.utils.Constants;
+
+import java.sql.SQLException;
+import java.util.List;
+import java.util.Map;
+
+import static org.swasth.hcx.utils.Constants.*;
+
+@RestController
+@RequestMapping(Constants.VERSION_PREFIX)
+public class BeneficiaryController extends BaseController {
+
+    private static final Logger logger = LoggerFactory.getLogger(BeneficiaryController.class);
+    @Autowired
+    private GenerateOutgoingRequest outgoingRequest;
+
+    @Autowired
+    private CloudStorageClient cloudStorageClient;
+    @Autowired
+    private BeneficiaryService beneficiaryService;
+    @Value("${phone.beneficiary-register}")
+    private String beneficiaryRegisterContent;
+
+    @PostMapping(CREATE_COVERAGEELIGIBILITY_REQUEST)
+    public ResponseEntity<Object> createCoverageEligibility(@RequestHeader HttpHeaders headers, @RequestBody Map<String, Object> requestBody) throws Exception {
+        return outgoingRequest.createCoverageEligibilityRequest(requestBody,Operations.COVERAGE_ELIGIBILITY_CHECK);
+    }
+
+    @PostMapping(CREATE_CLAIM_SUBMIT)
+    public ResponseEntity<Object> createClaimSubmit(@RequestBody Map<String, Object> requestBody) {
+        return outgoingRequest.createClaimRequest(requestBody, Operations.CLAIM_SUBMIT);
+    }
+
+    @PostMapping(CREATE_PRE_AUTH_SUBMIT)
+    public ResponseEntity<Object> createPreAuthSubmit(@RequestBody Map<String, Object> requestBody) {
+        return outgoingRequest.createClaimRequest(requestBody, Operations.PRE_AUTH_SUBMIT);
+    }
+
+    @PostMapping(CREATE_COMMUNICATION_REQUEST)
+    public ResponseEntity<Object> createCommunication(@RequestBody Map<String, Object> requestBody) {
+        return outgoingRequest.createCommunicationRequest(requestBody, Operations.COMMUNICATION_REQUEST);
+    }
+
+    @PostMapping(CREATE_COMMUNICATION_ON_REQUEST)
+    public ResponseEntity<Object> createOnCommunication(@RequestBody Map<String, Object> requestBody) throws ClientException {
+        return outgoingRequest.createCommunicationOnRequest(requestBody);
+    }
+
+    @PostMapping(BSP_REQUEST_LIST)
+    public ResponseEntity<Object> requestList(@RequestBody Map<String,Object>  requestBody) throws Exception {
+        if(requestBody.containsKey("mobile")){
+          return beneficiaryService.getRequestListFromDatabase(requestBody);
+        } else {
+            return beneficiaryService.getDataFromWorkflowId(requestBody);
+        }
+    }
+
+    @PostMapping(SEND_OTP)
+    public ResponseEntity<Object> sendOTP(@RequestBody Map<String, Object> requestBody) {
+        try {
+            String mobile = (String) requestBody.get(MOBILE);
+            beneficiaryService.sendOTP(mobile, beneficiaryRegisterContent);
+            return ResponseEntity.ok(Map.of("message", "OTP sent successfully", "mobile", mobile));
+        } catch (Exception e) {
+            return ResponseEntity.badRequest().body(e.getMessage());
+        }
+    }
+
+    @PostMapping(VERIFY_OTP)
+    public ResponseEntity<Object> verifyOTP(@RequestBody Map<String, Object> requestBody) {
+        try {
+            return beneficiaryService.verifyOTP(requestBody);
+        } catch (Exception e) {
+            return ResponseEntity.badRequest().body(e.getMessage());
+        }
+    }
+
+    @PostMapping(UPLOAD_DOCUMENTS)
+    public ResponseEntity<Object> uploadDocuments(@RequestParam("file") List<MultipartFile> files, @RequestParam("mobile") String mobile) {
+        try {
+            List<Map<String, Object>> responses = beneficiaryService.getDocumentUrls(files, mobile);
+            return ResponseEntity.ok(responses);
+        } catch (Exception e) {
+            return ResponseEntity.badRequest().body(e.getMessage());
+        }
+    }
+
+    @PostMapping("/check/communication/request")
+    public ResponseEntity<Object> checkCommunicationRequest(@RequestBody Map<String,Object> requestBody) throws ClientException, SQLException {
+        System.out.println("-------------- request body ------------------" + requestBody);
+        if (requestBody.isEmpty()) {
+            throw new ClientException("Request body cannot be empty");
+        }
+        boolean isCommunicationInitiated = beneficiaryService.checkCommunicationRequest(requestBody);
+        if (isCommunicationInitiated) {
+            return ResponseEntity.ok("Communication is initiated");
+        } else {
+            return ResponseEntity.badRequest().body("Communication is not initiated");
+        }
+    }
+
+}

src/main/java/org/swasth/hcx/controllers/v1/CommunicationController.java

@@ -2,23 +2,20 @@
 
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 import org.swasth.hcx.utils.Constants;
 import org.swasth.hcx.controllers.BaseController;
 
 import java.util.Map;
 
 @RestController()
-@RequestMapping(value =  "/"+ "${hcx_application.api_version}"+ "/communication")
+@RequestMapping(Constants.VERSION_PREFIX)
 public class CommunicationController extends BaseController {
 
     @Value("${kafka.topic.communication}")
     private String kafkaTopic;
 
-    @RequestMapping(value = "/request", method = RequestMethod.POST)
+    @PostMapping(Constants.COMMUNICATION_REQUEST)
     public ResponseEntity<Object> communicationRequest(@RequestBody Map<String, Object> requestBody) throws Exception {
         return processRequest(requestBody, Constants.COMMUNICATION_REQUEST, Constants.COMMUNICATION_ONREQUEST, kafkaTopic);
     }

src/main/java/org/swasth/hcx/controllers/v1/CoverageEligibilityController.java

@@ -21,13 +21,11 @@ public class CoverageEligibilityController extends BaseController {
 
     @RequestMapping(value = "/check", method = RequestMethod.POST)
     public ResponseEntity<Object> checkCoverageEligibility(@RequestBody Map<String, Object> requestBody) throws Exception {
-        System.out.println("---------request body--------" + requestBody);
-        System.out.println("-----------request size--------" + JSONUtils.serialize(requestBody).getBytes().length);
-        return processRequest(requestBody, Constants.COVERAGE_ELIGIBILITY_CHECK, Constants.COVERAGE_ELIGIBILITY_ONCHECK, kafkaTopic);
+        return processRequest(requestBody, Constants.COVERAGE_ELIGIBILITY_CHECK, Constants.COVERAGE_ELIGIBILITY_CHECK, kafkaTopic);
     }
 
     @RequestMapping(value = "/on_check", method = RequestMethod.POST)
     public ResponseEntity<Object> onCheckCoverageEligibility(@RequestBody Map<String, Object> requestBody) throws Exception {
-        return processRequest(requestBody, Constants.COVERAGE_ELIGIBILITY_ONCHECK,  Constants.COVERAGE_ELIGIBILITY_ONCHECK, kafkaTopic);
+        return processRequestIncoming(requestBody, Constants.COVERAGE_ELIGIBILITY_ONCHECK,  Constants.COVERAGE_ELIGIBILITY_ONCHECK, kafkaTopic);
     }
 }

src/main/java/org/swasth/hcx/controllers/v1/PayerController.java

@@ -69,6 +69,9 @@ public ResponseEntity<Object> requestList(@RequestBody Map<String, Object> reque
                 map.put("status", resultSet.getString("status"));
                 map.put("additional_info", JSONUtils.deserialize(resultSet.getString("additional_info"), Map.class));
                 map.put("payload", JSONUtils.deserialize(resultSet.getString("request_fhir"), Map.class));
+                map.put("otp_verification", resultSet.getString("otp_verification"));
+                map.put("account_number", resultSet.getString("account_number"));
+                map.put("ifsc_code", resultSet.getString("ifsc_code"));
                 result.add(map);
             }
             resp.put(type, result);
@@ -162,6 +165,8 @@ public ResponseEntity<Object> review(Map<String, Object> requestBody, String ent
                     if(!requestBody.containsKey("approved_amount") || !(requestBody.get("approved_amount") instanceof Integer))
                         throw new ClientException("Approved amount is mandatory field and should be a number");
                     info.put("approved_amount", requestBody.getOrDefault("approved_amount", 0));
+                    info.put("account_number", requestBody.getOrDefault("account_number", 0));
+                    info.put("ifsc_code", requestBody.getOrDefault("ifsc_code", ""));
                 }
                 String query = String.format("UPDATE %s SET additional_info = jsonb_set(additional_info::jsonb, '{%s}', '%s'),updated_on = %d WHERE request_id = '%s' RETURNING %s,%s,%s,%s,%s",
                         table, type, JSONUtils.serialize(info), System.currentTimeMillis(), id, "additional_info", "status", "raw_payload", "response_fhir", "action");

src/main/java/org/swasth/hcx/exception/ClientException.java

@@ -1,10 +1,8 @@
 package org.swasth.hcx.exception;
 
-import org.swasth.hcx.exception.ErrorCodes;
-
 public class ClientException extends Exception {
 
-    private org.swasth.hcx.exception.ErrorCodes errCode;
+    private ErrorCodes errCode;
 
     public ClientException(String message) {
         super(message);

src/main/java/org/swasth/hcx/exception/ErrorCodes.java

@@ -13,6 +13,7 @@ public enum ErrorCodes {
     ERR_WRONG_DOMAIN_PAYLOAD,
     ERR_INVALID_DOMAIN_PAYLOAD,
     ERR_SENDER_NOT_SUPPORTED,
-    ERR_DOMAIN_PROCESSING
+    ERR_DOMAIN_PROCESSING,
+    ERR_SENDING_OTP;
 
 }