03-11-25

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

@@ -1,21 +1,19 @@
 package com.billpaymentservice.bbps.dto;
 
+import java.util.UUID;
+
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
-import lombok.ToString;
 
 @Getter
 @Setter
-@AllArgsConstructor
 @NoArgsConstructor
-@ToString
-public class GeneralResponse {
+@AllArgsConstructor
+public class ChannelDTO {
 
-	private String statusCode;
-	private String status;
-	private String message;
-	private String remarks;
+	private UUID channelId; // Machine-generated Unique ID assigned internally
+	private String channelName;
 
 }

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

@@ -8,12 +8,14 @@ import java.util.List;
 @Setter
 public class GroupDTO {
 
-    private String name;
+	private String groupId;
+	
+	private String name;
 
-    private String input;
+	private String input;
 
-    private List<String> params;
+	private List<String> params;
 
-    // 🔁 Nested child groups
-    private List<GroupDTO> groups;
+	// 🔁 Nested child groups
+	private List<GroupDTO> groups;
 }

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

@@ -11,11 +11,8 @@ import lombok.Setter;
 @AllArgsConstructor
 @NoArgsConstructor
 public class BillFetchByBillIdRequest extends BaseClass {
-    
+
 	@NotNull
 	private String billId;
-	private String tenantId;                
-	private String digiledgeKey;           
-	private String agentId;   
 
 }

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

@@ -0,0 +1,30 @@
+package com.billpaymentservice.bbps.dto.request;
+
+import com.billpaymentservice.bbps.dto.CustomerParamsRequest;
+
+import jakarta.validation.constraints.NotNull;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+@Getter
+@Setter
+@AllArgsConstructor
+@NoArgsConstructor
+public class FetchBillValidatestRequest extends BaseClass {
+
+	@NotNull
+	private String billerId; // Alphanumeric, Unique ID assigned by NPCI
+	@NotNull
+	private String billerName; // String, Name of the biller
+	@NotNull
+	private String billerCategory; // String, Category of the biller
+	@NotNull
+	private String customerMobNo; // String, Mobile of the Customer
+
+	// Optional Fields
+	private String macAddress; // Alphanumeric MAC Address of the Agent Server
+	//private String clientReqId; // String, Unique id provided by the client
+	private CustomerParamsRequest customerParamsRequest; // Customer parameters for identifying the bill
+}

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

@@ -0,0 +1,24 @@
+package com.billpaymentservice.bbps.dto.request;
+
+import jakarta.validation.constraints.NotNull;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+@Getter
+@Setter
+@NoArgsConstructor
+@AllArgsConstructor
+public class MasterCategoryRequest extends BaseClass {
+
+	private String billerName;
+
+	@NotNull
+	private String category;
+
+	private Integer pageStart = 0;
+
+	private Integer pageEnd = 10;
+
+}

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

@@ -1,15 +1,12 @@
 package com.billpaymentservice.bbps.dto.request;
 
-import jakarta.validation.constraints.NotNull;
-import lombok.AllArgsConstructor;
 import lombok.Getter;
-import lombok.NoArgsConstructor;
+
 import lombok.Setter;
+
 @Getter
 @Setter
-@AllArgsConstructor
-@NoArgsConstructor
+
 public class MasterRequest extends BaseClass {
-    @NotNull
-	private String tenantId;
+
 }

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

@@ -0,0 +1,29 @@
+package com.billpaymentservice.bbps.dto.response;
+
+import java.util.List;
+
+import com.billpaymentservice.bbps.dto.AmountOptionDTO;
+import com.billpaymentservice.bbps.dto.GeneralResp;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+@Getter
+@Setter
+@AllArgsConstructor
+@NoArgsConstructor
+public class AmountOptionsResponse {
+
+	// Root element, no parent
+	@JsonProperty("amountOptions")
+	private Boolean amountOptions;
+
+	@JsonProperty("amountOptionDAOS")
+	private List<AmountOptionDTO> amountOptionDAOS;
+
+	@JsonProperty("generalResp")
+	private GeneralResp generalResp;
+}

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

@@ -6,8 +6,8 @@ import com.billpaymentservice.bbps.dto.AdditionalInfoBill;
 import com.billpaymentservice.bbps.dto.BillerResponseBill;
 import com.billpaymentservice.bbps.dto.CustomerParamDAO;
 import com.billpaymentservice.bbps.dto.GeneralResp;
-import com.billpaymentservice.bbps.dto.GeneralResponse;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonProperty;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;
@@ -20,21 +20,22 @@ import lombok.Setter;
 @NoArgsConstructor
 @JsonIgnoreProperties(ignoreUnknown = true)
 public class BillDataResponse {
-	
-	    private GeneralResp genericResponse;
-	    private String billId;
-	    private String refId;
-	    private String billerId;
-	    private String status;
-	    private String actionType;
-	    private String userId;
-	    
-	    private BillerResponseBill billerResponse;   // nested object
-	    private List<AdditionalInfoBill> additionalInfo;  // array of objects
-	    private List<CustomerParamDAO> customerParams;   // array of objects
 
-	    private String creationDate;
-	    private String modifiedDate;
-	    private long createdEpochDate;
-	    private long modifiedEpochDate;
+	@JsonProperty(access = JsonProperty.Access.WRITE_ONLY)
+	private GeneralResp genericResponse;
+	private String billId;
+	private String refId;
+	private String billerId;
+	private String status;
+	private String actionType;
+	private String userId;
+
+	private BillerResponseBill billerResponse; // nested object
+	private List<AdditionalInfoBill> additionalInfo; // array of objects
+	private List<CustomerParamDAO> customerParams; // array of objects
+
+	private String creationDate;
+	private String modifiedDate;
+	private long createdEpochDate;
+	private long modifiedEpochDate;
 }

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

@@ -2,7 +2,7 @@ package com.billpaymentservice.bbps.dto.response;
 
 import java.util.List;
 
-import com.billpaymentservice.bbps.dto.GeneralResponse;
+import com.billpaymentservice.bbps.dto.GeneralResp;
 import com.billpaymentservice.bbps.dto.MasterCategoryBillerResponse;
 
 import lombok.AllArgsConstructor;
@@ -20,7 +20,7 @@ public class BillerResponse {
 	private int pageSize;
 	private long totalElements;
 	private int totalPages;
-	private GeneralResponse generalResp;
+	private GeneralResp generalResp;
 	private List<MasterCategoryBillerResponse> billerResp;
 
 }

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

@@ -0,0 +1,25 @@
+package com.billpaymentservice.bbps.dto.response;
+
+import java.util.List;
+
+import com.billpaymentservice.bbps.dto.ChannelDTO;
+import com.billpaymentservice.bbps.dto.GeneralResp;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+@Getter
+@Setter
+@NoArgsConstructor
+@AllArgsConstructor
+public class ChannelsListResponse {
+
+	private List<ChannelDTO> channelList;
+
+	@JsonProperty(access = JsonProperty.Access.WRITE_ONLY)
+	private GeneralResp genericResp;
+
+}

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

@@ -0,0 +1,22 @@
+package com.billpaymentservice.bbps.dto.response;
+
+import com.billpaymentservice.bbps.dto.CustomerParamGroupsDTO;
+import com.billpaymentservice.bbps.dto.GeneralResp;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+@Getter
+@Setter
+@NoArgsConstructor
+@AllArgsConstructor
+public class CustomerParamGroupsResponse {
+
+	@JsonProperty(access = JsonProperty.Access.WRITE_ONLY)
+	private GeneralResp generalResp;
+
+	private CustomerParamGroupsDTO customerParamGroupResp;
+}

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

@@ -1,6 +1,6 @@
 package com.billpaymentservice.bbps.dto.response;
 
-import com.billpaymentservice.bbps.dto.GeneralResponse;
+import com.billpaymentservice.bbps.dto.GeneralResp;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 import lombok.AllArgsConstructor;
@@ -14,7 +14,7 @@ import lombok.Setter;
 @NoArgsConstructor
 public class FetchBillResponse {
 	@JsonProperty(access = JsonProperty.Access.WRITE_ONLY)
-	private GeneralResponse genericResponse;
+	private GeneralResp genericResponse;
     private String billId;
     private String refId;
     private String billerId;

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

@@ -0,0 +1,34 @@
+package com.billpaymentservice.bbps.dto.response;
+
+import com.billpaymentservice.bbps.dto.GeneralResp;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+@Getter
+@Setter
+@AllArgsConstructor
+@NoArgsConstructor
+public class FetchBillValidatestResponse {
+
+	@JsonProperty(access = JsonProperty.Access.WRITE_ONLY)
+	private GeneralResp genericResponse;
+	private String billId;
+	private String refId;
+	private String billerId;
+	private String status;
+	private String actionType;
+	private String userId;
+	private String billerResponse;
+	private String additionalInfo;
+	private String customerParams;
+	private String planInfoDaos;
+	private String creationDate;
+	private String modifiedDate;
+	private long createdEpochDate;
+	private long modifiedEpochDate;
+
+}

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

@@ -0,0 +1,24 @@
+package com.billpaymentservice.bbps.dto.response;
+
+import java.util.List;
+
+import com.billpaymentservice.bbps.dto.GeneralResp;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+@Getter
+@Setter
+@NoArgsConstructor
+@AllArgsConstructor
+public class PlaneCategoriesResponse {
+
+	private List<String> categoryRespList;
+
+	@JsonProperty(access = JsonProperty.Access.WRITE_ONLY)
+	private GeneralResp generalResp;
+
+}