Merge pull request #337 from asowjdan/fix/member

DooHyoJeong · web-flow · commit 04ca1663d984 · 2025-10-15T22:39:29.000+09:00
Fix[member]:토큰 생성 로직 수정으로 인한 테스트 코드 수정
diff --git a/backend/src/main/java/com/ai/lawyer/domain/member/repositories/MemberRepository.java b/backend/src/main/java/com/ai/lawyer/domain/member/repositories/MemberRepository.java
@@ -7,6 +7,11 @@
 import java.util.List;
 import java.util.Optional;
 
+/**
+ * MemberRepository
+ * findById 호출 시 SmartMemberRepositoryImpl을 통해 AuthUtil로 자동 리다이렉트됩니다.
+ * 이를 통해 loginType에 따라 Member 또는 OAuth2Member 테이블에서 조회합니다.
+ */
 @Repository
 public interface MemberRepository extends JpaRepository<Member, Long> {
 
diff --git a/backend/src/main/java/com/ai/lawyer/domain/member/repositories/MemberRepositoryFactoryBean.java b/backend/src/main/java/com/ai/lawyer/domain/member/repositories/MemberRepositoryFactoryBean.java
@@ -0,0 +1,47 @@
+package com.ai.lawyer.domain.member.repositories;
+
+import com.ai.lawyer.domain.member.entity.Member;
+import org.jetbrains.annotations.NotNull;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.support.JpaRepositoryFactory;
+import org.springframework.data.jpa.repository.support.JpaRepositoryFactoryBean;
+import org.springframework.data.repository.core.RepositoryMetadata;
+import org.springframework.data.repository.core.support.RepositoryFactorySupport;
+
+import jakarta.persistence.EntityManager;
+import java.io.Serializable;
+
+/**
+ * MemberRepository의 커스텀 팩토리 빈
+ * findById 호출을 가로채서 AuthUtil을 통해 처리하도록 합니다.
+ */
+public class MemberRepositoryFactoryBean<R extends JpaRepository<T, I>, T, I extends Serializable>
+        extends JpaRepositoryFactoryBean<R, T, I> {
+
+    public MemberRepositoryFactoryBean(Class<? extends R> repositoryInterface) {
+        super(repositoryInterface);
+    }
+
+    @NotNull
+    @Override
+    protected RepositoryFactorySupport createRepositoryFactory(@NotNull EntityManager entityManager) {
+        return new MemberRepositoryFactory(entityManager);
+    }
+
+    private static class MemberRepositoryFactory extends JpaRepositoryFactory {
+
+        public MemberRepositoryFactory(EntityManager entityManager) {
+            super(entityManager);
+        }
+
+        @NotNull
+        @Override
+        protected Class<?> getRepositoryBaseClass(RepositoryMetadata metadata) {
+            // Member 엔티티인 경우 커스텀 베이스 클래스 사용
+            if (Member.class.isAssignableFrom(metadata.getDomainType())) {
+                return SmartMemberRepositoryImpl.class;
+            }
+            return super.getRepositoryBaseClass(metadata);
+        }
+    }
+}
diff --git a/backend/src/main/java/com/ai/lawyer/domain/member/repositories/SmartMemberRepositoryImpl.java b/backend/src/main/java/com/ai/lawyer/domain/member/repositories/SmartMemberRepositoryImpl.java
@@ -0,0 +1,51 @@
+package com.ai.lawyer.domain.member.repositories;
+
+import com.ai.lawyer.domain.member.entity.Member;
+import com.ai.lawyer.global.util.AuthUtil;
+import org.jetbrains.annotations.NotNull;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.data.jpa.repository.support.JpaEntityInformation;
+import org.springframework.data.jpa.repository.support.SimpleJpaRepository;
+import org.springframework.web.server.ResponseStatusException;
+
+import jakarta.persistence.EntityManager;
+import java.util.Optional;
+
+/**
+ * MemberRepository의 커스텀 베이스 구현체
+ * findById 호출 시 AuthUtil을 통해 적절한 테이블에서 조회합니다.
+ */
+public class SmartMemberRepositoryImpl<T, ID> extends SimpleJpaRepository<T, ID> {
+
+    private static final Logger log = LoggerFactory.getLogger(SmartMemberRepositoryImpl.class);
+
+    private final JpaEntityInformation<T, ?> entityInformation;
+
+    public SmartMemberRepositoryImpl(JpaEntityInformation<T, ?> entityInformation,
+                                     EntityManager entityManager) {
+        super(entityInformation, entityManager);
+        this.entityInformation = entityInformation;
+    }
+
+    @NotNull
+    @Override
+    public Optional<T> findById(@NotNull ID id) {
+        // Member 엔티티이고 ID가 Long인 경우에만 AuthUtil 사용
+        if (entityInformation.getJavaType().equals(Member.class) && id instanceof Long) {
+            try {
+                log.debug("SmartMemberRepositoryImpl.findById 호출: memberId={}", id);
+                Member member = AuthUtil.getMemberOrThrow((Long) id);
+                @SuppressWarnings("unchecked")
+                T result = (T) member;
+                return Optional.of(result);
+            } catch (ResponseStatusException e) {
+                log.debug("회원을 찾을 수 없음: memberId={}", id);
+                return Optional.empty();
+            }
+        }
+
+        // 다른 엔티티는 기본 동작 수행
+        return super.findById(id);
+    }
+}
diff --git a/backend/src/main/java/com/ai/lawyer/global/config/DataDBConfig.java b/backend/src/main/java/com/ai/lawyer/global/config/DataDBConfig.java
@@ -1,5 +1,6 @@
 package com.ai.lawyer.global.config;
 
+import com.ai.lawyer.domain.member.repositories.MemberRepositoryFactoryBean;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.jdbc.DataSourceBuilder;
 import org.springframework.context.annotation.Bean;
@@ -18,7 +19,8 @@
 @EnableJpaRepositories(
         basePackages = "com.ai.lawyer.domain.*",
         entityManagerFactoryRef = "dataEntityManager",
-        transactionManagerRef = "dataTransactionManager"
+        transactionManagerRef = "dataTransactionManager",
+        repositoryFactoryBeanClass = MemberRepositoryFactoryBean.class
 )
 public class DataDBConfig {
 
@@ -49,7 +51,7 @@ public LocalContainerEntityManagerFactoryBean dataEntityManager() {
         LocalContainerEntityManagerFactoryBean em = new LocalContainerEntityManagerFactoryBean();
 
         em.setDataSource(dataDBSource());
-        em.setPackagesToScan(new String[]{"com.ai.lawyer.domain.*"});
+        em.setPackagesToScan("com.ai.lawyer.domain.*");
         em.setJpaVendorAdapter(new HibernateJpaVendorAdapter());
 
         HashMap<String, Object> properties = new HashMap<>();
diff --git a/backend/src/main/java/com/ai/lawyer/global/qdrant/initializer/QdrantInitializer.java b/backend/src/main/java/com/ai/lawyer/global/qdrant/initializer/QdrantInitializer.java
@@ -5,13 +5,15 @@
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Profile;
 import org.springframework.stereotype.Component;
 
 import java.util.concurrent.ExecutionException;
 
 @Slf4j
 @Component
 @RequiredArgsConstructor
+@Profile("!test")  // test 프로파일에서는 비활성화
 public class QdrantInitializer {
 
     private final QdrantClient qdrantClient;
diff --git a/backend/src/main/java/com/ai/lawyer/global/security/SecurityConfig.java b/backend/src/main/java/com/ai/lawyer/global/security/SecurityConfig.java
@@ -56,7 +56,6 @@ public class SecurityConfig {
             "/api/precedent/**",      // 판례 (공개)
             "/api/law/**",            // 법령 (공개)
             "/api/law-word/**",       // 법률 용어 (공개)
-            "/api/chat/**",           // 챗봇 (공개)
             "/api/home/**",         // 홈 (공개)
             "/h2-console/**",          // H2 콘솔 (개발용)
             "/actuator/health", "/actuator/health/**", "/actuator/info",    // Spring Actuator
diff --git a/backend/src/main/java/com/ai/lawyer/global/util/AuthUtil.java b/backend/src/main/java/com/ai/lawyer/global/util/AuthUtil.java
@@ -1,29 +1,22 @@
 package com.ai.lawyer.global.util;
 
+import jakarta.persistence.EntityManager;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.GrantedAuthority;
 import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.web.server.ResponseStatusException;
 import org.springframework.http.HttpStatus;
 import org.springframework.stereotype.Component;
 import org.springframework.beans.factory.annotation.Autowired;
-import com.ai.lawyer.domain.member.repositories.MemberRepository;
-import com.ai.lawyer.domain.member.repositories.OAuth2MemberRepository;
 import com.ai.lawyer.domain.member.entity.Member;
 
 @Component
 public class AuthUtil {
-    private static MemberRepository memberRepository;
-    private static OAuth2MemberRepository oauth2MemberRepository;
+    private static EntityManager entityManager;
 
     @Autowired
-    public AuthUtil(MemberRepository memberRepository) {
-        AuthUtil.memberRepository = memberRepository;
-    }
-
-    @Autowired(required = false)
-    public void setOauth2MemberRepository(OAuth2MemberRepository oauth2MemberRepository) {
-        AuthUtil.oauth2MemberRepository = oauth2MemberRepository;
+    public AuthUtil(EntityManager entityManager) {
+        AuthUtil.entityManager = entityManager;
     }
 
     public static Long getCurrentMemberId() {
@@ -67,37 +60,65 @@ public static String getCurrentMemberRole() {
             .orElse(null);
     }
 
+    /**
+     * 현재 인증된 사용자의 로그인 타입을 가져옵니다.
+     * @return "LOCAL" 또는 "OAUTH2", 없으면 null
+     */
+    public static String getCurrentLoginType() {
+        Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
+        if (authentication == null || !authentication.isAuthenticated()) {
+            return null;
+        }
+
+        Object details = authentication.getDetails();
+        if (details instanceof java.util.Map) {
+            @SuppressWarnings("unchecked")
+            java.util.Map<String, String> detailsMap = (java.util.Map<String, String>) details;
+            return detailsMap.get("loginType");
+        }
+
+        return null;
+    }
+
     /**
      * memberId로 회원을 조회합니다. (Member 또는 OAuth2Member)
+     * SecurityContext에서 현재 인증된 사용자의 loginType을 자동으로 확인하여 적절한 테이블에서 조회합니다.
      * OAuth2Member인 경우 Member 객체로 변환하여 반환합니다.
+     * EntityManager를 직접 사용하여 무한 루프를 방지합니다.
      * @param memberId 회원 ID
      * @return Member 객체
      * @throws ResponseStatusException 회원을 찾을 수 없는 경우
      */
     public static Member getMemberOrThrow(Long memberId) {
-        // 먼저 Member 테이블에서 조회
-        java.util.Optional<Member> member = memberRepository.findById(memberId);
-        if (member.isPresent()) {
-            return member.get();
+        // SecurityContext에서 loginType 자동 추출
+        String loginType = getCurrentLoginType();
+
+        // loginType이 있으면 해당 테이블에서만 조회 (성능 최적화)
+        if (loginType != null) {
+            return getMemberOrThrow(memberId, loginType);
         }
 
-        // Member 테이블에 없으면 OAuth2Member 테이블에서 조회
-        if (oauth2MemberRepository != null) {
-            java.util.Optional<com.ai.lawyer.domain.member.entity.OAuth2Member> oauth2Member =
-                oauth2MemberRepository.findById(memberId);
-            if (oauth2Member.isPresent()) {
-                // OAuth2Member를 Member로 변환 (엔티티 호환성을 위해)
-                com.ai.lawyer.domain.member.entity.OAuth2Member oauth = oauth2Member.get();
-                return Member.builder()
-                        .memberId(oauth.getMemberId())
-                        .loginId(oauth.getLoginId())
-                        .name(oauth.getName())
-                        .age(oauth.getAge())
-                        .gender(oauth.getGender())
-                        .role(oauth.getRole())
-                        .password("") // OAuth2는 비밀번호 없음
-                        .build();
-            }
+        // loginType이 없으면 하위 호환성을 위해 두 테이블 모두 조회
+        // 먼저 Member 테이블에서 조회 (EntityManager 직접 사용)
+        Member member = entityManager.find(Member.class, memberId);
+        if (member != null) {
+            return member;
+        }
+
+        // Member 테이블에 없으면 OAuth2Member 테이블에서 조회 (EntityManager 직접 사용)
+        com.ai.lawyer.domain.member.entity.OAuth2Member oauth2Member =
+            entityManager.find(com.ai.lawyer.domain.member.entity.OAuth2Member.class, memberId);
+        if (oauth2Member != null) {
+            // OAuth2Member를 Member로 변환 (엔티티 호환성을 위해)
+            return Member.builder()
+                    .memberId(oauth2Member.getMemberId())
+                    .loginId(oauth2Member.getLoginId())
+                    .name(oauth2Member.getName())
+                    .age(oauth2Member.getAge())
+                    .gender(oauth2Member.getGender())
+                    .role(oauth2Member.getRole())
+                    .password("") // OAuth2는 비밀번호 없음
+                    .build();
         }
 
         // 둘 다 없으면 예외 발생
@@ -107,36 +128,35 @@ public static Member getMemberOrThrow(Long memberId) {
     /**
      * memberId와 loginType으로 회원을 조회합니다.
      * loginType이 "LOCAL"이면 Member 테이블에서, "OAUTH2"이면 OAuth2Member 테이블에서 조회합니다.
+     * EntityManager를 직접 사용하여 무한 루프를 방지합니다.
      * @param memberId 회원 ID
      * @param loginType 로그인 타입 ("LOCAL" 또는 "OAUTH2")
      * @return Member 객체
      * @throws ResponseStatusException 회원을 찾을 수 없는 경우
      */
     public static Member getMemberOrThrow(Long memberId, String loginType) {
         if ("OAUTH2".equals(loginType)) {
-            // OAuth2 회원 조회
-            if (oauth2MemberRepository != null) {
-                java.util.Optional<com.ai.lawyer.domain.member.entity.OAuth2Member> oauth2Member =
-                    oauth2MemberRepository.findById(memberId);
-                if (oauth2Member.isPresent()) {
-                    // OAuth2Member를 Member로 변환
-                    com.ai.lawyer.domain.member.entity.OAuth2Member oauth = oauth2Member.get();
-                    return Member.builder()
-                            .memberId(oauth.getMemberId())
-                            .loginId(oauth.getLoginId())
-                            .name(oauth.getName())
-                            .age(oauth.getAge())
-                            .gender(oauth.getGender())
-                            .role(oauth.getRole())
-                            .password("") // OAuth2는 비밀번호 없음
-                            .build();
-                }
+            // OAuth2 회원 조회 (EntityManager 직접 사용)
+            com.ai.lawyer.domain.member.entity.OAuth2Member oauth2Member =
+                entityManager.find(com.ai.lawyer.domain.member.entity.OAuth2Member.class, memberId);
+
+            if (oauth2Member != null) {
+                // OAuth2Member를 Member로 변환
+                return Member.builder()
+                        .memberId(oauth2Member.getMemberId())
+                        .loginId(oauth2Member.getLoginId())
+                        .name(oauth2Member.getName())
+                        .age(oauth2Member.getAge())
+                        .gender(oauth2Member.getGender())
+                        .role(oauth2Member.getRole())
+                        .password("") // OAuth2는 비밀번호 없음
+                        .build();
             }
         } else {
-            // LOCAL 회원 조회 (기본값)
-            java.util.Optional<Member> member = memberRepository.findById(memberId);
-            if (member.isPresent()) {
-                return member.get();
+            // LOCAL 회원 조회 (EntityManager 직접 사용)
+            Member member = entityManager.find(Member.class, memberId);
+            if (member != null) {
+                return member;
             }
         }
 
diff --git a/backend/src/test/java/com/ai/lawyer/global/util/AuthUtilTest.java b/backend/src/test/java/com/ai/lawyer/global/util/AuthUtilTest.java
