Merge pull request 'feature3-userId-added' (#29) from feature3-userId-added into develop

Reviewed-on: https://git.zeptic.in/himanshu/bbps/pulls/29

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

@@ -1,10 +1,13 @@
 package com.billpaymentservice.bbps.dto.request;
 
+import jakarta.validation.constraints.NotBlank;
 import lombok.Getter;
 import lombok.Setter;
 
 @Getter
 @Setter
-public class PollBackRequest  extends BaseClass{
-   private String orderId;
+public class PollBackRequest extends BaseClass {
+
+	@NotBlank(message = "order Id not be null")
+	private String orderId;
 }

src/main/java/com/billpaymentservice/bbps/entites/AdditionalInfo.java

@@ -18,7 +18,7 @@ import lombok.ToString;
 @Setter
 @Entity
 @ToString
-@Table(name = "additional_info")
+@Table(name = "bbps_additional_info")
 public class AdditionalInfo {
 
     @Id

src/main/java/com/billpaymentservice/bbps/entites/AdditionalInfoBill.java

@@ -12,7 +12,7 @@ import lombok.Setter;
 
 
 @Entity
-@Table(name = "additional_info_bill")
+@Table(name = "bbps_additional_info_bill")
 @Getter
 @Setter
 public class AdditionalInfoBill {

src/main/java/com/billpaymentservice/bbps/entites/AdditionalInfoBillValidate.java

@@ -11,7 +11,7 @@ import lombok.Getter;
 import lombok.Setter;
 
 @Entity
-@Table(name = "additional_info_bill_validate")
+@Table(name = "bbps_additional_info_bill_validate")
 @Getter
 @Setter
 public class AdditionalInfoBillValidate {

src/main/java/com/billpaymentservice/bbps/entites/AdditionalInfoPlans.java

@@ -16,7 +16,7 @@ import lombok.Getter;
 import lombok.Setter;
 
 @Entity
-@Table(name = "plan_additional_info")
+@Table(name = "bbps_plan_additional_info")
 @Getter
 @Setter
 public class AdditionalInfoPlans {

src/main/java/com/billpaymentservice/bbps/entites/AgentFundTransfer.java

@@ -10,7 +10,7 @@ import lombok.NoArgsConstructor;
 import lombok.Setter;
 
 @Entity
-@Table(name = "agent_fund_transfer_Txn_Status")
+@Table(name = "bbps_agent_fund_transfer_Txn_Status")
 @NoArgsConstructor
 @Getter
 @Setter

src/main/java/com/billpaymentservice/bbps/entites/AgentFundTransferEntity.java

@@ -13,7 +13,7 @@ import lombok.Setter;
 @Entity
 @Getter
 @Setter
-@Table(name = "agent_fund_transfer")
+@Table(name = "bbps_agent_fund_transfer")
 public class AgentFundTransferEntity {
 
     @Id

src/main/java/com/billpaymentservice/bbps/entites/AmountOption.java

@@ -16,7 +16,7 @@ import lombok.Getter;
 import lombok.Setter;
 
 @Entity
-@Table(name = "amount_option")
+@Table(name = "bbps_amount_option")
 @Getter
 @Setter
 public class AmountOption {

src/main/java/com/billpaymentservice/bbps/entites/AmountOptionByBillerId.java

@@ -19,7 +19,7 @@ import lombok.Setter;
 @Getter
 @Setter
 @Entity
-@Table(name = "amount_option_biller_id")
+@Table(name = "bbps_amount_option_biller_id")
 public class AmountOptionByBillerId extends Auditable<String> {
 
 	@Id

src/main/java/com/billpaymentservice/bbps/entites/AmountOptionDetails.java

@@ -12,7 +12,7 @@ import lombok.Setter;
 @Getter
 @Setter
 @Entity
-@Table(name = "amount_option_details")
+@Table(name = "bbps_amount_option_details")
 public class AmountOptionDetails {
 
 	@Id

src/main/java/com/billpaymentservice/bbps/entites/BharatConnectMaster.java

@@ -17,7 +17,7 @@ import lombok.Setter;
 @AllArgsConstructor
 @NoArgsConstructor
 @Entity
-@Table(name = "Bharat_connect_master")
+@Table(name = "bbps_bharat_connect_master")
 public class BharatConnectMaster extends Auditable<String> {
 
     @Id

src/main/java/com/billpaymentservice/bbps/entites/BillAdditionalInfo.java

@@ -13,7 +13,7 @@ import lombok.Setter;
 @Getter
 @Setter
 @Entity
-@Table(name = "bill_additional_info")
+@Table(name = "bbps_bill_additional_info")
 public class BillAdditionalInfo {
 
 	@Id

src/main/java/com/billpaymentservice/bbps/entites/BillCustomerParams.java

@@ -13,7 +13,7 @@ import lombok.Setter;
 @Getter
 @Setter
 @Entity
-@Table(name = "bill_customer_params")
+@Table(name = "bbps_bill_customer_params")
 public class BillCustomerParams {
 
 	@Id

src/main/java/com/billpaymentservice/bbps/entites/BillInitiate.java

@@ -12,7 +12,7 @@ import lombok.NoArgsConstructor;
 @AllArgsConstructor
 @NoArgsConstructor
 @Entity
-@Table(name = "bill_initiate")
+@Table(name = "bbps_bill_initiate")
 public class BillInitiate {
 	@Id
 	@Column(name = "req_id")

src/main/java/com/billpaymentservice/bbps/entites/BillMaster.java

@@ -17,7 +17,7 @@ import lombok.NoArgsConstructor;
 import lombok.Setter;
 
 @Entity
-@Table(name = "bill_master")
+@Table(name = "bbps_bill_master")
 @Builder
 @Getter
 @Setter

src/main/java/com/billpaymentservice/bbps/entites/BillPayment.java

@@ -16,7 +16,7 @@ import lombok.Setter;
 @Getter
 @Setter
 @Entity
-@Table(name = "bill_payment")
+@Table(name = "bbps_bill_payment")
 public class BillPayment {
 
     @Id

src/main/java/com/billpaymentservice/bbps/entites/BillTag.java

@@ -13,7 +13,7 @@ import lombok.Setter;
 @Getter
 @Setter
 @Entity
-@Table(name = "bill_tag_list")
+@Table(name = "bbps_bill_tag_list")
 public class BillTag {
 	
 	@Id

src/main/java/com/billpaymentservice/bbps/entites/BillValidation.java

@@ -8,7 +8,7 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 
 @Entity
-@Table(name = "bill_validation")
+@Table(name = "bbps_bill_validation")
 @Data
 @AllArgsConstructor
 @NoArgsConstructor

src/main/java/com/billpaymentservice/bbps/entites/BillerAdditionalInfoPayment.java

@@ -13,7 +13,7 @@ import lombok.Getter;
 import lombok.Setter;
 @Getter
 @Setter
-@Table(name = "biller_additional_info_payment")
+@Table(name = "bbps_biller_additional_info_payment")
 @Entity
 public class BillerAdditionalInfoPayment {
 	     @Id

src/main/java/com/billpaymentservice/bbps/entites/BillerCategoryIcon.java

@@ -18,7 +18,7 @@ import lombok.NoArgsConstructor;
 import lombok.Setter;
 
 @Entity
-@Table(name = "biller_category_icon")
+@Table(name = "bbps_biller_category_icon")
 @Getter
 @Setter
 @NoArgsConstructor

src/main/java/com/billpaymentservice/bbps/entites/BillerCategoryWise.java

@@ -15,7 +15,7 @@ import lombok.NoArgsConstructor;
 import lombok.Setter;
 
 @Entity
-@Table(name = "biller_category_wise")
+@Table(name = "bbps_biller_category_wise")
 @Getter
 @Setter
 @NoArgsConstructor

src/main/java/com/billpaymentservice/bbps/entites/BillerDetails.java

@@ -34,7 +34,7 @@ import lombok.ToString;
 	    "billerAdditionalInfoPayments"
 	})
 
-@Table(name = "biller_details")
+@Table(name = "bbps_biller_details")
 @JsonIgnoreProperties(ignoreUnknown = true)
 public class BillerDetails{
 

src/main/java/com/billpaymentservice/bbps/entites/BillerPlanResponseParams.java

@@ -17,7 +17,7 @@ import lombok.ToString;
 @Setter
 @Entity
 @ToString
-@Table(name = "biller_plan_response_params")
+@Table(name = "bbps_biller_plan_response_params")
 public class BillerPlanResponseParams {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)

src/main/java/com/billpaymentservice/bbps/entites/BillerResponse.java

@@ -11,7 +11,7 @@ import lombok.Getter;
 import lombok.Setter;
 
 @Entity
-@Table(name = "biller_response")
+@Table(name = "bbps_biller_response")
 @Getter
 @Setter
 public class BillerResponse {

src/main/java/com/billpaymentservice/bbps/entites/BillerResponseParams.java

@@ -20,7 +20,7 @@ import lombok.Setter;
 @Getter
 @Setter
 @Entity
-@Table(name = "biller_response_params")
+@Table(name = "bbps_biller_response_params")
 public class BillerResponseParams {
 
     @Id

src/main/java/com/billpaymentservice/bbps/entites/CategoryResponseList.java

@@ -12,7 +12,7 @@ import lombok.Getter;
 import lombok.Setter;
 
 @Entity
-@Table(name = "category_response_list")
+@Table(name = "bbps_category_response_list")
 @Getter
 @Setter
 public class CategoryResponseList extends Auditable<String> {

src/main/java/com/billpaymentservice/bbps/entites/CheckClientBillerData.java

@@ -16,7 +16,7 @@ import lombok.Getter;
 import lombok.Setter;
 
 @Entity
-@Table(name = "check_client_biller_data")
+@Table(name = "bbps_check_client_biller_data")
 @Getter
 @Setter
 public class CheckClientBillerData {

src/main/java/com/billpaymentservice/bbps/entites/CheckClientStatusReqId.java

@@ -10,7 +10,7 @@ import lombok.Getter;
 import lombok.Setter;
 
 @Entity
-@Table(name = "check_client_status_req_id")
+@Table(name = "bbps_check_client_status_req_id")
 @Getter
 @Setter
 public class CheckClientStatusReqId {

src/main/java/com/billpaymentservice/bbps/entites/CloseComplaint.java

@@ -13,7 +13,7 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 
 @Entity
-@Table(name = "complaints")
+@Table(name = "bbps_complaints")
 @Data
 @AllArgsConstructor
 @NoArgsConstructor

src/main/java/com/billpaymentservice/bbps/entites/ComplainStatus.java

@@ -7,12 +7,14 @@ import jakarta.persistence.Entity;
 import jakarta.persistence.GeneratedValue;
 import jakarta.persistence.GenerationType;
 import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
 import jakarta.persistence.Table;
 import lombok.Getter;
 import lombok.Setter;
 
 @Entity
-@Table(name = "complaint_status")
+@Table(name = "bbps_complaint_status")
 @Getter
 @Setter
 public class ComplainStatus extends Auditable<String> {
@@ -71,4 +73,8 @@ public class ComplainStatus extends Auditable<String> {
 
 	@Column(name = "user_id")
 	private String userId;
+
+	@ManyToOne
+	@JoinColumn(name = "complaint_response_id")
+	private ComplaintResponseEntity complaintResponse;
 }

src/main/java/com/billpaymentservice/bbps/entites/ComplaintDetails.java

@@ -5,7 +5,7 @@ import lombok.Setter;
 import lombok.ToString;
 
 @Entity
-@Table(name = "complaint_details")
+@Table(name = "bbps_complaint_details")
 @Getter
 @Setter
 @ToString

src/main/java/com/billpaymentservice/bbps/entites/ComplaintHistory.java

@@ -7,6 +7,8 @@ import jakarta.persistence.Entity;
 import jakarta.persistence.GeneratedValue;
 import jakarta.persistence.GenerationType;
 import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
 import jakarta.persistence.Table;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
@@ -14,7 +16,7 @@ import lombok.NoArgsConstructor;
 import lombok.Setter;
 
 @Entity
-@Table(name = "complaints_history")
+@Table(name = "bbps_complaints_history")
 @Getter
 @Setter
 @NoArgsConstructor
@@ -46,4 +48,8 @@ public class ComplaintHistory extends Auditable<String> {
 	@Column(name = "user_id")
 	private String userId;
 
+	@ManyToOne
+	@JoinColumn(name = "complaint_response_id")
+	private ComplaintResponseEntity complaintResponse;
+
 }

src/main/java/com/billpaymentservice/bbps/entites/ComplaintResponseEntity.java

@@ -1,12 +1,16 @@
 package com.billpaymentservice.bbps.entites;
 
+import java.util.List;
+
 import com.billpaymentservice.bbps.audit.Auditable;
 
+import jakarta.persistence.CascadeType;
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
 import jakarta.persistence.GeneratedValue;
 import jakarta.persistence.GenerationType;
 import jakarta.persistence.Id;
+import jakarta.persistence.OneToMany;
 import jakarta.persistence.Table;
 import lombok.Getter;
 import lombok.Setter;
@@ -16,7 +20,7 @@ import lombok.ToString;
 @Getter
 @Setter
 @ToString
-@Table(name = "complaint_responses")
+@Table(name = "bbps_complaint_responses")
 public class ComplaintResponseEntity extends Auditable<String> {
 
 	@Id
@@ -68,4 +72,16 @@ public class ComplaintResponseEntity extends Auditable<String> {
 	@Column(name = "user_id")
 	private String userId;
 
+	@OneToMany(mappedBy = "complaintResponse", cascade = CascadeType.ALL, orphanRemoval = false)
+	private List<ComplainStatus> complaintStatusList;
+
+	@OneToMany(mappedBy = "complaintResponse", cascade = CascadeType.ALL, orphanRemoval = false)
+	private List<ComplaintHistory> historyList;
+
+	@OneToMany(mappedBy = "complaintResponse", cascade = CascadeType.ALL, orphanRemoval = false)
+	private List<ComplaintStatusDetails> statusDetailsList;
+
+	@OneToMany(mappedBy = "complaintResponse", cascade = CascadeType.ALL, orphanRemoval = false)
+	private List<ViewAllComplaintTicketStatusDetails> viewAllList;
+
 }

src/main/java/com/billpaymentservice/bbps/entites/ComplaintStatusDetails.java

@@ -7,6 +7,8 @@ import jakarta.persistence.Entity;
 import jakarta.persistence.GeneratedValue;
 import jakarta.persistence.GenerationType;
 import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
 import jakarta.persistence.Table;
 import lombok.Getter;
 import lombok.Setter;
@@ -14,7 +16,7 @@ import lombok.Setter;
 @Entity
 @Getter
 @Setter
-@Table(name = "view_ticket_status")
+@Table(name = "bbps_view_ticket_status")
 public class ComplaintStatusDetails extends Auditable<String> {
 
 	@Id
@@ -87,4 +89,8 @@ public class ComplaintStatusDetails extends Auditable<String> {
 	@Column(name = "biller_name")
 	private String billerName;
 
+	@ManyToOne
+	@JoinColumn(name = "complaint_response_id")
+	private ComplaintResponseEntity complaintResponse;
+
 }

src/main/java/com/billpaymentservice/bbps/entites/ComplaintStatusOptionsMaster.java

@@ -11,7 +11,7 @@ import lombok.Setter;
 import lombok.ToString;
 
 @Entity
-@Table(name = "complaint_options_status_master")
+@Table(name = "bbps_complaint_options_status_master")
 @Getter
 @Setter
 @ToString

src/main/java/com/billpaymentservice/bbps/entites/ContactMasterData.java

@@ -14,7 +14,7 @@ import lombok.NoArgsConstructor;
 import lombok.Setter;
 
 @Entity
-@Table(name = "contact_master_data")
+@Table(name = "bbps_contact_master_data")
 @Getter
 @Setter
 @NoArgsConstructor

src/main/java/com/billpaymentservice/bbps/entites/CustomParam.java

@@ -16,7 +16,7 @@ import lombok.ToString;
 @Setter
 @Entity
 @ToString
-@Table(name = "custom_param")
+@Table(name = "bbps_custom_param")
 public class CustomParam extends Auditable<String> {
 
 	@Id

src/main/java/com/billpaymentservice/bbps/entites/CustomerParam.java

@@ -22,7 +22,7 @@ import lombok.ToString;
 @Getter
 @Setter
 @Entity
-@Table(name = "customer_param")
+@Table(name = "bbps_customer_param")
 @ToString
 public class CustomerParam {
 

src/main/java/com/billpaymentservice/bbps/entites/CustomerParamBill.java

@@ -12,7 +12,7 @@ import lombok.Setter;
 @Entity
 @Getter
 @Setter
-@Table(name = "customer_param_bill")
+@Table(name = "bbps_customer_param_bill")
 public class CustomerParamBill {
 
     @Id

src/main/java/com/billpaymentservice/bbps/entites/CustomerParamBillValidation.java

@@ -6,7 +6,7 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 
 @Entity
-@Table(name = "customer_params_bill_validate")
+@Table(name = "bbps_customer_params_bill_validate")
 @Data
 @AllArgsConstructor
 @NoArgsConstructor

src/main/java/com/billpaymentservice/bbps/entites/CustomerParamDAO.java

@@ -12,7 +12,7 @@ import lombok.Setter;
 @Entity
 @Getter
 @Setter
-@Table(name = "customer_params")
+@Table(name = "bbps_customer_params")
 public class CustomerParamDAO {
 
     @Id

src/main/java/com/billpaymentservice/bbps/entites/CustomerParamGroupById.java

@@ -20,7 +20,7 @@ import lombok.Setter;
 @Getter
 @Setter
 @Entity
-@Table(name = "customer_param_group_by_biller_id")
+@Table(name = "bbps_customer_param_group_by_biller_id")
 public class CustomerParamGroupById extends Auditable<String> {
 
 	@Id

src/main/java/com/billpaymentservice/bbps/entites/CustomerParamGroups.java

@@ -21,7 +21,7 @@ import lombok.ToString;
 @Setter
 @Entity
 @ToString
-@Table(name = "customer_param_groups")
+@Table(name = "bbps_customer_param_groups")
 public class CustomerParamGroups {
 
     @Id

src/main/java/com/billpaymentservice/bbps/entites/CustomerParamTransaction.java

@@ -14,7 +14,7 @@ import lombok.Setter;
 @Entity
 @Getter
 @Setter
-@Table(name = "customer_params_transaction")
+@Table(name = "bbps_customer_params_transaction")
 public class CustomerParamTransaction {
 
     @Id

src/main/java/com/billpaymentservice/bbps/entites/DeviceBlockTag.java

@@ -15,7 +15,7 @@ import lombok.Setter;
 @Entity
 @Getter
 @Setter
-@Table(name = "device_block_tag")
+@Table(name = "bbps_device_block_tag")
 public class DeviceBlockTag {
 
     @Id

src/main/java/com/billpaymentservice/bbps/entites/DispositionDetails.java

@@ -11,7 +11,7 @@ import lombok.ToString;
 @Getter
 @Setter
 @Entity
-@Table(name = "disposition_details")
+@Table(name = "bbps_disposition_details")
 @ToString
 public class DispositionDetails {
 

src/main/java/com/billpaymentservice/bbps/entites/FetchBillValidate.java

@@ -18,7 +18,7 @@ import lombok.Setter;
 @AllArgsConstructor
 @NoArgsConstructor
 @Entity
-@Table(name = "fetch_bill_validate_response")
+@Table(name = "bbps_fetch_bill_validate_response")
 public class FetchBillValidate extends Auditable<String> {
 
 	@Id

src/main/java/com/billpaymentservice/bbps/entites/Group.java

@@ -25,7 +25,7 @@ import lombok.Setter;
 @Getter
 @Setter
 @Entity
-@Table(name = "biller_groups")
+@Table(name = "bbps_biller_groups")
 public class Group {
 
     @Id

src/main/java/com/billpaymentservice/bbps/entites/GroupParam.java

@@ -14,7 +14,7 @@ import lombok.Setter;
 @Getter
 @Setter
 @Entity
-@Table(name = "group_params")
+@Table(name = "bbps_group_params")
 public class GroupParam {
 
 	@Id

src/main/java/com/billpaymentservice/bbps/entites/InterchangeFee.java

@@ -21,7 +21,7 @@ import lombok.ToString;
 @Setter
 @Entity
 @ToString
-@Table(name = "interchange_fee")
+@Table(name = "bbps_interchange_fee")
 public class InterchangeFee {
 
     @Id

src/main/java/com/billpaymentservice/bbps/entites/InterchangeFeeConf.java

@@ -19,7 +19,7 @@ import lombok.Setter;
 @Getter
 @Setter
 @Entity
-@Table(name = "interchange_fee_conf")
+@Table(name = "bbps_interchange_fee_conf")
 public class InterchangeFeeConf {
 
     @Id

src/main/java/com/billpaymentservice/bbps/entites/InterchangeFeeDetail.java

@@ -12,7 +12,7 @@ import lombok.Getter;
 import lombok.Setter;
 
 @Entity
-@Table(name = "interchange_fee_detail")
+@Table(name = "bbps_interchange_fee_detail")
 @Getter
 @Setter
 public class InterchangeFeeDetail {

src/main/java/com/billpaymentservice/bbps/entites/PaymentChannel.java

@@ -17,7 +17,7 @@ import lombok.ToString;
 @Setter
 @Entity
 @ToString
-@Table(name = "payment_channel")
+@Table(name = "bbps_payment_channel")
 public class PaymentChannel {
 
 	@Id

src/main/java/com/billpaymentservice/bbps/entites/PaymentInitiate.java

@@ -12,7 +12,7 @@ import lombok.NoArgsConstructor;
 @AllArgsConstructor
 @NoArgsConstructor
 @Entity
-@Table(name = "payment_initiate")
+@Table(name = "bbps_payment_initiate")
 public class PaymentInitiate {
 
 	@Id

src/main/java/com/billpaymentservice/bbps/entites/PaymentMode.java

@@ -19,7 +19,7 @@ import lombok.ToString;
 @Getter
 @Setter
 @Entity
-@Table(name = "biller_payment_modes")
+@Table(name = "bbps_biller_payment_modes")
 @ToString
 public class PaymentMode {
     

src/main/java/com/billpaymentservice/bbps/entites/PaymentStartRecord.java

@@ -17,7 +17,7 @@ import lombok.NoArgsConstructor;
 @AllArgsConstructor
 @NoArgsConstructor
 @Entity
-@Table(name = "payment_start_record")
+@Table(name = "bbps_payment_start_record")
 public class PaymentStartRecord {
 
 		@Id

src/main/java/com/billpaymentservice/bbps/entites/Plan.java

@@ -18,7 +18,7 @@ import lombok.Getter;
 import lombok.Setter;
 
 @Entity
-@Table(name = "plan")
+@Table(name = "bbps_plan")
 @Getter
 @Setter
 public class Plan {

src/main/java/com/billpaymentservice/bbps/entites/PlanCategorySubType.java

@@ -12,7 +12,7 @@ import lombok.Getter;
 import lombok.Setter;
 
 @Entity
-@Table(name = "plan_category_sub_type")
+@Table(name = "bbps_plan_category_sub_type")
 @Getter
 @Setter
 public class PlanCategorySubType {

src/main/java/com/billpaymentservice/bbps/entites/PlanResponses.java

@@ -16,7 +16,7 @@ import lombok.Getter;
 import lombok.Setter;
 
 @Entity
-@Table(name = "plan_response")
+@Table(name = "bbps_plan_response")
 @Getter
 @Setter
 public class PlanResponses extends Auditable<String> {

src/main/java/com/billpaymentservice/bbps/entites/PlanTag.java

@@ -5,7 +5,7 @@ import lombok.Getter;
 import lombok.Setter;
 
 @Entity
-@Table(name = "plan_tag")
+@Table(name = "bbps_plan_tag")
 @Getter
 @Setter
 public class PlanTag {

src/main/java/com/billpaymentservice/bbps/entites/PlansList.java

@@ -14,7 +14,7 @@ import lombok.Getter;
 import lombok.Setter;
 
 @Entity
-@Table(name = "plans_list")
+@Table(name = "bbps_plans_list")
 @Getter
 @Setter
 public class PlansList {

src/main/java/com/billpaymentservice/bbps/entites/ReOpenComplain.java

@@ -12,7 +12,7 @@ import lombok.Getter;
 import lombok.Setter;
 
 @Entity
-@Table(name = "reopen_complaint")
+@Table(name = "bbps_reopen_complaint")
 @Getter
 @Setter
 public class ReOpenComplain extends Auditable<String> {

src/main/java/com/billpaymentservice/bbps/entites/RemitterIdentity.java

@@ -15,7 +15,7 @@ import lombok.Setter;
 @Getter
 @Setter
 @Entity
-@Table(name = "remitter_identity")
+@Table(name = "bbps_remitter_identity")
 public class RemitterIdentity {
 
     @Id

src/main/java/com/billpaymentservice/bbps/entites/TicketDispositionDetails.java

@@ -15,7 +15,7 @@ import lombok.ToString;
 @Getter
 @Setter
 @Entity
-@Table(name = "ticket_disposition_details")
+@Table(name = "bbps_ticket_disposition_details")
 @ToString
 public class TicketDispositionDetails extends Auditable<String> {
 

src/main/java/com/billpaymentservice/bbps/entites/TransactionMaster.java

@@ -20,7 +20,7 @@ import lombok.ToString;
 @Getter
 @Setter
 @Entity
-@Table(name = "transaction_master")
+@Table(name = "bbps_transaction_master")
 @ToString
 @NoArgsConstructor
 @AllArgsConstructor

src/main/java/com/billpaymentservice/bbps/entites/UserEntity.java

@@ -14,7 +14,7 @@ import lombok.NoArgsConstructor;
 import lombok.Setter;
 
 @Entity
-@Table(name = "users")
+@Table(name = "bbps_users")
 @Getter
 @Setter
 @AllArgsConstructor

src/main/java/com/billpaymentservice/bbps/entites/UsersDetails.java

@@ -15,7 +15,7 @@ import lombok.NoArgsConstructor;
 @NoArgsConstructor
 @AllArgsConstructor
 @Entity
-@Table(name = "user_details")
+@Table(name = "bbps_user_details")
 public class UsersDetails extends Auditable<String> {
 
 	@Id

src/main/java/com/billpaymentservice/bbps/entites/ViewAllComplaintTicketStatusDetails.java

@@ -7,6 +7,8 @@ import jakarta.persistence.Entity;
 import jakarta.persistence.GeneratedValue;
 import jakarta.persistence.GenerationType;
 import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
 import jakarta.persistence.Table;
 import lombok.Getter;
 import lombok.Setter;
@@ -14,7 +16,7 @@ import lombok.Setter;
 @Entity
 @Getter
 @Setter
-@Table(name = "view_all_complaint_ticket_status")
+@Table(name = "bbps_view_all_complaint_ticket_status")
 public class ViewAllComplaintTicketStatusDetails extends Auditable<String> {
 
 	@Id
@@ -86,4 +88,8 @@ public class ViewAllComplaintTicketStatusDetails extends Auditable<String> {
 
 	@Column(name = "biller_name")
 	private String billerName;
+
+	@ManyToOne
+	@JoinColumn(name = "complaint_response_id")
+	private ComplaintResponseEntity complaintResponse;
 }

src/main/java/com/billpaymentservice/bbps/repository/BBPSMasterDataRepo.java

@@ -9,6 +9,11 @@ import com.billpaymentservice.bbps.entites.BBPSMastersData;
 @Repository
 public interface BBPSMasterDataRepo extends JpaRepository<BBPSMastersData, Long> {
 
-	@Query("from BBPSMastersData where mid = ?1 and isDeleted  = false")
-	public BBPSMastersData findByMid(String mid);
+//	@Query("from BBPSMastersData where mid = ?1 and isDeleted  = false")
+//	public BBPSMastersData findByMid(String mid);
+	
+	@Query(value = "SELECT * FROM bbps_master_data WHERE mid = ?1 AND is_deleted = false", 
+		       nativeQuery = true)
+		BBPSMastersData findByMid(String mid);
+
 }

src/main/java/com/billpaymentservice/bbps/repository/BharatConnectMasterRepository.java

@@ -1,12 +1,17 @@
 package com.billpaymentservice.bbps.repository;
+
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;
 
 import com.billpaymentservice.bbps.entites.BharatConnectMaster;
 
 @Repository
-public interface BharatConnectMasterRepository extends JpaRepository<BharatConnectMaster,String> 
-{
-	public BharatConnectMaster findByOrgId(String orgId);
-	
+public interface BharatConnectMasterRepository extends JpaRepository<BharatConnectMaster, String> {
+	// public BharatConnectMaster findByOrgId(String orgId);
+
+	@Query(value = "SELECT * FROM bbps_bharat_connect_master WHERE org_id = :orgId", nativeQuery = true)
+	BharatConnectMaster findByOrgId(@Param("orgId") String orgId);
+
 }

src/main/java/com/billpaymentservice/bbps/repository/BillInitateRepository.java

@@ -3,6 +3,8 @@ package com.billpaymentservice.bbps.repository;
 import java.util.Optional;
 
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;
 
 import com.billpaymentservice.bbps.entites.BillInitiate;
@@ -10,8 +12,14 @@ import com.billpaymentservice.bbps.entites.BillInitiate;
 @Repository
 public interface BillInitateRepository extends JpaRepository<BillInitiate, String> {
 
-	 Optional<BillInitiate> findByTxnId(String clientReqId);
+	@Query(value = "SELECT * FROM bbps_bill_initiate WHERE txn_id = :txnId", nativeQuery = true)
+	Optional<BillInitiate> findByTxnId(@Param("txnId") String txnId);
 
-	 Optional<BillInitiate> findByReqId(String clientReqId);
+	// Optional<BillInitiate> findByTxnId(String clientReqId);
+
+	@Query(value = "SELECT * FROM bbps_bill_initiate WHERE req_id = :reqId", nativeQuery = true)
+	Optional<BillInitiate> findByReqId(@Param("reqId") String reqId);
+
+	// Optional<BillInitiate> findByReqId(String clientReqId);
 
 }

src/main/java/com/billpaymentservice/bbps/repository/BillerDataRepository.java

@@ -1,14 +1,20 @@
 package com.billpaymentservice.bbps.repository;
 
-
 import java.util.Optional;
 
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;
+
 import com.billpaymentservice.bbps.entites.BillerDetails;
 
 @Repository
 public interface BillerDataRepository extends JpaRepository<BillerDetails, String> {
 
-    Optional<BillerDetails> findByBillerId(String billerId);
+	// Optional<BillerDetails> findByBillerId(String billerId);
+
+	@Query(value = "SELECT * FROM bbps_biller_details WHERE biller_id = :billerId", nativeQuery = true)
+	Optional<BillerDetails> findByBillerId(@Param("billerId") String billerId);
+
 }

src/main/java/com/billpaymentservice/bbps/repository/ComplaintOptionsStatusMasterRepository.java

@@ -11,6 +11,10 @@ import com.billpaymentservice.bbps.entites.ComplaintStatusOptionsMaster;
 @Repository
 public interface ComplaintOptionsStatusMasterRepository extends JpaRepository<ComplaintStatusOptionsMaster, Integer> {
 
-	@Query("SELECT c FROM ComplaintStatusOptionsMaster c WHERE c.isDeleted = false")
+//	@Query("SELECT c FROM ComplaintStatusOptionsMaster c WHERE c.isDeleted = false")
+//	List<ComplaintStatusOptionsMaster> findAllActiveStatuses();
+
+	@Query(value = "SELECT * FROM bbps_complaint_options_status_master WHERE is_deleted = false", nativeQuery = true)
 	List<ComplaintStatusOptionsMaster> findAllActiveStatuses();
+
 }

src/main/java/com/billpaymentservice/bbps/repository/ComplaintResponseRepository.java

@@ -17,4 +17,8 @@ public interface ComplaintResponseRepository extends JpaRepository<ComplaintResp
 
 	@Query("SELECT c FROM ComplaintResponseEntity c WHERE c.userId = :userId")
 	Page<ComplaintResponseEntity> findByUserIdCustom(@Param("userId") String userId, Pageable pageable);
+
+	@Query(value = "SELECT * FROM bbps_complaint_responses WHERE user_id = :userId", nativeQuery = true)
+	Page<ComplaintResponseEntity> findByUserIdNative(@Param("userId") String userId, Pageable pageable);
+
 }

src/main/java/com/billpaymentservice/bbps/repository/MerchantRepository.java

@@ -2,6 +2,7 @@ package com.billpaymentservice.bbps.repository;
 
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;
 
 import com.billpaymentservice.bbps.entites.BBPSMerchantValidation;
@@ -9,6 +10,10 @@ import com.billpaymentservice.bbps.entites.BBPSMerchantValidation;
 @Repository
 public interface MerchantRepository extends JpaRepository<BBPSMerchantValidation, Long> {
 
-	@Query("from BBPSMerchantValidation where mid = ?1 and is_deleted = false")
-	public BBPSMerchantValidation findByMid(String mid);
+//	@Query("from BBPSMerchantValidation where mid = ?1 and is_deleted = false")
+//	public BBPSMerchantValidation findByMid(String mid);
+
+	@Query(value = "SELECT * FROM bbps_merchant_validation WHERE mid = :mid AND is_deleted = false", nativeQuery = true)
+	BBPSMerchantValidation findByMidNative(@Param("mid") String mid);
+
 }

src/main/java/com/billpaymentservice/bbps/repository/PaymentIntiateRepository.java

@@ -3,11 +3,15 @@ package com.billpaymentservice.bbps.repository;
 import java.util.Optional;
 
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
 
 import com.billpaymentservice.bbps.entites.PaymentInitiate;
 
 public interface PaymentIntiateRepository extends JpaRepository<PaymentInitiate, String> {
 
+	// Optional<PaymentInitiate> findByReqId(String clientReqId);
+
+	@Query(value = "SELECT * FROM bbps_payment_initiate WHERE req_id = :clientReqId", nativeQuery = true)
 	Optional<PaymentInitiate> findByReqId(String clientReqId);
 
 }

src/main/java/com/billpaymentservice/bbps/util/Helper.java

@@ -5,6 +5,7 @@ import java.time.LocalDateTime;
 import java.util.Date;
 import java.util.Random;
 
+import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.http.HttpHeaders;
@@ -71,19 +72,20 @@ public class Helper {
 		BBPSMastersData merchantValidation = bbpsMasterDataRepo.findByMid(mid);
 
 		if (merchantValidation == null) {
-			LOGGER.warn("Merchant not found for MID: {}", mid);
-			throw new CustomException("Merchant not found by id", "FAILED", BBPSConstant.BADREQUEST, null);
+		    LOGGER.warn("Merchant not found for MID: {}", mid);
+		    throw new CustomException("Merchant not found by id", "FAILED", BBPSConstant.BADREQUEST, null);
 		}
 
-		if (merchantValidation.getApiKey() == null && merchantValidation.getSecreteKey() == null) {
-			LOGGER.warn("Merchant BBPS service is not active MID: {}", mid);
-			throw new CustomException("Merchant BBPS Service is not active by mid", "FAILED", BBPSConstant.BADREQUEST,
-					null);
-		}
+		if (StringUtils.isBlank(merchantValidation.getApiKey()) 
+		        && StringUtils.isBlank(merchantValidation.getSecreteKey())) {
 
+		    LOGGER.warn("Merchant BBPS service is not active MID: {}", mid);
+		    throw new CustomException("Merchant BBPS Service is not active by mid",
+		            "FAILED", BBPSConstant.BADREQUEST, null);
+		}
 		if (!Boolean.TRUE.equals(merchantValidation.getIsActive())) {
-			LOGGER.warn("Merchant inactive for MID: {}", mid);
-			throw new CustomException("Merchant is inactive", "FAILED", BBPSConstant.BADREQUEST, null);
+		    LOGGER.warn("Merchant inactive for MID: {}", mid);
+		    throw new CustomException("Merchant is inactive", "FAILED", BBPSConstant.BADREQUEST, null);
 		}
 
 		LOGGER.info("Merchant is valid and active for MID: {}", mid);

src/main/resources/application-local.properties

@@ -18,11 +18,11 @@ swagger.server.description=Local Development Server
 
 
 # DataSource
-spring.datasource.url=jdbc:postgresql://localhost:5432/BBPS
+spring.datasource.url=jdbc:postgresql://localhost:5432/devdbuat
 spring.datasource.username=postgres
-#spring.datasource.password=UAT@DB_2025
+spring.datasource.password=UAT@DB_2025
 
-spring.datasource.password=himanshu@123
+#spring.datasource.password=himanshu@123
 spring.datasource.driver-class-name=org.postgresql.Driver
 spring.datasource.type=com.zaxxer.hikari.HikariDataSource
 

src/main/resources/application-uat.properties

@@ -17,7 +17,7 @@ swagger.server.description=Production Server
 
 
 # DataSource
-spring.datasource.url=jdbc:postgresql://localhost:5432/bbps
+spring.datasource.url=jdbc:postgresql://localhost:5432/devdbuat
 spring.datasource.username=postgres
 spring.datasource.password=LincPay098)(*
 spring.datasource.driver-class-name=org.postgresql.Driver