[Refactor] StatusFilterAspect 동작 수정

src/main/java/konkuk/thip/book/adapter/out/persistence/BookQueryPersistenceAdapter.java

@@ -9,12 +9,14 @@
 import konkuk.thip.common.util.CursorBasedList;
 import konkuk.thip.user.adapter.out.persistence.repository.UserJpaRepository;
 import lombok.RequiredArgsConstructor;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.stereotype.Repository;
 
 import java.time.LocalDateTime;
 import java.util.List;
 import java.util.Set;
 
+@Transactional(readOnly = true)
 @Repository
 @RequiredArgsConstructor
 public class BookQueryPersistenceAdapter implements BookQueryPort {

src/main/java/konkuk/thip/comment/adapter/out/persistence/CommentLikeQueryPersistenceAdapter.java

@@ -6,10 +6,12 @@
 import konkuk.thip.comment.application.port.out.CommentLikeQueryPort;
 import konkuk.thip.user.adapter.out.persistence.repository.UserJpaRepository;
 import lombok.RequiredArgsConstructor;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.stereotype.Repository;
 
 import java.util.Set;
 
+@Transactional(readOnly = true)
 @Repository
 @RequiredArgsConstructor
 public class CommentLikeQueryPersistenceAdapter implements CommentLikeQueryPort {

src/main/java/konkuk/thip/comment/adapter/out/persistence/CommentQueryPersistenceAdapter.java

@@ -7,13 +7,15 @@
 import konkuk.thip.common.util.Cursor;
 import konkuk.thip.common.util.CursorBasedList;
 import lombok.RequiredArgsConstructor;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.stereotype.Repository;
 
 import java.time.LocalDateTime;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
+@Transactional(readOnly = true)
 @Repository
 @RequiredArgsConstructor
 public class CommentQueryPersistenceAdapter implements CommentQueryPort {

src/main/java/konkuk/thip/common/aop/FilterContextHolder.java

@@ -0,0 +1,26 @@
+package konkuk.thip.common.aop;
+
+public class FilterContextHolder {
+
+    public enum FilterMode {
+        ACTIVE_ONLY,
+        UNFILTERED
+    }
+
+    private static final ThreadLocal<FilterMode> context =
+            ThreadLocal.withInitial(() -> FilterMode.ACTIVE_ONLY);
+
+    public static FilterMode get() {
+        return context.get();
+    }
+
+    public static void set(FilterMode mode) {
+        context.set(mode);
+    }
+
+    static void clear() {
+        context.remove();
+    }
+
+    private FilterContextHolder() {}
+}

src/main/java/konkuk/thip/common/aop/StatusFilterAspect.java

@@ -1,115 +1,73 @@
 package konkuk.thip.common.aop;
 
 import jakarta.persistence.EntityManager;
-import konkuk.thip.common.entity.StatusType;
-import konkuk.thip.common.exception.InternalServerException;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.aspectj.lang.ProceedingJoinPoint;
 import org.aspectj.lang.annotation.Around;
 import org.aspectj.lang.annotation.Aspect;
 import org.hibernate.Session;
+import org.springframework.core.Ordered;
+import org.springframework.core.annotation.Order;
 import org.springframework.stereotype.Component;
-import org.springframework.transaction.support.TransactionSynchronizationManager;
 
-import java.util.List;
-
-import static konkuk.thip.common.exception.code.ErrorCode.PERSISTENCE_TRANSACTION_REQUIRED;
+import static konkuk.thip.common.aop.FilterContextHolder.FilterMode.ACTIVE_ONLY;
+import static konkuk.thip.common.aop.FilterContextHolder.FilterMode.UNFILTERED;
 
 @Slf4j
+@Order(Ordered.LOWEST_PRECEDENCE)       // aspect order 명시 (우선순위 최하위 -> transaction aspect 이후에 동작)
 @Aspect
 @Component
 @RequiredArgsConstructor
 public class StatusFilterAspect {
 
     private final EntityManager em;
 
-    /**
-     * Hibernate Session은 thread-not-safe 하므로 반드시 트랜잭션 경계 내에서만 사용해야함
-     * 현재 스레드에 바인딩된 EntityManager를 통해 세션을 획득하도록 강제
-     */
-    private Session currentTxSession() {
-        if (!TransactionSynchronizationManager.isActualTransactionActive()) {
-            throw new InternalServerException(PERSISTENCE_TRANSACTION_REQUIRED);
-        }
-        return session();
-    }
-
-    private Session session() {
-        return em.unwrap(Session.class);    // 현재 스레드의 em에서 Hibernate 세션 얻기
-    }
-
     private static final String FILTER_NAME = "statusFilter";
-    private static final String PARAM_STATUSES = "statuses";
 
     private static final String ANN_TX = "org.springframework.transaction.annotation.Transactional";
-    private static final String ANN_INCLUDE_INACTIVE = "konkuk.thip.common.annotation.persistence.IncludeInactive";
     private static final String ANN_UNFILTERED = "konkuk.thip.common.annotation.persistence.Unfiltered";
 
-    // 기본: ACTIVE만 (트랜잭션 경계 진입 시)
-    // 1) @Transactional 이고
-    // 2) @IncludeInactive, @Unfiltered 가 붙어있지 않은 경우에만 적용
+    /**
+     * @Unfiltered: @Transactional 없이도 동작.
+     * ThreadLocal에 UNFILTERED 의도를 기록하고 반환.
+     * 실제 Session 조작은 트랜잭션 경계(PCUT_TX_DEFAULT)에서 수행.
+     */
+    private static final String PCUT_UNFILTERED = "@annotation(" + ANN_UNFILTERED + ")";
+
+    /**
+     * 기본: @Transactional 경계에서 ThreadLocal을 읽어 filter를 활성화.
+     * @Unfiltered가 붙은 메서드는 제외 (PCUT_UNFILTERED에서 처리).
+     */
     private static final String PCUT_TX_DEFAULT =
             "(" + "@annotation(" + ANN_TX + ") || @within(" + ANN_TX + ")" + ")" +
-                    " && !" + "@annotation(" + ANN_INCLUDE_INACTIVE + ")" +
                     " && !" + "@annotation(" + ANN_UNFILTERED + ")";
 
-    // @IncludeInactive: 트랜잭션 컨텍스트가 보장된 경우에만 동작
-    private static final String PCUT_INCLUDE_INACTIVE =
-            "@annotation(" + ANN_INCLUDE_INACTIVE + ") && (" + "@annotation(" + ANN_TX + ") || @within(" + ANN_TX + ")" + ")";
-
-    // @Unfiltered: 트랜잭션 컨텍스트가 보장된 경우에만 동작
-    private static final String PCUT_UNFILTERED =
-            "@annotation(" + ANN_UNFILTERED + ") && (" + "@annotation(" + ANN_TX + ") || @within(" + ANN_TX + ")" + ")";
-
-    // 기본: ACTIVE만
-    @Around(PCUT_TX_DEFAULT)
-    public Object enableActiveByDefault(ProceedingJoinPoint pjp) throws Throwable {
-        var s = currentTxSession();
-        var wasEnabled = isFilterEnabled(s);
-        if (!wasEnabled) {
-            enableFilterWith(s, List.of(StatusType.ACTIVE.name()));
-        }
+    @Around(PCUT_UNFILTERED)
+    public Object unfiltered(ProceedingJoinPoint pjp) throws Throwable {
+        FilterContextHolder.FilterMode prev = FilterContextHolder.get();
+        FilterContextHolder.set(UNFILTERED);
         try {
             return pjp.proceed();
         } finally {
-            if (!wasEnabled) {
-                disableFilter(s);
-            }
+            FilterContextHolder.set(prev);
         }
     }
 
-    // Include Inactive: ACTIVE, INACTIVE 모두 + 종료 시 active-only 로 복귀
-    @Around(PCUT_INCLUDE_INACTIVE)
-    public Object includeInactive(ProceedingJoinPoint pjp) throws Throwable {
-        var s = currentTxSession();
-        var prevEnabled = isFilterEnabled(s);
-
-        enableFilterWith(s, List.of(StatusType.ACTIVE.name(), StatusType.INACTIVE.name()));
+    @Around(PCUT_TX_DEFAULT)
+    public Object enableActiveByDefault(ProceedingJoinPoint pjp) throws Throwable {
+        Session s = em.unwrap(Session.class);
+        boolean wasEnabled = isFilterEnabled(s);
 
-        try {
-            return pjp.proceed();
-        } finally {
-            restoreToActive(s);
-            if (!prevEnabled) {
-                disableFilter(s);
-            }
+        if (FilterContextHolder.get() == ACTIVE_ONLY && !wasEnabled) {
+            enableFilter(s);
         }
-    }
 
-    // Unfiltered: 필터 해제 + 종료 시 active-only 로 복귀
-    @Around(PCUT_UNFILTERED)
-    public Object unfiltered(ProceedingJoinPoint pjp) throws Throwable {
-        var s = currentTxSession();
-        var wasEnabled = isFilterEnabled(s);
-        if (wasEnabled) {
-            disableFilter(s);
-        }
         try {
             return pjp.proceed();
         } finally {
-            if (wasEnabled) {
-                restoreToActive(s);
+            if (!wasEnabled) {
+                disableFilter(s);
             }
         }
     }
@@ -118,19 +76,13 @@ private boolean isFilterEnabled(Session s) {
         return s.getEnabledFilter(FILTER_NAME) != null;
     }
 
-    private void enableFilterWith(Session s, List<String> statuses) {
-        s.enableFilter(FILTER_NAME).setParameterList(PARAM_STATUSES, statuses);
-        log.debug("statusFilter -> ENABLED [statuses={}]", statuses);
-    }
-
-    private void restoreToActive(Session s) {
-        var restored = List.of(StatusType.ACTIVE.name());
-        s.enableFilter(FILTER_NAME).setParameterList(PARAM_STATUSES, restored);
-        log.debug("statusFilter -> RESTORED [statuses={}]", restored);
+    private void enableFilter(Session s) {
+        s.enableFilter(FILTER_NAME);
+        log.debug("statusFilter -> ENABLED [ACTIVE only]");
     }
 
     private void disableFilter(Session s) {
         s.disableFilter(FILTER_NAME);
         log.debug("statusFilter -> DISABLED");
     }
-}
+}

src/main/java/konkuk/thip/common/entity/BaseJpaEntity.java

@@ -9,7 +9,6 @@
 import lombok.Getter;
 import org.hibernate.annotations.Filter;
 import org.hibernate.annotations.FilterDef;
-import org.hibernate.annotations.ParamDef;
 import org.springframework.data.annotation.CreatedDate;
 import org.springframework.data.annotation.LastModifiedDate;
 import org.springframework.data.jpa.domain.support.AuditingEntityListener;
@@ -19,14 +18,8 @@
 @Getter
 @MappedSuperclass
 @EntityListeners(AuditingEntityListener.class)
-@FilterDef(
-        name = "statusFilter",
-        parameters = @ParamDef(name = "statuses", type = String.class)
-)
-@Filter(
-        name = "statusFilter",
-        condition = "status in (:statuses)"
-)
+@FilterDef(name = "statusFilter")
+@Filter(name = "statusFilter", condition = "status = 'ACTIVE'")
 public abstract class BaseJpaEntity {
 
     @CreatedDate

src/main/java/konkuk/thip/common/exception/code/ErrorCode.java

@@ -30,7 +30,6 @@ public enum ErrorCode implements ResponseCode {
     AWS_BUCKET_BASE_URL_NOT_CONFIGURED(HttpStatus.INTERNAL_SERVER_ERROR, 50101, "aws s3 bucket base url 설정이 누락되었습니다."),
     WEB_DOMAIN_ORIGIN_EMPTY(HttpStatus.INTERNAL_SERVER_ERROR, 50102, "허용된 웹 도메인 설정이 비어있습니다."),
 
-    PERSISTENCE_TRANSACTION_REQUIRED(HttpStatus.INTERNAL_SERVER_ERROR, 50110, "@Transactional 컨텍스트가 필요합니다. 트랜잭션 범위 내에서만 사용할 수 있습니다."),
     RESOURCE_LOCKED(HttpStatus.LOCKED, 50200, "자원이 잠겨 있어 요청을 처리할 수 없습니다."),
 
     /* 60000부터 비즈니스 예외 */

src/main/java/konkuk/thip/config/AppConfig.java

@@ -1,4 +1,10 @@
 package konkuk.thip.config;
 
+import org.springframework.context.annotation.Configuration;
+import org.springframework.core.Ordered;
+import org.springframework.transaction.annotation.EnableTransactionManagement;
+
+@Configuration
+@EnableTransactionManagement(order = Ordered.LOWEST_PRECEDENCE - 1)
 public class AppConfig {
 }

src/main/java/konkuk/thip/feed/adapter/out/persistence/FeedQueryPersistenceAdapter.java

@@ -10,12 +10,14 @@
 import konkuk.thip.feed.application.port.out.dto.FeedQueryDto;
 import konkuk.thip.user.adapter.out.persistence.repository.UserJpaRepository;
 import lombok.RequiredArgsConstructor;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.stereotype.Repository;
 
 import java.time.LocalDateTime;
 import java.util.List;
 import java.util.Set;
 
+@Transactional(readOnly = true)
 @Repository
 @RequiredArgsConstructor
 public class FeedQueryPersistenceAdapter implements FeedQueryPort {

src/main/java/konkuk/thip/notification/adapter/out/persistence/NotificationQueryPersistenceAdapter.java

@@ -8,10 +8,12 @@
 import konkuk.thip.notification.application.port.out.NotificationQueryPort;
 import konkuk.thip.notification.application.port.out.dto.NotificationQueryDto;
 import lombok.RequiredArgsConstructor;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
 
+@Transactional(readOnly = true)
 @Repository
 @RequiredArgsConstructor
 public class NotificationQueryPersistenceAdapter implements NotificationQueryPort {

src/main/java/konkuk/thip/post/adapter/out/persistence/PostLikeQueryPersistenceAdapter.java

@@ -3,10 +3,12 @@
 import konkuk.thip.post.adapter.out.persistence.repository.PostLikeJpaRepository;
 import konkuk.thip.post.application.port.out.PostLikeQueryPort;
 import lombok.RequiredArgsConstructor;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.stereotype.Repository;
 
 import java.util.Set;
 
+@Transactional(readOnly = true)
 @Repository
 @RequiredArgsConstructor
 public class PostLikeQueryPersistenceAdapter implements PostLikeQueryPort {

src/main/java/konkuk/thip/post/adapter/out/persistence/PostQueryPersistenceAdapter.java

@@ -4,8 +4,10 @@
 import konkuk.thip.post.application.port.out.PostQueryPort;
 import konkuk.thip.post.application.port.out.dto.PostQueryDto;
 import lombok.RequiredArgsConstructor;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.stereotype.Repository;
 
+@Transactional(readOnly = true)
 @Repository
 @RequiredArgsConstructor
 public class PostQueryPersistenceAdapter implements PostQueryPort {

src/main/java/konkuk/thip/recentSearch/adapter/out/persistence/RecentSearchQueryPersistenceAdapter.java

@@ -6,11 +6,13 @@
 import konkuk.thip.recentSearch.application.port.out.RecentSearchQueryPort;
 import konkuk.thip.recentSearch.domain.RecentSearch;
 import lombok.RequiredArgsConstructor;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
 import java.util.Optional;
 
+@Transactional(readOnly = true)
 @Repository
 @RequiredArgsConstructor
 public class RecentSearchQueryPersistenceAdapter implements RecentSearchQueryPort {

src/main/java/konkuk/thip/room/adapter/out/persistence/RoomParticipantQueryPersistenceAdapter.java

@@ -3,8 +3,10 @@
 import konkuk.thip.room.adapter.out.persistence.repository.roomparticipant.RoomParticipantJpaRepository;
 import konkuk.thip.room.application.port.out.RoomParticipantQueryPort;
 import lombok.RequiredArgsConstructor;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.stereotype.Repository;
 
+@Transactional(readOnly = true)
 @Repository
 @RequiredArgsConstructor
 public class RoomParticipantQueryPersistenceAdapter implements RoomParticipantQueryPort {

src/main/java/konkuk/thip/room/adapter/out/persistence/RoomQueryPersistenceAdapter.java

@@ -13,12 +13,14 @@
 import konkuk.thip.room.domain.value.Category;
 import konkuk.thip.room.domain.Room;
 import lombok.RequiredArgsConstructor;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.stereotype.Repository;
 
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.util.List;
 
+@Transactional(readOnly = true)
 @Repository
 @RequiredArgsConstructor
 public class RoomQueryPersistenceAdapter implements RoomQueryPort {