10-11-25 after conflict

src/main/java/com/billpaymentservice/bbps/serviceImpl/AgentServiceImpl.java

@@ -1,8 +1,9 @@
 package com.billpaymentservice.bbps.serviceImpl;
 
-import java.time.LocalDateTime;
 import java.util.Map;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.MediaType;
@@ -18,10 +19,14 @@ import com.billpaymentservice.bbps.dto.response.BillDataResponse;
 import com.billpaymentservice.bbps.dto.response.FetchBillResponse;
 import com.billpaymentservice.bbps.dto.response.FetchBillValidatestResponse;
 import com.billpaymentservice.bbps.entites.BharatConnectMaster;
+import com.billpaymentservice.bbps.entites.BillInitiate;
+import com.billpaymentservice.bbps.entites.BillMaster;
 import com.billpaymentservice.bbps.entites.InboundTraceLog;
 import com.billpaymentservice.bbps.entites.OutboundTraceLog;
 import com.billpaymentservice.bbps.exception.CustomException;
 import com.billpaymentservice.bbps.repository.BharatConnectMasterRepository;
+import com.billpaymentservice.bbps.repository.BillInitateRepository;
+import com.billpaymentservice.bbps.repository.BillMasterRepository;
 import com.billpaymentservice.bbps.repository.InboundTraceLogRepository;
 import com.billpaymentservice.bbps.repository.OutboundTraceLogRepository;
 import com.billpaymentservice.bbps.service.AgentService;
@@ -36,7 +41,6 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 import lombok.extern.slf4j.Slf4j;
 
 @Service
-@Slf4j
 public class AgentServiceImpl implements AgentService {
 
 	@Value("${agent.data.url}")
@@ -47,24 +51,32 @@ public class AgentServiceImpl implements AgentService {
 	private final Helper helper;
 	private final BharatConnectMasterRepository beneficiaryDetailsRepository;
 	private final BillerMapperHelper mapperHelper;
+	private final BillMasterRepository billMasterRepository;
+	private final BillInitateRepository billIntiateRepository;
+	private static final Logger LOGGER = LoggerFactory.getLogger(AgentServiceImpl.class);
 
 	public AgentServiceImpl(RestClient restClient, HttpService httpService, Helper helper,
 			BharatConnectMasterRepository beneficiaryDetailsRepository,
 			InboundTraceLogRepository inboundTraceLogRepository, OutboundTraceLogRepository outboundTraceLogRepository,
+			BillMasterRepository billMasterRepository, BillInitateRepository billIntiateRepository,
 			BillerMapperHelper mapperHelper) {
 		this.restClient = restClient;
 		this.httpService = httpService;
 		this.helper = helper;
 		this.beneficiaryDetailsRepository = beneficiaryDetailsRepository;
+		this.billMasterRepository = billMasterRepository;
+		this.billIntiateRepository = billIntiateRepository;
 		this.mapperHelper = mapperHelper;
 	}
 
 	@Override
 	public ResponseModel initiateBillFetch(FetchBillRequest fetchBillRequest) {
+		LOGGER.info("Initiating bill fetch for request ID: {} and MID", fetchBillRequest.getReqId(),
+				fetchBillRequest.getMid());
 		String apiName = "InitiateBillFetch";
 		String txnId = helper.generateTxnId(15);
 		String requestId = fetchBillRequest.getReqId();
-		String url = agentDtaUrl + BBPSConstant.BILL_FETCH_INTI;
+		String fullUrl = agentDtaUrl + BBPSConstant.BILL_FETCH_INTI;
 
 		helper.validateMerchant(fetchBillRequest.getMid());
 
@@ -82,60 +94,75 @@ public class AgentServiceImpl implements AgentService {
 		// ✅ Create inbound & outbound logs
 		InboundTraceLog inboundLog = helper.createInboundLog(requestId, txnId, apiName, fetchBillRequest.getMid(),
 				"POST", requestJson);
-		OutboundTraceLog outboundLog = helper.createOutboundLog(txnId, requestId, apiName, url, "POST", requestJson);
+		OutboundTraceLog outboundLog = helper.createOutboundLog(txnId, requestId, apiName, fullUrl, "POST",
+				requestJson);
+		LOGGER.debug("Outbound log created successfully for txnId: {} and reqId: {}", txnId, requestId);
 
 		try {
-			Map<String, String> responseMap = httpService.postRequest(url, requestJson, headers);
+			LOGGER.info("Calling external API: {}", fullUrl);
+			Map<String, String> responseMap = httpService.postRequest(fullUrl, requestJson, headers);
 			String responseData = responseMap.get("data");
 
-			log.info("📦 Bill Fetch API Response: {}", responseData);
 			helper.updateOutboundLogResponse(outboundLog, responseData);
-
-			if (responseData == null || responseData.isEmpty()) {
-				helper.updateInboundLogFailure(inboundLog, "Empty response from BBPS", "FAILED");
-				throw new CustomException("Empty response from BBPS server");
-			}
+			LOGGER.debug("Response received from BBPS: {}", responseData);
 
 			Map<String, Object> dataMap = objectMapper.readValue(responseData,
 					new TypeReference<Map<String, Object>>() {
 					});
 			if (!dataMap.containsKey("genericResponse")) {
-				helper.updateInboundLogFailure(inboundLog, responseData, "INVALID_STRUCTURE");
-				throw new CustomException("Invalid response structure from BBPS");
+				helper.updateInboundLogFailure(inboundLog, responseData, "INVALID_RESPONSE");
+				LOGGER.warn("Invalid response received for txnId: {}", txnId);
+				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")));
 			}
 
+			BillMaster billMaster = new BillMaster();
+			billMaster.setBillId((String) dataMap.get("billId"));
+			billMaster.setReqId(fetchBillRequest.getReqId());
+			billMaster.setTxnId(txnId);
+			billMasterRepository.save(billMaster);
+			LOGGER.info("BillMaster saved for billId: {}", billMaster.getBillId());
+
 			FetchBillResponse fetchBillResponse = objectMapper.convertValue(dataMap, FetchBillResponse.class);
 			GeneralResp generalResponse = fetchBillResponse.getGenericResponse();
-
 			helper.updateInboundLogSuccess(inboundLog, responseData, generalResponse.getStatus());
 
-			// ✅ Directly call fetchBillById (no polling)
+			BillInitiate billInitiate = new BillInitiate();
+			billInitiate.setBillId((String) dataMap.get("billId"));
+			billInitiate.setReqId(fetchBillRequest.getReqId());
+			billInitiate.setTxnId(txnId);
+			billIntiateRepository.save(billInitiate);
+			LOGGER.info("BillInitiate entry saved for billId: {}", billInitiate.getBillId());
+
 			BillFetchByBillIdRequest billFetchByBillIdRequest = new BillFetchByBillIdRequest();
 			billFetchByBillIdRequest.setBillId(fetchBillResponse.getBillId());
 			billFetchByBillIdRequest.setMid(fetchBillRequest.getMid());
 			billFetchByBillIdRequest.setReqId(requestId);
-
+			LOGGER.info("Waiting for 2 seconds before fetching bill by ID...");
+			try {
+				Thread.sleep(2000);
+			} catch (InterruptedException e) {
+				Thread.currentThread().interrupt();
+				LOGGER.warn("Thread interrupted during delay: {}", e.getMessage());
+			}
+			LOGGER.info("Calling internal method Fetching bill by ID: {}", billFetchByBillIdRequest.getBillId());
 			return fetchBillById(billFetchByBillIdRequest, inboundLog);
-
 		} catch (JsonProcessingException e) {
-			log.error("❌ JSON Parsing Error: {}", e.getMessage());
+			LOGGER.error("JSON Parsing Error: {}", e.getMessage(), e);
 			helper.updateInboundLogFailure(inboundLog, e.getMessage(), "JSON_ERROR");
 			throw new CustomException("Invalid JSON received from API");
-		} catch (CustomException ce) {
-			throw ce;
-		} catch (Exception e) {
-			log.error("❌ Exception in initiateBillFetch(): {}", e.getMessage(), e);
-			helper.updateInboundLogFailure(inboundLog, e.getMessage(), "EXCEPTION");
-			throw new CustomException("Bill Fetch initiation failed: " + e.getMessage());
 		}
 	}
 
 	public ResponseModel fetchBillById(BillFetchByBillIdRequest billFetchByBillIdRequest, InboundTraceLog inboundLog) {
+		LOGGER.info("Fetching bill by BILLID for request ID={} and MID={}", billFetchByBillIdRequest.getReqId(),
+				billFetchByBillIdRequest.getMid());
 		String apiName = "FetchBillById";
 		String txnId = helper.generateTxnId(15);
-		String requestId = billFetchByBillIdRequest.getReqId();
+		String reqId = billFetchByBillIdRequest.getReqId();
 		String billId = billFetchByBillIdRequest.getBillId();
-		String url = agentDtaUrl + BBPSConstant.BILL_FETCH_BY_ID + "1ced7566-1add-4e01-9ed6-04cd67ac9684";
+		String fullUrl = agentDtaUrl + BBPSConstant.BILL_FETCH_BY_ID + "1ced7566-1add-4e01-9ed6-04cd67ac9684";
 
 		helper.validateMerchant(billFetchByBillIdRequest.getMid());
 
@@ -147,127 +174,101 @@ public class AgentServiceImpl implements AgentService {
 		headers.setContentType(MediaType.APPLICATION_JSON);
 
 		ObjectMapper objectMapper = new ObjectMapper();
-		OutboundTraceLog outboundLog = helper.createOutboundLog(txnId, requestId, apiName, url, "GET", null);
+		OutboundTraceLog outboundLog = helper.createOutboundLog(txnId, reqId, apiName, fullUrl, "GET", null);
+		LOGGER.debug("Outbound log created successfully for FetchBillById: {}", fullUrl);
 
-		// ✅ Loop setup
-		long startTime = System.currentTimeMillis();
-		long maxWaitTimeMs = 40000; // 40 seconds
-		long intervalMs = 5000; // 5 seconds
+		try {
+			LOGGER.info("Calling external API: {}", fullUrl);
+			Map<String, String> responseMap = httpService.getRequest(fullUrl, headers);
+			String responseData = responseMap.get("data");
+			LOGGER.info("Bill FetchById Response: {}", responseData);
 
-		while (true) {
-			try {
-				Map<String, String> responseMap = httpService.getRequest(url, headers);
-				String responseData = responseMap.get("data");
-				log.info("📦 Bill FetchById Response: {}", responseData);
+			helper.updateOutboundLogResponse(outboundLog, responseData);
 
-				helper.updateOutboundLogResponse(outboundLog, responseData);
+			Map<String, Object> dataMap = objectMapper.readValue(responseData,
+					new TypeReference<Map<String, Object>>() {
+					});
 
-				Map<String, Object> dataMap = objectMapper.readValue(responseData,
-						new TypeReference<Map<String, Object>>() {
-						});
-
-				if (!dataMap.containsKey("genericResponse")) {
-					helper.updateInboundLogFailure(inboundLog, responseData, "INVALID_RESPONSE");
-					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")));
-				}
-
-				BillDataResponse responseWrapper = objectMapper.convertValue(dataMap, BillDataResponse.class);
-				GeneralResp generalResp = responseWrapper.getGenericResponse();
-
-				String status = generalResp.getStatus();
-				log.info("📡 Current Bill Status: {}", status);
-
-				// ✅ Check for "INPROGRESS" or pending state
-				if ("INPROGRESS".equalsIgnoreCase(status)) {
-					if (System.currentTimeMillis() - startTime > maxWaitTimeMs) {
-						helper.updateInboundLogFailure(inboundLog, "Timeout after 40 seconds", "FAILED");
-						throw new CustomException("Timeout waiting for bill fetch completion", "FAILED", 408,
-								"Bill fetch still in progress");
-					}
-
-					Thread.sleep(intervalMs);
-					continue; // retry again
-				}
-
-				// ✅ Final successful response
-				helper.updateInboundLogSuccess(inboundLog, responseData, generalResp.getStatus());
-
-				return new ResponseModel(generalResp.getMessage(), generalResp.getStatus(),
-						Integer.parseInt(generalResp.getStatusCode()), responseWrapper);
-
-			} catch (JsonProcessingException e) {
-				log.error("Error parsing BillById JSON: {}", e.getMessage());
-				helper.updateInboundLogFailure(inboundLog, e.getMessage(), "JSON_ERROR");
-				throw new CustomException("Invalid JSON received from API");
-			} catch (InterruptedException e) {
-				Thread.currentThread().interrupt();
-				helper.updateInboundLogFailure(inboundLog, e.getMessage(), "INTERRUPTED");
-				throw new CustomException("Thread interrupted during bill status check");
-			} catch (CustomException ce) {
-				throw ce;
-			} catch (Exception e) {
-				log.error("❌ Exception in fetchBillById(): {}", e.getMessage(), e);
-				helper.updateInboundLogFailure(inboundLog, e.getMessage(), "EXCEPTION");
-				throw new CustomException("Bill Fetch by ID failed: " + e.getMessage());
+			if (!dataMap.containsKey("genericResponse")) {
+				helper.updateInboundLogFailure(inboundLog, responseData, "INVALID_RESPONSE");
+				LOGGER.warn("Invalid response structure for txnId: {}", txnId);
+				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")));
 			}
+
+			BillDataResponse responseWrapper = objectMapper.convertValue(dataMap, BillDataResponse.class);
+			GeneralResp generalResp = responseWrapper.getGenericResponse();
+
+			String status = generalResp.getStatus();
+			LOGGER.info("Current Bill Status: {}", status);
+
+			helper.updateInboundLogSuccess(inboundLog, responseData, generalResp.getStatus());
+			helper.saveOrUpdateBillerData(responseWrapper, billFetchByBillIdRequest);
+			LOGGER.info("Bill data saved successfully for billId: {}", billId);
+
+			return new ResponseModel(generalResp.getMessage(), generalResp.getStatus(),
+					Integer.parseInt(generalResp.getStatusCode()), responseWrapper);
+		} catch (JsonProcessingException e) {
+			LOGGER.error("Error parsing BillById JSON: {}", e.getMessage(), e);
+			helper.updateInboundLogFailure(inboundLog, e.getMessage(), "JSON_ERROR");
+			throw new CustomException("Invalid JSON received from API");
 		}
 	}
 
 	@Override
 	public ResponseModel fetchBillById(BillFetchByBillIdRequest billFetchByBillIdRequest) {
+		String apiName = "FetchBillById";
+		String txnId = helper.generateTxnId(15);
+		String reqId = billFetchByBillIdRequest.getReqId();
+		String billId = billFetchByBillIdRequest.getBillId();
+		String fullUrl = agentDtaUrl + BBPSConstant.BILL_FETCH_BY_ID + "1ced7566-1add-4e01-9ed6-04cd67ac9684";
+
+		LOGGER.info("Initiating {} API for billId={} and reqId={}", apiName, billId, reqId);
 
 		try {
-
 			helper.validateMerchant(billFetchByBillIdRequest.getMid());
-
-			String billId = billFetchByBillIdRequest.getBillId();
-			String fullUrl = agentDtaUrl + BBPSConstant.BILL_FETCH_BY_ID + billId;
-			System.out.print(fullUrl);
+			LOGGER.debug("Merchant validated successfully for MID={}", billFetchByBillIdRequest.getMid());
 
 			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);
 
+			LOGGER.info("Calling external BBPS API for FetchBillById, URL={}", fullUrl);
 			Map<String, String> responseMap = httpService.getRequest(fullUrl, headers);
 			String responseData = responseMap.get("data");
-			log.info("data is :{}", responseData);
+			LOGGER.info("Response received from BBPS for billId={} : {}", billId, responseData);
 
 			ObjectMapper objectMapper = new ObjectMapper();
-
 			Map<String, Object> dataMap = objectMapper.readValue(responseData,
 					new TypeReference<Map<String, Object>>() {
 					});
+
 			if (!dataMap.containsKey("genericResponse")) {
+				LOGGER.warn("Invalid response structure received for billId={} | Response={}", billId, responseData);
 				throw new CustomException(String.valueOf(dataMap.get("message")), // message
 						String.valueOf(dataMap.get("status")), // status
-						Integer.parseInt(String.valueOf(dataMap.get("statusCode"))), // statusCode (int)
+						Integer.parseInt(String.valueOf(dataMap.get("statusCode"))), // statusCode
 						String.valueOf(dataMap.get("remarks")));
 			}
 
 			BillDataResponse responseWrapper = objectMapper.convertValue(dataMap, BillDataResponse.class);
-
 			GeneralResp generalResp = responseWrapper.getGenericResponse();
-
 			ResponseModel responseModel = new ResponseModel(generalResp.getMessage(), generalResp.getStatus(),
 					Integer.parseInt(generalResp.getStatusCode()), responseWrapper);
 
+			helper.saveOrUpdateBillerData(responseWrapper, billFetchByBillIdRequest);
+			LOGGER.info("Bill data saved successfully for billId={} | Status={}", billId, generalResp.getStatus());
+
 			return responseModel;
 
 		} catch (JsonProcessingException e) {
-			log.error("Error parsing responseData JSON: {}", e.getMessage());
+			LOGGER.error("Error parsing responseData JSON for billId={} : {}", billId, e.getMessage(), e);
 			throw new CustomException("Invalid JSON received from API");
-		} catch (CustomException ex) {
-			log.warn("Merchant validation failed: {}", ex.getMessage());
-			return ex.getResponseModel(); // Directly return ResponseModel from exception
 		}
-
 	}
 
 	@Override
@@ -306,7 +307,7 @@ public class AgentServiceImpl implements AgentService {
 			Map<String, String> responseMap = httpService.postRequest(url, json, headers);
 			String responseData = responseMap.get("data");
 
-			log.info("📦 Bill Fetch API Response: {}", responseData);
+			LOGGER.info("📦 Bill Fetch API Response: {}", responseData);
 			helper.updateOutboundLogResponse(outboundLog, responseData);
 
 			if (responseData == null || responseData.isEmpty()) {
@@ -334,10 +335,10 @@ public class AgentServiceImpl implements AgentService {
 					Integer.parseInt(generalResponse.getStatusCode()), fetchBillResponse);
 
 		} catch (CustomException ex) {
-			log.warn("Merchant validation failed: {}", ex.getMessage());
+			LOGGER.warn("Merchant validation failed: {}", ex.getMessage());
 			return ex.getResponseModel();
 		} catch (Exception e) {
-			log.error("❌ Exception in initiateBillFetch(): {}", e.getMessage(), e);
+			LOGGER.error("❌ Exception in initiateBillFetch(): {}", e.getMessage(), e);
 			responseModel.setStatus("500");
 			responseModel.setMessage("Exception occurred");
 			responseModel.setData(e.getMessage());
@@ -371,13 +372,13 @@ public class AgentServiceImpl implements AgentService {
 			String json = objectMapper.writeValueAsString(billRequest);
 			String url = agentDtaUrl + BBPSConstant.BILL_ID_URL + billRequest.getBillId();
 
-			log.info("Full URL" + url);
+			LOGGER.info("Full URL" + url);
 			objectMapper.setSerializationInclusion(JsonInclude.Include.NON_NULL);
 
 			Map<String, String> responseMap = httpService.getRequest(url, headers);
 			String responseData = responseMap.get("data");
 
-			log.info("📦 Bill Fetch API Response: {}", responseData);
+			LOGGER.info("📦 Bill Fetch API Response: {}", responseData);
 
 			if (responseData == null || responseData.isEmpty()) {
 				throw new CustomException("Empty response from BBPS server");
@@ -398,10 +399,10 @@ public class AgentServiceImpl implements AgentService {
 					Integer.parseInt(generalResponse.getStatusCode()), fetchBillResponse);
 
 		} catch (CustomException ex) {
-			log.warn("Merchant validation failed: {}", ex.getMessage());
+			LOGGER.warn("Merchant validation failed: {}", ex.getMessage());
 			return ex.getResponseModel();
 		} catch (Exception e) {
-			log.error("❌ Exception in initiateBillFetch(): {}", e.getMessage(), e);
+			LOGGER.error("❌ Exception in initiateBillFetch(): {}", e.getMessage(), e);
 			responseModel.setStatus("500");
 			responseModel.setMessage("Exception occurred");
 			responseModel.setData(e.getMessage());
@@ -410,4 +411,191 @@ public class AgentServiceImpl implements AgentService {
 		return responseModel;
 	}
 
+	/*
+	 * @Override public ResponseModel
+	 * initiateBillValidate(FetchBillValidatestRequest fetchBillValidateRequest) {
+	 * 
+	 * ResponseModel responseModel = new ResponseModel(); try {
+	 * 
+	 * helper.validateMerchant(fetchBillValidateRequest.getMid());
+	 * 
+	 * BharatConnectMaster headersData =
+	 * beneficiaryDetailsRepository.findByOrgId("ORG001");
+	 * 
+	 * if (headersData == null) { responseModel = new
+	 * ResponseModel("Tenant Id Is Null", "Not Found", BBPSConstant.BADREQUEST,
+	 * headersData); return responseModel; }
+	 * 
+	 * 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);
+	 * 
+	 * ObjectMapper objectMapper = new ObjectMapper();
+	 * objectMapper.setSerializationInclusion(JsonInclude.Include.NON_NULL); String
+	 * json = objectMapper.writeValueAsString(fetchBillValidateRequest); String url
+	 * = agentDtaUrl + BBPSConstant.BILLER_VALIDATE_URL;
+	 * 
+	 * Map<String, String> responseMap = httpService.postRequest(url, json,
+	 * headers); String responseData = responseMap.get("data");
+	 * 
+	 * log.info("📦 Bill Fetch API Response: {}", responseData);
+	 * 
+	 * if (responseData == null || responseData.isEmpty()) { throw new
+	 * CustomException("Empty response from BBPS server"); }
+	 * 
+	 * // ✅ Convert JSON string → Map Map<String, Object> dataMap =
+	 * objectMapper.readValue(responseData, new TypeReference<Map<String, Object>>()
+	 * {});
+	 * 
+	 * // ✅ Validate generalResp if (!dataMap.containsKey("genericResponse")) {
+	 * throw new CustomException("Invalid response structure from BBPS"); }
+	 * 
+	 * // ✅ Convert to your custom DTO FetchBillValidatestResponse fetchBillResponse
+	 * = objectMapper.convertValue(dataMap, FetchBillValidatestResponse.class);
+	 * GeneralResp generalResponse = fetchBillResponse.getGenericResponse();
+	 * 
+	 * // ✅ Build final ResponseModel responseModel = new ResponseModel(
+	 * generalResponse.getMessage(), generalResponse.getStatus(),
+	 * Integer.parseInt(generalResponse.getStatusCode()), fetchBillResponse );
+	 * 
+	 * } catch (CustomException ex) { log.warn("Merchant validation failed: {}",
+	 * ex.getMessage()); return ex.getResponseModel(); // Directly return
+	 * ResponseModel from exception } catch (Exception e) {
+	 * log.error("❌ Exception in initiateBillFetch(): {}", e.getMessage(), e);
+	 * responseModel.setStatus("500");
+	 * responseModel.setMessage("Exception occurred");
+	 * responseModel.setData(e.getMessage()); }
+	 * 
+	 * return responseModel; }
+	 * 
+	 * @Override public ResponseModel
+	 * initiateBillValidateByBillId(BillFetchByBillIdRequest billRequest) {
+	 * 
+	 * ResponseModel responseModel = new ResponseModel(); try {
+	 * helper.validateMerchant(billRequest.getMid());
+	 * 
+	 * BharatConnectMaster headersData =
+	 * beneficiaryDetailsRepository.findByOrgId("ORG001");
+	 * 
+	 * if (headersData == null) { responseModel = new
+	 * ResponseModel("Tenant Id Is Null", "Not Found", BBPSConstant.BADREQUEST,
+	 * headersData); return responseModel; }
+	 * 
+	 * 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);
+	 * 
+	 * ObjectMapper objectMapper = new ObjectMapper();
+	 * objectMapper.setSerializationInclusion(JsonInclude.Include.NON_NULL); String
+	 * json = objectMapper.writeValueAsString(billRequest); String url = agentDtaUrl
+	 * + BBPSConstant.BILL_ID_URL + billRequest.getBillId();
+	 * 
+	 * log.info("Full URL: {}", url);
+	 * objectMapper.setSerializationInclusion(JsonInclude.Include.NON_NULL);
+	 * 
+	 * // ✅ Call the API using httpService Map<String, String> responseMap =
+	 * httpService.getRequest(url, headers); String responseData =
+	 * responseMap.get("data");
+	 * 
+	 * log.info("📦 Bill Fetch API Response: {}", responseData);
+	 * 
+	 * if (responseData == null || responseData.isEmpty()) { throw new
+	 * CustomException("Empty response from BBPS server"); }
+	 * 
+	 * // ✅ Convert JSON string → Map Map<String, Object> dataMap =
+	 * objectMapper.readValue(responseData, new TypeReference<Map<String, Object>>()
+	 * {});
+	 * 
+	 * // ✅ Validate generalResp if (!dataMap.containsKey("genericResponse")) {
+	 * throw new CustomException("Invalid response structure from BBPS"); }
+	 * 
+	 * // ✅ Convert to your custom DTO BillDataResponse fetchBillResponse =
+	 * objectMapper.convertValue(dataMap, BillDataResponse.class); GeneralResp
+	 * generalResponse = fetchBillResponse.getGenericResponse();
+	 * 
+	 * // ✅ Build final ResponseModel responseModel = new ResponseModel(
+	 * generalResponse.getRemarks(), generalResponse.getStatus(),
+	 * Integer.parseInt(generalResponse.getStatusCode()), fetchBillResponse );
+	 * 
+	 * } catch (CustomException ex) { log.warn("Merchant validation failed: {}",
+	 * ex.getMessage()); return ex.getResponseModel(); // Directly return
+	 * ResponseModel from exception } catch (Exception e) {
+	 * log.error("❌ Exception in initiateBillFetch(): {}", e.getMessage(), e);
+	 * responseModel.setStatus("500");
+	 * responseModel.setMessage("Exception occurred");
+	 * responseModel.setData(e.getMessage()); }
+	 * 
+	 * return responseModel; }
+	 */
+
+	/*
+	 * POLLING METHOD public ResponseModel fetchBillById(BillFetchByBillIdRequest
+	 * billFetchByBillIdRequest, InboundTraceLog inboundLog) { String apiName =
+	 * "FetchBillById"; String txnId = helper.generateTxnId(15); String reqId =
+	 * billFetchByBillIdRequest.getReqId(); String billId =
+	 * billFetchByBillIdRequest.getBillId(); String url = agentDtaUrl +
+	 * BBPSConstant.BILL_FETCH_BY_ID + "1ced7566-1add-4e01-9ed6-04cd67ac9684";
+	 * 
+	 * helper.validateMerchant(billFetchByBillIdRequest.getMid());
+	 * 
+	 * 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);
+	 * 
+	 * ObjectMapper objectMapper = new ObjectMapper(); OutboundTraceLog outboundLog
+	 * = helper.createOutboundLog(txnId, reqId, apiName, url, "GET", null);
+	 * 
+	 * // ✅ Loop setup long startTime = System.currentTimeMillis(); long
+	 * maxWaitTimeMs = 40000; // 40 seconds long intervalMs = 5000; // 5 seconds
+	 * 
+	 * while (true) { try { Map<String, String> responseMap =
+	 * httpService.getRequest(url, headers); String responseData =
+	 * responseMap.get("data"); log.info("📦 Bill FetchById Response: {}",
+	 * responseData);
+	 * 
+	 * helper.updateOutboundLogResponse(outboundLog, responseData);
+	 * 
+	 * Map<String, Object> dataMap = objectMapper.readValue(responseData, new
+	 * TypeReference<Map<String, Object>>() {});
+	 * 
+	 * if (!dataMap.containsKey("genericResponse")) {
+	 * helper.updateInboundLogFailure(inboundLog, responseData, "INVALID_RESPONSE");
+	 * 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")) ); }
+	 * 
+	 * BillDataResponse responseWrapper = objectMapper.convertValue(dataMap,
+	 * BillDataResponse.class); GeneralResp generalResp =
+	 * responseWrapper.getGenericResponse();
+	 * 
+	 * String status = generalResp.getStatus();
+	 * log.info("📡 Current Bill Status: {}", status); // ✅ Check for "INPROGRESS"
+	 * or pending state if ("INPROGRESS".equalsIgnoreCase(status)) { if
+	 * (System.currentTimeMillis() - startTime > maxWaitTimeMs) {
+	 * helper.updateInboundLogFailure(inboundLog, "Timeout after 40 seconds",
+	 * "FAILED"); throw new CustomException("Timeout", "FAILED", 408,
+	 * "Bill fetch still in progress"); } Thread.sleep(intervalMs); continue; //
+	 * retry again } // ✅ Final successful response
+	 * helper.updateInboundLogSuccess(inboundLog, responseData,
+	 * generalResp.getStatus()); return new ResponseModel( generalResp.getMessage(),
+	 * generalResp.getStatus(), Integer.parseInt(generalResp.getStatusCode()),
+	 * responseWrapper ); } catch (JsonProcessingException e) {
+	 * log.error("Error parsing BillById JSON: {}", e.getMessage());
+	 * helper.updateInboundLogFailure(inboundLog, e.getMessage(), "JSON_ERROR");
+	 * throw new CustomException("Invalid JSON received from API"); } catch
+	 * (InterruptedException e) { Thread.currentThread().interrupt();
+	 * helper.updateInboundLogFailure(inboundLog, e.getMessage(), "INTERRUPTED");
+	 * throw new CustomException("Thread interrupted during bill status check"); } }
+	 * }
+	 */
+
 }

src/main/java/com/billpaymentservice/bbps/serviceImpl/HttpService.java

@@ -8,13 +8,11 @@ import org.slf4j.LoggerFactory;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
-import org.springframework.http.client.JdkClientHttpRequestFactory;
 import org.springframework.stereotype.Service;
 import org.springframework.web.client.HttpClientErrorException;
 import org.springframework.web.client.HttpServerErrorException;
 import org.springframework.web.client.RestClient;
 
-import com.billpaymentservice.bbps.dto.request.FetchBillRequest;
 import com.fasterxml.jackson.databind.ObjectMapper;
 
 import lombok.AllArgsConstructor;

src/main/java/com/billpaymentservice/bbps/serviceImpl/MasterDataServiceImpl.java

@@ -13,6 +13,9 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
 import com.billpaymentservice.bbps.dto.CustomerParamGroupsDTO;
+
+import com.billpaymentservice.bbps.dto.CustomParamDTO;
+
 import com.billpaymentservice.bbps.dto.GeneralResp;
 import com.billpaymentservice.bbps.dto.MasterApiResponse;
 import com.billpaymentservice.bbps.dto.ResponseModel;
@@ -35,12 +38,14 @@ import com.billpaymentservice.bbps.dto.response.PlaneCategoriesResponse;
 import com.billpaymentservice.bbps.entites.BharatConnectMaster;
 import com.billpaymentservice.bbps.entites.BillerCategoryWise;
 import com.billpaymentservice.bbps.entites.BillerDetails;
+import com.billpaymentservice.bbps.entites.CustomParam;
 import com.billpaymentservice.bbps.entites.DispositionDetails;
 import com.billpaymentservice.bbps.entites.InboundTraceLog;
 import com.billpaymentservice.bbps.entites.OutboundTraceLog;
 import com.billpaymentservice.bbps.exception.CustomException;
 import com.billpaymentservice.bbps.repository.BharatConnectMasterRepository;
 import com.billpaymentservice.bbps.repository.BillerDataRepository;
+import com.billpaymentservice.bbps.repository.CustomParamRepository;
 import com.billpaymentservice.bbps.repository.DispositionRepository;
 import com.billpaymentservice.bbps.repository.InboundTraceLogRepository;
 import com.billpaymentservice.bbps.repository.MerchantRepository;
@@ -68,17 +73,17 @@ public class MasterDataServiceImpl implements MasterDataService {
 	private final DispositionRepository dispositionRepository;
 	private final Helper helper;
 	private final BillerDataRepository billerDataRespository;
-	private static final Logger log = LoggerFactory.getLogger(MasterDataServiceImpl.class);
 	private final HttpService httpService;
 	private final ObjectMapper objectMapper = new ObjectMapper();
 	private final InboundTraceLogRepository inboundTraceLogRepository;
 	private final OutboundTraceLogRepository outboundTraceLogRepository;
+	private final CustomParamRepository customParamReposiotory;
 
 	public MasterDataServiceImpl(MerchantRepository merchantRegisterRepo, HttpService httpService,
 			HttpClientApi httpClientApi, Helper helper, BillerDataRepository billerDataRespository,
 			DispositionRepository dispositionRepository, BharatConnectMasterRepository beneficiaryDetailsRepository,
 			InboundTraceLogRepository inboundTraceLogRepository, OutboundTraceLogRepository outboundTraceLogRepository,
-			BillerMapperHelper mapperHelper) {
+			BillerMapperHelper mapperHelper, CustomParamRepository customParamReposiotory) {
 		this.merchantRegisterRepo = merchantRegisterRepo;
 		this.httpService = httpService;
 		this.httpClientApi = httpClientApi;
@@ -89,54 +94,39 @@ public class MasterDataServiceImpl implements MasterDataService {
 		this.inboundTraceLogRepository = inboundTraceLogRepository;
 		this.outboundTraceLogRepository = outboundTraceLogRepository;
 		this.mapperHelper = mapperHelper;
+		this.customParamReposiotory = customParamReposiotory;
 
 	}
 
 	@Override
 	public ResponseModel getMasterData(MasterRequest masterRequest) {
-		LOGGER.info("Request DTO: {}", masterRequest);
-
+		LOGGER.info("Fetching Master Data for ReqId={} and MID={}", masterRequest.getReqId(), masterRequest.getMid());
 		String txnID = helper.generateTxnId(15);
 		String apiName = "GetMasterData";
 		String requestId = masterRequest.getReqId();
 		String requestJson = helper.convertObjectToJson(masterRequest);
-
 		InboundTraceLog inboundLog = helper.createInboundLog(requestId, txnID, apiName, masterRequest.getMid(), "POST",
 				requestJson);
-
 		try {
 			// Merchant Validation
 			helper.validateMerchant(masterRequest.getMid());
-
-//			if (!"Valid".equalsIgnoreCase(validateMerchant)) {
-//				LOGGER.warn("Merchant validation failed: {}", validateMerchant);
-//				return new ResponseModel("Merchant validation failed", validateMerchant, BBPSConstant.BADREQUEST, null);
-//			}
-
 			// check Tender Id is present DB
 			BharatConnectMaster headersData = beneficiaryDetailsRepository.findByOrgId("ORG001");
-			log.info("Response -: " + headersData);
 			if (headersData == null) {
-				helper.updateInboundLogFailure(inboundLog, "Tenant Id Is Null", "NOT_FOUND");
-				return new ResponseModel("Tenant Id Is Null", "Not Found", BBPSConstant.BADREQUEST, headersData);
+				LOGGER.warn("header data not found for the orgID");
+				throw new CustomException("Something went wrong", "FAILED", 500, "");
 			}
-
 			// get full url
 			String fullUrl = masterRegisterUrl + BBPSConstant.MASTER_CATEGORY_URL + headersData.getTenantId();
 			LOGGER.info("Calling external API: {}", fullUrl);
-
 			OutboundTraceLog outboundLog = helper.createOutboundLog(txnID, requestId, apiName, fullUrl, "GET", null);
-
 			Map<String, String> responseMap = httpService.getRequest(fullUrl);
 			String responseData = responseMap.get("data");
 			LOGGER.info("Response Data: {}", responseData);
-
 			helper.updateOutboundLogResponse(outboundLog, responseData);
-
 			Map<String, Object> dataMap = objectMapper.readValue(responseData,
 					new TypeReference<Map<String, Object>>() {
 					});
-
 			if (!dataMap.containsKey("generalResp")) {
 				helper.updateInboundLogFailure(inboundLog, responseData, String.valueOf(dataMap.get("status")));
 				throw new CustomException(String.valueOf(dataMap.get("message")), // message
@@ -157,14 +147,17 @@ public class MasterDataServiceImpl implements MasterDataService {
 			return responseModel;
 
 		} catch (JsonProcessingException e) {
-			log.error("Error parsing responseData JSON: {}", e.getMessage());
+			LOGGER.error("Error parsing responseData JSON: {}", e.getMessage());
 			helper.updateInboundLogFailure(inboundLog, e.getMessage(), "JSON_ERROR");
 			throw new CustomException("Invalid JSON received from API");
 		}
+
 	}
 
 	@Override
 	public ResponseModel getBillerByBillerId(BillerDetailRequest billerDetailRequest) {
+		LOGGER.info("Fetching Biller Detail By Biller Id for ReqId={} and MID={}", billerDetailRequest.getReqId(),
+				billerDetailRequest.getMid());
 
 		helper.validateMerchant(billerDetailRequest.getMid());
 		String txnID = helper.generateTxnId(15);
@@ -172,56 +165,50 @@ public class MasterDataServiceImpl implements MasterDataService {
 		String requestId = billerDetailRequest.getReqId();
 		String billerId = billerDetailRequest.getBillerId();
 		String fullUrl = masterRegisterUrl + BBPSConstant.BILLER_DATA_FETCH_URL + billerId;
-
 		String requestJson = helper.convertObjectToJson(billerDetailRequest);
 		InboundTraceLog inboundLog = helper.createInboundLog(requestId, txnID, apiName, billerDetailRequest.getMid(),
 				"POST", requestJson);
 
 		OutboundTraceLog outboundLog = helper.createOutboundLog(txnID, requestId, apiName, fullUrl, "GET", null);
-
+		LOGGER.info("Calling external API: {}", fullUrl);
 		Map<String, String> responseMap = httpService.getRequest(fullUrl);
 		String responseData = responseMap.get("data");
-		log.info("data is :{}", responseData);
-
+		LOGGER.info("fetched data from api is :{}", responseData);
 		helper.updateOutboundLogResponse(outboundLog, responseData);
-
 		try {
 			Map<String, Object> dataMap = objectMapper.readValue(responseData,
 					new TypeReference<Map<String, Object>>() {
 					});
-
 			if (!dataMap.containsKey("generalResp")) {
 				helper.updateInboundLogFailure(inboundLog, responseData, String.valueOf(dataMap.get("status")));
 				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")));
 			}
-
 			BillerDataResponse responseWrapper = objectMapper.convertValue(dataMap, BillerDataResponse.class);
 			GeneralResp generalResp = responseWrapper.getGeneralResp();
-
 			ModelMapper mapper = new ModelMapper();
 			mapper.getConfiguration().setMatchingStrategy(MatchingStrategies.STRICT);
 			BillerDetails entity = mapper.map(responseWrapper.getBillerDAO(), BillerDetails.class);
-			EntityRelationshipUtil.linkBillerRelationships(entity);
-
+			EntityRelationshipUtil.linkBillerRelationships(entity);// linking nesting entity foreign key
+			helper.saveOrUpdateBillerData(entity);
 			ResponseModel responseModel = new ResponseModel(generalResp.getMessage(), generalResp.getStatus(),
 					Integer.parseInt(generalResp.getStatusCode()), responseWrapper);
-
 			helper.updateInboundLogSuccess(inboundLog, responseData, generalResp.getStatus());
-
 			return responseModel;
 		} catch (JsonProcessingException e) {
-			log.error("Error parsing responseData JSON: {}", e.getMessage());
+			LOGGER.error("Error parsing responseData JSON: {}", e.getMessage());
 			helper.updateInboundLogFailure(inboundLog, e.getMessage(), "JSON_ERROR");
 			throw new CustomException("Invalid JSON received from API");
 		}
-
 	}
 
 	@Override
 	public ResponseModel getCustomerParamByBillerId(CustomParamRequest customerParamRequest) {
 
+		LOGGER.info("Fetching Customer Param By Biller Id for ReqId={} and MID={}", customerParamRequest.getReqId(),
+				customerParamRequest.getMid());
+
 		String txnID = helper.generateTxnId(15);
 		String apiName = "GetCustomerParamByBillerId";
 		String requestId = customerParamRequest.getReqId();
@@ -231,20 +218,14 @@ public class MasterDataServiceImpl implements MasterDataService {
 
 		try {
 			helper.validateMerchant(customerParamRequest.getMid());
-
-//			if (!"Valid".equalsIgnoreCase(validateMerchant)) {
-//				LOGGER.warn("Merchant validation failed: {}", validateMerchant);
-//				return new ResponseModel("Merchant validation failed", validateMerchant, BBPSConstant.BADREQUEST, null);
-//			}
-
 			String billerId = customerParamRequest.getBillerId();
 			String fullUrl = masterRegisterUrl + BBPSConstant.CUSTOMPARAM_URL + billerId;
 
 			OutboundTraceLog outboundLog = helper.createOutboundLog(txnID, requestId, apiName, fullUrl, "GET", null);
-
+			LOGGER.info("Calling external API: {}", fullUrl);
 			Map<String, String> responseMap = httpService.getRequest(fullUrl);
 			String responseData = responseMap.get("data");
-			log.info("data is :{}", responseData);
+			LOGGER.info("data is :{}", responseData);
 
 			helper.updateOutboundLogResponse(outboundLog, responseData);
 
@@ -260,26 +241,34 @@ public class MasterDataServiceImpl implements MasterDataService {
 			}
 
 			CustomParamResp responseWrapper = objectMapper.convertValue(dataMap, CustomParamResp.class);
+			List<CustomParamDTO> customParams = responseWrapper.getCustomParamResp();
 			GeneralResp generalResp = responseWrapper.getGeneralResp();
+			List<CustomParamDTO> customParam = responseWrapper.getCustomParamResp();
+			ModelMapper mapper = new ModelMapper();
+			mapper.getConfiguration().setMatchingStrategy(MatchingStrategies.STRICT);
+
+			// Map DTOs to entities
+			List<CustomParam> entities = customParams.stream().map(dto -> mapper.map(dto, CustomParam.class))
+					.collect(Collectors.toList());
+			// Save all to DB
+			customParamReposiotory.saveAll(entities);
 
 			ResponseModel responseModel = new ResponseModel(generalResp.getMessage(), generalResp.getStatus(),
 					Integer.parseInt(generalResp.getStatusCode()), responseWrapper);
-
 			helper.updateInboundLogSuccess(inboundLog, responseData, generalResp.getStatus());
 
 			return responseModel;
 		} catch (JsonProcessingException e) {
-			log.error("Error parsing responseData JSON: {}", e.getMessage());
+			LOGGER.error("Error parsing responseData JSON: {}", e.getMessage());
 			helper.updateInboundLogFailure(inboundLog, e.getMessage(), "JSON_ERROR");
 			throw new CustomException("Invalid JSON received from API");
 		}
-
 	}
 
 	@Override
 	public ResponseModel getContactMaster(ContactMasterRequest contactMasterRequest) {
 
-		return new ResponseModel();
+		return new ResponseModel(); // things not comming from api
 	}
 
 	@Override
@@ -292,10 +281,8 @@ public class MasterDataServiceImpl implements MasterDataService {
 		String requestJson = helper.convertObjectToJson(masterRequest);
 		InboundTraceLog inboundLog = helper.createInboundLog(requestId, txnID, apiName, masterRequest.getMid(), "POST",
 				requestJson);
-
 		try {
 			helper.validateMerchant(masterRequest.getMid());
-
 			String fullUrl = String.format("%s%s?billerName=%s&category=%s&page=%d&pagesize=%d", masterRegisterUrl,
 					BBPSConstant.BILLER_URL, masterRequest.getBillerName(), masterRequest.getCategory(),
 					masterRequest.getPageStart(), masterRequest.getPageEnd());
@@ -334,7 +321,7 @@ public class MasterDataServiceImpl implements MasterDataService {
 
 			return responseModel;
 		} catch (JsonProcessingException e) {
-			log.error("Error parsing responseData JSON: {}", e.getMessage());
+			LOGGER.error("Error parsing responseData JSON: {}", e.getMessage());
 			helper.updateInboundLogFailure(inboundLog, e.getMessage(), "JSON_ERROR");
 			throw new CustomException("Invalid JSON received from API");
 		}
@@ -342,15 +329,19 @@ public class MasterDataServiceImpl implements MasterDataService {
 
 	@Override
 	public ResponseModel getDispositionDetails(DispositionRequest dispositionDetailRequest) {
+		LOGGER.info("Fetching Disposition Details for ReqId={} and MID={}", dispositionDetailRequest.getReqId(),
+				dispositionDetailRequest.getMid());
+
 		String txnID = helper.generateTxnId(15);
 		String apiName = "GetDispositionDetails";
 		String requestId = dispositionDetailRequest.getReqId();
-		;
+		helper.validateMerchant(dispositionDetailRequest.getMid());
 		InboundTraceLog inboundLog = helper.createInboundLog(requestId, txnID, apiName,
 				dispositionDetailRequest.getMid(), "GET", "N/A");
 
 		String fullUrl = masterRegisterUrl + BBPSConstant.DISPOSTION_URL;
 		OutboundTraceLog outboundLog = helper.createOutboundLog(txnID, requestId, apiName, fullUrl, "GET", null);
+		LOGGER.info("Calling external API: {}", fullUrl);
 		Map<String, String> responseMap = httpService.getRequest(fullUrl);
 		String responseData = responseMap.get("data");
 
@@ -393,16 +384,17 @@ public class MasterDataServiceImpl implements MasterDataService {
 
 			return responseModel;
 		} catch (JsonProcessingException e) {
-			log.error("Error parsing responseData JSON: {}", e.getMessage());
+			LOGGER.error("Error parsing responseData JSON: {}", e.getMessage());
 			helper.updateInboundLogFailure(inboundLog, e.getMessage(), "JSON_ERROR");
 			throw new CustomException("Invalid JSON received from API");
 		}
+
 	}
 
 	@Override
 	public ResponseModel fetchCustomerParamGroup(BillerDetailRequest requestModel) {
-		LOGGER.info("Fetching Master Data CategoryResponseList-wise for MID={}", requestModel.getMid());
-
+		LOGGER.info("Fetching Customer Param Group for ReqId={} and MID={}", requestModel.getReqId(),
+				requestModel.getMid());
 		String txnID = helper.generateTxnId(15);
 		String apiName = "FetchCustomerParamGroup";
 		String requestId = requestModel.getReqId();
@@ -414,7 +406,7 @@ public class MasterDataServiceImpl implements MasterDataService {
 
 			String fullUrl = masterRegisterUrl + BBPSConstant.CUSTOMER_PARAM_GROUP + requestModel.getBillerId();
 			OutboundTraceLog outboundLog = helper.createOutboundLog(txnID, requestId, apiName, fullUrl, "GET", null);
-
+			LOGGER.info("Calling external API: {}", fullUrl);
 			Map<String, String> apiResponse = httpService.getRequest(fullUrl);
 			String responseData = apiResponse.get("data").toString();
 			helper.updateOutboundLogResponse(outboundLog, responseData);
@@ -446,7 +438,7 @@ public class MasterDataServiceImpl implements MasterDataService {
 			return responseModel;
 
 		} catch (JsonProcessingException e) {
-			log.error("Error parsing responseData JSON: {}", e.getMessage());
+			LOGGER.error("Error parsing responseData JSON: {}", e.getMessage());
 			helper.updateInboundLogFailure(inboundLog, e.getMessage(), "JSON_ERROR");
 			throw new CustomException("Invalid JSON received from API");
 		}
@@ -455,8 +447,9 @@ public class MasterDataServiceImpl implements MasterDataService {
 
 	@Override
 	public ResponseModel fetchAllMasterAmountOption(BillerDetailRequest requestModel) {
-		LOGGER.info("Fetching Master Data Amount List for MID={}", requestModel.getMid());
 
+		LOGGER.info("Fetching Master Data Amount List for ReqId={} and MID={}", requestModel.getReqId(),
+				requestModel.getMid());
 		String txnID = helper.generateTxnId(15);
 		String apiName = "FetchAllMasterAmountOption";
 		String requestId = requestModel.getReqId();
@@ -468,9 +461,9 @@ public class MasterDataServiceImpl implements MasterDataService {
 
 			String fullUrl = masterRegisterUrl + BBPSConstant.AMOUNT_OPTIONS + requestModel.getBillerId();
 			OutboundTraceLog outboundLog = helper.createOutboundLog(txnID, requestId, apiName, fullUrl, "GET", null);
-
+			LOGGER.info("Calling external API: {}", fullUrl);
 			Map<String, String> apiResponse = httpService.getRequest(fullUrl);
-			log.info("Response" + apiResponse);
+			LOGGER.info("Response" + apiResponse);
 			String responseData = apiResponse.get("data").toString();
 
 			helper.updateOutboundLogResponse(outboundLog, responseData);
@@ -502,7 +495,7 @@ public class MasterDataServiceImpl implements MasterDataService {
 			return responseModel;
 
 		} catch (JsonProcessingException e) {
-			log.error("Error parsing responseData JSON: {}", e.getMessage());
+			LOGGER.error("Error parsing responseData JSON: {}", e.getMessage());
 			helper.updateInboundLogFailure(inboundLog, e.getMessage(), "JSON_ERROR");
 			throw new CustomException("Invalid JSON received from API");
 		}
@@ -511,8 +504,7 @@ public class MasterDataServiceImpl implements MasterDataService {
 
 	@Override
 	public ResponseModel fetchPlanCategorie(BillerDetailRequest requestModel) {
-		LOGGER.info("Fetching Master Data Amount List for MID={}", requestModel.getMid());
-
+		LOGGER.info("Fetching Plan Categories for ReqId={} and MID={}", requestModel.getReqId(), requestModel.getMid());
 		String txnID = helper.generateTxnId(15);
 		String apiName = "FetchPlanCategorie";
 		String requestId = requestModel.getReqId();
@@ -524,9 +516,9 @@ public class MasterDataServiceImpl implements MasterDataService {
 
 			String fullUrl = masterRegisterUrl + BBPSConstant.PLAN_CATEGORIES + requestModel.getBillerId();
 			OutboundTraceLog outboundLog = helper.createOutboundLog(txnID, requestId, apiName, fullUrl, "GET", null);
-
+			LOGGER.info("Calling external API: {}", fullUrl);
 			Map<String, String> apiResponse = httpService.getRequest(fullUrl);
-			log.info("Response" + apiResponse);
+			LOGGER.info("Response" + apiResponse);
 			String responseData = apiResponse.get("data").toString();
 
 			helper.updateOutboundLogResponse(outboundLog, responseData);
@@ -556,16 +548,17 @@ public class MasterDataServiceImpl implements MasterDataService {
 			return responseModel;
 
 		} catch (JsonProcessingException e) {
-			log.error("Error parsing responseData JSON: {}", e.getMessage());
+			LOGGER.error("Error parsing responseData JSON: {}", e.getMessage());
 			helper.updateInboundLogFailure(inboundLog, e.getMessage(), "JSON_ERROR");
 			throw new CustomException("Invalid JSON received from API");
 		}
+
 	}
 
 	@Override
 	public ResponseModel fetchInitiatingChannel(BillerDetailRequest requestModel) {
-		LOGGER.info("Fetching Initiating Channel List for MID={}", requestModel.getMid());
-
+		LOGGER.info("Fetching Initiating Channel for ReqId={} and MID={}", requestModel.getReqId(),
+				requestModel.getMid());
 		String txnID = helper.generateTxnId(15);
 		String apiName = "FetchInitiatingChannel";
 		String requestId = requestModel.getReqId();
@@ -576,12 +569,11 @@ public class MasterDataServiceImpl implements MasterDataService {
 			helper.validateMerchant(requestModel.getMid());
 
 			String fullUrl = masterRegisterUrl + BBPSConstant.INITIATING_CHANNEL;
-			LOGGER.info("Calling Master API: {}", fullUrl);
 
 			OutboundTraceLog outboundLog = helper.createOutboundLog(txnID, requestId, apiName, fullUrl, "GET", null);
-
+			LOGGER.info("Calling Master API: {}", fullUrl);
 			Map<String, String> apiResponse = httpService.getRequest(fullUrl);
-			log.info("Response" + apiResponse);
+			LOGGER.info("Response" + apiResponse);
 			String responseData = apiResponse.get("data").toString();
 
 			helper.updateOutboundLogResponse(outboundLog, responseData);
@@ -609,16 +601,17 @@ public class MasterDataServiceImpl implements MasterDataService {
 			return responseModel;
 
 		} catch (JsonProcessingException e) {
-			log.error("Error parsing responseData JSON: {}", e.getMessage());
+			LOGGER.error("Error parsing responseData JSON: {}", e.getMessage());
 			helper.updateInboundLogFailure(inboundLog, e.getMessage(), "JSON_ERROR");
 			throw new CustomException("Invalid JSON received from API");
+
 		}
 	}
 
 	public ResponseModel fetchPlanByCategories(PlanRequest requestModel) {
-		LOGGER.info("Fetching Initiating Fetch Plan CategoryResponseList By Biller Id for MID={}",
-				requestModel.getMid());
 
+		LOGGER.info("Fetching Plan By Categories for ReqId={} and MID={}", requestModel.getReqId(),
+				requestModel.getMid());
 		String txnID = helper.generateTxnId(15);
 		String apiName = "FetchPlanByCategories";
 		String requestId = requestModel.getReqId();
@@ -639,11 +632,10 @@ public class MasterDataServiceImpl implements MasterDataService {
 		InboundTraceLog inboundLog = helper.createInboundLog(requestId, txnID, apiName, requestModel.getMid(), "POST",
 				requestJson);
 		OutboundTraceLog outboundLog = helper.createOutboundLog(txnID, requestId, apiName, url, "GET", null);
-
 		try {
 			Map<String, String> apiResponse = httpService.getRequest(url);
 			String responseData = apiResponse.get("data");
-			log.info("Response Data: {}", responseData);
+			LOGGER.info("Response Data: {}", responseData);
 
 			// Update outbound log with response
 			helper.updateOutboundLogResponse(outboundLog, responseData);
@@ -672,7 +664,7 @@ public class MasterDataServiceImpl implements MasterDataService {
 			return responseModel;
 
 		} catch (JsonProcessingException e) {
-			log.error("Error parsing responseData JSON: {}", e.getMessage());
+			LOGGER.error("Error parsing responseData JSON: {}", e.getMessage());
 			helper.updateInboundLogFailure(inboundLog, e.getMessage(), "JSON_ERROR");
 			throw new CustomException("Invalid JSON received from API");
 		}

src/main/java/com/billpaymentservice/bbps/serviceImpl/PaymentServiceImpl.java

@@ -1,6 +1,5 @@
 package com.billpaymentservice.bbps.serviceImpl;
 
-import java.time.LocalDateTime;
 import java.util.Map;
 
 import org.modelmapper.ModelMapper;
@@ -11,28 +10,30 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.MediaType;
 import org.springframework.stereotype.Service;
-
 import com.billpaymentservice.bbps.dto.GeneralResp;
 import com.billpaymentservice.bbps.dto.ResponseModel;
-import com.billpaymentservice.bbps.dto.request.BillFetchByBillIdRequest;
 import com.billpaymentservice.bbps.dto.request.BillPaymentRequest;
-import com.billpaymentservice.bbps.dto.request.FetchBillRequest;
 import com.billpaymentservice.bbps.dto.request.TransactionStatusRequest;
-import com.billpaymentservice.bbps.dto.response.BillDataResponse;
 import com.billpaymentservice.bbps.dto.response.BillPaymentResponse;
-import com.billpaymentservice.bbps.dto.response.FetchBillResponse;
 import com.billpaymentservice.bbps.dto.response.TransactionStatusResponse;
+import com.billpaymentservice.bbps.entites.AgentFundTransfer;
 import com.billpaymentservice.bbps.entites.BharatConnectMaster;
 import com.billpaymentservice.bbps.entites.BillPayment;
 import com.billpaymentservice.bbps.entites.InboundTraceLog;
 import com.billpaymentservice.bbps.entites.OutboundTraceLog;
+import com.billpaymentservice.bbps.entites.PaymentInitiate;
+import com.billpaymentservice.bbps.entites.TransactionMaster;
 import com.billpaymentservice.bbps.exception.CustomException;
+import com.billpaymentservice.bbps.repository.AgentFundTransferRepository;
 import com.billpaymentservice.bbps.repository.BharatConnectMasterRepository;
 import com.billpaymentservice.bbps.repository.InboundTraceLogRepository;
 import com.billpaymentservice.bbps.repository.OutboundTraceLogRepository;
+import com.billpaymentservice.bbps.repository.PaymentIntiateRepository;
 import com.billpaymentservice.bbps.repository.PaymentRepository;
+import com.billpaymentservice.bbps.repository.TransactionMasterRepository;
 import com.billpaymentservice.bbps.service.PaymentService;
 import com.billpaymentservice.bbps.util.BBPSConstant;
+import com.billpaymentservice.bbps.util.EntityRelationshipUtil;
 import com.billpaymentservice.bbps.util.Helper;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.core.JsonProcessingException;
@@ -44,26 +45,35 @@ public class PaymentServiceImpl implements PaymentService {
 
 	@Value("${payment.data.url}")
 	private String paymentUrl;
+
 	private final BharatConnectMasterRepository beneficiaryDetailsRepository;
 	private final HttpService httpService;
 	private final Helper helper;
 	private final PaymentRepository paymentRepository;
 	private final InboundTraceLogRepository inboundTraceLogRepository;
 	private final OutboundTraceLogRepository outboundTraceLogRepository;
+	private final PaymentIntiateRepository paymentIntiateRepository;
+	private final TransactionMasterRepository transactionMasterRepository;
+	private final AgentFundTransferRepository agentFundTransferRepository;
+
+	private static final Logger LOGGER = LoggerFactory.getLogger(PaymentServiceImpl.class);
 
 	public PaymentServiceImpl(BharatConnectMasterRepository beneficiaryDetailsRepository, HttpService httpService,
 			Helper helper, PaymentRepository paymentRepository, InboundTraceLogRepository inboundTraceLogRepository,
-			OutboundTraceLogRepository outboundTraceLogRepository) {
+			OutboundTraceLogRepository outboundTraceLogRepository, PaymentIntiateRepository paymentIntiateRepository,
+			TransactionMasterRepository transactionMasterRepository,
+			AgentFundTransferRepository agentFundTransferRepository) {
 		this.beneficiaryDetailsRepository = beneficiaryDetailsRepository;
 		this.httpService = httpService;
 		this.helper = helper;
 		this.paymentRepository = paymentRepository;
 		this.inboundTraceLogRepository = inboundTraceLogRepository;
 		this.outboundTraceLogRepository = outboundTraceLogRepository;
+		this.paymentIntiateRepository = paymentIntiateRepository;
+		this.transactionMasterRepository = transactionMasterRepository;
+		this.agentFundTransferRepository = agentFundTransferRepository;
 	}
 
-	private static final Logger LOGGER = LoggerFactory.getLogger(MasterDataServiceImpl.class);
-
 	@Override
 	public ResponseModel initiatePayment(BillPaymentRequest billPaymentRequest) {
 	    String apiName = "InitiatePayment";
@@ -71,6 +81,8 @@ public class PaymentServiceImpl implements PaymentService {
 	    String requestId = billPaymentRequest.getReqId();
 	    String url = paymentUrl + BBPSConstant.PAYMENT_URL;
 
+	    LOGGER.info("Initiating payment for reqId={} and txnId={}", requestId, txnId);
+
 	    BharatConnectMaster headersData = beneficiaryDetailsRepository.findByOrgId("ORG001");
 	    HttpHeaders headers = new HttpHeaders();
 	    headers.set("x-digiledge-key", headersData.getXDigiledgeKey());
@@ -83,25 +95,27 @@ public class PaymentServiceImpl implements PaymentService {
 
 	    String requestJson = helper.convertObjectToJson(billPaymentRequest);
 
-	    // ✅ Create inbound & outbound logs
 	    InboundTraceLog inboundLog = helper.createInboundLog(requestId, txnId, apiName, billPaymentRequest.getMid(), "POST", requestJson);
 	    OutboundTraceLog outboundLog = helper.createOutboundLog(txnId, requestId, apiName, url, "POST", requestJson);
 
 	    try {
+	        LOGGER.info("Calling BBPS payment URL: {}", url);
 	        Map<String, String> responseMap = httpService.postRequest(url, requestJson, headers);
 	        String responseData = responseMap.get("data");
+	        LOGGER.info("Payment API Response: {}", responseData);
 
-	        LOGGER.info("📦 Payment API Response: {}", responseData);
 	        helper.updateOutboundLogResponse(outboundLog, responseData);
 
 	        if (responseData == null || responseData.isEmpty()) {
 	        	helper.updateInboundLogFailure(inboundLog, "Empty response from BBPS", "FAILED");
+	        	LOGGER.warn("Empty response received from BBPS for txnId={}", txnId);
 	            throw new CustomException("Empty response from BBPS server");
 	        }
 
 	        Map<String, Object> dataMap = objectMapper.readValue(responseData, new TypeReference<Map<String, Object>>() {});
 	        if (!dataMap.containsKey("genericResponse")) {
 	        	helper.updateInboundLogFailure(inboundLog, responseData, "INVALID_STRUCTURE");
+	        	LOGGER.warn("Invalid response structure received for txnId={}", txnId);
 	            throw new CustomException("Invalid response structure from BBPS");
 	        }
 
@@ -112,35 +126,44 @@ public class PaymentServiceImpl implements PaymentService {
 	        mapper.getConfiguration().setMatchingStrategy(MatchingStrategies.STRICT);
 	        BillPayment entity = mapper.map(billPaymentResponse, BillPayment.class);
 	        paymentRepository.save(entity);
+	        LOGGER.info("BillPayment entity saved successfully for txnId={}", txnId);
 
 	        helper.updateInboundLogSuccess(inboundLog, responseData, generalResponse.getStatus());
+	        PaymentInitiate paymentInitiate = new PaymentInitiate();
+	        paymentInitiate.setTxnId(txnId);
+	        paymentInitiate.setReqId(requestId);
+	        paymentInitiate.setBankTxnId(billPaymentResponse.getTxnId());
+	        paymentInitiate.setStatus(billPaymentResponse.getStatus());
+	        paymentIntiateRepository.save(paymentInitiate);
+	        LOGGER.info("PaymentInitiate entry saved successfully for txnId={}", txnId);
 
-	        // ✅ Trigger transaction status check
 	        TransactionStatusRequest transactionStatusRequest = new TransactionStatusRequest();
-	        transactionStatusRequest.setTxnId(entity.getTxnId());
+	        transactionStatusRequest.setTxnId(billPaymentResponse.getTxnId());
 	        transactionStatusRequest.setReqId(requestId);
-
+            
+	        try {
+	            Thread.sleep(2000);
+	        } catch (InterruptedException e) {
+	            Thread.currentThread().interrupt();
+	            LOGGER.warn("Thread interrupted during payment delay: {}", e.getMessage());
+	        }
+	        LOGGER.info("Checking transaction status for txnId={}", billPaymentResponse.getTxnId());
 	        return checkTrasactionStatus(transactionStatusRequest, inboundLog);
 
 	    } catch (JsonProcessingException e) {
-	        LOGGER.error("❌ JSON Parsing Error: {}", e.getMessage());
+	        LOGGER.error("JSON Parsing Error in initiatePayment: {}", e.getMessage(), e);
 	        helper.updateInboundLogFailure(inboundLog, e.getMessage(), "JSON_ERROR");
 	        throw new CustomException("Invalid JSON received from API");
-	    } catch (CustomException ce) {
-	        throw ce; // will be handled by global exception handler
-	    } catch (Exception e) {
-	        LOGGER.error("❌ Exception in initiatePayment(): {}", e.getMessage(), e);
-	        helper.updateInboundLogFailure(inboundLog, e.getMessage(), "EXCEPTION");
-	        throw new CustomException("Payment initiation failed: " + e.getMessage());
 	    }
 	}
 
-	
-	public ResponseModel checkTrasactionStatus(TransactionStatusRequest transactionStatusRequest,InboundTraceLog inboundLog) {
+	public ResponseModel checkTrasactionStatus(TransactionStatusRequest transactionStatusRequest, InboundTraceLog inboundLog) {
 	    String apiName = "CheckTransactionStatus";
-	    String txnId = helper.generateTxnId(15); //our genrated txnId
+	    String txnId = helper.generateTxnId(15);
 	    String requestId = transactionStatusRequest.getReqId();
-	    String url = paymentUrl + BBPSConstant.CHECK_TRANSACTION_URL + transactionStatusRequest.getTxnId(); ;
+	    String url = paymentUrl + BBPSConstant.CHECK_TRANSACTION_URL + transactionStatusRequest.getTxnId();
+
+	    LOGGER.info("Checking transaction status (internal) for txnId={} and reqId={}", transactionStatusRequest.getTxnId(), requestId);
 
 	    BharatConnectMaster headersData = beneficiaryDetailsRepository.findByOrgId("ORG001");
 	    HttpHeaders headers = new HttpHeaders();
@@ -148,69 +171,63 @@ public class PaymentServiceImpl implements PaymentService {
 	    headers.set("agentId", headersData.getAgentId());
 	    headers.set("tenantId", headersData.getTenantId());
 	    headers.setContentType(MediaType.APPLICATION_JSON);
-	    ObjectMapper objectMapper = new ObjectMapper();
 
+	    ObjectMapper objectMapper = new ObjectMapper();
 	    OutboundTraceLog outboundLog = helper.createOutboundLog(txnId, requestId, apiName, url, "GET", null);
 
-	    long startTime = System.currentTimeMillis();
-	    long maxWaitTimeMs = 40000;
-	    long intervalMs = 5000;
+	    Map<String, String> responseMap = httpService.getRequest(url, headers);
+	    String responseData = responseMap.get("data");
+	    LOGGER.info("Transaction status response: {}", responseData);
 
-	    while (true) {
-	        Map<String, String> responseMap = httpService.getRequest(url, headers);
-	        String responseData = responseMap.get("data");
-	        LOGGER.info("Transaction status response: {}", responseData);
+	    helper.updateOutboundLogResponse(outboundLog, responseData);
 
-	        helper.updateOutboundLogResponse(outboundLog, responseData);
-
-	        try {
-	            Map<String, Object> dataMap = objectMapper.readValue(responseData, new TypeReference<Map<String, Object>>() {});
-
-	            if (!dataMap.containsKey("generalResp")) {
-	            	helper.updateInboundLogFailure(inboundLog, responseData, "INVALID_RESPONSE");
-	                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"))
-	                );
-	            }
-
-	            TransactionStatusResponse responseWrapper = objectMapper.convertValue(dataMap, TransactionStatusResponse.class);
-	            GeneralResp generalResp = responseWrapper.getGeneralResp();
-
-	            String status = generalResp.getStatus();
-	            LOGGER.info("Current transaction status: {}", status);
-
-	            if ("INPROGRESS".equalsIgnoreCase(status)) {
-	                if (System.currentTimeMillis() - startTime > maxWaitTimeMs) {
-	                	helper.updateInboundLogFailure(inboundLog, "Timeout after 40 seconds", "FAILED");
-	                    throw new CustomException("Timeout waiting for transaction completion", "FAILED", 408, "Transaction still in progress");
-	                }
-
-	                Thread.sleep(intervalMs);
-	                continue;
-	            }
-
-	            ResponseModel responseModel = new ResponseModel(
-	                    generalResp.getMessage(),
-	                    generalResp.getStatus(),
-	                    Integer.parseInt(generalResp.getStatusCode()),
-	                    responseWrapper
+	    try {
+	        Map<String, Object> dataMap = objectMapper.readValue(responseData, new TypeReference<Map<String, Object>>() {});
+	        if (!dataMap.containsKey("generalResp")) {
+	        	helper.updateInboundLogFailure(inboundLog, responseData, "INVALID_RESPONSE");
+	        	LOGGER.warn("Invalid transaction status response for txnId={}", transactionStatusRequest.getTxnId());
+	            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"))
 	            );
-
-	            helper.updateInboundLogSuccess(inboundLog, responseData, generalResp.getStatus());
-	            return responseModel;
-
-	        } catch (JsonProcessingException e) {
-	            LOGGER.error("Error parsing transaction status JSON: {}", e.getMessage());
-	            helper.updateInboundLogFailure(inboundLog, e.getMessage(), "JSON_ERROR");
-	            throw new CustomException("Invalid JSON received from API");
-	        } catch (InterruptedException e) {
-	            Thread.currentThread().interrupt();
-	            helper.updateInboundLogFailure(inboundLog, e.getMessage(), "INTERRUPTED");
-	            throw new CustomException("Thread interrupted during transaction check");
 	        }
+
+	        TransactionStatusResponse responseWrapper = objectMapper.convertValue(dataMap, TransactionStatusResponse.class);
+	        GeneralResp generalResp = responseWrapper.getGeneralResp();
+	        LOGGER.info("Transaction status received: {}", generalResp.getStatus());
+
+	        ModelMapper mapper = new ModelMapper();
+	        mapper.getConfiguration().setMatchingStrategy(MatchingStrategies.STRICT);
+	        TransactionMaster transactionMaster = mapper.map(responseWrapper.getTransactionDAO(), TransactionMaster.class);
+	        transactionMaster.setTxnId(txnId);
+	        transactionMaster.setReqId(transactionStatusRequest.getReqId());
+	        EntityRelationshipUtil.linkTransactionMasterRelationships(transactionMaster);
+	        transactionMasterRepository.save(transactionMaster);
+	        LOGGER.info("TransactionMaster saved successfully for txnId={}", txnId);
+
+	        AgentFundTransfer agentFundTransfer = mapper.map(responseWrapper.getAgentFundTransfer(), AgentFundTransfer.class);
+	        agentFundTransfer.setTxnId(txnId);
+	        agentFundTransfer.setReqId(transactionStatusRequest.getReqId());
+	        agentFundTransfer.setTransactionMasterId(transactionMaster.getBankTxnId());
+	        agentFundTransferRepository.save(agentFundTransfer);
+	        LOGGER.info("AgentFundTransfer entry saved successfully for txnId={}", txnId);
+
+	        ResponseModel responseModel = new ResponseModel(
+	                generalResp.getMessage(),
+	                generalResp.getStatus(),
+	                Integer.parseInt(generalResp.getStatusCode()),
+	                responseWrapper
+	        );
+
+	        helper.updateInboundLogSuccess(inboundLog, responseData, generalResp.getStatus());
+	        return responseModel;
+
+	    } catch (JsonProcessingException e) {
+	        LOGGER.error("Error parsing transaction status JSON: {}", e.getMessage(), e);
+	        helper.updateInboundLogFailure(inboundLog, e.getMessage(), "JSON_ERROR");
+	        throw new CustomException("Invalid JSON received from API");
 	    }
 	}
 
@@ -222,62 +239,63 @@ public class PaymentServiceImpl implements PaymentService {
 		String requestId = transactionStatusRequest.getReqId();
 		String requestJson = helper.convertObjectToJson(transactionStatusRequest);
 	    String url = paymentUrl + BBPSConstant.CHECK_TRANSACTION_URL + transactionStatusRequest.getTxnId();
+
+	    LOGGER.info("Checking transaction status (public) for txnId={} and reqId={}", transactionStatusRequest.getTxnId(), requestId);
+
 	    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);
-	    InboundTraceLog inboundLog = helper.createInboundLog(requestId, txnID, apiName, transactionStatusRequest.getMid(), "POST",
-				requestJson);
-       	    OutboundTraceLog outboundLog = helper.createOutboundLog(txnID, requestId, apiName, url, "GET", null);
+
+	    InboundTraceLog inboundLog = helper.createInboundLog(requestId, txnID, apiName, transactionStatusRequest.getMid(), "POST", requestJson);
+        OutboundTraceLog outboundLog = helper.createOutboundLog(txnID, requestId, apiName, url, "GET", null);
 	    ObjectMapper objectMapper = new ObjectMapper();
 
-	        Map<String, String> responseMap = httpService.getRequest(url, headers);
-	        String responseData = responseMap.get("data");
-	        LOGGER.info("Transaction status response data: {}", responseData);
-	        helper.updateOutboundLogResponse(outboundLog, responseData);
+	    Map<String, String> responseMap = httpService.getRequest(url, headers);
+	    String responseData = responseMap.get("data");
+	    LOGGER.info("Transaction status response data: {}", responseData);
+	    helper.updateOutboundLogResponse(outboundLog, responseData);
 
-	        try {
-	            Map<String, Object> dataMap = objectMapper.readValue(responseData, new TypeReference<Map<String, Object>>() {});
-
-	            // If genericResponse key missing, throw exception
-	            if (!dataMap.containsKey("generalResp")) {
-	            	helper.updateInboundLogFailure(inboundLog, responseData, String.valueOf(dataMap.get("status")));
-	                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);
-	            ResponseModel responseModel = new ResponseModel(
-	                    generalResp.getMessage(),
-	                    generalResp.getStatus(),
-	                    Integer.parseInt(generalResp.getStatusCode()),
-	                    responseWrapper
+	    try {
+	        Map<String, Object> dataMap = objectMapper.readValue(responseData, new TypeReference<Map<String, Object>>() {});
+	        if (!dataMap.containsKey("generalResp")) {
+	        	helper.updateInboundLogFailure(inboundLog, responseData, String.valueOf(dataMap.get("status")));
+	        	LOGGER.warn("Invalid transaction status response for txnId={} from BBPS", transactionStatusRequest.getTxnId());
+	            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"))
 	            );
-	            helper.updateInboundLogSuccess(inboundLog, responseData, generalResp.getStatus());
-	            return responseModel;
-
-	        } catch (JsonProcessingException e) {
-	            LOGGER.error("Error parsing responseData JSON: {}", e.getMessage());
-	            helper.updateInboundLogFailure(inboundLog, e.getMessage(), "JSON_ERROR");
-	            throw new CustomException("Invalid JSON received from API");
 	        }
+
+	        TransactionStatusResponse responseWrapper = objectMapper.convertValue(dataMap, TransactionStatusResponse.class);
+	        GeneralResp generalResp = responseWrapper.getGeneralResp();
+
+	        String status = generalResp.getStatus();
+	        LOGGER.info("Current transaction status: {}", status);
+
+	        ResponseModel responseModel = new ResponseModel(
+	                generalResp.getMessage(),
+	                generalResp.getStatus(),
+	                Integer.parseInt(generalResp.getStatusCode()),
+	                responseWrapper
+	        );
+
+	        helper.updateInboundLogSuccess(inboundLog, responseData, generalResp.getStatus());
+	        return responseModel;
+
+	    } catch (JsonProcessingException e) {
+	        LOGGER.error("Error parsing responseData JSON: {}", e.getMessage(), e);
+	        helper.updateInboundLogFailure(inboundLog, e.getMessage(), "JSON_ERROR");
+	        throw new CustomException("Invalid JSON received from API");
 	    }
 	}
+}
 
-	/*
+	/*  PollBack logic for the fetchTxnByTxnId API
 	 * @Override public ResponseModel fetchTxnByTxnId(BillFetchByBillIdRequest
 	 * billFetchByBillIdRequest) {
 	 * 
@@ -327,4 +345,75 @@ public class PaymentServiceImpl implements PaymentService {
 	 * }
 	 */
 
-
+	/*
+	 * public ResponseModel checkTrasactionStatus(TransactionStatusRequest
+	 * transactionStatusRequest,InboundTraceLog inboundLog) { String apiName =
+	 * "CheckTransactionStatus"; String txnId = helper.generateTxnId(15); //our
+	 * genrated txnId String requestId = transactionStatusRequest.getReqId(); 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); ObjectMapper objectMapper
+	 * = new ObjectMapper();
+	 * 
+	 * OutboundTraceLog outboundLog = helper.createOutboundLog(txnId, requestId,
+	 * apiName, url, "GET", null);
+	 * 
+	 * long startTime = System.currentTimeMillis(); long maxWaitTimeMs = 40000; long
+	 * intervalMs = 5000;
+	 * 
+	 * while (true) { Map<String, String> responseMap = httpService.getRequest(url,
+	 * headers); String responseData = responseMap.get("data");
+	 * LOGGER.info("Transaction status response: {}", responseData);
+	 * 
+	 * helper.updateOutboundLogResponse(outboundLog, responseData);
+	 * 
+	 * try { Map<String, Object> dataMap = objectMapper.readValue(responseData, new
+	 * TypeReference<Map<String, Object>>() {});
+	 * 
+	 * if (!dataMap.containsKey("generalResp")) {
+	 * helper.updateInboundLogFailure(inboundLog, responseData, "INVALID_RESPONSE");
+	 * 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")) ); }
+	 * 
+	 * TransactionStatusResponse responseWrapper =
+	 * objectMapper.convertValue(dataMap, TransactionStatusResponse.class);
+	 * GeneralResp generalResp = responseWrapper.getGeneralResp();
+	 * 
+	 * String status = generalResp.getStatus();
+	 * LOGGER.info("Current transaction status: {}", status);
+	 * 
+	 * if ("INPROGRESS".equalsIgnoreCase(status)) { if (System.currentTimeMillis() -
+	 * startTime > maxWaitTimeMs) { helper.updateInboundLogFailure(inboundLog,
+	 * "Timeout after 40 seconds", "FAILED"); throw new
+	 * CustomException("Timeout waiting for transaction completion", "FAILED", 408,
+	 * "Transaction still in progress"); }
+	 * 
+	 * Thread.sleep(intervalMs); continue; }
+	 * 
+	 * ResponseModel responseModel = new ResponseModel( generalResp.getMessage(),
+	 * generalResp.getStatus(), Integer.parseInt(generalResp.getStatusCode()),
+	 * responseWrapper );
+	 * 
+	 * helper.updateInboundLogSuccess(inboundLog, responseData,
+	 * generalResp.getStatus()); return responseModel;
+	 * 
+	 * } catch (JsonProcessingException e) {
+	 * LOGGER.error("Error parsing transaction status JSON: {}", e.getMessage());
+	 * helper.updateInboundLogFailure(inboundLog, e.getMessage(), "JSON_ERROR");
+	 * throw new CustomException("Invalid JSON received from API"); } catch
+	 * (InterruptedException e) { Thread.currentThread().interrupt();
+	 * helper.updateInboundLogFailure(inboundLog, e.getMessage(), "INTERRUPTED");
+	 * throw new CustomException("Thread interrupted during transaction check"); } }
+	 * }
+	 * 
+	 * 
+	 */