[Refactor] 메서드 매개변수 목록 간략화 (#253)

DongminL · web-flow · commit 078018871bdc · 2025-05-13T19:02:51.000+09:00
* refactor: 관리자 검색 조건 클래스로 묶기

* refactor: 피드백 검색 조건 클래스로 묶기

* refactor: 매개변수 간략화

* test: 리팩터링 이후 로직 검증

* refactor: FeedbackSearchCondition 클래스로 넘기기

* refactor: 메서드명 변경
diff --git a/src/main/java/org/programmers/signalbuddyfinal/domain/admin/dto/AdminSearchCondition.java b/src/main/java/org/programmers/signalbuddyfinal/domain/admin/dto/AdminSearchCondition.java
@@ -0,0 +1,19 @@
+package org.programmers.signalbuddyfinal.domain.admin.dto;
+
+import java.time.LocalDate;
+import lombok.AccessLevel;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Getter;
+
+@Getter
+@Builder
+@AllArgsConstructor(access = AccessLevel.PRIVATE)
+public class AdminSearchCondition {
+
+    private final LocalDate startDate;
+
+    private final LocalDate endDate;
+
+    private final Boolean deleted;
+}
diff --git a/src/main/java/org/programmers/signalbuddyfinal/domain/admin/service/AdminFeedbackService.java b/src/main/java/org/programmers/signalbuddyfinal/domain/admin/service/AdminFeedbackService.java
@@ -2,7 +2,9 @@
 
 import java.time.LocalDate;
 import lombok.RequiredArgsConstructor;
+import org.programmers.signalbuddyfinal.domain.admin.dto.AdminSearchCondition;
 import org.programmers.signalbuddyfinal.domain.feedback.dto.FeedbackResponse;
+import org.programmers.signalbuddyfinal.domain.feedback.dto.FeedbackSearchCondition;
 import org.programmers.signalbuddyfinal.domain.feedback.dto.FeedbackSearchRequest;
 import org.programmers.signalbuddyfinal.domain.feedback.repository.FeedbackRepository;
 import org.programmers.signalbuddyfinal.domain.member.entity.enums.MemberRole;
@@ -31,10 +33,19 @@ public PageResponse<FeedbackResponse> searchFeedbackList(
             throw new BusinessException(GlobalErrorCode.ADMIN_ONLY);
         }
 
+        AdminSearchCondition adminSearchCondition = AdminSearchCondition.builder()
+            .startDate(startDate).endDate(endDate).deleted(deleted)
+            .build();
+
+        FeedbackSearchCondition condition = FeedbackSearchCondition.builder()
+            .target(target).keyword(request.getKeyword())
+            .answerStatus(request.getStatus()).categories(request.getCategory())
+            .adminSearchCondition(adminSearchCondition)
+            .build();
+
         return new PageResponse<>(
             feedbackRepository.findAllByFilter(
-                pageable, target, request.getKeyword(), request.getStatus(),
-                request.getCategory(), startDate, endDate, deleted
+                pageable, condition
             )
         );
     }
diff --git a/src/main/java/org/programmers/signalbuddyfinal/domain/feedback/dto/FeedbackSearchCondition.java b/src/main/java/org/programmers/signalbuddyfinal/domain/feedback/dto/FeedbackSearchCondition.java
@@ -0,0 +1,37 @@
+package org.programmers.signalbuddyfinal.domain.feedback.dto;
+
+import io.jsonwebtoken.lang.Collections;
+import java.util.Optional;
+import java.util.Set;
+import lombok.Builder;
+import lombok.Getter;
+import org.programmers.signalbuddyfinal.domain.admin.dto.AdminSearchCondition;
+import org.programmers.signalbuddyfinal.domain.feedback.entity.enums.AnswerStatus;
+import org.programmers.signalbuddyfinal.domain.feedback.entity.enums.FeedbackCategory;
+import org.programmers.signalbuddyfinal.global.constant.SearchTarget;
+
+@Getter
+public class FeedbackSearchCondition {
+
+    private final SearchTarget target;
+
+    private final String keyword;
+
+    private final AnswerStatus answerStatus;
+
+    private final Set<FeedbackCategory> categories;
+
+    private final Optional<AdminSearchCondition> adminSearchCondition;
+
+    @Builder
+    private FeedbackSearchCondition(
+        String keyword, SearchTarget target, AnswerStatus answerStatus,
+        Set<FeedbackCategory> categories, AdminSearchCondition adminSearchCondition
+    ) {
+        this.keyword = keyword;
+        this.target = target;
+        this.answerStatus = answerStatus;
+        this.categories = Collections.asSet(categories);
+        this.adminSearchCondition = Optional.ofNullable(adminSearchCondition);
+    }
+}
diff --git a/src/main/java/org/programmers/signalbuddyfinal/domain/feedback/repository/CustomFeedbackRepository.java b/src/main/java/org/programmers/signalbuddyfinal/domain/feedback/repository/CustomFeedbackRepository.java
@@ -1,32 +1,23 @@
 package org.programmers.signalbuddyfinal.domain.feedback.repository;
 
-import java.time.LocalDate;
-import java.util.Set;
 import org.programmers.signalbuddyfinal.domain.feedback.dto.FeedbackResponse;
+import org.programmers.signalbuddyfinal.domain.feedback.dto.FeedbackSearchCondition;
 import org.programmers.signalbuddyfinal.domain.feedback.entity.Feedback;
-import org.programmers.signalbuddyfinal.domain.feedback.entity.enums.AnswerStatus;
-import org.programmers.signalbuddyfinal.domain.feedback.entity.enums.FeedbackCategory;
-import org.programmers.signalbuddyfinal.global.constant.SearchTarget;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 
 public interface CustomFeedbackRepository {
 
     Page<FeedbackResponse> findAllByActiveMembers(
-        Pageable pageable,
-        SearchTarget target,
-        AnswerStatus answerStatus, Set<FeedbackCategory> categories,
-        Long crossroadId, String keyword
+        Pageable pageable, Long crossroadId,
+        FeedbackSearchCondition condition
     );
 
     Page<FeedbackResponse> findPagedExcludingMember(Long memberId, Pageable pageable);
 
     Page<FeedbackResponse> findAllByFilter(
-        Pageable pageable, SearchTarget target,
-        String keyword, AnswerStatus answerStatus,
-        Set<FeedbackCategory> categories,
-        LocalDate startDate, LocalDate endDate,
-        Boolean deleted
+        Pageable pageable,
+        FeedbackSearchCondition condition
     );
 
     Feedback findByIdOrThrow(Long id);
diff --git a/src/main/java/org/programmers/signalbuddyfinal/domain/feedback/repository/CustomFeedbackRepositoryImpl.java b/src/main/java/org/programmers/signalbuddyfinal/domain/feedback/repository/CustomFeedbackRepositoryImpl.java
@@ -14,12 +14,12 @@
 import com.querydsl.core.types.dsl.BooleanExpression;
 import com.querydsl.core.types.dsl.Expressions;
 import com.querydsl.jpa.impl.JPAQueryFactory;
-import java.time.LocalDate;
 import java.util.List;
 import java.util.Optional;
 import java.util.Set;
 import lombok.RequiredArgsConstructor;
 import org.programmers.signalbuddyfinal.domain.feedback.dto.FeedbackResponse;
+import org.programmers.signalbuddyfinal.domain.feedback.dto.FeedbackSearchCondition;
 import org.programmers.signalbuddyfinal.domain.feedback.entity.Feedback;
 import org.programmers.signalbuddyfinal.domain.feedback.entity.enums.AnswerStatus;
 import org.programmers.signalbuddyfinal.domain.feedback.entity.enums.FeedbackCategory;
@@ -58,26 +58,20 @@ public class CustomFeedbackRepositoryImpl implements CustomFeedbackRepository {
 
     @Override
     public Page<FeedbackResponse> findAllByActiveMembers(
-        Pageable pageable,
-        SearchTarget target,
-        AnswerStatus answerStatus, Set<FeedbackCategory> categories,
-        Long crossroadId, String keyword
+        Pageable pageable, Long crossroadId,
+        FeedbackSearchCondition condition
     ) {
-        BooleanExpression searchCondition = searchCondition(target, keyword);
+        BooleanExpression searchCondition = searchCondition(condition);
         BooleanExpression activityMember = member.memberStatus.eq(MemberStatus.ACTIVITY);
-        BooleanExpression answerStatusCondition = answerStatusCondition(answerStatus);
-        BooleanExpression categoriesCondition = categoriesCondition(categories);
         BooleanExpression crossroadIdCondition = crossroadIdCondition(crossroadId);
 
         List<FeedbackResponse> results = jpaQueryFactory
             .select(feedbackResponseDto)
             .from(feedback)
             .join(member).on(feedback.member.eq(member)).fetchJoin()
             .where(
-                searchCondition
-                    .and(answerStatusCondition)
-                    .and(categoriesCondition)
-                    .and(crossroadIdCondition)
+                crossroadIdCondition
+                    .and(searchCondition)
                     .and(activityMember)
                     .and(isNotDeletedFeedback)
             )
@@ -91,10 +85,8 @@ public Page<FeedbackResponse> findAllByActiveMembers(
                 .from(feedback)
                 .join(member).on(feedback.member.eq(member)).fetchJoin()
                 .where(
-                    searchCondition
-                        .and(answerStatusCondition)
-                        .and(categoriesCondition)
-                        .and(crossroadIdCondition)
+                    crossroadIdCondition
+                        .and(searchCondition)
                         .and(activityMember)
                         .and(isNotDeletedFeedback)
                 ).fetchOne()
@@ -120,29 +112,16 @@ public Page<FeedbackResponse> findPagedExcludingMember(Long memberId, Pageable p
 
     @Override
     public Page<FeedbackResponse> findAllByFilter(
-        Pageable pageable, SearchTarget target,
-        String keyword, AnswerStatus answerStatus,
-        Set<FeedbackCategory> categories,
-        LocalDate startDate, LocalDate endDate,
-        Boolean deleted
+        Pageable pageable,
+        FeedbackSearchCondition condition
     ) {
-        BooleanExpression searchCondition = searchCondition(target, keyword);
-        BooleanExpression answerStatusCondition = answerStatusCondition(answerStatus);
-        BooleanExpression categoriesCondition = categoriesCondition(categories);
-        BooleanExpression betweenDates = betweenDates(feedback.createdAt, startDate, endDate);
-        BooleanExpression deletedCondition = deletedCondition(deleted);
+        BooleanExpression searchCondition = searchCondition(condition);
 
         List<FeedbackResponse> results = jpaQueryFactory
             .select(feedbackResponseDto)
             .from(feedback)
             .join(member).on(feedback.member.eq(member)).fetchJoin()
-            .where(
-                searchCondition
-                    .and(answerStatusCondition)
-                    .and(deletedCondition)
-                    .and(categoriesCondition)
-                    .and(betweenDates)
-            )
+            .where(searchCondition)
             .offset(pageable.getOffset()).limit(pageable.getPageSize())
             .orderBy(getOrderSpecifiers(pageable, feedback.getType(), "feedback")).fetch();
 
@@ -151,13 +130,8 @@ public Page<FeedbackResponse> findAllByFilter(
                 .select(feedback.count())
                 .from(feedback)
                 .join(member).on(feedback.member.eq(member)).fetchJoin()
-                .where(
-                    searchCondition
-                        .and(answerStatusCondition)
-                        .and(deletedCondition)
-                        .and(categoriesCondition)
-                        .and(betweenDates)
-                ).fetchOne()
+                .where(searchCondition)
+                .fetchOne()
         ).orElse(0L);
 
         return new PageImpl<>(results, pageable, count);
@@ -175,6 +149,23 @@ public Feedback findByIdOrThrow(Long id ) {
         ).orElseThrow(() -> new BusinessException(FeedbackErrorCode.NOT_FOUND_FEEDBACK));
     }
 
+    private BooleanExpression searchCondition(FeedbackSearchCondition condition) {
+        return Expressions.allOf(
+            searchKeyword(condition.getTarget(), condition.getKeyword()),
+            answerStatusCondition(condition.getAnswerStatus()),
+            categoriesCondition(condition.getCategories()),
+            condition.getAdminSearchCondition()
+                .map(adminCondition -> Expressions.allOf(
+                    betweenDates(
+                        feedback.createdAt,
+                        adminCondition.getStartDate(), adminCondition.getEndDate()
+                    ),
+                    deletedCondition(adminCondition.getDeleted())
+                ))
+                .orElse(Expressions.TRUE)
+        );
+    }
+
     private BooleanExpression answerStatusCondition(AnswerStatus answerStatus) {
         if (answerStatus == null) {
             return Expressions.TRUE;
@@ -205,7 +196,7 @@ private BooleanExpression categoriesCondition(Set<FeedbackCategory> categories)
         return expression;
     }
 
-    private BooleanExpression searchCondition(SearchTarget target, String keyword) {
+    private BooleanExpression searchKeyword(SearchTarget target, String keyword) {
         BooleanExpression fulltextSearch = Expressions.TRUE;
         if (SearchTarget.WRITER.equals(target)) {
             fulltextSearch = fulltextSearch(keyword, member.nickname);
diff --git a/src/main/java/org/programmers/signalbuddyfinal/domain/feedback/service/FeedbackService.java b/src/main/java/org/programmers/signalbuddyfinal/domain/feedback/service/FeedbackService.java
@@ -6,6 +6,7 @@
 import org.programmers.signalbuddyfinal.domain.crossroad.repository.CrossroadRepository;
 import org.programmers.signalbuddyfinal.domain.feedback.dto.FeedbackRequest;
 import org.programmers.signalbuddyfinal.domain.feedback.dto.FeedbackResponse;
+import org.programmers.signalbuddyfinal.domain.feedback.dto.FeedbackSearchCondition;
 import org.programmers.signalbuddyfinal.domain.feedback.dto.FeedbackSearchRequest;
 import org.programmers.signalbuddyfinal.domain.feedback.entity.Feedback;
 import org.programmers.signalbuddyfinal.domain.feedback.exception.FeedbackErrorCode;
@@ -50,10 +51,14 @@ public PageResponse<FeedbackResponse> searchFeedbackList(
         FeedbackSearchRequest request,
         Long crossroadId
     ) {
+        FeedbackSearchCondition condition = FeedbackSearchCondition.builder()
+            .target(target).keyword(request.getKeyword())
+            .answerStatus(request.getStatus()).categories(request.getCategory())
+            .build();
+
         return new PageResponse<>(
             feedbackRepository.findAllByActiveMembers(
-                pageable, target, request.getStatus(), request.getCategory(),
-                crossroadId, request.getKeyword()
+                pageable, crossroadId, condition
             )
         );
     }
diff --git a/src/test/java/org/programmers/signalbuddyfinal/domain/admin/service/AdminFeedbackServiceTest.java b/src/test/java/org/programmers/signalbuddyfinal/domain/admin/service/AdminFeedbackServiceTest.java
@@ -1,6 +1,7 @@
 package org.programmers.signalbuddyfinal.domain.admin.service;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.when;
 
 import java.time.LocalDate;
@@ -12,6 +13,7 @@
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.programmers.signalbuddyfinal.domain.feedback.dto.FeedbackResponse;
+import org.programmers.signalbuddyfinal.domain.feedback.dto.FeedbackSearchCondition;
 import org.programmers.signalbuddyfinal.domain.feedback.dto.FeedbackSearchRequest;
 import org.programmers.signalbuddyfinal.domain.feedback.entity.enums.AnswerStatus;
 import org.programmers.signalbuddyfinal.domain.feedback.entity.enums.FeedbackCategory;
@@ -73,10 +75,7 @@ void searchFeedbackList_Success() {
 
         when(
             feedbackRepository.findAllByFilter(
-                pageable, target,
-                request.getKeyword(), request.getStatus(), request.getCategory(),
-                startDate, endDate,
-                deleted
+                any(Pageable.class), any(FeedbackSearchCondition.class)
             )
         ).thenReturn(new PageImpl<>(contents, pageable, 123));
 
@@ -108,7 +107,8 @@ void searchFeedbackList_Failure() {
         // When & Then
         try {
             adminFeedbackService.searchFeedbackList(
-                null, SearchTarget.SUBJECT_OR_CONTENT, null, null, null, null, user
+                null, SearchTarget.SUBJECT_OR_CONTENT,
+                null, null, null, null, user
             );
         } catch (BusinessException e) {
             assertThat(e.getErrorCode()).isEqualTo(GlobalErrorCode.ADMIN_ONLY);
diff --git a/src/test/java/org/programmers/signalbuddyfinal/domain/feedback/repository/FeedbackRepositoryImplTest.java b/src/test/java/org/programmers/signalbuddyfinal/domain/feedback/repository/FeedbackRepositoryImplTest.java
