refactor: 검색 관련 도메인 패키징 및 불필요한 정적 팩토리 메소드 제거

woowacourse-teams · Sep 24, 2024 · 99ab43e · 99ab43e
1 parent ea511f4
commit 99ab43e
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 26 deletions.
diff --git a/backend/src/main/java/kr/touroot/travelogue/domain/SearchCondition.java b/backend/src/main/java/kr/touroot/travelogue/domain/SearchCondition.java
diff --git a/backend/src/main/java/kr/touroot/travelogue/domain/search/SearchCondition.java b/backend/src/main/java/kr/touroot/travelogue/domain/search/SearchCondition.java
@@ -0,0 +1,15 @@
+package kr.touroot.travelogue.domain.search;
+
+import lombok.Getter;
+
+@Getter
+public class SearchCondition {
+
+    private final String keyword;
+    private final SearchType searchType;
+
+    public SearchCondition(String keyword, SearchType searchType) {
+        this.keyword = keyword;
+        this.searchType = searchType;
+    }
+}
diff --git a/...touroot/travelogue/domain/SearchType.java → .../travelogue/domain/search/SearchType.java b/...touroot/travelogue/domain/SearchType.java → .../travelogue/domain/search/SearchType.java
@@ -1,4 +1,4 @@
-package kr.touroot.travelogue.domain;
+package kr.touroot.travelogue.domain.search;
 
 import java.util.Arrays;
 

diff --git a/backend/src/main/java/kr/touroot/travelogue/repository/query/TravelogueQueryRepository.java b/backend/src/main/java/kr/touroot/travelogue/repository/query/TravelogueQueryRepository.java
@@ -1,8 +1,8 @@
 package kr.touroot.travelogue.repository.query;
 
 import java.util.List;
-import kr.touroot.travelogue.domain.SearchCondition;
 import kr.touroot.travelogue.domain.Travelogue;
+import kr.touroot.travelogue.domain.search.SearchCondition;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 

diff --git a/...d/src/main/java/kr/touroot/travelogue/repository/query/TravelogueQueryRepositoryImpl.java b/...d/src/main/java/kr/touroot/travelogue/repository/query/TravelogueQueryRepositoryImpl.java
@@ -8,9 +8,9 @@
 import com.querydsl.core.types.dsl.StringPath;
 import com.querydsl.jpa.impl.JPAQueryFactory;
 import java.util.List;
-import kr.touroot.travelogue.domain.SearchCondition;
-import kr.touroot.travelogue.domain.SearchType;
 import kr.touroot.travelogue.domain.Travelogue;
+import kr.touroot.travelogue.domain.search.SearchCondition;
+import kr.touroot.travelogue.domain.search.SearchType;
 import lombok.RequiredArgsConstructor;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageImpl;

diff --git a/backend/src/main/java/kr/touroot/travelogue/service/TravelogueService.java b/backend/src/main/java/kr/touroot/travelogue/service/TravelogueService.java
@@ -5,9 +5,9 @@
 import kr.touroot.global.exception.ForbiddenException;
 import kr.touroot.image.infrastructure.AwsS3Provider;
 import kr.touroot.member.domain.Member;
-import kr.touroot.travelogue.domain.SearchCondition;
-import kr.touroot.travelogue.domain.SearchType;
 import kr.touroot.travelogue.domain.Travelogue;
+import kr.touroot.travelogue.domain.search.SearchCondition;
+import kr.touroot.travelogue.domain.search.SearchType;
 import kr.touroot.travelogue.dto.request.TravelogueRequest;
 import kr.touroot.travelogue.dto.request.TravelogueSearchRequest;
 import kr.touroot.travelogue.repository.TravelogueRepository;
@@ -52,7 +52,7 @@ public Page<Travelogue> findAllByMember(Member member, Pageable pageable) {
     @Transactional(readOnly = true)
     public Page<Travelogue> findByKeyword(TravelogueSearchRequest request, Pageable pageable) {
         SearchType searchType = SearchType.from(request.searchType());
-        SearchCondition searchCondition = SearchCondition.of(request.keyword(), searchType);
+        SearchCondition searchCondition = new SearchCondition(request.keyword(), searchType);
 
         return travelogueQueryRepository.findByKeywordAndSearchType(searchCondition, pageable);
     }