From 29bce40c6573e698937531d638463b980a471417 Mon Sep 17 00:00:00 2001 From: Lincpay Tech Date: Wed, 10 Dec 2025 11:08:03 +0530 Subject: [PATCH 1/3] removed userdetails table --- .../bbps/config/CustomUserDetailsService.java | 2 - .../bbps/entites/BillCustomerParams.java | 4 +- .../bbps/entites/UsersDetails.java | 38 ------------------- .../repository/UsersDetailsRepository.java | 16 -------- .../bbps/serviceImpl/AuthServiceImpl.java | 7 +--- .../serviceImpl/MasterDataServiceImpl.java | 2 - 6 files changed, 4 insertions(+), 65 deletions(-) delete mode 100644 src/main/java/com/billpaymentservice/bbps/entites/UsersDetails.java delete mode 100644 src/main/java/com/billpaymentservice/bbps/repository/UsersDetailsRepository.java diff --git a/src/main/java/com/billpaymentservice/bbps/config/CustomUserDetailsService.java b/src/main/java/com/billpaymentservice/bbps/config/CustomUserDetailsService.java index c9f2759..a58b824 100644 --- a/src/main/java/com/billpaymentservice/bbps/config/CustomUserDetailsService.java +++ b/src/main/java/com/billpaymentservice/bbps/config/CustomUserDetailsService.java @@ -11,9 +11,7 @@ import org.springframework.security.core.userdetails.UsernameNotFoundException; import org.springframework.stereotype.Service; import com.billpaymentservice.bbps.entites.UserEntity; -import com.billpaymentservice.bbps.entites.UsersDetails; import com.billpaymentservice.bbps.repository.UserRepository; -import com.billpaymentservice.bbps.repository.UsersDetailsRepository; @Service public class CustomUserDetailsService implements UserDetailsService { diff --git a/src/main/java/com/billpaymentservice/bbps/entites/BillCustomerParams.java b/src/main/java/com/billpaymentservice/bbps/entites/BillCustomerParams.java index 4428092..b6302bc 100644 --- a/src/main/java/com/billpaymentservice/bbps/entites/BillCustomerParams.java +++ b/src/main/java/com/billpaymentservice/bbps/entites/BillCustomerParams.java @@ -1,5 +1,7 @@ package com.billpaymentservice.bbps.entites; +import com.billpaymentservice.bbps.audit.Auditable; + import jakarta.persistence.Entity; import jakarta.persistence.GeneratedValue; import jakarta.persistence.GenerationType; @@ -14,7 +16,7 @@ import lombok.Setter; @Setter @Entity @Table(name = "bbps_bill_customer_params") -public class BillCustomerParams { +public class BillCustomerParams extends Auditable { @Id @GeneratedValue(strategy = GenerationType.IDENTITY) diff --git a/src/main/java/com/billpaymentservice/bbps/entites/UsersDetails.java b/src/main/java/com/billpaymentservice/bbps/entites/UsersDetails.java deleted file mode 100644 index b21f94c..0000000 --- a/src/main/java/com/billpaymentservice/bbps/entites/UsersDetails.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.billpaymentservice.bbps.entites; - -import com.billpaymentservice.bbps.audit.Auditable; -import jakarta.persistence.Column; -import jakarta.persistence.Entity; -import jakarta.persistence.GeneratedValue; -import jakarta.persistence.GenerationType; -import jakarta.persistence.Id; -import jakarta.persistence.Table; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; - -@Data -@NoArgsConstructor -@AllArgsConstructor -@Entity -@Table(name = "bbps_user_details") -public class UsersDetails extends Auditable { - - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - @Column(name = "id") - private Long id; - - @Column(name = "user_email_id") - private String userEmailId; - - @Column(name = "user_mob_no") - private String userMobNo; - - @Column(name = "user_name") - private String userName; - - @Column(name = "user_age") - private String userAge; - -} diff --git a/src/main/java/com/billpaymentservice/bbps/repository/UsersDetailsRepository.java b/src/main/java/com/billpaymentservice/bbps/repository/UsersDetailsRepository.java deleted file mode 100644 index 167b40a..0000000 --- a/src/main/java/com/billpaymentservice/bbps/repository/UsersDetailsRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.billpaymentservice.bbps.repository; - -import java.util.Optional; - -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.security.core.userdetails.UserDetails; -import org.springframework.stereotype.Repository; - -import com.billpaymentservice.bbps.entites.UsersDetails; - -@Repository -public interface UsersDetailsRepository extends JpaRepository { - - Optional findByUserMobNo(String userMobNo); - -} diff --git a/src/main/java/com/billpaymentservice/bbps/serviceImpl/AuthServiceImpl.java b/src/main/java/com/billpaymentservice/bbps/serviceImpl/AuthServiceImpl.java index 0753ff2..c060c3a 100644 --- a/src/main/java/com/billpaymentservice/bbps/serviceImpl/AuthServiceImpl.java +++ b/src/main/java/com/billpaymentservice/bbps/serviceImpl/AuthServiceImpl.java @@ -20,10 +20,8 @@ import com.billpaymentservice.bbps.dto.auth.UserDto; import com.billpaymentservice.bbps.dto.auth.VerifyOtpRequest; import com.billpaymentservice.bbps.dto.response.AuthResponses; import com.billpaymentservice.bbps.entites.UserEntity; -import com.billpaymentservice.bbps.entites.UsersDetails; import com.billpaymentservice.bbps.exception.CustomException; import com.billpaymentservice.bbps.repository.UserRepository; -import com.billpaymentservice.bbps.repository.UsersDetailsRepository; import com.billpaymentservice.bbps.service.AuthService; import com.billpaymentservice.bbps.util.BBPSConstant; import com.billpaymentservice.bbps.util.Helper; @@ -41,16 +39,13 @@ public class AuthServiceImpl implements AuthService { private final UserRepository userRepository; private final OtpClient otpClient; private final Helper helper; - private final UsersDetailsRepository userRepo; private final JwtUtil jwtUtil; @Autowired - public AuthServiceImpl(UserRepository userRepository, OtpClient otpClient, Helper helper, - UsersDetailsRepository userRepo, JwtUtil jwtUtil) { + public AuthServiceImpl(UserRepository userRepository, OtpClient otpClient, Helper helper, JwtUtil jwtUtil) { this.userRepository = userRepository; this.otpClient = otpClient; this.helper = helper; - this.userRepo = userRepo; this.jwtUtil = jwtUtil; } diff --git a/src/main/java/com/billpaymentservice/bbps/serviceImpl/MasterDataServiceImpl.java b/src/main/java/com/billpaymentservice/bbps/serviceImpl/MasterDataServiceImpl.java index f620ce6..21afef3 100644 --- a/src/main/java/com/billpaymentservice/bbps/serviceImpl/MasterDataServiceImpl.java +++ b/src/main/java/com/billpaymentservice/bbps/serviceImpl/MasterDataServiceImpl.java @@ -49,7 +49,6 @@ import com.billpaymentservice.bbps.entites.DispositionDetails; import com.billpaymentservice.bbps.entites.InboundTraceLog; import com.billpaymentservice.bbps.entites.OutboundTraceLog; import com.billpaymentservice.bbps.entites.PlanResponses; -import com.billpaymentservice.bbps.entites.UsersDetails; import com.billpaymentservice.bbps.exception.CustomException; import com.billpaymentservice.bbps.repository.BharatConnectMasterRepository; import com.billpaymentservice.bbps.repository.BillerDataRepository; @@ -58,7 +57,6 @@ import com.billpaymentservice.bbps.repository.DispositionRepository; import com.billpaymentservice.bbps.repository.InboundTraceLogRepository; import com.billpaymentservice.bbps.repository.MerchantRepository; import com.billpaymentservice.bbps.repository.OutboundTraceLogRepository; -import com.billpaymentservice.bbps.repository.UsersDetailsRepository; import com.billpaymentservice.bbps.service.MasterDataService; import com.billpaymentservice.bbps.util.BBPSConstant; import com.billpaymentservice.bbps.util.BillerMapperHelper; From abf89ce7f0c92094d22d3eb8d8f1d2d03b33b093 Mon Sep 17 00:00:00 2001 From: Lincpay Tech Date: Wed, 10 Dec 2025 16:07:57 +0530 Subject: [PATCH 2/3] resolved intitate payment problem --- .../bbps/dto/request/BillPaymentRequest.java | 2 +- .../bbps/dto/sentRequest/BillPaymentForwardRequest.java | 2 +- .../bbps/serviceImpl/PaymentServiceImpl.java | 8 +++++++- .../bbps/serviceImpl/PaymentStartServiceImpl.java | 2 +- 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/billpaymentservice/bbps/dto/request/BillPaymentRequest.java b/src/main/java/com/billpaymentservice/bbps/dto/request/BillPaymentRequest.java index 5a87b3b..bdb5a8d 100644 --- a/src/main/java/com/billpaymentservice/bbps/dto/request/BillPaymentRequest.java +++ b/src/main/java/com/billpaymentservice/bbps/dto/request/BillPaymentRequest.java @@ -32,7 +32,7 @@ public class BillPaymentRequest extends BaseClass { private String customerMobNo; - private String txnAmount; // Changed to @NotNull as it's an Integer (non-nullable) + private Integer txnAmount; // Changed to @NotNull as it's an Integer (non-nullable) private String paymentRefId; diff --git a/src/main/java/com/billpaymentservice/bbps/dto/sentRequest/BillPaymentForwardRequest.java b/src/main/java/com/billpaymentservice/bbps/dto/sentRequest/BillPaymentForwardRequest.java index e5df46c..047432e 100644 --- a/src/main/java/com/billpaymentservice/bbps/dto/sentRequest/BillPaymentForwardRequest.java +++ b/src/main/java/com/billpaymentservice/bbps/dto/sentRequest/BillPaymentForwardRequest.java @@ -29,7 +29,7 @@ public class BillPaymentForwardRequest { private String billerCategory; private String macAdress; private String customerMobNo; - private String txnAmount; + private Integer txnAmount; private String paymentRefId; private String clientReqId; private String paymentChannel; diff --git a/src/main/java/com/billpaymentservice/bbps/serviceImpl/PaymentServiceImpl.java b/src/main/java/com/billpaymentservice/bbps/serviceImpl/PaymentServiceImpl.java index a6fbb43..d195103 100644 --- a/src/main/java/com/billpaymentservice/bbps/serviceImpl/PaymentServiceImpl.java +++ b/src/main/java/com/billpaymentservice/bbps/serviceImpl/PaymentServiceImpl.java @@ -138,9 +138,15 @@ public class PaymentServiceImpl implements PaymentService { LOGGER.warn("Invalid response structure received for txnId={}", txnId); throw new CustomException(BBPSConstant.INVALID_STRUCTURE); } - BillPaymentResponse billPaymentResponse = objectMapper.convertValue(dataMap, BillPaymentResponse.class); + GeneralResp generalResponse = billPaymentResponse.getGenericResponse(); + LOGGER.info("genric Response" + generalResponse); + if(generalResponse.getStatus().equalsIgnoreCase("Failed")) { + throw new CustomException(generalResponse.getMessage(), generalResponse.getStatus(), + Integer.parseInt(generalResponse.getStatusCode()), generalResponse.getRemarks()); + } + BillPayment entity = modelMapper.map(billPaymentResponse, BillPayment.class); paymentRepository.save(entity); diff --git a/src/main/java/com/billpaymentservice/bbps/serviceImpl/PaymentStartServiceImpl.java b/src/main/java/com/billpaymentservice/bbps/serviceImpl/PaymentStartServiceImpl.java index 164d4e5..d36004d 100644 --- a/src/main/java/com/billpaymentservice/bbps/serviceImpl/PaymentStartServiceImpl.java +++ b/src/main/java/com/billpaymentservice/bbps/serviceImpl/PaymentStartServiceImpl.java @@ -303,7 +303,7 @@ public class PaymentStartServiceImpl implements PaymentStartService { rd.setAmount(parsedAmount != null && !parsedAmount.isEmpty() ? parsedAmount : "0.00"); rd.setMid(parsedMid); rd.setOrderNo(orderNo); - rd.setQrString("NO_QR"); + rd.setQrString("HTML_RESPONSE"); rd.setCreatedOn(LocalDateTime.now().toString()); apiResp.setResponseData(rd); From 06cb102aed57e884fe1f496153cee770d3631dca Mon Sep 17 00:00:00 2001 From: Lincpay Tech Date: Thu, 11 Dec 2025 11:05:38 +0530 Subject: [PATCH 3/3] made spome miniorchanges and remove user details --- .../bbps/config/CustomUserDetailsService.java | 2 - .../bbps/entites/InboundTraceLog.java | 2 + .../bbps/entites/OutboundTraceLog.java | 2 + .../bbps/entites/UsersDetails.java | 38 ------------------- .../repository/UsersDetailsRepository.java | 16 -------- .../bbps/serviceImpl/AuthServiceImpl.java | 7 +--- .../serviceImpl/MasterDataServiceImpl.java | 2 - 7 files changed, 5 insertions(+), 64 deletions(-) delete mode 100644 src/main/java/com/billpaymentservice/bbps/entites/UsersDetails.java delete mode 100644 src/main/java/com/billpaymentservice/bbps/repository/UsersDetailsRepository.java diff --git a/src/main/java/com/billpaymentservice/bbps/config/CustomUserDetailsService.java b/src/main/java/com/billpaymentservice/bbps/config/CustomUserDetailsService.java index c9f2759..a58b824 100644 --- a/src/main/java/com/billpaymentservice/bbps/config/CustomUserDetailsService.java +++ b/src/main/java/com/billpaymentservice/bbps/config/CustomUserDetailsService.java @@ -11,9 +11,7 @@ import org.springframework.security.core.userdetails.UsernameNotFoundException; import org.springframework.stereotype.Service; import com.billpaymentservice.bbps.entites.UserEntity; -import com.billpaymentservice.bbps.entites.UsersDetails; import com.billpaymentservice.bbps.repository.UserRepository; -import com.billpaymentservice.bbps.repository.UsersDetailsRepository; @Service public class CustomUserDetailsService implements UserDetailsService { diff --git a/src/main/java/com/billpaymentservice/bbps/entites/InboundTraceLog.java b/src/main/java/com/billpaymentservice/bbps/entites/InboundTraceLog.java index 15a1b3c..6f23804 100644 --- a/src/main/java/com/billpaymentservice/bbps/entites/InboundTraceLog.java +++ b/src/main/java/com/billpaymentservice/bbps/entites/InboundTraceLog.java @@ -7,6 +7,7 @@ import jakarta.persistence.Entity; import jakarta.persistence.GeneratedValue; import jakarta.persistence.GenerationType; import jakarta.persistence.Id; +import jakarta.persistence.Table; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; @@ -14,6 +15,7 @@ import lombok.ToString; @Entity @Getter @Setter @NoArgsConstructor @ToString +@Table(name = "bbps_inbound_trace_log") public class InboundTraceLog { @Id diff --git a/src/main/java/com/billpaymentservice/bbps/entites/OutboundTraceLog.java b/src/main/java/com/billpaymentservice/bbps/entites/OutboundTraceLog.java index 06a2088..3a34043 100644 --- a/src/main/java/com/billpaymentservice/bbps/entites/OutboundTraceLog.java +++ b/src/main/java/com/billpaymentservice/bbps/entites/OutboundTraceLog.java @@ -7,6 +7,7 @@ import jakarta.persistence.Entity; import jakarta.persistence.GeneratedValue; import jakarta.persistence.GenerationType; import jakarta.persistence.Id; +import jakarta.persistence.Table; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; @@ -14,6 +15,7 @@ import lombok.ToString; @Entity @Getter @Setter @NoArgsConstructor @ToString +@Table(name = "bbps_outbound_trace_log") public class OutboundTraceLog { @Id diff --git a/src/main/java/com/billpaymentservice/bbps/entites/UsersDetails.java b/src/main/java/com/billpaymentservice/bbps/entites/UsersDetails.java deleted file mode 100644 index 98e2f28..0000000 --- a/src/main/java/com/billpaymentservice/bbps/entites/UsersDetails.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.billpaymentservice.bbps.entites; - -import jakarta.persistence.Column; -import jakarta.persistence.Entity; -import jakarta.persistence.GeneratedValue; -import jakarta.persistence.GenerationType; -import jakarta.persistence.Id; -import jakarta.persistence.Table; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; - -@Data -@NoArgsConstructor -@AllArgsConstructor -@Entity -@Table(name = "bbps_user_details") - -public class UsersDetails extends Auditable { - - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - @Column(name = "id") - private Long id; - - @Column(name = "user_email_id") - private String userEmailId; - - @Column(name = "user_mob_no") - private String userMobNo; - - @Column(name = "user_name") - private String userName; - - @Column(name = "user_age") - private String userAge; - -} \ No newline at end of file diff --git a/src/main/java/com/billpaymentservice/bbps/repository/UsersDetailsRepository.java b/src/main/java/com/billpaymentservice/bbps/repository/UsersDetailsRepository.java deleted file mode 100644 index 167b40a..0000000 --- a/src/main/java/com/billpaymentservice/bbps/repository/UsersDetailsRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.billpaymentservice.bbps.repository; - -import java.util.Optional; - -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.security.core.userdetails.UserDetails; -import org.springframework.stereotype.Repository; - -import com.billpaymentservice.bbps.entites.UsersDetails; - -@Repository -public interface UsersDetailsRepository extends JpaRepository { - - Optional findByUserMobNo(String userMobNo); - -} diff --git a/src/main/java/com/billpaymentservice/bbps/serviceImpl/AuthServiceImpl.java b/src/main/java/com/billpaymentservice/bbps/serviceImpl/AuthServiceImpl.java index dcf6772..65be8d6 100644 --- a/src/main/java/com/billpaymentservice/bbps/serviceImpl/AuthServiceImpl.java +++ b/src/main/java/com/billpaymentservice/bbps/serviceImpl/AuthServiceImpl.java @@ -20,10 +20,8 @@ import com.billpaymentservice.bbps.dto.auth.UserDto; import com.billpaymentservice.bbps.dto.auth.VerifyOtpRequest; import com.billpaymentservice.bbps.dto.response.AuthResponses; import com.billpaymentservice.bbps.entites.UserEntity; -import com.billpaymentservice.bbps.entites.UsersDetails; import com.billpaymentservice.bbps.exception.CustomException; import com.billpaymentservice.bbps.repository.UserRepository; -import com.billpaymentservice.bbps.repository.UsersDetailsRepository; import com.billpaymentservice.bbps.service.AuthService; import com.billpaymentservice.bbps.util.BBPSConstant; import com.billpaymentservice.bbps.util.Helper; @@ -41,16 +39,13 @@ public class AuthServiceImpl implements AuthService { private final UserRepository userRepository; private final OtpClient otpClient; private final Helper helper; - private final UsersDetailsRepository userRepo; private final JwtUtil jwtUtil; @Autowired - public AuthServiceImpl(UserRepository userRepository, OtpClient otpClient, Helper helper, - UsersDetailsRepository userRepo, JwtUtil jwtUtil) { + public AuthServiceImpl(UserRepository userRepository, OtpClient otpClient, Helper helper, JwtUtil jwtUtil) { this.userRepository = userRepository; this.otpClient = otpClient; this.helper = helper; - this.userRepo = userRepo; this.jwtUtil = jwtUtil; } diff --git a/src/main/java/com/billpaymentservice/bbps/serviceImpl/MasterDataServiceImpl.java b/src/main/java/com/billpaymentservice/bbps/serviceImpl/MasterDataServiceImpl.java index 3769d72..b32d7d7 100644 --- a/src/main/java/com/billpaymentservice/bbps/serviceImpl/MasterDataServiceImpl.java +++ b/src/main/java/com/billpaymentservice/bbps/serviceImpl/MasterDataServiceImpl.java @@ -49,7 +49,6 @@ import com.billpaymentservice.bbps.entites.DispositionDetails; import com.billpaymentservice.bbps.entites.InboundTraceLog; import com.billpaymentservice.bbps.entites.OutboundTraceLog; import com.billpaymentservice.bbps.entites.PlanResponses; -import com.billpaymentservice.bbps.entites.UsersDetails; import com.billpaymentservice.bbps.exception.CustomException; import com.billpaymentservice.bbps.repository.BharatConnectMasterRepository; import com.billpaymentservice.bbps.repository.BillerDataRepository; @@ -58,7 +57,6 @@ import com.billpaymentservice.bbps.repository.DispositionRepository; import com.billpaymentservice.bbps.repository.InboundTraceLogRepository; import com.billpaymentservice.bbps.repository.MerchantRepository; import com.billpaymentservice.bbps.repository.OutboundTraceLogRepository; -import com.billpaymentservice.bbps.repository.UsersDetailsRepository; import com.billpaymentservice.bbps.service.MasterDataService; import com.billpaymentservice.bbps.util.BBPSConstant; import com.billpaymentservice.bbps.util.BillerMapperHelper;