|
|
@ -31,12 +31,11 @@ public class UserServiceImpl implements UserService { |
|
|
|
private UserRoleRepository userRoleRepository; |
|
|
|
|
|
|
|
@Autowired |
|
|
|
private PasswordEncoder passwordEncoder; |
|
|
|
|
|
|
|
private PasswordEncoder passwordEncoder; |
|
|
|
|
|
|
|
@Autowired |
|
|
|
private RoleService roleService; |
|
|
|
|
|
|
|
|
|
|
|
@Autowired |
|
|
|
private UserSessionRepository userSessionRepository; |
|
|
|
|
|
|
@ -50,8 +49,8 @@ public class UserServiceImpl implements UserService { |
|
|
|
Role role = roleService.getRole("USER"); |
|
|
|
userRole.setRole(role); |
|
|
|
userRole.setUser(changedUser); |
|
|
|
// System.out.println(role.getRoleID()); |
|
|
|
// System.out.println(changedUser.getUserID()); |
|
|
|
// System.out.println(role.getRoleID()); |
|
|
|
// System.out.println(changedUser.getUserID()); |
|
|
|
userRoleRepository.save(userRole); |
|
|
|
return userRole; |
|
|
|
} |
|
|
@ -71,27 +70,26 @@ public class UserServiceImpl implements UserService { |
|
|
|
@Transactional(readOnly = true) |
|
|
|
public List<ActiveUserDTO> getOtherActiveUsers(String userName) { |
|
|
|
List<String> userList = findAllOtherUsers(userName); |
|
|
|
|
|
|
|
|
|
|
|
List<UserSession> userSessionsList = userSessionRepository.findAllUserSessions(); |
|
|
|
Map<String, UserSession> lastActiveMap = convertToMap(userSessionsList); |
|
|
|
|
|
|
|
|
|
|
|
List<ActiveUserDTO> activeUserDTOs = new ArrayList<ActiveUserDTO>(); |
|
|
|
userList.forEach(u -> { |
|
|
|
ActiveUserDTO activeUserDTO = new ActiveUserDTO(); |
|
|
|
UserSession us = lastActiveMap.get(u); |
|
|
|
|
|
|
|
UserSession us = lastActiveMap.get(u); |
|
|
|
|
|
|
|
activeUserDTO.setUserName(u); |
|
|
|
activeUserDTO.setOnline(false); |
|
|
|
activeUserDTO.setLastActive(null); |
|
|
|
if(us != null) |
|
|
|
{ |
|
|
|
if (us != null) { |
|
|
|
activeUserDTO.setOnline(us.isOnline()); |
|
|
|
activeUserDTO.setLastActive(toLastActiveString(us.getTimeStamp())); |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
activeUserDTOs.add(activeUserDTO); |
|
|
|
}); |
|
|
|
|
|
|
|
|
|
|
|
return activeUserDTOs; |
|
|
|
} |
|
|
|
|
|
|
@ -145,4 +143,10 @@ public class UserServiceImpl implements UserService { |
|
|
|
// @formatter:on |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
@Override |
|
|
|
@Transactional(readOnly = true) |
|
|
|
public List<UserRole> getUserWithRole(String userName) { |
|
|
|
return userRoleRepository.findByUser(userName); |
|
|
|
} |
|
|
|
} |