update code complaint code

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

@@ -0,0 +1,14 @@
+package com.billpaymentservice.bbps.dto;
+
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class BillAdditionalInfoDTO {
+
+	private String additionalInfoId;
+	private String name;
+	private String value;
+
+}

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

@@ -0,0 +1,14 @@
+package com.billpaymentservice.bbps.dto;
+
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class BillCustomerParamsDTO {
+
+	private String name;
+	private String value;
+	private String type;
+
+}

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

@@ -0,0 +1,29 @@
+package com.billpaymentservice.bbps.dto;
+
+import java.util.List;
+
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class CheckClientBillerResponseDTO {
+
+	private String billId;
+	private String amount;
+	private String billDate;
+	private String billNumber;
+	private String billPeriod;
+	private String custConvFee;
+	private String couCustConvFee;
+	private String dueDate;
+	private String customerName;
+	private Boolean amountOption;
+
+	private List<Detail> tagList;
+
+	// Conditional fields
+	private List<BillAdditionalInfoDTO> additionalInfo; // C
+	private List<BillCustomerParamsDTO> customerParams; // C
+
+}

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

@@ -1,5 +1,7 @@
 package com.billpaymentservice.bbps.dto;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
+
 import lombok.Getter;
 import lombok.Setter;
 
@@ -7,30 +9,33 @@ import lombok.Setter;
 @Getter
 public class ComplainDetailsDto {
 
-	private String complaintId;
-	private String complaintDescr;
-	private String complaintDispos;
-	private String complaintType;
-	private String txnId;
-	private String complaintStatus;
-	private String assignedTo;
-	private String complaintNpciId;
-	private String complaintRaisedFrom;
-	private String userId;
-	private String status;
-	private String refId;
-	private String estimated_TAT;
-	private String creationDate;
-	private String modifiedDate;
-	private String billerName;
-	private String txnAmount;
-	private String superLevelEsc;
-	private String openComplaint;
-	private String reopenComplaint;
-	private String remarks;
-	private String agentId;
-	private String category;
-	private long createdEpochDate;
-	private long modifiedEpochDate;
+	@JsonProperty("TicketId")
+	private String TicketId;
+	@JsonProperty("TicketNpciId")
+	private String TicketNpciId;
+	@JsonProperty("TxnId")
+	private String TxnId;
+	@JsonProperty("TxnNpciId")
+	private String TxnNpciId;
+	@JsonProperty("TicketStatus")
+	private String TicketStatus;
+	@JsonProperty("TicketType")
+	private String TicketType;
+	@JsonProperty("TicketDespo")
+	private String TicketDespo;
+	@JsonProperty("TicketDescr")
+	private String TicketDescr;
+	@JsonProperty("TicketRaisedBy")
+	private String TicketRaisedBy;
+	@JsonProperty("CreatedTime")
+	private String CreatedTime;
+	@JsonProperty("TxnAmount")
+	private String TxnAmount;
+	@JsonProperty("TotalTxnAmount")
+	private String TotalTxnAmount;
+	@JsonProperty("BillCategory")
+	private String BillCategory;
+	@JsonProperty("BillerName")
+	private String BillerName;
 
 }

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

@@ -9,24 +9,12 @@ import lombok.Setter;
 @Getter
 @Setter
 @JsonIgnoreProperties(ignoreUnknown = true)
-public  class ComplaintDetailsDTO {
-    private String complaintId;          // UUID
-    private String complaintDescr;       // Complaint description
-    private String complaintDispos;      // Complaint disposition
-    private String complaintType;
-    // Complaint type
-    @JsonProperty("txnId")
-    private String bankTxnId;                // Transaction ID
-    private String txnNpciId;            // Transaction NPCI ID
-    private String assignedTo;           // Assigned person
-    private String complaintNpciId;      // Complaint NPCI ID
-    private String complaintRaisedFrom;  // Who raised the complaint
-    private String userId;               // User ID
-    private String status;               // Complaint status
-    private String refId;                // Reference ID
-    private String estimated_TAT;        // Estimated Turnaround Time
-    private String creationDate;         // ISO timestamp
-    private String modifiedDate;         // ISO timestamp
-    private Long createdEpochDate;       // Epoch creation time
-    private Long modifiedEpochDate;      // Epoch modified time
+public class ComplaintDetailsDTO {
+	private String refId; // UUID
+	private String txnNpciId; // Complaint description
+	private String ticketId; // Complaint disposition
+	private String ticketType;
+	private String ticketNpciId; // Transaction ID
+	private String ticketDesp; // Transaction NPCI ID
+	private String ticketDesr; // Assigned person
 }

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

@@ -7,19 +7,9 @@ import lombok.Setter;
 @Setter
 public class ComplaintHistoryDTO {
 
-	private String complaintHistoryId;
-	private String complaintId;
-	private String complaintDescr;
-	private String complaintDispos;
-	private String txnId;
-	private String assignedTo;
-	private String complaintNpciId;
-	private String complaintType;
-	private String complaintRaisedFrom;
-	private String userId;
-	private String status;
-	private String modifiedDate; // ISO 8601 Timestamp
-	private Long modifiedEpochDate; // UNIX Epoch
-	private String tenantId;
+	private String historyId;
+	private String ticketId;
+	private String time;
+	private String historyStatus;
 
 }

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

@@ -0,0 +1,21 @@
+package com.billpaymentservice.bbps.dto;
+
+import lombok.Data;
+
+@Data
+public class TicketDetailsDTO {
+
+	private String ticketId;
+	private String ticketNpciId;
+	private String txnNpciId;
+	private String ticketType;
+	private String ticketDespo;
+	private String ticketDescr;
+	private String status;
+
+	private String npciTicketType;
+	private String npciTicketStatus;
+
+	private String createdTime;
+
+}

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

@@ -0,0 +1,15 @@
+package com.billpaymentservice.bbps.dto;
+
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class TicketDispositionsDTO {
+
+	private String dispositionId;
+	private String dispositionDescr;
+	private String tenantId;
+	private String dispositionCode;
+
+}

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

@@ -2,7 +2,6 @@ package com.billpaymentservice.bbps.dto;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
-
 import lombok.Getter;
 import lombok.Setter;
 
@@ -10,34 +9,46 @@ import lombok.Setter;
 @Setter
 @JsonIgnoreProperties(ignoreUnknown = true)
 public class ViewComplaintDTO {
-	private String assignedTo;
-    private String comment;
-    private String complaintDescr;
-    private String complaintDispos;
-    private String complaintId;
-    private String complaintNpciId;
-    private String complaintRaisedFrom;
-    private String complaintType;
-    private String createdEpochDate;
+
+    @JsonProperty("TicketId")
+    private String ticketId;
+
+    @JsonProperty("TicketNpciId")
+    private String ticketNpciId;
+
+    @JsonProperty("TxnId")
+    private String txnId;
+
+    @JsonProperty("TxnNpciId")
+    private String txnNpciId;
+
+    @JsonProperty("TicketStatus")
+    private String ticketStatus;
+
+    @JsonProperty("TicketType")
+    private String ticketType;
+
+    @JsonProperty("TicketDespo")
+    private String ticketDespo;
+
+    @JsonProperty("TicketDescr")
+    private String ticketDescr;
+
+    @JsonProperty("TicketRaisedBy")
+    private String ticketRaisedBy;
+
+    @JsonProperty("CreatedTime")
     private String creationDate;
-    private String estimated_TAT;
-    private String modifiedDate;
-    private String modifiedEpochDate;
-    private String refId;
-    private String status;
-    @JsonProperty("txnId")
-    private String bankTxnId;
 
-    private String userId;
-    private String category;
-    private String billerName;
+    @JsonProperty("TxnAmount")
     private String txnAmount;
-    private String totalTxnAmount;
-    private String complaintStatus;
-    private String superLevelEsc;
-    private String openComplaint;
-    private String reopenComplaint;
-    private String remarks;
-    private String agentId;
 
+    @JsonProperty("TotalTxnAmount")
+    private String totalTxnAmount;
+
+    @JsonProperty("BillCategory")
+    private String billCategory;
+
+    @JsonProperty("BillerName")
+    private String billerName;
 }

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

@@ -6,8 +6,9 @@ import lombok.Setter;
 
 @Getter
 @Setter
-public class ViewComplainByIdRequest extends BaseClass {
+public class BillFetchbyClientIdRequest extends BaseClass{
+
+	@NotBlank(message = "client Req Id is not be null")
+	private String clientReqId;
 
-  @NotBlank(message = "Complain ID cannot be blank")
-  private String complaintId;
 }

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

@@ -13,6 +13,6 @@ import lombok.Setter;
 @NoArgsConstructor
 public class ComplainStatusRequest extends BaseClass {
 
-	@NotBlank(message = "Complaint Id cannot be null or blank")
-	private String complaintId;
+	@NotBlank(message = "ticketId Id cannot be null or blank")
+	private String ticketId;
 }

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

@@ -7,9 +7,11 @@ import lombok.Setter;
 @Setter
 public class ComplaintRequestDTO extends BaseClass {
 
-    private String complaintDescription;    // Complaint description that the user enters
-    private String complaintDisposition;    // Complaint disposition
-    private String complaintType;           // Type of complaint
-    private String txnId;                   // Transaction ID (optional)
-    private String clientReqId;             // Client Req ID (optional)
+	private String ticketDescription; // Complaint description that the user enters
+	private String ticketDisposition; // Complaint disposition
+	private String ticketDispositionCode; // Type of complaint
+	private String txnId; // Transaction ID (optional)
+	private String billerId; // Client Req ID (optional);
+	private String billerName;
+	
 }

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

@@ -0,0 +1,25 @@
+package com.billpaymentservice.bbps.dto.request;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+
+import jakarta.validation.constraints.NotBlank;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+@Getter
+@Setter
+@AllArgsConstructor
+@NoArgsConstructor
+public class GetTicketLatestStausRequest extends BaseClass {
+
+	@NotBlank(message = "txnNpciId Id cannot be null or blank")
+	private String txnNpciId;
+
+	@NotBlank(message = "ticketId Id cannot be null or blank")
+	private String ticketId;
+
+
+	private String tenantId;
+}

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

@@ -0,0 +1,15 @@
+package com.billpaymentservice.bbps.dto.request;
+
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class ViewAllComplaintsTicketsRequest extends BaseClass{
+
+	private String statusType; // e.g. COMPLAINT_OPEN_SUCCESS
+	private Integer pageNo; // default 0
+	private Integer pageSize; // default 10
+	private String ticketType; // default 10
+
+}

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

@@ -24,6 +24,6 @@ public class AmountOptionsResponse {
 	@JsonProperty("amountOptionDAOS")
 	private List<AmountOptionDTO> amountOptionDAOS;
 
-	@JsonProperty("generalResp")
+	@JsonProperty(access = JsonProperty.Access.WRITE_ONLY)
 	private GeneralResp generalResp;
 }

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

@@ -0,0 +1,28 @@
+package com.billpaymentservice.bbps.dto.response;
+
+import com.billpaymentservice.bbps.dto.CheckClientBillerResponseDTO;
+import com.billpaymentservice.bbps.dto.GeneralResp;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class ClientReqIdResponse {
+
+	private String billId;
+	private String refId;
+	private String billerId;
+	private String status;
+	private String actionType;
+	private String userId;
+	private String creationDate;
+	private String modifiedDate;
+	private Long createdEpochDate;
+	private Long modifiedEpochDate;
+	private CheckClientBillerResponseDTO billerResponse;
+	@JsonProperty(access = JsonProperty.Access.WRITE_ONLY)
+	private GeneralResp genericResponse;
+
+}

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

@@ -17,12 +17,8 @@ import lombok.Setter;
 @AllArgsConstructor
 public class ComplaintHistoryStatusResponse {
 
-	private List<ComplaintHistoryDTO> complaintsHistories;
+	private List<ComplaintHistoryDTO> ticketHistories;
 	@JsonProperty(access = JsonProperty.Access.WRITE_ONLY)
 	private GeneralResp generalResp;
-	private int pageNo;
-	private int pageSize;
-	private int totalPages;
-	private int totalElements;
 
 }

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

@@ -1,8 +1,6 @@
 package com.billpaymentservice.bbps.dto.response;
 
 import com.billpaymentservice.bbps.dto.ComplaintDetailsDTO;
-import com.billpaymentservice.bbps.dto.GeneralResp;
-import com.fasterxml.jackson.annotation.JsonProperty;
 
 import lombok.Getter;
 import lombok.Setter;
@@ -10,7 +8,10 @@ import lombok.Setter;
 @Getter
 @Setter
 public class ComplaintResponse {
-	    private ComplaintDetailsDTO complaints;  // multiple complaints
-	    @JsonProperty(access = JsonProperty.Access.WRITE_ONLY)
-	    private GeneralResp generalResp;   
+	private ComplaintDetailsDTO ticketDetails; // multiple complaints
+
+	private String message;
+	private String remarks;
+	private String status;
+	private String statusCode;
 }

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

@@ -0,0 +1,17 @@
+package com.billpaymentservice.bbps.dto.response;
+
+import com.billpaymentservice.bbps.dto.TicketDetailsDTO;
+
+import lombok.Data;
+
+@Data
+public class TicketCheckStatusResponse {
+
+	private String refId;
+	private TicketDetailsDTO ticketDetails;
+	private String message;
+	private String remarks;
+	private String status;
+	private String statusCode;
+
+}

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

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

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

@@ -0,0 +1,24 @@
+package com.billpaymentservice.bbps.dto.response;
+
+import java.util.List;
+
+import com.billpaymentservice.bbps.dto.ComplainDetailsDto;
+import com.billpaymentservice.bbps.dto.GeneralResp;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class ViewAllComplaintsTicketsResponse {
+	
+	private List<ComplainDetailsDto> tickets;
+	@JsonProperty(access = JsonProperty.Access.WRITE_ONLY)
+    private GeneralResp generalResp;
+    private Integer page;
+    private Integer pageSize;
+    private Integer totalPages;
+    private Long totalElements;
+
+}

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

@@ -4,6 +4,7 @@ import java.util.List;
 
 import com.billpaymentservice.bbps.dto.GeneralResp;
 import com.billpaymentservice.bbps.dto.ViewComplaintDTO;
+import com.fasterxml.jackson.annotation.JsonProperty;
 
 import lombok.Getter;
 import lombok.Setter;
@@ -11,10 +12,11 @@ import lombok.Setter;
 @Getter
 @Setter
 public class ViewComplainByIdResponse {
-	  private List<ViewComplaintDTO> complaintsList;
-	    private GeneralResp generalResp;
-	    private int pageNo;
-	    private int pageSize;
-	    private int totalPages;
-	    private int totalElements;
+	private List<ViewComplaintDTO> tickets;
+	@JsonProperty(access = JsonProperty.Access.WRITE_ONLY)
+	private GeneralResp generalResp;
+	private int page;
+	private int pageSize;
+	private int totalPages;
+	private int totalElements;
 }