10-11-2025

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

@@ -26,6 +26,7 @@ import com.billpaymentservice.bbps.repository.InboundTraceLogRepository;
 import com.billpaymentservice.bbps.repository.OutboundTraceLogRepository;
 import com.billpaymentservice.bbps.service.AgentService;
 import com.billpaymentservice.bbps.util.BBPSConstant;
+import com.billpaymentservice.bbps.util.BillerMapperHelper;
 import com.billpaymentservice.bbps.util.Helper;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.core.JsonProcessingException;
@@ -45,179 +46,176 @@ public class AgentServiceImpl implements AgentService {
 	private final HttpService httpService;
 	private final Helper helper;
 	private final BharatConnectMasterRepository beneficiaryDetailsRepository;
+	private final BillerMapperHelper mapperHelper;
 
 	public AgentServiceImpl(RestClient restClient, HttpService httpService, Helper helper,
-			BharatConnectMasterRepository beneficiaryDetailsRepository,InboundTraceLogRepository inboundTraceLogRepository,
-			OutboundTraceLogRepository outboundTraceLogRepository) {
+			BharatConnectMasterRepository beneficiaryDetailsRepository,
+			InboundTraceLogRepository inboundTraceLogRepository, OutboundTraceLogRepository outboundTraceLogRepository,
+			BillerMapperHelper mapperHelper) {
 		this.restClient = restClient;
 		this.httpService = httpService;
 		this.helper = helper;
 		this.beneficiaryDetailsRepository = beneficiaryDetailsRepository;
+		this.mapperHelper = mapperHelper;
 	}
-	
-	
 
 	@Override
 	public ResponseModel initiateBillFetch(FetchBillRequest fetchBillRequest) {
-	    String apiName = "InitiateBillFetch";
-	    String txnId = helper.generateTxnId(15);
-	    String requestId = fetchBillRequest.getReqId();
-	    String url = agentDtaUrl + BBPSConstant.BILL_FETCH_INTI;
+		String apiName = "InitiateBillFetch";
+		String txnId = helper.generateTxnId(15);
+		String requestId = fetchBillRequest.getReqId();
+		String url = agentDtaUrl + BBPSConstant.BILL_FETCH_INTI;
 
-	    helper.validateMerchant(fetchBillRequest.getMid());
+		helper.validateMerchant(fetchBillRequest.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);
+		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();
-	    objectMapper.setSerializationInclusion(JsonInclude.Include.NON_NULL);
-	    String requestJson = helper.convertObjectToJson(fetchBillRequest);
+		ObjectMapper objectMapper = new ObjectMapper();
+		objectMapper.setSerializationInclusion(JsonInclude.Include.NON_NULL);
+		String requestJson = helper.convertObjectToJson(fetchBillRequest);
 
-	    // ✅ 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);
+		// ✅ 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);
 
-	    try {
-	        Map<String, String> responseMap = httpService.postRequest(url, requestJson, headers);
-	        String responseData = responseMap.get("data");
+		try {
+			Map<String, String> responseMap = httpService.postRequest(url, requestJson, headers);
+			String responseData = responseMap.get("data");
 
-	        log.info("📦 Bill Fetch API Response: {}", responseData);
-	        helper.updateOutboundLogResponse(outboundLog, responseData);
+			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");
-	        }
+			if (responseData == null || responseData.isEmpty()) {
+				helper.updateInboundLogFailure(inboundLog, "Empty response from BBPS", "FAILED");
+				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");
-	            throw new CustomException("Invalid response structure from BBPS");
-	        }
+			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");
+			}
 
-	        FetchBillResponse fetchBillResponse = objectMapper.convertValue(dataMap, FetchBillResponse.class);
-	        GeneralResp generalResponse = fetchBillResponse.getGenericResponse();
+			FetchBillResponse fetchBillResponse = objectMapper.convertValue(dataMap, FetchBillResponse.class);
+			GeneralResp generalResponse = fetchBillResponse.getGenericResponse();
 
-	        helper.updateInboundLogSuccess(inboundLog, responseData, generalResponse.getStatus());
+			helper.updateInboundLogSuccess(inboundLog, responseData, generalResponse.getStatus());
 
-	        // ✅ Directly call fetchBillById (no polling)
-	        BillFetchByBillIdRequest billFetchByBillIdRequest = new BillFetchByBillIdRequest();
-	        billFetchByBillIdRequest.setBillId(fetchBillResponse.getBillId());
-	        billFetchByBillIdRequest.setMid(fetchBillRequest.getMid());
-	        billFetchByBillIdRequest.setReqId(requestId);
+			// ✅ Directly call fetchBillById (no polling)
+			BillFetchByBillIdRequest billFetchByBillIdRequest = new BillFetchByBillIdRequest();
+			billFetchByBillIdRequest.setBillId(fetchBillResponse.getBillId());
+			billFetchByBillIdRequest.setMid(fetchBillRequest.getMid());
+			billFetchByBillIdRequest.setReqId(requestId);
 
-	        return fetchBillById(billFetchByBillIdRequest, inboundLog);
+			return fetchBillById(billFetchByBillIdRequest, inboundLog);
 
-	    } catch (JsonProcessingException e) {
-	        log.error("❌ JSON Parsing Error: {}", e.getMessage());
-	        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());
-	    }
+		} catch (JsonProcessingException e) {
+			log.error("❌ JSON Parsing Error: {}", e.getMessage());
+			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) {
-	    String apiName = "FetchBillById";
-	    String txnId = helper.generateTxnId(15);
-	    String requestId = billFetchByBillIdRequest.getReqId();
-	    String billId = billFetchByBillIdRequest.getBillId();
-	    String url = agentDtaUrl + BBPSConstant.BILL_FETCH_BY_ID + "1ced7566-1add-4e01-9ed6-04cd67ac9684";
+		String apiName = "FetchBillById";
+		String txnId = helper.generateTxnId(15);
+		String requestId = billFetchByBillIdRequest.getReqId();
+		String billId = billFetchByBillIdRequest.getBillId();
+		String url = agentDtaUrl + BBPSConstant.BILL_FETCH_BY_ID + "1ced7566-1add-4e01-9ed6-04cd67ac9684";
 
-	    helper.validateMerchant(billFetchByBillIdRequest.getMid());
+		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);
+		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);
+		ObjectMapper objectMapper = new ObjectMapper();
+		OutboundTraceLog outboundLog = helper.createOutboundLog(txnId, requestId, apiName, url, "GET", null);
 
-	    // ✅ Loop setup
-	    long startTime = System.currentTimeMillis();
-	    long maxWaitTimeMs = 40000; // 40 seconds
-	    long intervalMs = 5000; // 5 seconds
+		// ✅ 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);
+		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"))
-	                );
-	            }
+				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();
+				BillDataResponse responseWrapper = objectMapper.convertValue(dataMap, BillDataResponse.class);
+				GeneralResp generalResp = responseWrapper.getGenericResponse();
 
-	            String status = generalResp.getStatus();
-	            log.info("📡 Current Bill Status: {}", status);
+				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");
-	                }
+				// ✅ 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
-	            }
+					Thread.sleep(intervalMs);
+					continue; // retry again
+				}
 
-	            // ✅ Final successful response
-	            helper.updateInboundLogSuccess(inboundLog, responseData, generalResp.getStatus());
+				// ✅ Final successful response
+				helper.updateInboundLogSuccess(inboundLog, responseData, generalResp.getStatus());
 
-	            return new ResponseModel(
-	                    generalResp.getMessage(),
-	                    generalResp.getStatus(),
-	                    Integer.parseInt(generalResp.getStatusCode()),
-	                    responseWrapper
-	            );
+				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());
-	        }
-	    }
+			} 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());
+			}
+		}
 	}
 
-
 	@Override
 	public ResponseModel fetchBillById(BillFetchByBillIdRequest billFetchByBillIdRequest) {
 
@@ -272,140 +270,144 @@ public class AgentServiceImpl implements AgentService {
 
 	}
 
-
-
 	@Override
 	public ResponseModel initiateBillValidate(FetchBillValidatestRequest fetchBillValidateRequest) {
-		// TODO Auto-generated method stub
-		return null;
+		ResponseModel responseModel = new ResponseModel();
+		try {
+
+			String apiName = "InitiateBillValidate";
+			String txnId = helper.generateTxnId(15);
+			String requestId = fetchBillValidateRequest.getReqId();
+			String url = agentDtaUrl + BBPSConstant.BILLER_VALIDATE_URL;
+			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);
+			String requestJson = helper.convertObjectToJson(fetchBillValidateRequest);
+
+			ObjectMapper objectMapper = new ObjectMapper();
+			InboundTraceLog inboundLog = helper.createInboundLog(requestId, txnId, apiName,
+					fetchBillValidateRequest.getMid(), "POST", requestJson);
+			OutboundTraceLog outboundLog = helper.createOutboundLog(txnId, requestId, apiName, url, "POST",
+					requestJson);
+			objectMapper.setSerializationInclusion(JsonInclude.Include.NON_NULL);
+			String json = objectMapper.writeValueAsString(fetchBillValidateRequest);
+			Map<String, String> responseMap = httpService.postRequest(url, json, 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");
+			}
+
+			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");
+			}
+
+			FetchBillValidatestResponse fetchBillResponse = objectMapper.convertValue(dataMap,
+					FetchBillValidatestResponse.class);
+
+			mapperHelper.saveFetchBillValidateResponse(fetchBillResponse, requestId, txnId);
+			GeneralResp generalResponse = fetchBillResponse.getGenericResponse();
+
+			helper.updateInboundLogSuccess(inboundLog, responseData, generalResponse.getStatus());
+			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();
+		} 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) {
-		// TODO Auto-generated method stub
-		return null;
+		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);
+
+			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");
+			}
+
+			Map<String, Object> dataMap = objectMapper.readValue(responseData,
+					new TypeReference<Map<String, Object>>() {
+					});
+
+			if (!dataMap.containsKey("genericResponse")) {
+				throw new CustomException("Invalid response structure from BBPS");
+			}
+
+			BillDataResponse fetchBillResponse = objectMapper.convertValue(dataMap, BillDataResponse.class);
+			GeneralResp generalResponse = fetchBillResponse.getGenericResponse();
+
+			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();
+		} 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
-	 * 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;
-	 * 
-	 * }
-	 */
-
 }

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

@@ -1,16 +1,18 @@
 // java
 package com.billpaymentservice.bbps.serviceImpl;
 
-import java.time.LocalDateTime;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
+
 import org.modelmapper.ModelMapper;
 import org.modelmapper.convention.MatchingStrategies;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
+
+import com.billpaymentservice.bbps.dto.CustomerParamGroupsDTO;
 import com.billpaymentservice.bbps.dto.GeneralResp;
 import com.billpaymentservice.bbps.dto.MasterApiResponse;
 import com.billpaymentservice.bbps.dto.ResponseModel;
@@ -31,6 +33,7 @@ import com.billpaymentservice.bbps.dto.response.DispositionResponse;
 import com.billpaymentservice.bbps.dto.response.PlanResponse;
 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.DispositionDetails;
 import com.billpaymentservice.bbps.entites.InboundTraceLog;
@@ -44,6 +47,7 @@ import com.billpaymentservice.bbps.repository.MerchantRepository;
 import com.billpaymentservice.bbps.repository.OutboundTraceLogRepository;
 import com.billpaymentservice.bbps.service.MasterDataService;
 import com.billpaymentservice.bbps.util.BBPSConstant;
+import com.billpaymentservice.bbps.util.BillerMapperHelper;
 import com.billpaymentservice.bbps.util.EntityRelationshipUtil;
 import com.billpaymentservice.bbps.util.Helper;
 import com.fasterxml.jackson.core.JsonProcessingException;
@@ -58,7 +62,7 @@ public class MasterDataServiceImpl implements MasterDataService {
 	@Value("${master.data.url}")
 	private String masterRegisterUrl;
 	private final BharatConnectMasterRepository beneficiaryDetailsRepository;
-
+	private final BillerMapperHelper mapperHelper;
 	private MerchantRepository merchantRegisterRepo;
 	private HttpClientApi httpClientApi;
 	private final DispositionRepository dispositionRepository;
@@ -73,8 +77,8 @@ public class MasterDataServiceImpl implements MasterDataService {
 	public MasterDataServiceImpl(MerchantRepository merchantRegisterRepo, HttpService httpService,
 			HttpClientApi httpClientApi, Helper helper, BillerDataRepository billerDataRespository,
 			DispositionRepository dispositionRepository, BharatConnectMasterRepository beneficiaryDetailsRepository,
-			InboundTraceLogRepository inboundTraceLogRepository,
-			OutboundTraceLogRepository outboundTraceLogRepository) {
+			InboundTraceLogRepository inboundTraceLogRepository, OutboundTraceLogRepository outboundTraceLogRepository,
+			BillerMapperHelper mapperHelper) {
 		this.merchantRegisterRepo = merchantRegisterRepo;
 		this.httpService = httpService;
 		this.httpClientApi = httpClientApi;
@@ -84,6 +88,7 @@ public class MasterDataServiceImpl implements MasterDataService {
 		this.beneficiaryDetailsRepository = beneficiaryDetailsRepository;
 		this.inboundTraceLogRepository = inboundTraceLogRepository;
 		this.outboundTraceLogRepository = outboundTraceLogRepository;
+		this.mapperHelper = mapperHelper;
 
 	}
 
@@ -95,10 +100,10 @@ public class MasterDataServiceImpl implements MasterDataService {
 		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());
@@ -155,15 +160,12 @@ public class MasterDataServiceImpl implements MasterDataService {
 			log.error("Error parsing responseData JSON: {}", e.getMessage());
 			helper.updateInboundLogFailure(inboundLog, e.getMessage(), "JSON_ERROR");
 			throw new CustomException("Invalid JSON received from API");
-		} catch (CustomException ex) {
-			LOGGER.warn("Merchant validation failed: {}", ex.getMessage());
-			return ex.getResponseModel(); // Directly return ResponseModel from exception
 		}
 	}
 
 	@Override
 	public ResponseModel getBillerByBillerId(BillerDetailRequest billerDetailRequest) {
-		
+
 		helper.validateMerchant(billerDetailRequest.getMid());
 		String txnID = helper.generateTxnId(15);
 		String apiName = "GetBillerByBillerId";
@@ -172,8 +174,8 @@ public class MasterDataServiceImpl implements MasterDataService {
 		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);
+		InboundTraceLog inboundLog = helper.createInboundLog(requestId, txnID, apiName, billerDetailRequest.getMid(),
+				"POST", requestJson);
 
 		OutboundTraceLog outboundLog = helper.createOutboundLog(txnID, requestId, apiName, fullUrl, "GET", null);
 
@@ -224,8 +226,8 @@ public class MasterDataServiceImpl implements MasterDataService {
 		String apiName = "GetCustomerParamByBillerId";
 		String requestId = customerParamRequest.getReqId();
 		String requestJson = helper.convertObjectToJson(customerParamRequest);
-		InboundTraceLog inboundLog = helper.createInboundLog(requestId, txnID, apiName, customerParamRequest.getMid(), "POST",
-				requestJson);
+		InboundTraceLog inboundLog = helper.createInboundLog(requestId, txnID, apiName, customerParamRequest.getMid(),
+				"POST", requestJson);
 
 		try {
 			helper.validateMerchant(customerParamRequest.getMid());
@@ -270,9 +272,6 @@ public class MasterDataServiceImpl implements MasterDataService {
 			log.error("Error parsing responseData JSON: {}", e.getMessage());
 			helper.updateInboundLogFailure(inboundLog, e.getMessage(), "JSON_ERROR");
 			throw new CustomException("Invalid JSON received from API");
-		} catch (CustomException ex) {
-			LOGGER.warn("Merchant validation failed: {}", ex.getMessage());
-			return ex.getResponseModel(); // Directly return ResponseModel from exception
 		}
 
 	}
@@ -285,7 +284,7 @@ public class MasterDataServiceImpl implements MasterDataService {
 
 	@Override
 	public ResponseModel fetchMasterDataCategoryWise(MasterCategoryRequest masterRequest) {
-		LOGGER.info("Fetching Master Data Category-wise " + masterRequest);
+		LOGGER.info("Fetching Master Data CategoryResponseList-wise " + masterRequest);
 
 		String txnID = helper.generateTxnId(15);
 		String apiName = "FetchMasterDataCategoryWise";
@@ -323,6 +322,9 @@ public class MasterDataServiceImpl implements MasterDataService {
 			}
 
 			BillerResponse responseWrapper = objectMapper.convertValue(dataMap, BillerResponse.class);
+			List<BillerCategoryWise> savedEntities = mapperHelper.mapAndSaveAll(responseWrapper.getBillerResp(),
+					requestId, txnID);
+
 			GeneralResp generalResp = responseWrapper.getGeneralResp();
 
 			ResponseModel responseModel = new ResponseModel(generalResp.getMessage(), generalResp.getStatus(),
@@ -335,9 +337,6 @@ public class MasterDataServiceImpl implements MasterDataService {
 			log.error("Error parsing responseData JSON: {}", e.getMessage());
 			helper.updateInboundLogFailure(inboundLog, e.getMessage(), "JSON_ERROR");
 			throw new CustomException("Invalid JSON received from API");
-		} catch (CustomException ex) {
-			LOGGER.warn("Merchant validation failed: {}", ex.getMessage());
-			return ex.getResponseModel(); // Directly return ResponseModel from exception
 		}
 	}
 
@@ -347,8 +346,8 @@ public class MasterDataServiceImpl implements MasterDataService {
 		String apiName = "GetDispositionDetails";
 		String requestId = dispositionDetailRequest.getReqId();
 		;
-		InboundTraceLog inboundLog = helper.createInboundLog(requestId, txnID, apiName, dispositionDetailRequest.getMid(),
-				"GET", "N/A");
+		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);
@@ -397,15 +396,12 @@ public class MasterDataServiceImpl implements MasterDataService {
 			log.error("Error parsing responseData JSON: {}", e.getMessage());
 			helper.updateInboundLogFailure(inboundLog, e.getMessage(), "JSON_ERROR");
 			throw new CustomException("Invalid JSON received from API");
-		} catch (CustomException ex) {
-			LOGGER.warn("Merchant validation failed: {}", ex.getMessage());
-			return ex.getResponseModel(); // Directly return ResponseModel from exception
 		}
 	}
 
 	@Override
 	public ResponseModel fetchCustomerParamGroup(BillerDetailRequest requestModel) {
-		LOGGER.info("Fetching Master Data Category-wise for MID={}", requestModel.getMid());
+		LOGGER.info("Fetching Master Data CategoryResponseList-wise for MID={}", requestModel.getMid());
 
 		String txnID = helper.generateTxnId(15);
 		String apiName = "FetchCustomerParamGroup";
@@ -439,6 +435,9 @@ public class MasterDataServiceImpl implements MasterDataService {
 					CustomerParamGroupsResponse.class);
 			GeneralResp generalResp = responseWrapper.getGeneralResp();
 
+			CustomerParamGroupsDTO responseDTO = mapperHelper
+					.saveCustomerParamGroups(responseWrapper.getCustomerParamGroupResp(), requestId, txnID);
+
 			ResponseModel responseModel = new ResponseModel(generalResp.getMessage(), generalResp.getStatus(),
 					Integer.parseInt(generalResp.getStatusCode()), responseWrapper);
 
@@ -450,9 +449,6 @@ public class MasterDataServiceImpl implements MasterDataService {
 			log.error("Error parsing responseData JSON: {}", e.getMessage());
 			helper.updateInboundLogFailure(inboundLog, e.getMessage(), "JSON_ERROR");
 			throw new CustomException("Invalid JSON received from API");
-		} catch (CustomException ex) {
-			LOGGER.warn("Merchant validation failed: {}", ex.getMessage());
-			return ex.getResponseModel(); // Directly return ResponseModel from exception
 		}
 
 	}
@@ -492,6 +488,10 @@ public class MasterDataServiceImpl implements MasterDataService {
 			}
 
 			AmountOptionsResponse responseWrapper = objectMapper.convertValue(dataMap, AmountOptionsResponse.class);
+
+			String saveAmountOptionsResponse = mapperHelper.saveAmountOptionsResponse(responseWrapper, requestId,
+					txnID);
+
 			GeneralResp generalResp = responseWrapper.getGeneralResp();
 
 			ResponseModel responseModel = new ResponseModel(generalResp.getMessage(), generalResp.getStatus(),
@@ -505,9 +505,6 @@ public class MasterDataServiceImpl implements MasterDataService {
 			log.error("Error parsing responseData JSON: {}", e.getMessage());
 			helper.updateInboundLogFailure(inboundLog, e.getMessage(), "JSON_ERROR");
 			throw new CustomException("Invalid JSON received from API");
-		} catch (CustomException e) {
-			LOGGER.error("Custom Exception: {}", e.getMessage());
-			throw e; // Rethrow custom exceptions to be handled by the controller
 		}
 
 	}
@@ -547,6 +544,8 @@ public class MasterDataServiceImpl implements MasterDataService {
 			}
 
 			PlaneCategoriesResponse responseWrapper = objectMapper.convertValue(dataMap, PlaneCategoriesResponse.class);
+
+			mapperHelper.saveCategoryItems(responseWrapper.getCategoryRespList(), requestId, txnID);
 			GeneralResp generalResp = responseWrapper.getGeneralResp();
 
 			ResponseModel responseModel = new ResponseModel(generalResp.getMessage(), generalResp.getStatus(),
@@ -560,9 +559,6 @@ public class MasterDataServiceImpl implements MasterDataService {
 			log.error("Error parsing responseData JSON: {}", e.getMessage());
 			helper.updateInboundLogFailure(inboundLog, e.getMessage(), "JSON_ERROR");
 			throw new CustomException("Invalid JSON received from API");
-		} catch (CustomException e) {
-			LOGGER.error("Custom Exception: {}", e.getMessage());
-			throw e; // Rethrow custom exceptions to be handled by the controller
 		}
 	}
 
@@ -616,84 +612,70 @@ public class MasterDataServiceImpl implements MasterDataService {
 			log.error("Error parsing responseData JSON: {}", e.getMessage());
 			helper.updateInboundLogFailure(inboundLog, e.getMessage(), "JSON_ERROR");
 			throw new CustomException("Invalid JSON received from API");
-		} catch (CustomException e) {
-			LOGGER.error("Custom Exception: {}", e.getMessage());
-			throw e; // Rethrow custom exceptions to be handled by the controller
 		}
 	}
 
 	public ResponseModel fetchPlanByCategories(PlanRequest requestModel) {
-	    LOGGER.info("Fetching Initiating Fetch Plan Category By Biller Id for MID={}", requestModel.getMid());
+		LOGGER.info("Fetching Initiating Fetch Plan CategoryResponseList By Biller Id for MID={}",
+				requestModel.getMid());
 
-	    String txnID = helper.generateTxnId(15);
-	    String apiName = "FetchPlanByCategories";
-	    String requestId = requestModel.getReqId();
+		String txnID = helper.generateTxnId(15);
+		String apiName = "FetchPlanByCategories";
+		String requestId = requestModel.getReqId();
 
-	    helper.validateMerchant(requestModel.getMid());
+		helper.validateMerchant(requestModel.getMid());
 
-	    String url = String.format("%s%s?billerId=%s%s%s%s&page=%d&pagesize=%d",
-	            masterRegisterUrl,
-	            BBPSConstant.PLANS_URL,
-	            requestModel.getBillerId(),
-	            requestModel.getCategory() != null ? "&category=" + requestModel.getCategory() : "",
-	            requestModel.getAmountInRupees() != null ? "&amountInRupees=" + requestModel.getAmountInRupees() : "",
-	            requestModel.getCircle() != null ? "&circle=" + requestModel.getCircle() : "",
-	            requestModel.getPage(),
-	            requestModel.getPagesize()
-	    );
+		String url = String.format("%s%s?billerId=%s%s%s%s&page=%d&pagesize=%d", masterRegisterUrl,
+				BBPSConstant.PLANS_URL, requestModel.getBillerId(),
+				requestModel.getCategory() != null ? "&category=" + requestModel.getCategory() : "",
+				requestModel.getAmountInRupees() != null ? "&amountInRupees=" + requestModel.getAmountInRupees() : "",
+				requestModel.getCircle() != null ? "&circle=" + requestModel.getCircle() : "", requestModel.getPage(),
+				requestModel.getPagesize());
 
-	    LOGGER.info("Calling Master API: {}", url);
+		LOGGER.info("Calling Master API: {}", url);
 
-	    // Convert request to JSON and create inbound & outbound logs
-	    String requestJson = helper.convertObjectToJson(requestModel);
-	    InboundTraceLog inboundLog = helper.createInboundLog(requestId, txnID, apiName, requestModel.getMid(), "POST", requestJson);
-	    OutboundTraceLog outboundLog = helper.createOutboundLog(txnID, requestId, apiName, url, "GET", null);
+		// Convert request to JSON and create inbound & outbound logs
+		String requestJson = helper.convertObjectToJson(requestModel);
+		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);
+		try {
+			Map<String, String> apiResponse = httpService.getRequest(url);
+			String responseData = apiResponse.get("data");
+			log.info("Response Data: {}", responseData);
 
-	        // Update outbound log with response
-	        helper.updateOutboundLogResponse(outboundLog, responseData);
+			// Update outbound log with response
+			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("generalResp")) {
-	            // Failure response
-	        	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"))
-	            );
-	        }
+			if (!dataMap.containsKey("generalResp")) {
+				// Failure response
+				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")));
+			}
 
-	        // Success response
-	        PlanResponse responseWrapper = objectMapper.convertValue(dataMap, PlanResponse.class);
-	        GeneralResp generalResp = responseWrapper.getGeneralResp();
+			// Success response
+			PlanResponse responseWrapper = objectMapper.convertValue(dataMap, PlanResponse.class);
+			GeneralResp generalResp = responseWrapper.getGeneralResp();
 
-	        ResponseModel responseModel = new ResponseModel(
-	                generalResp.getMessage(),
-	                generalResp.getStatus(),
-	                Integer.parseInt(generalResp.getStatusCode()),
-	                responseWrapper
-	        );
+			mapperHelper.savePlanResponse(responseWrapper, requestId, txnID);
+			ResponseModel responseModel = new ResponseModel(generalResp.getMessage(), generalResp.getStatus(),
+					Integer.parseInt(generalResp.getStatusCode()), responseWrapper);
 
-	        helper.updateInboundLogSuccess(inboundLog, responseData, generalResp.getStatus());
-	        return responseModel;
+			helper.updateInboundLogSuccess(inboundLog, responseData, generalResp.getStatus());
+			return responseModel;
 
-	    } catch (JsonProcessingException e) {
-	        log.error("Error parsing responseData JSON: {}", e.getMessage());
-	        helper.updateInboundLogFailure(inboundLog, e.getMessage(), "JSON_ERROR");
-	        throw new CustomException("Invalid JSON received from API");
-	    } catch (CustomException e) {
-	    	
-	        LOGGER.error("Custom Exception: {}", e.getMessage());
-	        helper.updateInboundLogFailure(inboundLog, e.getMessage(), "Custom_exception");
-	        throw e; // Rethrow for controller-level handling
-	    } 
+		} catch (JsonProcessingException e) {
+			log.error("Error parsing responseData JSON: {}", e.getMessage());
+			helper.updateInboundLogFailure(inboundLog, e.getMessage(), "JSON_ERROR");
+			throw new CustomException("Invalid JSON received from API");
+		}
 	}
 
 }