Globots/bbps-backend
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

user id addded in this code

Browse Source
This commit is contained in:
Mohd-Arham
2025-12-03 17:40:04 +05:30
parent d521459227
commit 003dd9325c
33 changed files with 723 additions and 568 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/billpaymentservice/bbps/serviceImpl/AuthServiceImpl.java
+7 -5
View File
@@ -142,8 +142,8 @@ public class AuthServiceImpl implements AuthService {
Optional<UserEntity> existing = userRepository.findByMobile(request.getMobile());
if (existing.isPresent()) {
UserEntity u = existing.get();
UserDto dto = new UserDto(u.getId(), u.getMobile(), u.getName(), u.getEmail());
AuthResponse ar = new AuthResponse(false, "User already exists", true, dto);
UserDto dto = new UserDto(u.getUserId(), u.getMobile(), u.getName(), u.getEmail());
AuthResponse ar = new AuthResponse(false, "User already exists", null, dto);
return ResponseModel.builder().message(ar.getMessage()).status("Failure").statusCode(409).data(ar)
.build();
}
@@ -151,9 +151,11 @@ public class AuthServiceImpl implements AuthService {
UserEntity userEntity = helper.createNewUser(request);
userRepository.save(userEntity);
String token = jwtUtil.generateToken(userEntity.getMobile());
UserDto dto = new UserDto(userEntity.getId(), userEntity.getMobile(), userEntity.getName(),
userEntity.getEmail());
AuthResponse ar = new AuthResponse(true, "user registed sucessfully", token);
// UserDto dto = new UserDto(userEntity.getUserId(), userEntity.getMobile(), userEntity.getName(),
// userEntity.getEmail());
Object userDetailsDTO = helper.mapUserToUserDetailsDTO(userEntity);
AuthResponse ar = new AuthResponse(true, "user registered successfully", token, userDetailsDTO);
return ResponseModel.builder().message(ar.getMessage()).status("Success").statusCode(201).data(ar).build();
} catch (ExpiredJwtException e) {
LOGGER.error("Token has expired: {}", e.getMessage());