resolve conflict

src/main/java/com/billpaymentservice/bbps/controller/MasterDataController.java

@@ -4,6 +4,8 @@ import java.util.List;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -16,6 +18,7 @@ import org.springframework.web.bind.annotation.RestController;
 import com.billpaymentservice.bbps.dto.MasterApiResponse;
 import com.billpaymentservice.bbps.dto.request.BillerDetailRequest;
 import com.billpaymentservice.bbps.dto.request.MerchantRequestModel;
+import com.billpaymentservice.bbps.dto.response.BillerDataResponse;
 import com.billpaymentservice.bbps.dto.response.BillerResponse;
 import com.billpaymentservice.bbps.service.MasterDataService;
 
@@ -25,7 +28,7 @@ import jakarta.servlet.http.HttpServletRequest;
 @RestController
 public class MasterDataController {
 
-	private static final Logger LOGGER = LoggerFactory.getLogger(MasterDataController.class);
+	private static final Logger log = LoggerFactory.getLogger(MasterDataController.class);
 
 	private final MasterDataService masterDataService;
 
@@ -33,6 +36,38 @@ public class MasterDataController {
 		this.masterDataService = masterDataService;
 	}
 
+	@PostMapping(value = "/getBillerDetails", consumes = MediaType.APPLICATION_JSON_VALUE, produces = MediaType.APPLICATION_JSON_VALUE)
+	public ResponseEntity<BillerDataResponse> getBillerDetails(
+			@Validated @RequestBody BillerDetailRequest billerDetailRequest) {
+
+		log.info("Received biller details request for billerId: {}", billerDetailRequest.getBillerId());
+
+		BillerDataResponse response = masterDataService.getBillerByBillerId(billerDetailRequest);
+
+		HttpStatus status;
+		String statusCode = response.getGeneralResp() != null ? response.getGeneralResp().getStatusCode() : "500";
+
+		switch (statusCode) {
+		case "200":
+			status = HttpStatus.OK;
+			break;
+		case "404":
+			status = HttpStatus.NOT_FOUND;
+			break;
+		case "500":
+			status = HttpStatus.INTERNAL_SERVER_ERROR;
+			break;
+		default:
+			status = HttpStatus.BAD_REQUEST;
+			break;
+		}
+
+		log.info("Returning response for billerId: {} with HTTP status: {}", billerDetailRequest.getBillerId(), status);
+
+		return new ResponseEntity<>(response, status);
+
+	}
+
 	@PostMapping("/getBillerById")
 	public String getBillerById(@RequestBody BillerDetailRequest billerRequestRequest) {
 		masterDataService.getBillerByBillerId(billerRequestRequest);
@@ -43,7 +78,7 @@ public class MasterDataController {
 	@GetMapping("/getAllMasters")
 	public ResponseEntity<List<MasterApiResponse>> fetchMasterData(
 			@Validated @RequestBody MerchantRequestModel requestModel, HttpServletRequest request) {
-		LOGGER.info("Fetching Master Data Registered URL");
+		log.info("Fetching Master Data Registered URL");
 		return masterDataService.getMasterData(requestModel, request);
 	}
 
@@ -53,7 +88,7 @@ public class MasterDataController {
 			@Validated @RequestBody MerchantRequestModel requestModel, HttpServletRequest request,
 			@RequestParam String category, @RequestParam(defaultValue = "0") int pageStart, @RequestParam int pageEnd) {
 
-		LOGGER.info("Request received: category=" + category + ", pageNumber=" + pageStart + ", pageSize=" + pageEnd);
-		return masterDataService.fetchMasterDataCategoryWise(requestModel,category, pageStart, pageEnd);
+		log.info("Request received: category=" + category + ", pageNumber=" + pageStart + ", pageSize=" + pageEnd);
+		return masterDataService.fetchMasterDataCategoryWise(requestModel, category, pageStart, pageEnd);
 	}
 }