Skip to content

refactor(user-admin-service): improve UserDetailsService implementati… #150

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
isanort merged 1 commit into from
Oct 6, 2025
Merged

refactor(user-admin-service): improve UserDetailsService implementati… #150

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/main/java/com/SleepUp/SU/user/admin/UserAdminService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,10 @@
import com.SleepUp.SU.user.dto.UserRequestAdmin;
import com.SleepUp.SU.user.dto.UserResponse;
import com.SleepUp.SU.user.role.Role;
import org.springframework.security.core.userdetails.UserDetailsService;

import java.util.List;

public interface UserAdminService extends UserDetailsService {
public interface UserAdminService {

List<UserResponse> getAllUsers();

Expand All @@ -19,4 +18,5 @@ public interface UserAdminService extends UserDetailsService {
UserResponse updateUser(Long userId, UserRequestAdmin userRequestAdmin);

void deleteUserById(Long id);

}
15 changes: 11 additions & 4 deletions src/main/java/com/SleepUp/SU/user/admin/UserAdminServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
package com.SleepUp.SU.user.admin;

import com.SleepUp.SU.accommodation.entity.Accommodation;
import com.SleepUp.SU.accommodation.repository.AccommodationRepository;
import com.SleepUp.SU.reservation.entity.Reservation;
Expand All @@ -16,8 +17,10 @@
import com.SleepUp.SU.utils.EntityUtil;
import com.SleepUp.SU.utils.email.EmailServiceHelper;
import com.SleepUp.SU.utils.exceptions.UserNotFoundByIdException;
import com.SleepUp.SU.utils.exceptions.UserNotFoundByUsernameException;
import lombok.RequiredArgsConstructor;
import org.springframework.security.core.userdetails.UserDetails;
import org.springframework.security.core.userdetails.UserDetailsService;
import org.springframework.security.core.userdetails.UsernameNotFoundException;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
Expand All @@ -26,7 +29,7 @@

@Service
@RequiredArgsConstructor
public class UserAdminServiceImpl implements UserAdminService {
public class UserAdminServiceImpl implements UserAdminService, UserDetailsService {

private final UserRepository userRepository;
private final UserMapper userMapper;
Expand Down Expand Up @@ -55,7 +58,7 @@ public UserResponse createUser(UserRequest userRequest, Role role) {

@Override
@Transactional
public UserResponse updateUser(Long userId, UserRequestAdmin userRequestAdmin) {;
public UserResponse updateUser(Long userId, UserRequestAdmin userRequestAdmin) {
User user = userServiceHelper.getUserEntityById(userId);
User updatedUser = userServiceHelper.updateUserDataAdmin(userRequestAdmin, user);
return userMapper.toResponse(updatedUser);
Expand Down Expand Up @@ -93,7 +96,11 @@ public void deleteUserById(Long id){

@Override
public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException {
User user = userServiceHelper.getUserEntityByUsername(username);
return new CustomUserDetails(user);
try {
User user = userServiceHelper.getUserEntityByUsername(username);
return new CustomUserDetails(user);
} catch (UserNotFoundByUsernameException ex) {
throw new UsernameNotFoundException("User with username '" + username + "' not found", ex);
}
}
}
Loading