merged with himanshu code

2025-11-03 12:24:24 +05:30
parent 2f33b306ae d4c8b433cc
commit 89a131fa84
34 changed files with 604 additions and 317 deletions
@@ -1,6 +1,8 @@
 package com.billpaymentservice.bbps.serviceImpl;

+import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;

 import org.modelmapper.ModelMapper;
 import org.modelmapper.convention.MatchingStrategies;
@@ -23,14 +25,19 @@ import com.billpaymentservice.bbps.dto.response.BillerResponse;
 import com.billpaymentservice.bbps.dto.response.ChannelsListResponse;
 import com.billpaymentservice.bbps.dto.response.CustomParamResp;
 import com.billpaymentservice.bbps.dto.response.CustomerParamGroupsResponse;
+import com.billpaymentservice.bbps.dto.response.DispositionResponse;
 import com.billpaymentservice.bbps.dto.response.PlaneCategoriesResponse;
 import com.billpaymentservice.bbps.entites.BharatConnectMaster;
 import com.billpaymentservice.bbps.entites.BillerDetails;
+import com.billpaymentservice.bbps.entites.DispositionDetails;
 import com.billpaymentservice.bbps.exception.CustomException;
 import com.billpaymentservice.bbps.repository.BharatConnectMasterRepository;
 import com.billpaymentservice.bbps.repository.BillerDataRepository;
+import com.billpaymentservice.bbps.repository.DispositionRepository;
+import com.billpaymentservice.bbps.repository.MerchantRepository;
 import com.billpaymentservice.bbps.service.MasterDataService;
 import com.billpaymentservice.bbps.util.BBPSConstant;
+import com.billpaymentservice.bbps.util.EntityRelationshipUtil;
 import com.billpaymentservice.bbps.util.Helper;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.core.type.TypeReference;
@@ -43,71 +50,27 @@ public class MasterDataServiceImpl implements MasterDataService {

 	@Value("${master.data.url}")
 	private String masterRegisterUrl;
-
-	private Helper helper;
-	private final BillerDataRepository billerDataRespository;
 	private final BharatConnectMasterRepository beneficiaryDetailsRepository;

+	private MerchantRepository merchantRegisterRepo;
+	private HttpClientApi httpClientApi;
+	private final DispositionRepository dispositionRepository;
+	private final Helper helper;
+	private final BillerDataRepository billerDataRespository;
 	private static final Logger log = LoggerFactory.getLogger(MasterDataServiceImpl.class);
 	private final HttpService httpService;
 	private final ObjectMapper objectMapper = new ObjectMapper();

-	// Inject HttpService
-	public MasterDataServiceImpl(BharatConnectMasterRepository beneficiaryDetailsRepository, HttpService httpService,
-			Helper helper, BillerDataRepository billerDataRespository) {
-		this.beneficiaryDetailsRepository = beneficiaryDetailsRepository;
+	public MasterDataServiceImpl(MerchantRepository merchantRegisterRepo, HttpService httpService,
+			HttpClientApi httpClientApi, Helper helper, BillerDataRepository billerDataRespository,
+			DispositionRepository dispositionRepository, BharatConnectMasterRepository beneficiaryDetailsRepository) {
+		this.merchantRegisterRepo = merchantRegisterRepo;
 		this.httpService = httpService;
+		this.httpClientApi = httpClientApi;
 		this.helper = helper;
 		this.billerDataRespository = billerDataRespository;
-
-	}
-
-	@Override
-	public ResponseModel getBillerByBillerId(BillerDetailRequest billerDetailRequest) {
-
-		String billerId = billerDetailRequest.getBillerId();
-		String fullUrl = masterRegisterUrl + BBPSConstant.BILLER_DATA_FETCH_URL + billerId;
-
-		Map<String, String> responseMap = httpService.getRequest(fullUrl);
-		String responseData = responseMap.get("data");
-		log.info("data is :{}", responseData);
-
-		ObjectMapper objectMapper = new ObjectMapper();
-
-		try {
-			Map<String, Object> dataMap = objectMapper.readValue(responseData,
-					new TypeReference<Map<String, Object>>() {
-					});
-			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 (int)
-						String.valueOf(dataMap.get("remarks")));
-			}
-
-			BillerDataResponse responseWrapper = objectMapper.convertValue(dataMap, BillerDataResponse.class);
-			GeneralResp generalResp = responseWrapper.getGeneralResp();
-			ModelMapper mapper = new ModelMapper();
-			mapper.getConfiguration().setMatchingStrategy(MatchingStrategies.STRICT);
-			BillerDetails entity = mapper.map(responseWrapper.getBillerDAO(), BillerDetails.class);
-
-			System.out.println(entity);
-
-			if (entity != null) {
-				billerDataRespository.save(entity);
-			} else {
-				LOGGER.warn("No biller found in response to save.");
-			}
-
-			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");
-		}
+		this.dispositionRepository = dispositionRepository;
+		this.beneficiaryDetailsRepository = beneficiaryDetailsRepository;

 	}

@@ -158,6 +121,45 @@ public class MasterDataServiceImpl implements MasterDataService {
 		}
 	}

+	@Override
+	public ResponseModel getBillerByBillerId(BillerDetailRequest billerDetailRequest) {
+
+		String billerId = billerDetailRequest.getBillerId();
+		String fullUrl = masterRegisterUrl + BBPSConstant.BILLER_DATA_FETCH_URL + billerId;
+
+		Map<String, String> responseMap = httpService.getRequest(fullUrl);
+		String responseData = responseMap.get("data");
+		log.info("data is :{}", responseData);
+
+		ObjectMapper objectMapper = new ObjectMapper();
+
+		try {
+			Map<String, Object> dataMap = objectMapper.readValue(responseData,
+					new TypeReference<Map<String, Object>>() {
+					});
+			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 (int)
+						String.valueOf(dataMap.get("remarks")));
+			}
+			BillerDataResponse responseWrapper = objectMapper.convertValue(dataMap, BillerDataResponse.class);
+			GeneralResp generalResp = responseWrapper.getGeneralResp();
+			ModelMapper mapper = new ModelMapper();
+			mapper.getConfiguration().setMatchingStrategy(MatchingStrategies.STRICT);
+			BillerDetails entity = mapper.map(responseWrapper.getBillerDAO(), BillerDetails.class);
+			EntityRelationshipUtil.linkBillerRelationships(entity);
+			// billerDataRespository.save(entity);
+			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 getCustomerParamByBillerId(CustomParamRequest customerParamRequest) {

@@ -245,7 +247,52 @@ public class MasterDataServiceImpl implements MasterDataService {
 					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 getDispositionDetails() {
+		String fullUrl = masterRegisterUrl + BBPSConstant.DISPOSTION_URL;
+		Map<String, String> responseMap = httpService.getRequest(fullUrl);
+		String responseData = responseMap.get("data");
+
+		ObjectMapper objectMapper = new ObjectMapper();
+
+		try {
+			Map<String, Object> dataMap = objectMapper.readValue(responseData,
+					new TypeReference<Map<String, Object>>() {
+					});
+			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 (int)
+						String.valueOf(dataMap.get("remarks")));
+			}
+
+			DispositionResponse responseWrapper = objectMapper.convertValue(dataMap, DispositionResponse.class);
+			System.out.println(responseWrapper);
+			GeneralResp generalResp = responseWrapper.getGeneralResp();
+			ModelMapper mapper = new ModelMapper();
+			mapper.getConfiguration().setMatchingStrategy(MatchingStrategies.STRICT);
+			List<DispositionDetails> entities = responseWrapper.getDispositionsList().stream()
+					.map(dto -> mapper.map(dto, DispositionDetails.class)).collect(Collectors.toList());
+
+			System.out.println(entities);
+
+			if (entities != null) {
+				dispositionRepository.saveAll(entities);
+			} else {
+				LOGGER.warn("No disposition found in response to save.");
+			}
+
+			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");