From 7e7b8ae9cfa5c351e566a0d07a9f486e5777ab6a Mon Sep 17 00:00:00 2001 From: Mohd-Arham Date: Mon, 8 Dec 2025 10:05:29 +0530 Subject: [PATCH 1/3] update complaint --- .../bbps/config/RestClientConfig.java | 26 ++++++++++++------- .../bbps/dto/request/PollBackRequest.java | 7 +++-- .../bbps/entites/BharatConnectMaster.java | 2 +- .../bbps/entites/ComplainStatus.java | 6 +++++ .../bbps/entites/ComplaintHistory.java | 6 +++++ .../bbps/entites/ComplaintResponseEntity.java | 16 ++++++++++++ .../bbps/entites/ComplaintStatusDetails.java | 6 +++++ .../ViewAllComplaintTicketStatusDetails.java | 6 +++++ .../bbps/repository/BBPSMasterDataRepo.java | 9 +++++-- .../BharatConnectMasterRepository.java | 13 +++++++--- .../billpaymentservice/bbps/util/Helper.java | 20 +++++++------- .../resources/application-local.properties | 4 +-- 12 files changed, 92 insertions(+), 29 deletions(-) diff --git a/src/main/java/com/billpaymentservice/bbps/config/RestClientConfig.java b/src/main/java/com/billpaymentservice/bbps/config/RestClientConfig.java index c248203..705c472 100644 --- a/src/main/java/com/billpaymentservice/bbps/config/RestClientConfig.java +++ b/src/main/java/com/billpaymentservice/bbps/config/RestClientConfig.java @@ -2,13 +2,14 @@ package com.billpaymentservice.bbps.config; import java.security.cert.X509Certificate; +import javax.net.ssl.HttpsURLConnection; import javax.net.ssl.SSLContext; import javax.net.ssl.TrustManager; import javax.net.ssl.X509TrustManager; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import org.springframework.http.client.HttpComponentsClientHttpRequestFactory; +import org.springframework.http.client.SimpleClientHttpRequestFactory; import org.springframework.web.client.RestClient; @Configuration @@ -16,24 +17,31 @@ public class RestClientConfig { @Bean public RestClient restClient() throws Exception { - // ✅ Create trust all SSL context - SSLContext sslContext = SSLContext.getInstance("TLS"); + + // Create Trust-All SSL context TrustManager[] trustAllCerts = new TrustManager[]{ new X509TrustManager() { public X509Certificate[] getAcceptedIssuers() { return new X509Certificate[0]; } - public void checkClientTrusted(X509Certificate[] certs, String authType) { - } - public void checkServerTrusted(X509Certificate[] certs, String authType) { - } + public void checkClientTrusted(X509Certificate[] certs, String authType) {} + public void checkServerTrusted(X509Certificate[] certs, String authType) {} } }; + + SSLContext sslContext = SSLContext.getInstance("TLS"); sslContext.init(null, trustAllCerts, new java.security.SecureRandom()); - // ✅ Create RestClient with custom SSL context + // Use JDK's Simple HTTP client with custom SSL context + SimpleClientHttpRequestFactory requestFactory = new SimpleClientHttpRequestFactory(); + requestFactory.setBufferRequestBody(false); + + // Apply SSL context to HttpsURLConnection globally + HttpsURLConnection.setDefaultSSLSocketFactory(sslContext.getSocketFactory()); + HttpsURLConnection.setDefaultHostnameVerifier((hostname, session) -> true); + return RestClient.builder() - .requestFactory(new HttpComponentsClientHttpRequestFactory()) + .requestFactory(requestFactory) .build(); } } \ No newline at end of file diff --git a/src/main/java/com/billpaymentservice/bbps/dto/request/PollBackRequest.java b/src/main/java/com/billpaymentservice/bbps/dto/request/PollBackRequest.java index c477dd4..0766157 100644 --- a/src/main/java/com/billpaymentservice/bbps/dto/request/PollBackRequest.java +++ b/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; } diff --git a/src/main/java/com/billpaymentservice/bbps/entites/BharatConnectMaster.java b/src/main/java/com/billpaymentservice/bbps/entites/BharatConnectMaster.java index 965351f..2acf6e9 100644 --- a/src/main/java/com/billpaymentservice/bbps/entites/BharatConnectMaster.java +++ b/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 = "bharat_connect_master") public class BharatConnectMaster extends Auditable { @Id diff --git a/src/main/java/com/billpaymentservice/bbps/entites/ComplainStatus.java b/src/main/java/com/billpaymentservice/bbps/entites/ComplainStatus.java index d6a64aa..7cb9ec8 100644 --- a/src/main/java/com/billpaymentservice/bbps/entites/ComplainStatus.java +++ b/src/main/java/com/billpaymentservice/bbps/entites/ComplainStatus.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; @@ -71,4 +73,8 @@ public class ComplainStatus extends Auditable { @Column(name = "user_id") private String userId; + + @ManyToOne + @JoinColumn(name = "complaint_response_id") + private ComplaintResponseEntity complaintResponse; } diff --git a/src/main/java/com/billpaymentservice/bbps/entites/ComplaintHistory.java b/src/main/java/com/billpaymentservice/bbps/entites/ComplaintHistory.java index 9fed60c..adb5698 100644 --- a/src/main/java/com/billpaymentservice/bbps/entites/ComplaintHistory.java +++ b/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; @@ -46,4 +48,8 @@ public class ComplaintHistory extends Auditable { @Column(name = "user_id") private String userId; + @ManyToOne + @JoinColumn(name = "complaint_response_id") + private ComplaintResponseEntity complaintResponse; + } diff --git a/src/main/java/com/billpaymentservice/bbps/entites/ComplaintResponseEntity.java b/src/main/java/com/billpaymentservice/bbps/entites/ComplaintResponseEntity.java index a3cad8e..63c085c 100644 --- a/src/main/java/com/billpaymentservice/bbps/entites/ComplaintResponseEntity.java +++ b/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; @@ -68,4 +72,16 @@ public class ComplaintResponseEntity extends Auditable { @Column(name = "user_id") private String userId; + @OneToMany(mappedBy = "complaintResponse", cascade = CascadeType.ALL, orphanRemoval = false) + private List complaintStatusList; + + @OneToMany(mappedBy = "complaintResponse", cascade = CascadeType.ALL, orphanRemoval = false) + private List historyList; + + @OneToMany(mappedBy = "complaintResponse", cascade = CascadeType.ALL, orphanRemoval = false) + private List statusDetailsList; + + @OneToMany(mappedBy = "complaintResponse", cascade = CascadeType.ALL, orphanRemoval = false) + private List viewAllList; + } diff --git a/src/main/java/com/billpaymentservice/bbps/entites/ComplaintStatusDetails.java b/src/main/java/com/billpaymentservice/bbps/entites/ComplaintStatusDetails.java index 2b07d00..d115f04 100644 --- a/src/main/java/com/billpaymentservice/bbps/entites/ComplaintStatusDetails.java +++ b/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; @@ -87,4 +89,8 @@ public class ComplaintStatusDetails extends Auditable { @Column(name = "biller_name") private String billerName; + @ManyToOne + @JoinColumn(name = "complaint_response_id") + private ComplaintResponseEntity complaintResponse; + } diff --git a/src/main/java/com/billpaymentservice/bbps/entites/ViewAllComplaintTicketStatusDetails.java b/src/main/java/com/billpaymentservice/bbps/entites/ViewAllComplaintTicketStatusDetails.java index 3d92701..bd3650f 100644 --- a/src/main/java/com/billpaymentservice/bbps/entites/ViewAllComplaintTicketStatusDetails.java +++ b/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; @@ -86,4 +88,8 @@ public class ViewAllComplaintTicketStatusDetails extends Auditable { @Column(name = "biller_name") private String billerName; + + @ManyToOne + @JoinColumn(name = "complaint_response_id") + private ComplaintResponseEntity complaintResponse; } diff --git a/src/main/java/com/billpaymentservice/bbps/repository/BBPSMasterDataRepo.java b/src/main/java/com/billpaymentservice/bbps/repository/BBPSMasterDataRepo.java index 68a27b5..b299ea7 100644 --- a/src/main/java/com/billpaymentservice/bbps/repository/BBPSMasterDataRepo.java +++ b/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 { - @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); + } diff --git a/src/main/java/com/billpaymentservice/bbps/repository/BharatConnectMasterRepository.java b/src/main/java/com/billpaymentservice/bbps/repository/BharatConnectMasterRepository.java index b04b176..7356469 100644 --- a/src/main/java/com/billpaymentservice/bbps/repository/BharatConnectMasterRepository.java +++ b/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 -{ - public BharatConnectMaster findByOrgId(String orgId); - +public interface BharatConnectMasterRepository extends JpaRepository { + // public BharatConnectMaster findByOrgId(String orgId); + + @Query(value = "SELECT * FROM bharat_connect_master WHERE org_id = :orgId", nativeQuery = true) + BharatConnectMaster findByOrgId(@Param("orgId") String orgId); + } diff --git a/src/main/java/com/billpaymentservice/bbps/util/Helper.java b/src/main/java/com/billpaymentservice/bbps/util/Helper.java index 1022e8e..fd2ab54 100644 --- a/src/main/java/com/billpaymentservice/bbps/util/Helper.java +++ b/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); diff --git a/src/main/resources/application-local.properties b/src/main/resources/application-local.properties index 4eaafbc..aaf1e10 100644 --- a/src/main/resources/application-local.properties +++ b/src/main/resources/application-local.properties @@ -20,9 +20,9 @@ swagger.server.description=Local Development Server # DataSource spring.datasource.url=jdbc:postgresql://localhost:5432/BBPS 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 From 6ea6dc47751e39948d988a21873efc1c26cbb2ba Mon Sep 17 00:00:00 2001 From: Mohd-Arham Date: Mon, 8 Dec 2025 17:02:51 +0530 Subject: [PATCH 2/3] entity add bbps --- .../com/billpaymentservice/bbps/entites/AdditionalInfo.java | 2 +- .../com/billpaymentservice/bbps/entites/AdditionalInfoBill.java | 2 +- .../bbps/entites/AdditionalInfoBillValidate.java | 2 +- .../billpaymentservice/bbps/entites/AdditionalInfoPlans.java | 2 +- .../com/billpaymentservice/bbps/entites/AgentFundTransfer.java | 2 +- .../bbps/entites/AgentFundTransferEntity.java | 2 +- .../java/com/billpaymentservice/bbps/entites/AmountOption.java | 2 +- .../billpaymentservice/bbps/entites/AmountOptionByBillerId.java | 2 +- .../billpaymentservice/bbps/entites/AmountOptionDetails.java | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/main/java/com/billpaymentservice/bbps/entites/AdditionalInfo.java b/src/main/java/com/billpaymentservice/bbps/entites/AdditionalInfo.java index 2e0ca0d..5a400b8 100644 --- a/src/main/java/com/billpaymentservice/bbps/entites/AdditionalInfo.java +++ b/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 diff --git a/src/main/java/com/billpaymentservice/bbps/entites/AdditionalInfoBill.java b/src/main/java/com/billpaymentservice/bbps/entites/AdditionalInfoBill.java index d80e79e..a8aa9c2 100644 --- a/src/main/java/com/billpaymentservice/bbps/entites/AdditionalInfoBill.java +++ b/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 { diff --git a/src/main/java/com/billpaymentservice/bbps/entites/AdditionalInfoBillValidate.java b/src/main/java/com/billpaymentservice/bbps/entites/AdditionalInfoBillValidate.java index 57392d8..6944c27 100644 --- a/src/main/java/com/billpaymentservice/bbps/entites/AdditionalInfoBillValidate.java +++ b/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 { diff --git a/src/main/java/com/billpaymentservice/bbps/entites/AdditionalInfoPlans.java b/src/main/java/com/billpaymentservice/bbps/entites/AdditionalInfoPlans.java index 0c9ba35..0abd649 100644 --- a/src/main/java/com/billpaymentservice/bbps/entites/AdditionalInfoPlans.java +++ b/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 { diff --git a/src/main/java/com/billpaymentservice/bbps/entites/AgentFundTransfer.java b/src/main/java/com/billpaymentservice/bbps/entites/AgentFundTransfer.java index a227085..b6e0bc6 100644 --- a/src/main/java/com/billpaymentservice/bbps/entites/AgentFundTransfer.java +++ b/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 diff --git a/src/main/java/com/billpaymentservice/bbps/entites/AgentFundTransferEntity.java b/src/main/java/com/billpaymentservice/bbps/entites/AgentFundTransferEntity.java index 766def0..6961f96 100644 --- a/src/main/java/com/billpaymentservice/bbps/entites/AgentFundTransferEntity.java +++ b/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 diff --git a/src/main/java/com/billpaymentservice/bbps/entites/AmountOption.java b/src/main/java/com/billpaymentservice/bbps/entites/AmountOption.java index b766930..a0f0874 100644 --- a/src/main/java/com/billpaymentservice/bbps/entites/AmountOption.java +++ b/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 { diff --git a/src/main/java/com/billpaymentservice/bbps/entites/AmountOptionByBillerId.java b/src/main/java/com/billpaymentservice/bbps/entites/AmountOptionByBillerId.java index b87b654..b3aee72 100644 --- a/src/main/java/com/billpaymentservice/bbps/entites/AmountOptionByBillerId.java +++ b/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 { @Id diff --git a/src/main/java/com/billpaymentservice/bbps/entites/AmountOptionDetails.java b/src/main/java/com/billpaymentservice/bbps/entites/AmountOptionDetails.java index 8e95e06..0da53ca 100644 --- a/src/main/java/com/billpaymentservice/bbps/entites/AmountOptionDetails.java +++ b/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 From 896ff1722ab810da98a54f55c3f1c21b12a9c33c Mon Sep 17 00:00:00 2001 From: Mohd-Arham Date: Mon, 8 Dec 2025 18:41:12 +0530 Subject: [PATCH 3/3] updated code entity name --- .../bbps/entites/BharatConnectMaster.java | 2 +- .../bbps/entites/BillAdditionalInfo.java | 2 +- .../bbps/entites/BillCustomerParams.java | 2 +- .../bbps/entites/BillInitiate.java | 2 +- .../billpaymentservice/bbps/entites/BillMaster.java | 2 +- .../billpaymentservice/bbps/entites/BillPayment.java | 2 +- .../com/billpaymentservice/bbps/entites/BillTag.java | 2 +- .../bbps/entites/BillValidation.java | 2 +- .../bbps/entites/BillerAdditionalInfoPayment.java | 2 +- .../bbps/entites/BillerCategoryIcon.java | 2 +- .../bbps/entites/BillerCategoryWise.java | 2 +- .../bbps/entites/BillerDetails.java | 2 +- .../bbps/entites/BillerPlanResponseParams.java | 2 +- .../bbps/entites/BillerResponse.java | 2 +- .../bbps/entites/BillerResponseParams.java | 2 +- .../bbps/entites/CategoryResponseList.java | 2 +- .../bbps/entites/CheckClientBillerData.java | 2 +- .../bbps/entites/CheckClientStatusReqId.java | 2 +- .../bbps/entites/CloseComplaint.java | 2 +- .../bbps/entites/ComplainStatus.java | 2 +- .../bbps/entites/ComplaintDetails.java | 2 +- .../bbps/entites/ComplaintHistory.java | 2 +- .../bbps/entites/ComplaintResponseEntity.java | 2 +- .../bbps/entites/ComplaintStatusDetails.java | 2 +- .../bbps/entites/ComplaintStatusOptionsMaster.java | 2 +- .../bbps/entites/ContactMasterData.java | 2 +- .../billpaymentservice/bbps/entites/CustomParam.java | 2 +- .../bbps/entites/CustomerParam.java | 2 +- .../bbps/entites/CustomerParamBill.java | 2 +- .../bbps/entites/CustomerParamBillValidation.java | 2 +- .../bbps/entites/CustomerParamDAO.java | 2 +- .../bbps/entites/CustomerParamGroupById.java | 2 +- .../bbps/entites/CustomerParamGroups.java | 2 +- .../bbps/entites/CustomerParamTransaction.java | 2 +- .../bbps/entites/DeviceBlockTag.java | 2 +- .../bbps/entites/DispositionDetails.java | 2 +- .../bbps/entites/FetchBillValidate.java | 2 +- .../com/billpaymentservice/bbps/entites/Group.java | 2 +- .../billpaymentservice/bbps/entites/GroupParam.java | 2 +- .../bbps/entites/InterchangeFee.java | 2 +- .../bbps/entites/InterchangeFeeConf.java | 2 +- .../bbps/entites/InterchangeFeeDetail.java | 2 +- .../bbps/entites/PaymentChannel.java | 2 +- .../bbps/entites/PaymentInitiate.java | 2 +- .../billpaymentservice/bbps/entites/PaymentMode.java | 2 +- .../bbps/entites/PaymentStartRecord.java | 2 +- .../com/billpaymentservice/bbps/entites/Plan.java | 2 +- .../bbps/entites/PlanCategorySubType.java | 2 +- .../bbps/entites/PlanResponses.java | 2 +- .../com/billpaymentservice/bbps/entites/PlanTag.java | 2 +- .../billpaymentservice/bbps/entites/PlansList.java | 2 +- .../bbps/entites/ReOpenComplain.java | 2 +- .../bbps/entites/RemitterIdentity.java | 2 +- .../bbps/entites/TicketDispositionDetails.java | 2 +- .../bbps/entites/TransactionMaster.java | 2 +- .../billpaymentservice/bbps/entites/UserEntity.java | 2 +- .../bbps/entites/UsersDetails.java | 2 +- .../entites/ViewAllComplaintTicketStatusDetails.java | 2 +- .../bbps/repository/BillInitateRepository.java | 12 ++++++++++-- .../bbps/repository/BillerDataRepository.java | 10 ++++++++-- .../ComplaintOptionsStatusMasterRepository.java | 6 +++++- .../bbps/repository/ComplaintResponseRepository.java | 4 ++++ .../bbps/repository/MerchantRepository.java | 9 +++++++-- .../bbps/repository/PaymentIntiateRepository.java | 4 ++++ src/main/resources/application-local.properties | 2 +- src/main/resources/application-uat.properties | 2 +- 66 files changed, 98 insertions(+), 67 deletions(-) diff --git a/src/main/java/com/billpaymentservice/bbps/entites/BharatConnectMaster.java b/src/main/java/com/billpaymentservice/bbps/entites/BharatConnectMaster.java index 2acf6e9..42c5d2a 100644 --- a/src/main/java/com/billpaymentservice/bbps/entites/BharatConnectMaster.java +++ b/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 { @Id diff --git a/src/main/java/com/billpaymentservice/bbps/entites/BillAdditionalInfo.java b/src/main/java/com/billpaymentservice/bbps/entites/BillAdditionalInfo.java index f097729..6256d73 100644 --- a/src/main/java/com/billpaymentservice/bbps/entites/BillAdditionalInfo.java +++ b/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 diff --git a/src/main/java/com/billpaymentservice/bbps/entites/BillCustomerParams.java b/src/main/java/com/billpaymentservice/bbps/entites/BillCustomerParams.java index b8dcd4c..4428092 100644 --- a/src/main/java/com/billpaymentservice/bbps/entites/BillCustomerParams.java +++ b/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 diff --git a/src/main/java/com/billpaymentservice/bbps/entites/BillInitiate.java b/src/main/java/com/billpaymentservice/bbps/entites/BillInitiate.java index 6684e49..c2fd685 100644 --- a/src/main/java/com/billpaymentservice/bbps/entites/BillInitiate.java +++ b/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") diff --git a/src/main/java/com/billpaymentservice/bbps/entites/BillMaster.java b/src/main/java/com/billpaymentservice/bbps/entites/BillMaster.java index f60d49c..eb2631c 100644 --- a/src/main/java/com/billpaymentservice/bbps/entites/BillMaster.java +++ b/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 diff --git a/src/main/java/com/billpaymentservice/bbps/entites/BillPayment.java b/src/main/java/com/billpaymentservice/bbps/entites/BillPayment.java index 9b7fdaf..13015e4 100644 --- a/src/main/java/com/billpaymentservice/bbps/entites/BillPayment.java +++ b/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 diff --git a/src/main/java/com/billpaymentservice/bbps/entites/BillTag.java b/src/main/java/com/billpaymentservice/bbps/entites/BillTag.java index 7779d3d..0fa196d 100644 --- a/src/main/java/com/billpaymentservice/bbps/entites/BillTag.java +++ b/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 diff --git a/src/main/java/com/billpaymentservice/bbps/entites/BillValidation.java b/src/main/java/com/billpaymentservice/bbps/entites/BillValidation.java index f03cb4b..c61b987 100644 --- a/src/main/java/com/billpaymentservice/bbps/entites/BillValidation.java +++ b/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 diff --git a/src/main/java/com/billpaymentservice/bbps/entites/BillerAdditionalInfoPayment.java b/src/main/java/com/billpaymentservice/bbps/entites/BillerAdditionalInfoPayment.java index b01a6b3..963deb7 100644 --- a/src/main/java/com/billpaymentservice/bbps/entites/BillerAdditionalInfoPayment.java +++ b/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 diff --git a/src/main/java/com/billpaymentservice/bbps/entites/BillerCategoryIcon.java b/src/main/java/com/billpaymentservice/bbps/entites/BillerCategoryIcon.java index 685775a..0209eed 100644 --- a/src/main/java/com/billpaymentservice/bbps/entites/BillerCategoryIcon.java +++ b/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 diff --git a/src/main/java/com/billpaymentservice/bbps/entites/BillerCategoryWise.java b/src/main/java/com/billpaymentservice/bbps/entites/BillerCategoryWise.java index 0f856a4..8b06027 100644 --- a/src/main/java/com/billpaymentservice/bbps/entites/BillerCategoryWise.java +++ b/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 diff --git a/src/main/java/com/billpaymentservice/bbps/entites/BillerDetails.java b/src/main/java/com/billpaymentservice/bbps/entites/BillerDetails.java index 9fe5245..a5f00ec 100644 --- a/src/main/java/com/billpaymentservice/bbps/entites/BillerDetails.java +++ b/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{ diff --git a/src/main/java/com/billpaymentservice/bbps/entites/BillerPlanResponseParams.java b/src/main/java/com/billpaymentservice/bbps/entites/BillerPlanResponseParams.java index 80fb1b7..be607f9 100644 --- a/src/main/java/com/billpaymentservice/bbps/entites/BillerPlanResponseParams.java +++ b/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) diff --git a/src/main/java/com/billpaymentservice/bbps/entites/BillerResponse.java b/src/main/java/com/billpaymentservice/bbps/entites/BillerResponse.java index b2608a3..49f84e7 100644 --- a/src/main/java/com/billpaymentservice/bbps/entites/BillerResponse.java +++ b/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 { diff --git a/src/main/java/com/billpaymentservice/bbps/entites/BillerResponseParams.java b/src/main/java/com/billpaymentservice/bbps/entites/BillerResponseParams.java index d8b1c9a..cc2bcfd 100644 --- a/src/main/java/com/billpaymentservice/bbps/entites/BillerResponseParams.java +++ b/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 diff --git a/src/main/java/com/billpaymentservice/bbps/entites/CategoryResponseList.java b/src/main/java/com/billpaymentservice/bbps/entites/CategoryResponseList.java index a3a8a4c..7fc1c6c 100644 --- a/src/main/java/com/billpaymentservice/bbps/entites/CategoryResponseList.java +++ b/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 { diff --git a/src/main/java/com/billpaymentservice/bbps/entites/CheckClientBillerData.java b/src/main/java/com/billpaymentservice/bbps/entites/CheckClientBillerData.java index ddd31bf..e193d33 100644 --- a/src/main/java/com/billpaymentservice/bbps/entites/CheckClientBillerData.java +++ b/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 { diff --git a/src/main/java/com/billpaymentservice/bbps/entites/CheckClientStatusReqId.java b/src/main/java/com/billpaymentservice/bbps/entites/CheckClientStatusReqId.java index 1f2e050..f346b42 100644 --- a/src/main/java/com/billpaymentservice/bbps/entites/CheckClientStatusReqId.java +++ b/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 { diff --git a/src/main/java/com/billpaymentservice/bbps/entites/CloseComplaint.java b/src/main/java/com/billpaymentservice/bbps/entites/CloseComplaint.java index 04a3487..786f303 100644 --- a/src/main/java/com/billpaymentservice/bbps/entites/CloseComplaint.java +++ b/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 diff --git a/src/main/java/com/billpaymentservice/bbps/entites/ComplainStatus.java b/src/main/java/com/billpaymentservice/bbps/entites/ComplainStatus.java index 7cb9ec8..a207d67 100644 --- a/src/main/java/com/billpaymentservice/bbps/entites/ComplainStatus.java +++ b/src/main/java/com/billpaymentservice/bbps/entites/ComplainStatus.java @@ -14,7 +14,7 @@ import lombok.Getter; import lombok.Setter; @Entity -@Table(name = "complaint_status") +@Table(name = "bbps_complaint_status") @Getter @Setter public class ComplainStatus extends Auditable { diff --git a/src/main/java/com/billpaymentservice/bbps/entites/ComplaintDetails.java b/src/main/java/com/billpaymentservice/bbps/entites/ComplaintDetails.java index 747b266..d2bc669 100644 --- a/src/main/java/com/billpaymentservice/bbps/entites/ComplaintDetails.java +++ b/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 diff --git a/src/main/java/com/billpaymentservice/bbps/entites/ComplaintHistory.java b/src/main/java/com/billpaymentservice/bbps/entites/ComplaintHistory.java index adb5698..9face21 100644 --- a/src/main/java/com/billpaymentservice/bbps/entites/ComplaintHistory.java +++ b/src/main/java/com/billpaymentservice/bbps/entites/ComplaintHistory.java @@ -16,7 +16,7 @@ import lombok.NoArgsConstructor; import lombok.Setter; @Entity -@Table(name = "complaints_history") +@Table(name = "bbps_complaints_history") @Getter @Setter @NoArgsConstructor diff --git a/src/main/java/com/billpaymentservice/bbps/entites/ComplaintResponseEntity.java b/src/main/java/com/billpaymentservice/bbps/entites/ComplaintResponseEntity.java index 63c085c..2d1cd1f 100644 --- a/src/main/java/com/billpaymentservice/bbps/entites/ComplaintResponseEntity.java +++ b/src/main/java/com/billpaymentservice/bbps/entites/ComplaintResponseEntity.java @@ -20,7 +20,7 @@ import lombok.ToString; @Getter @Setter @ToString -@Table(name = "complaint_responses") +@Table(name = "bbps_complaint_responses") public class ComplaintResponseEntity extends Auditable { @Id diff --git a/src/main/java/com/billpaymentservice/bbps/entites/ComplaintStatusDetails.java b/src/main/java/com/billpaymentservice/bbps/entites/ComplaintStatusDetails.java index d115f04..8e61e4f 100644 --- a/src/main/java/com/billpaymentservice/bbps/entites/ComplaintStatusDetails.java +++ b/src/main/java/com/billpaymentservice/bbps/entites/ComplaintStatusDetails.java @@ -16,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 { @Id diff --git a/src/main/java/com/billpaymentservice/bbps/entites/ComplaintStatusOptionsMaster.java b/src/main/java/com/billpaymentservice/bbps/entites/ComplaintStatusOptionsMaster.java index ad4a10d..bb878b7 100644 --- a/src/main/java/com/billpaymentservice/bbps/entites/ComplaintStatusOptionsMaster.java +++ b/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 diff --git a/src/main/java/com/billpaymentservice/bbps/entites/ContactMasterData.java b/src/main/java/com/billpaymentservice/bbps/entites/ContactMasterData.java index 1306964..1b9cf6d 100644 --- a/src/main/java/com/billpaymentservice/bbps/entites/ContactMasterData.java +++ b/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 diff --git a/src/main/java/com/billpaymentservice/bbps/entites/CustomParam.java b/src/main/java/com/billpaymentservice/bbps/entites/CustomParam.java index a1bcd53..94d7b94 100644 --- a/src/main/java/com/billpaymentservice/bbps/entites/CustomParam.java +++ b/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 { @Id diff --git a/src/main/java/com/billpaymentservice/bbps/entites/CustomerParam.java b/src/main/java/com/billpaymentservice/bbps/entites/CustomerParam.java index 109370f..11af4e3 100644 --- a/src/main/java/com/billpaymentservice/bbps/entites/CustomerParam.java +++ b/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 { diff --git a/src/main/java/com/billpaymentservice/bbps/entites/CustomerParamBill.java b/src/main/java/com/billpaymentservice/bbps/entites/CustomerParamBill.java index 870ee57..ef629f9 100644 --- a/src/main/java/com/billpaymentservice/bbps/entites/CustomerParamBill.java +++ b/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 diff --git a/src/main/java/com/billpaymentservice/bbps/entites/CustomerParamBillValidation.java b/src/main/java/com/billpaymentservice/bbps/entites/CustomerParamBillValidation.java index cf3571e..b88a1f7 100644 --- a/src/main/java/com/billpaymentservice/bbps/entites/CustomerParamBillValidation.java +++ b/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 diff --git a/src/main/java/com/billpaymentservice/bbps/entites/CustomerParamDAO.java b/src/main/java/com/billpaymentservice/bbps/entites/CustomerParamDAO.java index 5fc6a25..7b1fdb2 100644 --- a/src/main/java/com/billpaymentservice/bbps/entites/CustomerParamDAO.java +++ b/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 diff --git a/src/main/java/com/billpaymentservice/bbps/entites/CustomerParamGroupById.java b/src/main/java/com/billpaymentservice/bbps/entites/CustomerParamGroupById.java index 6055f55..78a067c 100644 --- a/src/main/java/com/billpaymentservice/bbps/entites/CustomerParamGroupById.java +++ b/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 { @Id diff --git a/src/main/java/com/billpaymentservice/bbps/entites/CustomerParamGroups.java b/src/main/java/com/billpaymentservice/bbps/entites/CustomerParamGroups.java index 12e84ed..80988e5 100644 --- a/src/main/java/com/billpaymentservice/bbps/entites/CustomerParamGroups.java +++ b/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 diff --git a/src/main/java/com/billpaymentservice/bbps/entites/CustomerParamTransaction.java b/src/main/java/com/billpaymentservice/bbps/entites/CustomerParamTransaction.java index 7a82c12..7adb44a 100644 --- a/src/main/java/com/billpaymentservice/bbps/entites/CustomerParamTransaction.java +++ b/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 diff --git a/src/main/java/com/billpaymentservice/bbps/entites/DeviceBlockTag.java b/src/main/java/com/billpaymentservice/bbps/entites/DeviceBlockTag.java index 56ac522..ac82bec 100644 --- a/src/main/java/com/billpaymentservice/bbps/entites/DeviceBlockTag.java +++ b/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 diff --git a/src/main/java/com/billpaymentservice/bbps/entites/DispositionDetails.java b/src/main/java/com/billpaymentservice/bbps/entites/DispositionDetails.java index b3ecd8b..03d2a6b 100644 --- a/src/main/java/com/billpaymentservice/bbps/entites/DispositionDetails.java +++ b/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 { diff --git a/src/main/java/com/billpaymentservice/bbps/entites/FetchBillValidate.java b/src/main/java/com/billpaymentservice/bbps/entites/FetchBillValidate.java index c955dd1..09600c7 100644 --- a/src/main/java/com/billpaymentservice/bbps/entites/FetchBillValidate.java +++ b/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 { @Id diff --git a/src/main/java/com/billpaymentservice/bbps/entites/Group.java b/src/main/java/com/billpaymentservice/bbps/entites/Group.java index 26dd959..685de39 100644 --- a/src/main/java/com/billpaymentservice/bbps/entites/Group.java +++ b/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 diff --git a/src/main/java/com/billpaymentservice/bbps/entites/GroupParam.java b/src/main/java/com/billpaymentservice/bbps/entites/GroupParam.java index 648ca14..967dd45 100644 --- a/src/main/java/com/billpaymentservice/bbps/entites/GroupParam.java +++ b/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 diff --git a/src/main/java/com/billpaymentservice/bbps/entites/InterchangeFee.java b/src/main/java/com/billpaymentservice/bbps/entites/InterchangeFee.java index 445e232..3792599 100644 --- a/src/main/java/com/billpaymentservice/bbps/entites/InterchangeFee.java +++ b/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 diff --git a/src/main/java/com/billpaymentservice/bbps/entites/InterchangeFeeConf.java b/src/main/java/com/billpaymentservice/bbps/entites/InterchangeFeeConf.java index bee4034..55ffab2 100644 --- a/src/main/java/com/billpaymentservice/bbps/entites/InterchangeFeeConf.java +++ b/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 diff --git a/src/main/java/com/billpaymentservice/bbps/entites/InterchangeFeeDetail.java b/src/main/java/com/billpaymentservice/bbps/entites/InterchangeFeeDetail.java index 08c9d14..b01b4cc 100644 --- a/src/main/java/com/billpaymentservice/bbps/entites/InterchangeFeeDetail.java +++ b/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 { diff --git a/src/main/java/com/billpaymentservice/bbps/entites/PaymentChannel.java b/src/main/java/com/billpaymentservice/bbps/entites/PaymentChannel.java index f68d3f8..5177528 100644 --- a/src/main/java/com/billpaymentservice/bbps/entites/PaymentChannel.java +++ b/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 diff --git a/src/main/java/com/billpaymentservice/bbps/entites/PaymentInitiate.java b/src/main/java/com/billpaymentservice/bbps/entites/PaymentInitiate.java index 6ead1a4..bf9b48d 100644 --- a/src/main/java/com/billpaymentservice/bbps/entites/PaymentInitiate.java +++ b/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 diff --git a/src/main/java/com/billpaymentservice/bbps/entites/PaymentMode.java b/src/main/java/com/billpaymentservice/bbps/entites/PaymentMode.java index 955ba08..9542486 100644 --- a/src/main/java/com/billpaymentservice/bbps/entites/PaymentMode.java +++ b/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 { diff --git a/src/main/java/com/billpaymentservice/bbps/entites/PaymentStartRecord.java b/src/main/java/com/billpaymentservice/bbps/entites/PaymentStartRecord.java index a40db19..dee93d3 100644 --- a/src/main/java/com/billpaymentservice/bbps/entites/PaymentStartRecord.java +++ b/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 diff --git a/src/main/java/com/billpaymentservice/bbps/entites/Plan.java b/src/main/java/com/billpaymentservice/bbps/entites/Plan.java index 1a0e002..9223b76 100644 --- a/src/main/java/com/billpaymentservice/bbps/entites/Plan.java +++ b/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 { diff --git a/src/main/java/com/billpaymentservice/bbps/entites/PlanCategorySubType.java b/src/main/java/com/billpaymentservice/bbps/entites/PlanCategorySubType.java index f73e53e..16c94a3 100644 --- a/src/main/java/com/billpaymentservice/bbps/entites/PlanCategorySubType.java +++ b/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 { diff --git a/src/main/java/com/billpaymentservice/bbps/entites/PlanResponses.java b/src/main/java/com/billpaymentservice/bbps/entites/PlanResponses.java index 9defaf9..b014df1 100644 --- a/src/main/java/com/billpaymentservice/bbps/entites/PlanResponses.java +++ b/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 { diff --git a/src/main/java/com/billpaymentservice/bbps/entites/PlanTag.java b/src/main/java/com/billpaymentservice/bbps/entites/PlanTag.java index 8f6d2c9..bbf7f10 100644 --- a/src/main/java/com/billpaymentservice/bbps/entites/PlanTag.java +++ b/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 { diff --git a/src/main/java/com/billpaymentservice/bbps/entites/PlansList.java b/src/main/java/com/billpaymentservice/bbps/entites/PlansList.java index 948f139..a222f11 100644 --- a/src/main/java/com/billpaymentservice/bbps/entites/PlansList.java +++ b/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 { diff --git a/src/main/java/com/billpaymentservice/bbps/entites/ReOpenComplain.java b/src/main/java/com/billpaymentservice/bbps/entites/ReOpenComplain.java index e2e92d1..369c337 100644 --- a/src/main/java/com/billpaymentservice/bbps/entites/ReOpenComplain.java +++ b/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 { diff --git a/src/main/java/com/billpaymentservice/bbps/entites/RemitterIdentity.java b/src/main/java/com/billpaymentservice/bbps/entites/RemitterIdentity.java index 020fa3a..b23bb93 100644 --- a/src/main/java/com/billpaymentservice/bbps/entites/RemitterIdentity.java +++ b/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 diff --git a/src/main/java/com/billpaymentservice/bbps/entites/TicketDispositionDetails.java b/src/main/java/com/billpaymentservice/bbps/entites/TicketDispositionDetails.java index 1b52917..46dcc61 100644 --- a/src/main/java/com/billpaymentservice/bbps/entites/TicketDispositionDetails.java +++ b/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 { diff --git a/src/main/java/com/billpaymentservice/bbps/entites/TransactionMaster.java b/src/main/java/com/billpaymentservice/bbps/entites/TransactionMaster.java index a484b75..eb9a0c2 100644 --- a/src/main/java/com/billpaymentservice/bbps/entites/TransactionMaster.java +++ b/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 diff --git a/src/main/java/com/billpaymentservice/bbps/entites/UserEntity.java b/src/main/java/com/billpaymentservice/bbps/entites/UserEntity.java index 6f15c4e..7d157ed 100644 --- a/src/main/java/com/billpaymentservice/bbps/entites/UserEntity.java +++ b/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 diff --git a/src/main/java/com/billpaymentservice/bbps/entites/UsersDetails.java b/src/main/java/com/billpaymentservice/bbps/entites/UsersDetails.java index 96b9e50..b21f94c 100644 --- a/src/main/java/com/billpaymentservice/bbps/entites/UsersDetails.java +++ b/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 { @Id diff --git a/src/main/java/com/billpaymentservice/bbps/entites/ViewAllComplaintTicketStatusDetails.java b/src/main/java/com/billpaymentservice/bbps/entites/ViewAllComplaintTicketStatusDetails.java index bd3650f..cfb0248 100644 --- a/src/main/java/com/billpaymentservice/bbps/entites/ViewAllComplaintTicketStatusDetails.java +++ b/src/main/java/com/billpaymentservice/bbps/entites/ViewAllComplaintTicketStatusDetails.java @@ -16,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 { @Id diff --git a/src/main/java/com/billpaymentservice/bbps/repository/BillInitateRepository.java b/src/main/java/com/billpaymentservice/bbps/repository/BillInitateRepository.java index 46012f7..db5e97d 100644 --- a/src/main/java/com/billpaymentservice/bbps/repository/BillInitateRepository.java +++ b/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 { - Optional findByTxnId(String clientReqId); + @Query(value = "SELECT * FROM bbps_bill_initiate WHERE txn_id = :txnId", nativeQuery = true) + Optional findByTxnId(@Param("txnId") String txnId); - Optional findByReqId(String clientReqId); + // Optional findByTxnId(String clientReqId); + + @Query(value = "SELECT * FROM bbps_bill_initiate WHERE req_id = :reqId", nativeQuery = true) + Optional findByReqId(@Param("reqId") String reqId); + + // Optional findByReqId(String clientReqId); } diff --git a/src/main/java/com/billpaymentservice/bbps/repository/BillerDataRepository.java b/src/main/java/com/billpaymentservice/bbps/repository/BillerDataRepository.java index e7c0831..6d9993f 100644 --- a/src/main/java/com/billpaymentservice/bbps/repository/BillerDataRepository.java +++ b/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 { - Optional findByBillerId(String billerId); + // Optional findByBillerId(String billerId); + + @Query(value = "SELECT * FROM bbps_biller_details WHERE biller_id = :billerId", nativeQuery = true) + Optional findByBillerId(@Param("billerId") String billerId); + } diff --git a/src/main/java/com/billpaymentservice/bbps/repository/ComplaintOptionsStatusMasterRepository.java b/src/main/java/com/billpaymentservice/bbps/repository/ComplaintOptionsStatusMasterRepository.java index de11e13..01374f9 100644 --- a/src/main/java/com/billpaymentservice/bbps/repository/ComplaintOptionsStatusMasterRepository.java +++ b/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 { - @Query("SELECT c FROM ComplaintStatusOptionsMaster c WHERE c.isDeleted = false") +// @Query("SELECT c FROM ComplaintStatusOptionsMaster c WHERE c.isDeleted = false") +// List findAllActiveStatuses(); + + @Query(value = "SELECT * FROM bbps_complaint_options_status_master WHERE is_deleted = false", nativeQuery = true) List findAllActiveStatuses(); + } diff --git a/src/main/java/com/billpaymentservice/bbps/repository/ComplaintResponseRepository.java b/src/main/java/com/billpaymentservice/bbps/repository/ComplaintResponseRepository.java index dcbf0c3..a018e30 100644 --- a/src/main/java/com/billpaymentservice/bbps/repository/ComplaintResponseRepository.java +++ b/src/main/java/com/billpaymentservice/bbps/repository/ComplaintResponseRepository.java @@ -17,4 +17,8 @@ public interface ComplaintResponseRepository extends JpaRepository findByUserIdCustom(@Param("userId") String userId, Pageable pageable); + + @Query(value = "SELECT * FROM bbps_complaint_responses WHERE user_id = :userId", nativeQuery = true) + Page findByUserIdNative(@Param("userId") String userId, Pageable pageable); + } diff --git a/src/main/java/com/billpaymentservice/bbps/repository/MerchantRepository.java b/src/main/java/com/billpaymentservice/bbps/repository/MerchantRepository.java index a8cf354..9e749f2 100644 --- a/src/main/java/com/billpaymentservice/bbps/repository/MerchantRepository.java +++ b/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 { - @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); + } diff --git a/src/main/java/com/billpaymentservice/bbps/repository/PaymentIntiateRepository.java b/src/main/java/com/billpaymentservice/bbps/repository/PaymentIntiateRepository.java index cb54f23..f91d6f9 100644 --- a/src/main/java/com/billpaymentservice/bbps/repository/PaymentIntiateRepository.java +++ b/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 { + // Optional findByReqId(String clientReqId); + + @Query(value = "SELECT * FROM bbps_payment_initiate WHERE req_id = :clientReqId", nativeQuery = true) Optional findByReqId(String clientReqId); } diff --git a/src/main/resources/application-local.properties b/src/main/resources/application-local.properties index aaf1e10..92c14ea 100644 --- a/src/main/resources/application-local.properties +++ b/src/main/resources/application-local.properties @@ -18,7 +18,7 @@ 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 diff --git a/src/main/resources/application-uat.properties b/src/main/resources/application-uat.properties index 41bb455..bdd8d1c 100644 --- a/src/main/resources/application-uat.properties +++ b/src/main/resources/application-uat.properties @@ -9,7 +9,7 @@ spring.jpa.hibernate.ddl-auto=update spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.PostgreSQLDialect spring.jpa.properties.hibernate.default_schema=public -swagger.server.url=https://11.godemo.in/BBPS +swagger.server.url=https://11.godemo.in/devdbuat swagger.server.description=Production Server #swagger.server.url=http://localhost:9090