Merge branch 'develop' into feature1

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

@@ -0,0 +1,36 @@
+package com.billpaymentservice.bbps.dto;
+
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class CloseComplaintDTO {
+
+	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 estimatedTAT;
+	private String creationDate; // ISO 8601 format
+	private String modifiedDate; // ISO 8601 format
+	private String billerName;
+	private String txnAmount;
+	private String superLevelEsc; // True/False
+	private String openComplaint; // Y/N
+	private String reopenComplaint; // Y/N
+	private String remarks;
+	private String agentId;
+	private String category;
+	private Long createdEpochDate; // UNIX timestamp
+	private Long modifiedEpochDate; // UNIX timestamp
+
+}

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

@@ -0,0 +1,36 @@
+package com.billpaymentservice.bbps.dto;
+
+import lombok.Getter;
+import lombok.Setter;
+
+@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;
+
+}

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

@@ -0,0 +1,25 @@
+package com.billpaymentservice.bbps.dto;
+
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@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;
+
+}

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

@@ -0,0 +1,17 @@
+package com.billpaymentservice.bbps.dto.request;
+
+import jakarta.validation.constraints.NotBlank;
+import lombok.Getter;
+import lombok.Setter;
+
+@Setter
+@Getter
+public class CloseComplaintRequest extends BaseClass {
+
+	@NotBlank(message = "complaintDescr not be null")
+	private String complaintDescr;
+
+	@NotBlank(message = "complaintId not be null")
+	private String complaintId;
+
+}

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

@@ -0,0 +1,18 @@
+package com.billpaymentservice.bbps.dto.request;
+
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+@Getter
+@Setter
+@AllArgsConstructor
+@NoArgsConstructor
+public class ComplainStatusRequest extends BaseClass {
+
+	@NotBlank(message = "Complaint Id cannot be null or blank")
+	private String complaintId;
+}

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

@@ -0,0 +1,14 @@
+package com.billpaymentservice.bbps.dto.request;
+
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class ReOpenComplain extends BaseClass {
+
+	private String complaintDescr;
+
+	private String complaintId;
+
+}

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

@@ -0,0 +1,16 @@
+package com.billpaymentservice.bbps.dto.response;
+
+import com.billpaymentservice.bbps.dto.GeneralResp;
+import com.billpaymentservice.bbps.entites.CloseComplaint;
+
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class CloseComplaintStatusResponse {
+
+	private CloseComplaint complaint; // main complaint details
+	private GeneralResp generalResp;
+
+}

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

@@ -0,0 +1,28 @@
+package com.billpaymentservice.bbps.dto.response;
+
+import java.util.List;
+
+import com.billpaymentservice.bbps.dto.ComplaintHistoryDTO;
+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 ComplaintHistoryStatusResponse {
+
+	private List<ComplaintHistoryDTO> complaintsHistories;
+	@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/ComplaintStatusResponse.java

@@ -0,0 +1,16 @@
+package com.billpaymentservice.bbps.dto.response;
+
+import com.billpaymentservice.bbps.dto.ComplainDetailsDto;
+import com.billpaymentservice.bbps.dto.GeneralResp;
+
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class ComplaintStatusResponse {
+
+	private ComplainDetailsDto complaints;
+	private GeneralResp generalResp;
+
+}