moved some mapper code from helper to billerMapper

src/main/java/com/billpaymentservice/bbps/serviceImpl/PaymentServiceImpl.java

@@ -37,6 +37,7 @@ import com.billpaymentservice.bbps.repository.PaymentRepository;
 import com.billpaymentservice.bbps.repository.TransactionMasterRepository;
 import com.billpaymentservice.bbps.service.PaymentService;
 import com.billpaymentservice.bbps.util.BBPSConstant;
+import com.billpaymentservice.bbps.util.BillerMapperHelper;
 import com.billpaymentservice.bbps.util.EntityRelationshipUtil;
 import com.billpaymentservice.bbps.util.Helper;
 import com.fasterxml.jackson.annotation.JsonInclude;
@@ -59,7 +60,7 @@ public class PaymentServiceImpl implements PaymentService {
     private final PaymentIntiateRepository paymentIntiateRepository;
     private final TransactionMasterRepository transactionMasterRepository;
     private final AgentFundTransferRepository agentFundTransferRepository;
-
+    private final BillerMapperHelper mapperHelper;
     // Shared reusable instances
     private final ObjectMapper objectMapper;
     private final ModelMapper modelMapper;
@@ -70,7 +71,8 @@ public class PaymentServiceImpl implements PaymentService {
             Helper helper, PaymentRepository paymentRepository, InboundTraceLogRepository inboundTraceLogRepository,
             OutboundTraceLogRepository outboundTraceLogRepository, PaymentIntiateRepository paymentIntiateRepository,
             TransactionMasterRepository transactionMasterRepository,
-            AgentFundTransferRepository agentFundTransferRepository) {
+            AgentFundTransferRepository agentFundTransferRepository,
+            BillerMapperHelper mapperHelper) {
         this.beneficiaryDetailsRepository = beneficiaryDetailsRepository;
         this.httpService = httpService;
         this.helper = helper;
@@ -80,6 +82,7 @@ public class PaymentServiceImpl implements PaymentService {
         this.paymentIntiateRepository = paymentIntiateRepository;
         this.transactionMasterRepository = transactionMasterRepository;
         this.agentFundTransferRepository = agentFundTransferRepository;
+        this.mapperHelper = mapperHelper;
 
         this.objectMapper = new ObjectMapper();
         this.objectMapper.setSerializationInclusion(JsonInclude.Include.NON_NULL);
@@ -100,7 +103,7 @@ public class PaymentServiceImpl implements PaymentService {
         BharatConnectMaster headersData = beneficiaryDetailsRepository.findByOrgId("ORG001");
         HttpHeaders headers = helper.buildHeaders(headersData);
 
-        BillPaymentForwardRequest forwardReq = helper.billPaymentForwardRequest(billPaymentRequest);
+        BillPaymentForwardRequest forwardReq = mapperHelper.billPaymentForwardRequest(billPaymentRequest);
         String forwardjson = helper.convertObjectToJson(forwardReq);
         String requestJson = helper.convertObjectToJson(billPaymentRequest);