Globots/bbps-backend
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

himanshu clean code

Browse Source
This commit is contained in:
himanshu
2025-11-03 11:18:24 +05:30
parent 680d05b5bd
commit d4c8b433cc
3 changed files with 2 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/billpaymentservice/bbps/controller/MasterDataController.java
+2 -5
View File
@@ -66,17 +66,14 @@ public class MasterDataController {
/** Get CustomerParam by billerId.The parameter is different from the data we are getting in the billerDetail **/
@PostMapping(value = "/getCustomerParamDetails", consumes = MediaType.APPLICATION_JSON_VALUE, produces = MediaType.APPLICATION_JSON_VALUE)
public ResponseEntity<ResponseModel> getBillerDetails(
public ResponseEntity<ResponseModel> getCustomerParamDetails(
@Validated @RequestBody CustomParamRequest customerParamRequest) {
log.info("Received biller details request for billerId: {}",customerParamRequest.getBillerId() );
return ResponseEntity.ok(masterDataService.getCustomerParamByBillerId(customerParamRequest));
}
@PostMapping("/getAllMastersData")
public ResponseModel fetchMasterData(@Validated @RequestBody MasterRequest masterRequest) {
return masterDataService.getMasterData(masterRequest);
}
}
src/main/java/com/billpaymentservice/bbps/service/MasterDataService.java
-4
View File
@@ -11,10 +11,6 @@ public interface MasterDataService {
public ResponseModel getBillerByBillerId(BillerDetailRequest billerDetailRequest);
public ResponseModel getMasterData(MasterRequest masterRequest);
public ResponseModel fetchMasterDataCategoryWise(MerchantRequestModel requestModel, String category, int pageStart, int pageEnd);
public ResponseModel getCustomerParamByBillerId(CustomParamRequest customerParamRequest);
public ResponseModel getContactMaster(ContactMasterRequest contactMasterRequest);
src/main/java/com/billpaymentservice/bbps/serviceImpl/MasterDataServiceImpl.java
-94
View File
@@ -129,100 +129,6 @@ public class MasterDataServiceImpl implements MasterDataService {
}
}
@Override
public ResponseModel getMasterData(MasterRequest masterRequest) {
LOGGER.info("Request DTO: {}", masterRequest);
String fullUrl = masterRegisterUrl + BBPSConstant.MASTER_CATEGORY_URL + masterRequest.getTenantId();
LOGGER.info("Calling external API: {}", fullUrl);
Map<String, String> responseMap = httpService.getRequest(fullUrl);
String responseData = responseMap.get("data");
LOGGER.info("Response Data: {}", responseData);
ObjectMapper objectMapper = new ObjectMapper();
try {
Map<String, Object> dataMap = objectMapper.readValue(responseData, new TypeReference<Map<String, Object>>() {});
// ✅ Same check as in getBillerByBillerId()
if (!dataMap.containsKey("generalResp")) {
throw new CustomException(
String.valueOf(dataMap.get("message")), // message
String.valueOf(dataMap.get("status")), // status
Integer.parseInt(String.valueOf(dataMap.get("statusCode"))), // statusCode
String.valueOf(dataMap.get("remarks")) // remarks
);
}
MasterApiResponse responseWrapper = objectMapper.convertValue(dataMap, MasterApiResponse.class);
GeneralResp generalResp = responseWrapper.getGeneralResp();
ResponseModel responseModel = new ResponseModel(
generalResp.getMessage(),
generalResp.getStatus(),
Integer.parseInt(generalResp.getStatusCode()),
responseWrapper
);
return responseModel;
} catch (JsonProcessingException e) {
log.error("Error parsing responseData JSON: {}", e.getMessage());
throw new CustomException("Invalid JSON received from API");
}
}
@Override
public ResponseModel fetchMasterDataCategoryWise(MerchantRequestModel requestModel,
String category, int pageStart, int pageEnd) {
LOGGER.info("Fetching Master Data Category-wise for MID={}, Category={}, PageStart={}, PageEnd={}",
requestModel.getMid(), category, pageStart, pageEnd);
BBPSMerchantValidation merchantValidation = merchantRegisterRepo.findByMid(requestModel.getMid());
BillerResponse responseModel = new BillerResponse();
// if Start merchant validations
if (Optional.ofNullable(merchantValidation).isPresent()) {
// if Start merchant active check
if (merchantValidation.isActive()) {
LOGGER.info("mid Value: " + requestModel.getMid() + " secret Value: " + requestModel.getSecretKey()
+ "txt Value: " + requestModel);
// 2️⃣ Build API URL
String fullUrl = String.format("%s%s?category=%s&page=%d&pagesize=%d", masterRegisterUrl,
BBPSConstant.BILLER_URL, category, pageStart, pageEnd);
LOGGER.info("Calling Master API: {}", fullUrl);
HashMap<String, Object> response = httpClientApi.getRequestForPaymentStatus(fullUrl);
LOGGER.info("BBPS bank response data: " + response.get("data") + " code: " + response.get("respCode"));
// if Start merchant cehck response code
if (response.get("respCode") != null && response.get("respCode").toString().contains("200")) {
LOGGER.info("Response -: " + response.get("data"));
String jsonData = response.get("data").toString();
//responseModel = responseParser.billerResponse(jsonData);
LOGGER.info("kkk" + responseModel.toString());
// 5️⃣ Prepare API response model
} else {
LOGGER.warn("Unexpected response code: " + response.get("respCode"));
}
} else {
LOGGER.info("Merchant Not Active for mid - " + requestModel.getMid());
throw new AppException("Merchant Not Active", BBPSConstant.CODE_MERCHANT_INACTIVE);
}
} else {
LOGGER.info("Merchant Not Valid for mid - " + requestModel.getMid());
throw new AppException("Merchant Not Valid", BBPSConstant.CODE_MERCHANT_INVALID);
}
return new ResponseModel();
}
@Override
public ResponseModel getCustomerParamByBillerId(CustomParamRequest customerParamRequest) {