Merge pull request #262 from Probono-GCC/develop

Develop

Author: 137pjy

src/main/java/probono/gcc/school/jwt/JWTFilter.java

@@ -11,6 +11,7 @@
 import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.web.filter.OncePerRequestFilter;
 import probono.gcc.school.model.dto.CustomUserDetails;
+import probono.gcc.school.model.dto.users.UserLoginDTO;
 import probono.gcc.school.model.entity.Users;
 import probono.gcc.school.model.enums.Role;
 
@@ -55,10 +56,12 @@ protected void doFilterInternal(HttpServletRequest request, HttpServletResponse
     String role = jwtUtil.getRole(token);
 
     //userEntity를 생성하여 값 set
-    Users user = new Users();
-    user.setUsername(username);
-    user.setPassword("temppassword");
-    user.setRole(Role.valueOf(role));
+    //Users user = new Users();
+//    user.setUsername(username);
+//    user.setPassword("temppassword");
+//    user.setRole(Role.valueOf(role));
+
+    UserLoginDTO user = new UserLoginDTO(username, "temppassword", Role.valueOf(role));
 
     //UserDetails에 회원 정보 객체 담기
     CustomUserDetails customUserDetails = new CustomUserDetails(user);

src/main/java/probono/gcc/school/jwt/LoginFilter.java

@@ -40,7 +40,7 @@ public Authentication attemptAuthentication(HttpServletRequest request,
     UsernamePasswordAuthenticationToken authToken = new UsernamePasswordAuthenticationToken(
         username, password, null);
 
-    sample.stop(meterRegistry.timer("login.step", "phase", "login_authentication"));
+    //sample.stop(meterRegistry.timer("login.step", "phase", "login_authentication"));
 
     // 인증 매니저 호출 (여기까지의 시간 측정 포함)
     Authentication authentication = authenticationManager.authenticate(authToken);

src/main/java/probono/gcc/school/model/dto/CustomUserDetails.java

@@ -6,11 +6,13 @@
 import org.springframework.security.core.GrantedAuthority;
 import org.springframework.security.core.userdetails.UserDetails;
 import probono.gcc.school.model.entity.Users;
+import probono.gcc.school.model.projection.UserLoginProjection;
 
 @RequiredArgsConstructor
 public class CustomUserDetails implements UserDetails {
 
-  private final Users users;
+  //private final Users users;
+  private final UserLoginProjection users;
 
   @Override
   public Collection<? extends GrantedAuthority> getAuthorities() {

src/main/java/probono/gcc/school/model/dto/users/UserLoginDTO.java

@@ -0,0 +1,15 @@
+package probono.gcc.school.model.dto.users;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import probono.gcc.school.model.enums.Role;
+import probono.gcc.school.model.projection.UserLoginProjection;
+
+@Data
+@AllArgsConstructor
+public class UserLoginDTO implements UserLoginProjection {
+  private String username;
+  private String password;
+  private Role role;
+
+}

src/main/java/probono/gcc/school/model/projection/UserLoginProjection.java

@@ -0,0 +1,9 @@
+package probono.gcc.school.model.projection;
+
+import probono.gcc.school.model.enums.Role;
+
+public interface UserLoginProjection {
+  String getUsername();
+  String getPassword();
+  Role getRole();
+}

src/main/java/probono/gcc/school/repository/UserRepository.java

@@ -11,6 +11,7 @@
 import probono.gcc.school.model.enums.Grades;
 import probono.gcc.school.model.enums.Role;
 import probono.gcc.school.model.enums.Status;
+import probono.gcc.school.model.projection.UserLoginProjection;
 
 public interface UserRepository extends JpaRepository<Users, Long> {
 
@@ -39,4 +40,7 @@ Page<Users> findByStatusAndRoleAndGradeNot(Status status, Role role, Grades grad
       PageRequest pageRequest);
 
   List<Users> findByStatusAndRoleAndGradeNot(Status status, Role role, Grades grades);
+
+  // Projection용 메서드 추가
+  Optional<UserLoginProjection> findProjectedByUsername(String username);
 }

src/main/java/probono/gcc/school/service/CustomUserDetailsService.java

@@ -7,6 +7,7 @@
 import org.springframework.stereotype.Service;
 import probono.gcc.school.model.dto.CustomUserDetails;
 import probono.gcc.school.model.entity.Users;
+import probono.gcc.school.model.projection.UserLoginProjection;
 import probono.gcc.school.repository.UserRepository;
 import io.micrometer.core.instrument.MeterRegistry;
 import io.micrometer.core.instrument.Timer;
@@ -22,7 +23,12 @@ public class CustomUserDetailsService implements UserDetailsService {
   public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException {
     Timer.Sample sample = Timer.start(meterRegistry);
     /*DB 조회 - 시작*/
-    Users userData = userRepository.findByUsername(username).get();
+//    Users userData = userRepository.findByUsername(username).get();
+
+    // Projection으로 유저 정보 조회
+    UserLoginProjection userData = userRepository.findProjectedByUsername(username)
+        .orElseThrow(() -> new UsernameNotFoundException("User not found: " + username));
+
     /*끝*/
     sample.stop(meterRegistry.timer("login.step", "phase", "DB_user_lookup"));
     if (userData != null) {