10-11-25 after conflict

src/main/java/com/billpaymentservice/bbps/dto/AdditionalInfoBillDTO.java

@@ -9,7 +9,7 @@ import lombok.Setter;
 @Setter
 @AllArgsConstructor
 @NoArgsConstructor
-public class AdditionalInfoBill {
+public class AdditionalInfoBillDTO {
 	   private String additionalInfoId;
 	   private String name;
 	   private String value;

src/main/java/com/billpaymentservice/bbps/dto/AmountOptionDTO.java

@@ -1,8 +1,8 @@
 package com.billpaymentservice.bbps.dto;
-import jakarta.persistence.*;
+import java.util.List;
+
 import lombok.Getter;
 import lombok.Setter;
-import java.util.List;
 
 @Getter
 @Setter

src/main/java/com/billpaymentservice/bbps/dto/BillerDTO.java

@@ -1,7 +1,9 @@
 package com.billpaymentservice.bbps.dto;
 
 import java.util.List;
+
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.Size;
 import lombok.Getter;

src/main/java/com/billpaymentservice/bbps/dto/BillerResponseParamsDTO.java

@@ -1,8 +1,9 @@
 package com.billpaymentservice.bbps.dto;
 
+import java.util.List;
+
 import lombok.Getter;
 import lombok.Setter;
-import java.util.List;
 
 @Getter
 @Setter

src/main/java/com/billpaymentservice/bbps/dto/CustomParamDTO.java

@@ -6,11 +6,13 @@ import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
+import lombok.ToString;
 
 @Getter
 @Setter
 @AllArgsConstructor
 @NoArgsConstructor
+@ToString
 public class CustomParamDTO {
 	 private String customParamName;
      private String dataType;

src/main/java/com/billpaymentservice/bbps/dto/CustomerParamDTO.java

@@ -1,11 +1,11 @@
 package com.billpaymentservice.bbps.dto;
+import java.util.List;
+
 import jakarta.validation.constraints.Min;
 import jakarta.validation.constraints.NotBlank;
 import lombok.Getter;
 import lombok.Setter;
 
-import java.util.List;
-
 @Getter
 @Setter
 public class CustomerParamDTO {

src/main/java/com/billpaymentservice/bbps/dto/CustomerParamGroupsDTO.java

@@ -1,10 +1,13 @@
 package com.billpaymentservice.bbps.dto;
+import java.util.List;
+
 import lombok.Getter;
 import lombok.Setter;
-import java.util.List;
+import lombok.ToString;
 
 @Getter
 @Setter
+@ToString
 public class CustomerParamGroupsDTO {
     private List<GroupDTO> groups;
 }

src/main/java/com/billpaymentservice/bbps/dto/DispositionsDTO.java

@@ -2,7 +2,6 @@ package com.billpaymentservice.bbps.dto;
 
 import lombok.Getter;
 import lombok.Setter;
-import lombok.ToString;
 
 @Getter
 @Setter

src/main/java/com/billpaymentservice/bbps/dto/GroupDTO.java

@@ -1,8 +1,9 @@
 package com.billpaymentservice.bbps.dto;
 
+import java.util.List;
+
 import lombok.Getter;
 import lombok.Setter;
-import java.util.List;
 
 @Getter
 @Setter

src/main/java/com/billpaymentservice/bbps/dto/PaymentChannelDTO.java

@@ -1,6 +1,5 @@
 package com.billpaymentservice.bbps.dto;
 
-import com.fasterxml.jackson.annotation.JsonProperty;
 import jakarta.validation.constraints.Min;
 import jakarta.validation.constraints.NotBlank;
 import lombok.Getter;

src/main/java/com/billpaymentservice/bbps/dto/PaymentModeDTO.java

@@ -2,7 +2,9 @@ package com.billpaymentservice.bbps.dto;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 
-import jakarta.validation.constraints.*;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.Pattern;
+import jakarta.validation.constraints.PositiveOrZero;
 import lombok.Getter;
 import lombok.Setter;
 

src/main/java/com/billpaymentservice/bbps/dto/TransactionDTO.java

@@ -3,6 +3,7 @@ package com.billpaymentservice.bbps.dto;
 import java.util.List;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonProperty;
 
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
@@ -12,10 +13,10 @@ import lombok.Setter;
 @Getter
 @Setter
 @JsonIgnoreProperties(ignoreUnknown = true)
-
 public class TransactionDTO {
-
-    @NotBlank private String txnId;
+   
+	@JsonProperty("txnId")
+    @NotBlank private String bankTxnId;
     @NotBlank private String refId;
     private String txnNpciId;
     private String paymentRefId;
@@ -55,12 +56,10 @@ public class TransactionDTO {
     private String fundTxnType;
     private String reason;
 
-    private List<String> amountTags;
-    private List<String> customerParamsDAOS;
-    private List<String> paymentInformation;
+    private String amountTags;
+    private String customerParamsDAOS;
+    private String paymentInformation;
     private List<DeviceBlockTag> deviceBlockTags;
-
-
     private List<CustomerParamDAO> customerParamsDAO;
 
     private String planId;

src/main/java/com/billpaymentservice/bbps/dto/request/BaseClass.java

@@ -27,7 +27,6 @@ public abstract class BaseClass {
 	private String reqId;
 
 	private DeviceDetail deviceDetial;
-
 	// ✅ 10 User Defined Fields (UDF1–UDF10)
 	private String udf1;
 

src/main/java/com/billpaymentservice/bbps/dto/request/BillPaymentRequest.java

@@ -1,5 +1,6 @@
 package com.billpaymentservice.bbps.dto.request;
 import java.util.List;
+
 import lombok.Getter;
 import lombok.Setter;
 

src/main/java/com/billpaymentservice/bbps/dto/request/CustomParamRequest.java

@@ -5,11 +5,13 @@ import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
+import lombok.ToString;
 
 @Getter
 @Setter
 @NoArgsConstructor
 @AllArgsConstructor
+@ToString
 public class CustomParamRequest extends BaseClass {
 
 	@NotNull

src/main/java/com/billpaymentservice/bbps/dto/request/DispositionRequest.java

@@ -1,5 +1,5 @@
 package com.billpaymentservice.bbps.dto.request;
 
 public class DispositionRequest extends BaseClass {
-
+   
 }

src/main/java/com/billpaymentservice/bbps/dto/request/MasterRequest.java

@@ -1,7 +1,6 @@
 package com.billpaymentservice.bbps.dto.request;
 
 import lombok.Getter;
-
 import lombok.Setter;
 
 @Getter

src/main/java/com/billpaymentservice/bbps/dto/response/BillDataResponse.java

@@ -2,7 +2,7 @@ package com.billpaymentservice.bbps.dto.response;
 
 import java.util.List;
 
-import com.billpaymentservice.bbps.dto.AdditionalInfoBill;
+import com.billpaymentservice.bbps.dto.AdditionalInfoBillDTO;
 import com.billpaymentservice.bbps.dto.BillerResponseBill;
 import com.billpaymentservice.bbps.dto.CustomerParamDAO;
 import com.billpaymentservice.bbps.dto.GeneralResp;
@@ -31,7 +31,7 @@ public class BillDataResponse {
 	private String userId;
 
 	private BillerResponseBill billerResponse; // nested object
-	private List<AdditionalInfoBill> additionalInfo; // array of objects
+	private List<AdditionalInfoBillDTO> additionalInfo; // array of objects
 	private List<CustomerParamDAO> customerParams; // array of objects
 
 	private String creationDate;

src/main/java/com/billpaymentservice/bbps/dto/response/BillPaymentResponse.java

@@ -1,6 +1,7 @@
 package com.billpaymentservice.bbps.dto.response;
 
 import com.billpaymentservice.bbps.dto.GeneralResp;
+
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;

src/main/java/com/billpaymentservice/bbps/dto/response/BillerDataResponse.java

@@ -2,7 +2,6 @@ package com.billpaymentservice.bbps.dto.response;
 
 import com.billpaymentservice.bbps.dto.BillerDTO;
 import com.billpaymentservice.bbps.dto.GeneralResp;
-import com.billpaymentservice.bbps.dto.request.BillerDetailRequest;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 

src/main/java/com/billpaymentservice/bbps/dto/response/CustomParamResp.java

@@ -1,21 +1,22 @@
 package com.billpaymentservice.bbps.dto.response;
 
 import java.util.List;
-import com.billpaymentservice.bbps.dto.ContactMaster;
+
 import com.billpaymentservice.bbps.dto.CustomParamDTO;
 import com.billpaymentservice.bbps.dto.GeneralResp;
-import com.billpaymentservice.bbps.entites.CustomerParam;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
+import lombok.ToString;
 
 @Getter
 @Setter
 @AllArgsConstructor
 @NoArgsConstructor
+@ToString
 public class CustomParamResp {
 	  @JsonProperty(access = JsonProperty.Access.WRITE_ONLY)
 	  private GeneralResp generalResp;

src/main/java/com/billpaymentservice/bbps/dto/response/TransactionStatusResponse.java

@@ -7,9 +7,11 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 
 import lombok.Getter;
 import lombok.Setter;
+import lombok.ToString;
 
 @Getter
 @Setter
+@ToString
 public class TransactionStatusResponse {
 
     @JsonProperty("transactionDAO")