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;