|
|
@ -13,6 +13,7 @@ import org.ros.chatto.model.ChatUser; |
|
|
|
import org.ros.chatto.model.Role; |
|
|
|
import org.ros.chatto.model.UserRole; |
|
|
|
import org.ros.chatto.model.UserSession; |
|
|
|
import org.ros.chatto.repository.RoleRepository; |
|
|
|
import org.ros.chatto.repository.UserRepository; |
|
|
|
import org.ros.chatto.repository.UserRoleRepository; |
|
|
|
import org.ros.chatto.repository.UserSessionRepository; |
|
|
@ -24,20 +25,25 @@ import org.springframework.transaction.annotation.Transactional; |
|
|
|
@Transactional |
|
|
|
@Service |
|
|
|
public class UserServiceImpl implements UserService { |
|
|
|
@Autowired |
|
|
|
private UserRepository userRepository; |
|
|
|
private final UserRepository userRepository; |
|
|
|
|
|
|
|
@Autowired |
|
|
|
private UserRoleRepository userRoleRepository; |
|
|
|
private final UserRoleRepository userRoleRepository; |
|
|
|
|
|
|
|
@Autowired |
|
|
|
private PasswordEncoder passwordEncoder; |
|
|
|
private final PasswordEncoder passwordEncoder; |
|
|
|
|
|
|
|
@Autowired |
|
|
|
private RoleService roleService; |
|
|
|
private final RoleRepository roleRepository; |
|
|
|
|
|
|
|
@Autowired |
|
|
|
private UserSessionRepository userSessionRepository; |
|
|
|
private final UserSessionRepository userSessionRepository; |
|
|
|
|
|
|
|
public UserServiceImpl(@Autowired UserRepository userRepository, @Autowired UserRoleRepository userRoleRepository, |
|
|
|
@Autowired PasswordEncoder passwordEncoder, @Autowired RoleRepository roleRepository, |
|
|
|
@Autowired UserSessionRepository userSessionRepository) { |
|
|
|
this.userRepository = userRepository; |
|
|
|
this.userRoleRepository = userRoleRepository; |
|
|
|
this.passwordEncoder = passwordEncoder; |
|
|
|
this.roleRepository = roleRepository; |
|
|
|
this.userSessionRepository = userSessionRepository; |
|
|
|
} |
|
|
|
|
|
|
|
@Override |
|
|
|
public UserRole registerUser(UserRegistrationDTO userRegistrationDTO) { |
|
|
@ -46,11 +52,9 @@ public class UserServiceImpl implements UserService { |
|
|
|
user.setPassword(passwordEncoder.encode(userRegistrationDTO.getPassword())); |
|
|
|
ChatUser changedUser = userRepository.save(user); |
|
|
|
UserRole userRole = new UserRole(); |
|
|
|
Role role = roleService.getRole("USER"); |
|
|
|
Role role = roleRepository.findByName("USER"); |
|
|
|
userRole.setRole(role); |
|
|
|
userRole.setUser(changedUser); |
|
|
|
// System.out.println(role.getRoleID()); |
|
|
|
// System.out.println(changedUser.getUserID()); |
|
|
|
userRoleRepository.save(userRole); |
|
|
|
return userRole; |
|
|
|
} |
|
|
|