diff --git a/backend/src/main/java/kr/touroot/travelogue/domain/SearchCondition.java b/backend/src/main/java/kr/touroot/travelogue/domain/SearchCondition.java deleted file mode 100644 index 5549c0e8..00000000 --- a/backend/src/main/java/kr/touroot/travelogue/domain/SearchCondition.java +++ /dev/null @@ -1,19 +0,0 @@ -package kr.touroot.travelogue.domain; - -import lombok.Getter; - -@Getter -public class SearchCondition { - - private final String keyword; - private final SearchType searchType; - - private SearchCondition(String keyword, SearchType searchType) { - this.keyword = keyword; - this.searchType = searchType; - } - - public static SearchCondition of(String keyword, SearchType searchType) { - return new SearchCondition(keyword, searchType); - } -} 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 new file mode 100644 index 00000000..e8fe8fd4 --- /dev/null +++ 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/backend/src/main/java/kr/touroot/travelogue/domain/SearchType.java b/backend/src/main/java/kr/touroot/travelogue/domain/search/SearchType.java similarity index 90% rename from backend/src/main/java/kr/touroot/travelogue/domain/SearchType.java rename to backend/src/main/java/kr/touroot/travelogue/domain/search/SearchType.java index beb2f197..299cbd76 100644 --- a/backend/src/main/java/kr/touroot/travelogue/domain/SearchType.java +++ b/backend/src/main/java/kr/touroot/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 index 9f3a3557..779c813d 100644 --- 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/backend/src/main/java/kr/touroot/travelogue/repository/query/TravelogueQueryRepositoryImpl.java b/backend/src/main/java/kr/touroot/travelogue/repository/query/TravelogueQueryRepositoryImpl.java index 43288cd6..7464c14b 100644 --- a/backend/src/main/java/kr/touroot/travelogue/repository/query/TravelogueQueryRepositoryImpl.java +++ b/backend/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 index 9fca41c3..90970c29 100644 --- 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 findAllByMember(Member member, Pageable pageable) { @Transactional(readOnly = true) public Page 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); }