solved duplicate key problem on getBillerData

src/main/java/com/billpaymentservice/bbps/util/Helper.java

@@ -2,6 +2,7 @@ package com.billpaymentservice.bbps.util;
 
 import java.security.SecureRandom;
 import java.time.LocalDateTime;
+import java.util.Optional;
 import java.util.function.Function;
 
 import org.slf4j.Logger;
@@ -12,12 +13,16 @@ import com.billpaymentservice.bbps.dto.ResponseModel;
 import com.billpaymentservice.bbps.entites.BBPSMastersData;
 import com.billpaymentservice.bbps.exception.CustomException;
 import com.billpaymentservice.bbps.repository.BBPSMasterDataRepo;
+import com.billpaymentservice.bbps.repository.BillerDataRepository;
 import com.billpaymentservice.bbps.repository.InboundTraceLogRepository;
 import com.billpaymentservice.bbps.dto.request.BillerDetailRequest;
 import com.billpaymentservice.bbps.dto.request.MerchantRequestModel;
 import com.billpaymentservice.bbps.entites.BBPSMerchantValidation;
+import com.billpaymentservice.bbps.entites.BillerDetails;
 import com.billpaymentservice.bbps.entites.InboundTraceLog;
 import com.billpaymentservice.bbps.entites.OutboundTraceLog;
+import com.billpaymentservice.bbps.entites.PaymentChannel;
+import com.billpaymentservice.bbps.entites.PaymentMode;
 import com.billpaymentservice.bbps.exception.CustomException;
 import com.billpaymentservice.bbps.repository.MerchantRepository;
 import com.billpaymentservice.bbps.repository.OutboundTraceLogRepository;
@@ -36,13 +41,15 @@ public class Helper {
 	private final ObjectMapper objectMapper = new ObjectMapper();
 
 	private final BBPSMasterDataRepo bbpsMasterDataRepo;
+	private final BillerDataRepository billerDataRespository;
 
 	// Constructor Injection
 	public Helper(BBPSMasterDataRepo bbpsMasterDataRepo, InboundTraceLogRepository inboundTraceLogRepository,
-			OutboundTraceLogRepository outboundTraceLogRepository) {
+			OutboundTraceLogRepository outboundTraceLogRepository,BillerDataRepository billerDataRepository) {
 		this.bbpsMasterDataRepo = bbpsMasterDataRepo;
 		this.inboundTraceLogRepository = inboundTraceLogRepository;
 		this.outboundTraceLogRepository = outboundTraceLogRepository;
+		this.billerDataRespository=billerDataRepository;
 	}
 
 	/**
@@ -182,7 +189,44 @@ public class Helper {
 		outboundLog.setResponseReceiveTime(LocalDateTime.now());
 		outboundTraceLogRepository.save(outboundLog);
 	}
-
 	/* ---------- End helpers ---------- */
+	public void saveOrUpdateBillerData(BillerDetails newEntity) {
+
+	    Optional<BillerDetails> existingOpt = billerDataRespository.findByBillerId(newEntity.getBillerId());
+
+	    if (existingOpt.isPresent()) {
+	        BillerDetails existing = existingOpt.get();
+
+	        // Update base biller fields
+	        existing.setBillerName(newEntity.getBillerName());
+	        existing.setBillerAliasName(newEntity.getBillerAliasName());
+	        existing.setBillerDescription(newEntity.getBillerDescription());
+	        existing.setStatus(newEntity.getStatus());
+	        existing.setBillerCoverage(newEntity.getBillerCoverage());
+	        // ... (update other simple fields as needed)
+
+	        // ✅ Clear and replace nested lists to avoid duplicate inserts
+	        existing.getBillerPaymentModes().clear();
+	        if (newEntity.getBillerPaymentModes() != null) {
+	            for (PaymentMode mode : newEntity.getBillerPaymentModes()) {
+	                mode.setBiller(existing);
+	                existing.getBillerPaymentModes().add(mode);
+	            }
+	        }
+	        existing.getBillerPaymentChannels().clear();
+	        if (newEntity.getBillerPaymentChannels() != null) {
+	            for (PaymentChannel channel : newEntity.getBillerPaymentChannels()) {
+	                channel.setBiller(existing);
+	                existing.getBillerPaymentChannels().add(channel);
+	            }
+	        }
+	        billerDataRespository.save(existing);
+	    } 
+	    else {
+	        // brand new biller
+	        billerDataRespository.save(newEntity);
+	    }
+	}
+
 
 }