for the review

This commit is contained in:
himanshu
2025-10-28 15:46:31 +05:30
parent 4d501f7b4a
commit 92e71695a5
24 changed files with 331 additions and 284 deletions
@@ -16,9 +16,11 @@ import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import com.billpaymentservice.bbps.dto.MasterApiResponse;
import com.billpaymentservice.bbps.dto.ResponseModel;
import com.billpaymentservice.bbps.dto.request.BillerDetailRequest;
import com.billpaymentservice.bbps.dto.request.ContactMasterRequest;
import com.billpaymentservice.bbps.dto.request.CustomerParamRequest;
import com.billpaymentservice.bbps.dto.request.CustomParamRequest;
import com.billpaymentservice.bbps.dto.request.MasterRequest;
import com.billpaymentservice.bbps.dto.request.MerchantRequestModel;
import com.billpaymentservice.bbps.dto.response.BillerDataResponse;
import com.billpaymentservice.bbps.dto.response.BillerResponse;
@@ -41,8 +43,7 @@ public class MasterDataController {
}
/**Get Details of the biller by billId **/
@PostMapping(value = "/getBillerDetails", consumes = MediaType.APPLICATION_JSON_VALUE, produces = MediaType.APPLICATION_JSON_VALUE)
public ResponseEntity<BillerDataResponse> getBillerDetails(
@Validated @RequestBody BillerDetailRequest billerDetailRequest) {
public ResponseEntity<ResponseModel> getBillerDetails(@Validated @RequestBody BillerDetailRequest billerDetailRequest) {
log.info("Received biller details request for billerId: {}", billerDetailRequest.getBillerId());
@@ -50,7 +51,7 @@ public class MasterDataController {
}
/**Get Master Contact**/
@PostMapping(value = "/getContactMasterResponse", consumes = MediaType.APPLICATION_JSON_VALUE, produces = MediaType.APPLICATION_JSON_VALUE)
public ResponseEntity<ContactMasterResponse> getContactMaster(
public ResponseEntity<ResponseModel> getContactMaster(
@Validated @RequestBody ContactMasterRequest contactMasterRequest ) {
return ResponseEntity.ok(masterDataService.getContactMaster(contactMasterRequest));
@@ -58,29 +59,16 @@ 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<CustomParamResp> getBillerDetails(
@Validated @RequestBody CustomerParamRequest customerParamRequest) {
public ResponseEntity<ResponseModel> getBillerDetails(
@Validated @RequestBody CustomParamRequest customerParamRequest) {
log.info("Received biller details request for billerId: {}",customerParamRequest.getBillerId() );
return ResponseEntity.ok(masterDataService.getCustomerParamByBillerId(customerParamRequest));
}
/** Get All Masters API Fetch All Category from BBPS URL **/
@GetMapping("/getAllMasters")
public ResponseEntity<List<MasterApiResponse>> fetchMasterData(
@Validated @RequestBody MerchantRequestModel requestModel, HttpServletRequest request) {
log.info("Fetching Master Data Registered URL");
return masterDataService.getMasterData(requestModel, request);
@PostMapping("/getAllMastersData")
public ResponseModel fetchMasterData(@Validated @RequestBody MasterRequest masterRequest) {
return masterDataService.getMasterData(masterRequest);
}
/** Get Master Category Wise API Fetch Category Wise from BBPS URL **/
@GetMapping("/getMasterCategoryWise")
public ResponseEntity<BillerResponse> getMasterDataCategoryWise(
@Validated @RequestBody MerchantRequestModel requestModel, HttpServletRequest request,
@RequestParam String category, @RequestParam(defaultValue = "0") int pageStart, @RequestParam int pageEnd) {
log.info("Request received: category=" + category + ", pageNumber=" + pageStart + ", pageSize=" + pageEnd);
return masterDataService.fetchMasterDataCategoryWise(requestModel, category, pageStart, pageEnd);
}
}