merged with himanshu code

2025-11-03 12:24:24 +05:30
parent 2f33b306ae d4c8b433cc
commit 89a131fa84
34 changed files with 604 additions and 317 deletions
@@ -58,7 +58,7 @@ public class PaymentServiceImpl implements PaymentService {
 	public ResponseModel initiatePayment(BillPaymentRequest billPaymentRequest) {

 		String url = paymentUrl + BBPSConstant.PAYMENT_URL;
-		System.out.println(url);
+		System.out.println(url); 

 		BharatConnectMaster headersData = beneficiaryDetailsRepository.findByOrgId("ORG001");

@@ -99,7 +99,9 @@ public class PaymentServiceImpl implements PaymentService {

 			// ✅ Convert to your custom DTO
 			BillPaymentResponse billPaymentResponse = objectMapper.convertValue(dataMap, BillPaymentResponse.class);
+			System.out.print(billPaymentResponse);
 			GeneralResp generalResponse = billPaymentResponse.getGenericResponse();
+			
 			//
 			// start a new thread here
 			/*
@@ -108,15 +110,16 @@ public class PaymentServiceImpl implements PaymentService {
 			 * return fetchBillById(pollReq); }, 3, // interval in seconds 15 // total time
 			 * in seconds );
 			 */
+			
 			ModelMapper mapper = new ModelMapper();
 			mapper.getConfiguration().setMatchingStrategy(MatchingStrategies.STRICT);
 			BillPayment entity = mapper.map(billPaymentResponse, BillPayment.class);
 			paymentRepository.save(entity);
-
-			// ✅ Build final ResponseModel
-			responseModel = new ResponseModel(generalResponse.getMessage(), generalResponse.getStatus(),
-					Integer.parseInt(generalResponse.getStatusCode()), billPaymentResponse);
-
+			TransactionStatusRequest transactionStatusRequest=new TransactionStatusRequest();
+			//call the checkTransactionStatus
+			transactionStatusRequest.setTxnId(billPaymentResponse.getTxnId());
+			System.out.println(transactionStatusRequest);
+			 responseModel= checkTrasactionStatus(transactionStatusRequest);
 		} catch (Exception e) {
 			LOGGER.error("❌ Exception in initiateBillFetch(): {}", e.getMessage(), e);
 			responseModel.setStatus("500");
@@ -130,49 +133,88 @@ public class PaymentServiceImpl implements PaymentService {
 	@Override
 	public ResponseModel checkTrasactionStatus(TransactionStatusRequest transactionStatusRequest) {

-	   String url=paymentUrl + BBPSConstant.CHECK_TRANSACTION_URL+transactionStatusRequest.getTxnId();
-	   
-		 BharatConnectMaster headersData=beneficiaryDetailsRepository.findByOrgId("ORG001");
-        
-		HttpHeaders headers = new HttpHeaders();
-        headers.set("x-digiledge-key",headersData.getXDigiledgeKey());
-        headers.set("agentId", headersData.getAgentId());
-        headers.set("tenantId", headersData.getTenantId());
-        headers.setContentType(MediaType.APPLICATION_JSON);
-        
-		  Map<String, String> responseMap = httpService.getRequest(url,headers);
-		  String responseData = responseMap.get("data");
-		  LOGGER.info("data is :{}", responseData);
-		
+	    String url = paymentUrl + BBPSConstant.CHECK_TRANSACTION_URL + transactionStatusRequest.getTxnId();
+	    BharatConnectMaster headersData = beneficiaryDetailsRepository.findByOrgId("ORG001");

-		ObjectMapper objectMapper = new ObjectMapper();
+	    HttpHeaders headers = new HttpHeaders();
+	    headers.set("x-digiledge-key", headersData.getXDigiledgeKey());
+	    headers.set("agentId", headersData.getAgentId());
+	    headers.set("tenantId", headersData.getTenantId());
+	    headers.setContentType(MediaType.APPLICATION_JSON);

-		try {
-			Map<String, Object> dataMap = objectMapper.readValue(responseData,
-					new TypeReference<Map<String, Object>>() {
-					});
-			if (!dataMap.containsKey("genericResponse")) {
-				throw new CustomException(String.valueOf(dataMap.get("message")),  // message
-					    String.valueOf(dataMap.get("status")),   // status
-					    Integer.parseInt(String.valueOf(dataMap.get("statusCode"))), // statusCode (int)
-					    String.valueOf(dataMap.get("remarks")) );
-			}
-	
-			TransactionStatusResponse responseWrapper = objectMapper.convertValue(dataMap, TransactionStatusResponse.class);
-			
-			GeneralResp generalResp = responseWrapper.getGeneralResp();
-			
-			ResponseModel responseModel=new ResponseModel( generalResp.getMessage(),
-			        generalResp.getStatus(),
-			        Integer.parseInt(generalResp.getStatusCode()),
-			        responseWrapper);
-			
-			return responseModel;
+	    ObjectMapper objectMapper = new ObjectMapper();

-		} catch (JsonProcessingException e) {
-			LOGGER.error("Error parsing responseData JSON: {}", e.getMessage());
-			throw new CustomException("Invalid JSON received from API");
-		}
+	    // ✅ Polling configuration
+	    long startTime = System.currentTimeMillis();
+	    long maxWaitTimeMs = 40000; // 40 seconds timeout
+	    long intervalMs = 5000;     // retry every 5 seconds
+
+	    while (true) {
+	        Map<String, String> responseMap = httpService.getRequest(url, headers);
+	        String responseData = responseMap.get("data");
+	        LOGGER.info("Transaction status response data: {}", responseData);
+
+	        try {
+	            Map<String, Object> dataMap = objectMapper.readValue(responseData, new TypeReference<Map<String, Object>>() {});
+
+	            // If genericResponse key missing, throw exception
+	            if (!dataMap.containsKey("generalResp")) {
+	                throw new CustomException(
+	                        String.valueOf(dataMap.get("message")),
+	                        String.valueOf(dataMap.get("status")),
+	                        Integer.parseInt(String.valueOf(dataMap.get("statusCode"))),
+	                        String.valueOf(dataMap.get("remarks"))
+	                );
+	            }
+	            
+
+	            // Convert into proper DTO
+	            TransactionStatusResponse responseWrapper = objectMapper.convertValue(dataMap, TransactionStatusResponse.class);
+	            
+	            GeneralResp generalResp = responseWrapper.getGeneralResp();
+
+	            String status = generalResp.getStatus();
+	            LOGGER.info("Current transaction status: {}", status);
+
+	            // ✅ If IN_PROGRESS → wait & retry
+	            if ("INPROGRESS".equalsIgnoreCase(status)) {
+
+	                if (System.currentTimeMillis() - startTime > maxWaitTimeMs) {
+	                    // Timeout after 40 sec
+	                    throw new CustomException(
+	                            "Timeout waiting for transaction completion",
+	                            "FAILED",
+	                            408,
+	                            "Transaction still in progress after 40 seconds"
+	                    );
+	                }
+
+	                try {
+	                    Thread.sleep(intervalMs);
+	                } catch (InterruptedException e) {
+	                    Thread.currentThread().interrupt();
+	                    throw new CustomException("Thread interrupted during retry");
+	                }
+
+	                LOGGER.info("Transaction still IN_PROGRESS... retrying after {} seconds", (intervalMs / 1000));
+	                continue; // retry
+	            }
+
+	            // ✅ If status is SUCCESS / FAILED / etc. → return response
+	            ResponseModel responseModel = new ResponseModel(
+	                    generalResp.getMessage(),
+	                    generalResp.getStatus(),
+	                    Integer.parseInt(generalResp.getStatusCode()),
+	                    responseWrapper
+	            );
+
+	            return responseModel;
+
+	        } catch (JsonProcessingException e) {
+	            LOGGER.error("Error parsing responseData JSON: {}", e.getMessage());
+	            throw new CustomException("Invalid JSON received from API");
+	        }
+	    }
 	}

 	/*