update code complaint code
This commit is contained in:
Mohd-Arham
@@ -3,8 +3,6 @@ package com.billpaymentservice.bbps.serviceImpl;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
import org.modelmapper.ModelMapper;
|
||||
import org.modelmapper.convention.MatchingStrategies;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
import org.springframework.beans.factory.annotation.Value;
|
||||
@@ -16,20 +14,18 @@ import org.springframework.web.client.RestClient;
|
||||
import com.billpaymentservice.bbps.dto.GeneralResp;
|
||||
import com.billpaymentservice.bbps.dto.ResponseModel;
|
||||
import com.billpaymentservice.bbps.dto.request.AllMasterOptionsRequest;
|
||||
import com.billpaymentservice.bbps.dto.request.CloseComplaintRequest;
|
||||
import com.billpaymentservice.bbps.dto.request.ComplainStatusRequest;
|
||||
import com.billpaymentservice.bbps.dto.request.ComplaintRequestDTO;
|
||||
import com.billpaymentservice.bbps.dto.request.ReOpenComplain;
|
||||
import com.billpaymentservice.bbps.dto.request.GetTicketLatestStausRequest;
|
||||
import com.billpaymentservice.bbps.dto.request.TxnStatusRequest;
|
||||
import com.billpaymentservice.bbps.dto.request.ViewComplainByIdRequest;
|
||||
import com.billpaymentservice.bbps.dto.request.ViewAllComplaintsTicketsRequest;
|
||||
import com.billpaymentservice.bbps.dto.response.ComplaintHistoryStatusResponse;
|
||||
import com.billpaymentservice.bbps.dto.response.ComplaintResponse;
|
||||
|
||||
import com.billpaymentservice.bbps.dto.response.ComplaintStatusResponse;
|
||||
import com.billpaymentservice.bbps.dto.response.TicketCheckStatusResponse;
|
||||
import com.billpaymentservice.bbps.dto.response.TxnStatusResponse;
|
||||
import com.billpaymentservice.bbps.dto.response.ViewAllComplaintsTicketsResponse;
|
||||
import com.billpaymentservice.bbps.dto.response.ViewComplainByIdResponse;
|
||||
import com.billpaymentservice.bbps.entites.BharatConnectMaster;
|
||||
import com.billpaymentservice.bbps.entites.ComplaintDetails;
|
||||
import com.billpaymentservice.bbps.entites.ComplaintStatusOptionsMaster;
|
||||
import com.billpaymentservice.bbps.entites.InboundTraceLog;
|
||||
import com.billpaymentservice.bbps.entites.OutboundTraceLog;
|
||||
@@ -45,6 +41,7 @@ import com.fasterxml.jackson.annotation.JsonInclude;
|
||||
import com.fasterxml.jackson.core.JsonProcessingException;
|
||||
import com.fasterxml.jackson.core.type.TypeReference;
|
||||
import com.fasterxml.jackson.databind.ObjectMapper;
|
||||
import com.fasterxml.jackson.databind.node.ObjectNode;
|
||||
|
||||
@Service
|
||||
public class ComplainServiceImpl implements ComplainService {
|
||||
@@ -82,14 +79,20 @@ public class ComplainServiceImpl implements ComplainService {
|
||||
@Override
|
||||
public ResponseModel addComplain(ComplaintRequestDTO complainRequestDTO) {
|
||||
|
||||
LOGGER.info("Initiating addComplain for request ID: {} and MID", complainRequestDTO.getReqId(),
|
||||
LOGGER.info("Initiating add Complain for request ID: {} and MID {}", complainRequestDTO.getReqId(),
|
||||
complainRequestDTO.getMid());
|
||||
String apiName = "ADDCOMPLAIN";
|
||||
|
||||
String apiName = "ADD_COMPLAIN";
|
||||
String txnId = helper.generateTxnId(15);
|
||||
String requestId = complainRequestDTO.getReqId();
|
||||
String fullUrl = complainDataUrl + BBPSConstant.ADD_COMPLAIN_ENDPOINT;
|
||||
|
||||
// Convert input DTO to JSON
|
||||
String requestJson = helper.convertObjectToJson(complainRequestDTO);
|
||||
|
||||
// Fetch tenant & agent from DB
|
||||
BharatConnectMaster headersData = beneficiaryDetailsRepository.findByOrgId("ORG001");
|
||||
|
||||
HttpHeaders headers = new HttpHeaders();
|
||||
headers.set("x-digiledge-key", headersData.getXDigiledgeKey());
|
||||
headers.set("agentId", headersData.getAgentId());
|
||||
@@ -98,233 +101,155 @@ public class ComplainServiceImpl implements ComplainService {
|
||||
|
||||
InboundTraceLog inboundLog = helper.createInboundLog(requestId, txnId, apiName, complainRequestDTO.getMid(),
|
||||
"POST", requestJson);
|
||||
|
||||
OutboundTraceLog outboundLog = helper.createOutboundLog(txnId, requestId, apiName, fullUrl, "POST", null);
|
||||
LOGGER.info("Calling external API: {}", fullUrl);
|
||||
LOGGER.info("Request payload: {}", requestJson);
|
||||
Map<String, String> responseMap = httpService.postRequest(fullUrl, requestJson, headers);
|
||||
String responseData = responseMap.get("data");
|
||||
LOGGER.info("fetched data from api is :{}", responseData);
|
||||
helper.updateOutboundLogResponse(outboundLog, responseData);
|
||||
|
||||
try {
|
||||
// Inject tenantId + agentId into request JSON
|
||||
ObjectNode root = (ObjectNode) objectMapper.readTree(requestJson);
|
||||
root.put("tenantId", headersData.getTenantId());
|
||||
root.put("agentId", headersData.getAgentId());
|
||||
|
||||
String finalJson = root.toString();
|
||||
LOGGER.info("Final Request Sent to API: {}", finalJson);
|
||||
|
||||
// IMPORTANT: Send finalJson, not requestJson
|
||||
Map<String, String> responseMap = httpService.postRequest(fullUrl, finalJson, headers);
|
||||
|
||||
String responseData = responseMap.get("data");
|
||||
LOGGER.info("Fetched response: {}", responseData);
|
||||
|
||||
helper.updateOutboundLogResponse(outboundLog, responseData);
|
||||
|
||||
// Handle HttpService error wrapper
|
||||
if (responseData.startsWith("HttpService Error")) {
|
||||
int start = responseData.indexOf("{");
|
||||
int end = responseData.lastIndexOf("}");
|
||||
if (start != -1 && end != -1) {
|
||||
responseData = responseData.substring(start, end + 1);
|
||||
}
|
||||
LOGGER.info("Extracted pure JSON from error: {}", responseData);
|
||||
}
|
||||
|
||||
// Parse JSON into Map
|
||||
Map<String, Object> dataMap = objectMapper.readValue(responseData,
|
||||
new TypeReference<Map<String, Object>>() {
|
||||
});
|
||||
LOGGER.info("Parsed response data: {}", dataMap);
|
||||
if (!dataMap.containsKey("generalResp")) {
|
||||
helper.updateInboundLogFailure(inboundLog, responseData, String.valueOf(dataMap.get("status")));
|
||||
|
||||
int statusCode = Integer.parseInt(String.valueOf(dataMap.get("statusCode")));
|
||||
|
||||
// Throw exception for non-200
|
||||
if (statusCode != 200) {
|
||||
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")));
|
||||
statusCode, String.valueOf(dataMap.get("remarks")));
|
||||
}
|
||||
|
||||
// Convert to response wrapper
|
||||
ComplaintResponse responseWrapper = objectMapper.convertValue(dataMap, ComplaintResponse.class);
|
||||
GeneralResp generalResp = responseWrapper.getGeneralResp();
|
||||
ModelMapper mapper = new ModelMapper();
|
||||
mapper.getConfiguration().setMatchingStrategy(MatchingStrategies.STRICT);
|
||||
ComplaintDetails entity = mapper.map(responseWrapper.getComplaints(), ComplaintDetails.class);
|
||||
entity.setReqId(complainRequestDTO.getReqId());
|
||||
entity.setTxnId(txnId);
|
||||
complainRepository.save(entity);
|
||||
ResponseModel responseModel = new ResponseModel(generalResp.getMessage(), generalResp.getStatus(),
|
||||
Integer.parseInt(generalResp.getStatusCode()), responseWrapper);
|
||||
helper.updateInboundLogSuccess(inboundLog, responseData, generalResp.getStatus());
|
||||
|
||||
ResponseModel responseModel = new ResponseModel(responseWrapper.getMessage(), responseWrapper.getStatus(),
|
||||
Integer.parseInt(responseWrapper.getStatusCode()), responseWrapper);
|
||||
|
||||
helper.updateInboundLogSuccess(inboundLog, responseData, responseWrapper.getStatus());
|
||||
return responseModel;
|
||||
|
||||
} catch (JsonProcessingException e) {
|
||||
LOGGER.error("Error parsing responseData JSON: {}", e.getMessage());
|
||||
LOGGER.error("JSON Parsing Error: {}", e.getMessage());
|
||||
helper.updateInboundLogFailure(inboundLog, e.getMessage(), "JSON_ERROR");
|
||||
throw new CustomException("Invalid JSON received from API");
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public ResponseModel getComplaintStatus(ComplainStatusRequest request) {
|
||||
LOGGER.info("Fetching Compalint Status by Complaint Id={}", request.getComplaintId(), request.getReqId());
|
||||
// String apiName = "Complaint Status";
|
||||
// String txnId = helper.generateTxnId(15);
|
||||
// String reqId = request.getReqId();
|
||||
// String complaintId = request.getComplaintId();
|
||||
// String fullUrl = agentDtaUrl + BBPSConstant.COMPALINT_STATUS;
|
||||
//
|
||||
// helper.validateMerchant(request.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();
|
||||
// objectMapper.setSerializationInclusion(JsonInclude.Include.NON_NULL);
|
||||
// String requestJson = helper.convertObjectToJson(request);
|
||||
//
|
||||
// InboundTraceLog inboundLog = helper.createInboundLog(reqId, txnId, apiName, request.getMid(), "POST",
|
||||
// requestJson);
|
||||
// OutboundTraceLog outboundLog = helper.createOutboundLog(txnId, reqId, apiName, fullUrl, "POST", complaintId);
|
||||
// LOGGER.debug("Outbound log created successfully for Complaint : {}", fullUrl);
|
||||
public ResponseModel getComplaintStatus(GetTicketLatestStausRequest request) {
|
||||
|
||||
LOGGER.info("Fetching Complaint Status for TicketId={} ReqId={}", request.getTicketId(), request.getReqId());
|
||||
|
||||
String apiName = "COMPLAINT_STATUS";
|
||||
String txnId = helper.generateTxnId(15);
|
||||
String reqId = request.getReqId();
|
||||
String complaintId = request.getTicketId();
|
||||
String fullUrl = agentDtaUrl + BBPSConstant.COMPALINT_STATUS;
|
||||
|
||||
helper.validateMerchant(request.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);
|
||||
|
||||
// Convert request to JSON
|
||||
String requestJson = helper.convertObjectToJson(request);
|
||||
|
||||
InboundTraceLog inboundLog = helper.createInboundLog(reqId, txnId, apiName, request.getMid(), "POST",
|
||||
requestJson);
|
||||
|
||||
OutboundTraceLog outboundLog = helper.createOutboundLog(txnId, reqId, apiName, fullUrl, "POST", complaintId);
|
||||
|
||||
try {
|
||||
//
|
||||
// LOGGER.info("Calling external API: {}", fullUrl);
|
||||
// Map<String, String> responseMap = httpService.postRequest(fullUrl, requestJson, headers);
|
||||
// String responseData = responseMap.get("data");
|
||||
// LOGGER.info("Complaint FetchById Response: {}", responseData);
|
||||
//
|
||||
//
|
||||
//
|
||||
// // Dummy complaint map start
|
||||
// JsonNode root = objectMapper.readTree(responseData);
|
||||
// String message = root.path("message").asText("");
|
||||
// String statuss = root.path("status").asText("");
|
||||
//
|
||||
// // dummy data send when server response is coming error.
|
||||
// // Check for internal server error
|
||||
// if ("Internal server error, please try again later".equalsIgnoreCase(message)) {
|
||||
//
|
||||
// Map<String, Object> dummyComplaint = mapperHelper.getComplaintStatusJson();
|
||||
//
|
||||
// LOGGER.info("Returning Dummy Response: {}", dummyComplaint);
|
||||
//
|
||||
// // Pass map directly to ResponseModel
|
||||
// return new ResponseModel("Successfully requested complaint status", "success", 200, dummyComplaint);
|
||||
// }
|
||||
// // Dummy complaint map End
|
||||
//
|
||||
// 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");
|
||||
// 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")));
|
||||
// }
|
||||
//
|
||||
// ComplaintStatusResponse responseWrapper = objectMapper.convertValue(dataMap, ComplaintStatusResponse.class);
|
||||
// GeneralResp generalResp = responseWrapper.getGeneralResp();
|
||||
//
|
||||
// String status = generalResp.getStatus();
|
||||
// LOGGER.info("Current Complaint Status: {}", status);
|
||||
//
|
||||
// helper.updateInboundLogSuccess(inboundLog, responseData, generalResp.getStatus());
|
||||
// mapperHelper.saveComplaintStatus(responseWrapper, reqId, txnId);
|
||||
// LOGGER.info("Complaint data saved successfully for billId: {}", complaintId);
|
||||
//
|
||||
// return new ResponseModel(generalResp.getMessage(), generalResp.getStatus(),
|
||||
// Integer.parseInt(generalResp.getStatusCode()), responseWrapper);
|
||||
// } catch (JsonProcessingException e) {
|
||||
// LOGGER.error("Error parsing Complaint Id JSON: {}", e.getMessage(), e);
|
||||
// helper.updateInboundLogFailure(inboundLog, e.getMessage(), "JSON_ERROR");
|
||||
// throw new CustomException("Invalid JSON received from API");
|
||||
|
||||
Map<String, Object> dummyComplaint = mapperHelper.getComplaintStatusJson();
|
||||
LOGGER.info("Calling external API: {}", fullUrl);
|
||||
Map<String, String> responseMap = httpService.postRequest(fullUrl, requestJson, headers);
|
||||
|
||||
LOGGER.info("Returning Dummy Response: {}", dummyComplaint);
|
||||
String responseData = responseMap.get("data");
|
||||
|
||||
// Pass map directly to ResponseModel
|
||||
return new ResponseModel("Successfully requested complaint status", "success", 200, dummyComplaint);
|
||||
LOGGER.info("Complaint Fetch Response: {}", responseData);
|
||||
helper.updateOutboundLogResponse(outboundLog, responseData);
|
||||
|
||||
// Dummy complaint map End
|
||||
if (responseData.startsWith("HttpService Error")) {
|
||||
int start = responseData.indexOf("{");
|
||||
int end = responseData.lastIndexOf("}");
|
||||
if (start != -1 && end != -1) {
|
||||
responseData = responseData.substring(start, end + 1);
|
||||
LOGGER.info("Extracted Clean JSON: {}", responseData);
|
||||
}
|
||||
}
|
||||
|
||||
} catch (Exception ex) {
|
||||
LOGGER.error("Error parsing response JSON", ex);
|
||||
throw new CustomException("Error " + ex.getMessage());
|
||||
}
|
||||
}
|
||||
// Convert JSON to Map
|
||||
Map<String, Object> dataMap = objectMapper.readValue(responseData,
|
||||
new TypeReference<Map<String, Object>>() {
|
||||
});
|
||||
|
||||
@Override
|
||||
public ResponseModel reOpenComplaint(ReOpenComplain request) {
|
||||
LOGGER.info("Fetching ReOpen Complaint by Complaint Id={}", request.getComplaintId(), request.getReqId());
|
||||
// String apiName = "Complaint Status";
|
||||
// String txnId = helper.generateTxnId(15);
|
||||
// String reqId = request.getReqId();
|
||||
// String complaintId = request.getComplaintId();
|
||||
// String fullUrl = agentDtaUrl + BBPSConstant.REOPEN_COMPALINT;
|
||||
//
|
||||
// helper.validateMerchant(request.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();
|
||||
// objectMapper.setSerializationInclusion(JsonInclude.Include.NON_NULL);
|
||||
// String requestJson = helper.convertObjectToJson(request);
|
||||
//
|
||||
// InboundTraceLog inboundLog = helper.createInboundLog(reqId, txnId, apiName, request.getMid(), "POST",
|
||||
// requestJson);
|
||||
// OutboundTraceLog outboundLog = helper.createOutboundLog(txnId, reqId, apiName, fullUrl, "POST", complaintId);
|
||||
// LOGGER.debug("Outbound log created successfully for Complaint : {}", fullUrl);
|
||||
int statusCode = Integer.parseInt(String.valueOf(dataMap.get("statusCode")));
|
||||
|
||||
try {
|
||||
// LOGGER.info("Calling external API: {}", fullUrl);
|
||||
// Map<String, String> responseMap = httpService.postRequest(fullUrl, requestJson, headers);
|
||||
// String responseData = responseMap.get("data");
|
||||
// LOGGER.info("Complaint ReOpen FetchById Response: {}", responseData);
|
||||
if (statusCode != 200) {
|
||||
throw new CustomException(String.valueOf(dataMap.get("message")), String.valueOf(dataMap.get("status")),
|
||||
statusCode, String.valueOf(dataMap.get("remarks")));
|
||||
}
|
||||
|
||||
// Dummy complaint map start
|
||||
// Check for internal server error
|
||||
TicketCheckStatusResponse responseWrapper = objectMapper.convertValue(dataMap,
|
||||
TicketCheckStatusResponse.class);
|
||||
|
||||
Map<String, Object> dummyComplaint = mapperHelper.getDummyReopenComplaintJson();
|
||||
LOGGER.info("Returning Dummy Response: {}", dummyComplaint);
|
||||
LOGGER.info("Complaint Current Status: {}", responseWrapper.getStatus());
|
||||
|
||||
return new ResponseModel("Complaint reopening requested", "success", 200, dummyComplaint);
|
||||
helper.updateInboundLogSuccess(inboundLog, responseData, responseWrapper.getStatus());
|
||||
|
||||
// Dummy complaint map End
|
||||
// Save in DB
|
||||
mapperHelper.saveComplaintStatus(responseWrapper, reqId, txnId);
|
||||
|
||||
return new ResponseModel(responseWrapper.getMessage(), responseWrapper.getStatus(),
|
||||
Integer.parseInt(responseWrapper.getStatusCode()), responseWrapper);
|
||||
|
||||
} catch (JsonProcessingException e) {
|
||||
|
||||
LOGGER.error("Error parsing Complaint Status JSON: {}", e.getMessage());
|
||||
helper.updateInboundLogFailure(inboundLog, e.getMessage(), "JSON_ERROR");
|
||||
throw new CustomException("Invalid JSON received from API");
|
||||
|
||||
// helper.updateOutboundLogResponse(outboundLog, responseData);
|
||||
//
|
||||
// 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 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")));
|
||||
// }
|
||||
//
|
||||
// ComplaintStatusResponse responseWrapper = objectMapper.convertValue(dataMap, ComplaintStatusResponse.class);
|
||||
// GeneralResp generalResp = responseWrapper.getGeneralResp();
|
||||
//
|
||||
// String status = generalResp.getStatus();
|
||||
// LOGGER.info("Current Complaint ReOpen Status: {}", status);
|
||||
//
|
||||
// helper.updateInboundLogSuccess(inboundLog, responseData, generalResp.getStatus());
|
||||
// mapperHelper.saveReOpenComplaint(responseWrapper, reqId, txnId);
|
||||
// LOGGER.info("Complaint ReOpen data saved successfully for billId: {}", complaintId);
|
||||
//
|
||||
// return new ResponseModel(generalResp.getMessage(), generalResp.getStatus(),
|
||||
// Integer.parseInt(generalResp.getStatusCode()), responseWrapper);
|
||||
// } catch (JsonProcessingException e) {
|
||||
// LOGGER.error("Error parsing Complaint Id JSON: {}", e.getMessage(), e);
|
||||
// helper.updateInboundLogFailure(inboundLog, e.getMessage(), "JSON_ERROR");
|
||||
// throw new CustomException("Invalid JSON received from API");
|
||||
} catch (Exception ex) {
|
||||
LOGGER.error("Error parsing response JSON", ex);
|
||||
throw new CustomException("Error " + ex.getMessage());
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public ResponseModel viewComplaintHistory(ComplainStatusRequest request) {
|
||||
LOGGER.info("Fetching View Complaint History Complaint by Complaint Id={}", request.getComplaintId(),
|
||||
LOGGER.info("Fetching View Complaint History Complaint by Complaint Id={}", request.getTicketId(),
|
||||
request.getReqId());
|
||||
String apiName = "Complaint Status";
|
||||
String apiName = "View_Complaint_History";
|
||||
String txnId = helper.generateTxnId(15);
|
||||
String reqId = request.getReqId();
|
||||
String complaintId = request.getComplaintId();
|
||||
String fullUrl = agentDtaUrl + BBPSConstant.COMPLAINT_HISTORY + request.getComplaintId();
|
||||
String ticketId = request.getTicketId();
|
||||
String fullUrl = agentDtaUrl + BBPSConstant.COMPLAINT_HISTORY + request.getTicketId();
|
||||
|
||||
helper.validateMerchant(request.getMid());
|
||||
|
||||
@@ -341,7 +266,7 @@ public class ComplainServiceImpl implements ComplainService {
|
||||
|
||||
InboundTraceLog inboundLog = helper.createInboundLog(reqId, txnId, apiName, request.getMid(), "GET",
|
||||
requestJson);
|
||||
OutboundTraceLog outboundLog = helper.createOutboundLog(txnId, reqId, apiName, fullUrl, "GET", complaintId);
|
||||
OutboundTraceLog outboundLog = helper.createOutboundLog(txnId, reqId, apiName, fullUrl, "GET", ticketId);
|
||||
LOGGER.debug("Outbound log created successfully for Complaint : {}", fullUrl);
|
||||
|
||||
try {
|
||||
@@ -384,92 +309,14 @@ public class ComplainServiceImpl implements ComplainService {
|
||||
}
|
||||
|
||||
@Override
|
||||
public ResponseModel closeComplaint(CloseComplaintRequest request) {
|
||||
LOGGER.info("Fetching Close Complaint by Complaint Id={}", request.getComplaintId(), request.getReqId());
|
||||
// String apiName = "Complaint Status";
|
||||
// String txnId = helper.generateTxnId(15);
|
||||
// String reqId = request.getReqId();
|
||||
// String complaintId = request.getComplaintId();
|
||||
// String fullUrl = agentDtaUrl + BBPSConstant.CLOSE_COMPLAINT;
|
||||
//
|
||||
// helper.validateMerchant(request.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();
|
||||
// objectMapper.setSerializationInclusion(JsonInclude.Include.NON_NULL);
|
||||
// String requestJson = helper.convertObjectToJson(request);
|
||||
//
|
||||
// InboundTraceLog inboundLog = helper.createInboundLog(reqId, txnId, apiName, request.getMid(), "POST",
|
||||
// requestJson);
|
||||
// OutboundTraceLog outboundLog = helper.createOutboundLog(txnId, reqId, apiName, fullUrl, "POST", complaintId);
|
||||
// LOGGER.debug("Outbound log created successfully for Complaint : {}", fullUrl);
|
||||
public ResponseModel viewComplaintById(ComplainStatusRequest request) {
|
||||
|
||||
try {
|
||||
// LOGGER.info("Calling external API: {}", fullUrl);
|
||||
// Map<String, String> responseMap = httpService.postRequest(fullUrl, requestJson, headers);
|
||||
// String responseData = responseMap.get("data");
|
||||
// LOGGER.info("Complaint Close FetchById Response: {}", responseData);
|
||||
|
||||
// Dummy complaint map Start
|
||||
Map<String, Object> dummyComplaint = mapperHelper.getDummyClosureComplaintJson();
|
||||
LOGGER.info("Returning Dummy Response: {}", dummyComplaint);
|
||||
|
||||
return new ResponseModel("Complaint closure requested", "success", 200, dummyComplaint);
|
||||
|
||||
// Dummy complaint map End
|
||||
|
||||
// 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");
|
||||
// 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")));
|
||||
// }
|
||||
//
|
||||
// CloseComplaintStatusResponse responseWrapper = objectMapper.convertValue(dataMap,
|
||||
// CloseComplaintStatusResponse.class);
|
||||
// GeneralResp generalResp = responseWrapper.getGeneralResp();
|
||||
//
|
||||
// String status = generalResp.getStatus();
|
||||
// LOGGER.info("Current Complaint Close Status: {}", status);
|
||||
//
|
||||
// helper.updateInboundLogSuccess(inboundLog, responseData, generalResp.getStatus());
|
||||
// // mapperHelper.saveReOpenComplaint(responseWrapper, reqId, txnId);
|
||||
// LOGGER.info("Complaint Close data saved successfully for billId: {}", complaintId);
|
||||
//
|
||||
// return new ResponseModel(generalResp.getMessage(), generalResp.getStatus(),
|
||||
// Integer.parseInt(generalResp.getStatusCode()), responseWrapper);
|
||||
// } catch (JsonProcessingException e) {
|
||||
// LOGGER.error("Error parsing Complaint Id JSON: {}", e.getMessage(), e);
|
||||
// helper.updateInboundLogFailure(inboundLog, e.getMessage(), "JSON_ERROR");
|
||||
// throw new CustomException("Invalid JSON received from API");
|
||||
} catch (Exception e) {
|
||||
throw new CustomException("Invalid JSON received from API" + e.getMessage());
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public ResponseModel viewComplaintById(ViewComplainByIdRequest request) {
|
||||
|
||||
LOGGER.info("Fetching View Complaint History Complaint by Complaint Id={}", request.getComplaintId(),
|
||||
request.getReqId());
|
||||
String apiName = "View Complaint By ID";
|
||||
LOGGER.info("Fetching View Complaint Complaint by Complaint Id={}", request.getTicketId(), request.getReqId());
|
||||
String apiName = "View_Complaint_By_ID";
|
||||
String txnId = helper.generateTxnId(15);
|
||||
String reqId = request.getReqId();
|
||||
String complaintId = request.getComplaintId();
|
||||
String fullUrl = agentDtaUrl + BBPSConstant.VIEW_COMPLAINT_BY_ID + request.getComplaintId();
|
||||
String ticketId = request.getTicketId();
|
||||
String fullUrl = agentDtaUrl + BBPSConstant.VIEW_COMPLAINT_BY_ID + request.getTicketId();
|
||||
|
||||
helper.validateMerchant(request.getMid());
|
||||
|
||||
@@ -486,7 +333,7 @@ public class ComplainServiceImpl implements ComplainService {
|
||||
|
||||
InboundTraceLog inboundLog = helper.createInboundLog(reqId, txnId, apiName, request.getMid(), "GET",
|
||||
requestJson);
|
||||
OutboundTraceLog outboundLog = helper.createOutboundLog(txnId, reqId, apiName, fullUrl, "GET", complaintId);
|
||||
OutboundTraceLog outboundLog = helper.createOutboundLog(txnId, reqId, apiName, fullUrl, "GET", ticketId);
|
||||
LOGGER.debug("Outbound log created successfully for Complaint : {}", fullUrl);
|
||||
|
||||
try {
|
||||
@@ -516,14 +363,8 @@ public class ComplainServiceImpl implements ComplainService {
|
||||
LOGGER.info("Current Complaint ReOpen Status: {}", status);
|
||||
|
||||
helper.updateInboundLogSuccess(inboundLog, responseData, generalResp.getStatus());
|
||||
|
||||
// String saveComplaintHistory =
|
||||
// mapperHelper.saveComplaintHistory(responseWrapper, reqId, txnId);
|
||||
// LOGGER.info("Complaint ReOpen data saved successfully for Count History: {}",
|
||||
// saveComplaintHistory);
|
||||
String saveComplaint = mapperHelper.saveComplainStatusDetail(responseWrapper, reqId, txnId);
|
||||
// LOGGER.info("Complaint ReOpen data saved successfully for Count History: {}",
|
||||
// saveComplaintHistory);
|
||||
LOGGER.info("Complaint ReOpen data saved successfully for Count History: {}", saveComplaint);
|
||||
|
||||
return new ResponseModel(generalResp.getMessage(), generalResp.getStatus(),
|
||||
Integer.parseInt(generalResp.getStatusCode()), responseWrapper);
|
||||
@@ -538,7 +379,6 @@ public class ComplainServiceImpl implements ComplainService {
|
||||
public ResponseModel getAllActiveStatuses(AllMasterOptionsRequest request) {
|
||||
|
||||
try {
|
||||
|
||||
LOGGER.info("Fetch All Master Options - MID: {}", request.getMid());
|
||||
String apiName = "View All Options Fetch By Id";
|
||||
String txnId = helper.generateTxnId(15);
|
||||
@@ -580,7 +420,7 @@ public class ComplainServiceImpl implements ComplainService {
|
||||
}
|
||||
|
||||
public ResponseModel checkTxnStatus(TxnStatusRequest request) {
|
||||
LOGGER.info("Fetching TxnStatusRequest by Id={} and ReqId ={}", request.getId(), request.getReqId());
|
||||
LOGGER.info("Check Txn Status Request by Id={} and ReqId ={}", request.getId(), request.getReqId());
|
||||
String apiName = "CheckTxnStatus";
|
||||
String txnId = helper.generateTxnId(15);
|
||||
String reqId = request.getReqId();
|
||||
@@ -631,11 +471,6 @@ public class ComplainServiceImpl implements ComplainService {
|
||||
LOGGER.info("Current Complaint ReOpen Status: {}", status);
|
||||
|
||||
helper.updateInboundLogSuccess(inboundLog, responseData, generalResp.getStatus());
|
||||
// String saveComplaint = mapperHelper.saveComplainStatusDetail(responseWrapper,
|
||||
// reqId, txnId);
|
||||
// LOGGER.info("Complaint ReOpen data saved successfully for Count History: {}",
|
||||
// saveComplaintHistory);
|
||||
|
||||
return new ResponseModel(generalResp.getMessage(), generalResp.getStatus(),
|
||||
Integer.parseInt(generalResp.getStatusCode()), responseWrapper);
|
||||
} catch (JsonProcessingException e) {
|
||||
@@ -646,4 +481,74 @@ public class ComplainServiceImpl implements ComplainService {
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public ResponseModel ViewAllComplaints(ViewAllComplaintsTicketsRequest request) {
|
||||
|
||||
LOGGER.info("Fetching All Complaint for status Type={} and reqId={} ", request.getStatusType(),
|
||||
request.getReqId());
|
||||
String apiName = "View_All_Complaint_By_Status_Type";
|
||||
String txnId = helper.generateTxnId(15);
|
||||
String reqId = request.getReqId();
|
||||
String fullUrl = complainDataUrl + BBPSConstant.VIEW_ALL_COMPLAINTS_BASE + "?pageNo=" + request.getPageNo()
|
||||
+ "&pageSize=" + request.getPageSize() + "&statusType=" + request.getStatusType() + "&ticketType="
|
||||
+ request.getTicketType();
|
||||
|
||||
helper.validateMerchant(request.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();
|
||||
objectMapper.setSerializationInclusion(JsonInclude.Include.NON_NULL);
|
||||
String requestJson = helper.convertObjectToJson(request);
|
||||
|
||||
InboundTraceLog inboundLog = helper.createInboundLog(reqId, txnId, apiName, request.getMid(), "POST",
|
||||
requestJson);
|
||||
OutboundTraceLog outboundLog = helper.createOutboundLog(txnId, reqId, apiName, fullUrl, "GET",
|
||||
request.getStatusType());
|
||||
LOGGER.debug("Outbound log created successfully for Complaint : {}", fullUrl);
|
||||
|
||||
try {
|
||||
LOGGER.info("Calling external API: {}", fullUrl);
|
||||
Map<String, String> responseMap = httpService.getRequest(fullUrl, headers);
|
||||
String responseData = responseMap.get("data");
|
||||
LOGGER.info("Response: {}", 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, "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(""));
|
||||
}
|
||||
|
||||
ViewAllComplaintsTicketsResponse responseWrapper = objectMapper.convertValue(dataMap,
|
||||
ViewAllComplaintsTicketsResponse.class);
|
||||
GeneralResp generalResp = responseWrapper.getGeneralResp();
|
||||
|
||||
String status = generalResp.getStatus();
|
||||
LOGGER.info("Current Complaint ReOpen Status: {}", status);
|
||||
|
||||
String saveComplaint = mapperHelper.saveAllComplaints(responseWrapper, reqId, txnId);
|
||||
LOGGER.info("Complaint ReOpen data saved successfully for Count History: {}",
|
||||
saveComplaint);
|
||||
|
||||
return new ResponseModel(generalResp.getMessage(), generalResp.getStatus(),
|
||||
Integer.parseInt(generalResp.getStatusCode()), responseWrapper);
|
||||
} catch (JsonProcessingException e) {
|
||||
LOGGER.error("Error parsing Complaint Id JSON: {}", e.getMessage(), e);
|
||||
helper.updateInboundLogFailure(inboundLog, e.getMessage(), "JSON_ERROR");
|
||||
throw new CustomException("Invalid JSON received from API");
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user