[Feat] 장소 조회 API를 추가했어요

src/main/java/team7/inplace/likedPlace/persistence/LikedPlaceRepository.java

@@ -1,8 +1,12 @@
 package team7.inplace.likedPlace.persistence;
 
+import java.util.Optional;
+import java.util.Set;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
 import team7.inplace.likedPlace.domain.LikedPlace;
 
 import java.util.Optional;
@@ -12,4 +16,7 @@ public interface LikedPlaceRepository extends JpaRepository<LikedPlace, Long> {
     Optional<LikedPlace> findByUserIdAndPlaceId(Long userId, Long placeId);
 
     Page<LikedPlace> findByUserIdAndIsLikedTrue(Long userId, Pageable pageable);
+
+    @Query("SELECT l.place.id FROM LikedPlace l WHERE l.user.id = :userId AND l.isLiked = true")
+    Set<Long> findPlaceIdsByUserIdAndIsLikedTrue(@Param("userId") Long userId);
 }

src/main/java/team7/inplace/search/application/SearchService.java

@@ -9,7 +9,9 @@
 import org.springframework.transaction.annotation.Transactional;
 import team7.inplace.favoriteInfluencer.persistent.FavoriteInfluencerRepository;
 import team7.inplace.influencer.application.dto.InfluencerInfo;
+import team7.inplace.likedPlace.persistence.LikedPlaceRepository;
 import team7.inplace.search.application.dto.AutoCompletionInfo;
+import team7.inplace.search.application.dto.PlaceSearchInfo;
 import team7.inplace.search.application.dto.SearchType;
 import team7.inplace.search.persistence.InfluencerSearchRepository;
 import team7.inplace.search.persistence.PlaceSearchRepository;
@@ -28,6 +30,7 @@ public class SearchService {
     private final InfluencerSearchRepository influencerSearchRepository;
     private final PlaceSearchRepository placeSearchRepository;
     private final FavoriteInfluencerRepository favoriteInfluencerRepository;
+    private final LikedPlaceRepository likedPlaceRepository;
 
     public List<AutoCompletionInfo> searchAutoCompletions(String keyword) {
         var influencerSearchInfo = influencerSearchRepository.searchEntityByKeywords(keyword);
@@ -46,7 +49,6 @@ public List<AutoCompletionInfo> searchAutoCompletions(String keyword) {
                 .toList();
     }
 
-    @Transactional(readOnly = true)
     public List<VideoInfo> searchVideo(String keyword) {
         var videoInfos = videoSearchRepository.searchEntityByKeywords(keyword);
 
@@ -57,7 +59,6 @@ public List<VideoInfo> searchVideo(String keyword) {
                 .toList();
     }
 
-    @Transactional(readOnly = true)
     public List<InfluencerInfo> searchInfluencer(String keyword) {
         var influencerInfos = influencerSearchRepository.searchEntityByKeywords(keyword);
         Long userId = AuthorizationUtil.getUserId();
@@ -78,4 +79,24 @@ public List<InfluencerInfo> searchInfluencer(String keyword) {
                 .sorted((a, b) -> Boolean.compare(b.likes(), a.likes()))
                 .toList();
     }
+
+    public List<PlaceSearchInfo> searchPlace(String keyword) {
+        var placeInfos = placeSearchRepository.searchEntityByKeywords(keyword);
+        Long userId = AuthorizationUtil.getUserId();
+
+        if (userId == null) {
+            return placeInfos.stream()
+                    .map(placeInfo -> PlaceSearchInfo.from(placeInfo.searchResult(), false))
+                    .toList();
+        }
+
+        var likedPlaceIds = likedPlaceRepository.findPlaceIdsByUserIdAndIsLikedTrue(userId);
+        return placeInfos.stream()
+                .map(placeInfo -> {
+                    boolean isLiked = likedPlaceIds.contains(placeInfo.searchResult().getId());
+                    return PlaceSearchInfo.from(placeInfo.searchResult(), isLiked);
+                })
+                .sorted((a, b) -> Boolean.compare(b.likes(), a.likes()))
+                .toList();
+    }
 }

src/main/java/team7/inplace/search/application/dto/PlaceSearchInfo.java

@@ -0,0 +1,19 @@
+package team7.inplace.search.application.dto;
+
+import team7.inplace.place.domain.Place;
+
+public record PlaceSearchInfo(
+        Long placeId,
+        String placeName,
+        String imageUrl,
+        Boolean likes
+) {
+    public static PlaceSearchInfo from(Place place, Boolean likes) {
+        return new PlaceSearchInfo(
+                place.getId(),
+                place.getName(),
+                place.getMenuImgUrl(),
+                likes
+        );
+    }
+}

src/main/java/team7/inplace/search/presentation/SearchController.java

@@ -11,6 +11,7 @@
 import team7.inplace.influencer.presentation.dto.InfluencerResponse;
 import team7.inplace.search.application.SearchService;
 import team7.inplace.search.application.dto.AutoCompletionInfo;
+import team7.inplace.search.application.dto.PlaceSearchInfo;
 import team7.inplace.video.presentation.dto.VideoResponse;
 
 @RestController
@@ -48,4 +49,12 @@ public ResponseEntity<List<InfluencerResponse>> searchInfluencer(@RequestParam S
                 .toList();
         return new ResponseEntity<>(response, HttpStatus.OK);
     }
+
+    @Override
+    @GetMapping("/place")
+    public ResponseEntity<List<PlaceSearchInfo>> searchPlace(@RequestParam String value) {
+        var places = searchService.searchPlace(value);
+
+        return new ResponseEntity<>(places, HttpStatus.OK);
+    }
 }

src/main/java/team7/inplace/search/presentation/SearchControllerApiSpec.java

@@ -7,6 +7,7 @@
 import org.springframework.http.ResponseEntity;
 import team7.inplace.influencer.presentation.dto.InfluencerResponse;
 import team7.inplace.search.application.dto.AutoCompletionInfo;
+import team7.inplace.search.application.dto.PlaceSearchInfo;
 import team7.inplace.video.presentation.dto.VideoResponse;
 
 @Tag(name = "검색 API입니다.")
@@ -23,4 +24,8 @@ public interface SearchControllerApiSpec {
     @Operation(summary = "인플루언서를 검색합니다.")
     @ApiResponse(responseCode = "200", description = "인플루언서 검색 성공")
     ResponseEntity<List<InfluencerResponse>> searchInfluencer(String value);
+
+    @Operation(summary = "장소를 검색합니다.")
+    @ApiResponse(responseCode = "200", description = "장소 검색 성공")
+    ResponseEntity<List<PlaceSearchInfo>> searchPlace(String value);
 }

src/main/resources/sql/schema.sql

@@ -4,7 +4,9 @@ create table influencer
         primary key,
     job     varchar(20) not null,
     name    varchar(30) not null,
-    img_url text        not null
+    img_url text        not null,
+
+    FULLTEXT INDEX ft_name_ngram (name) WITH PARSER ngram
 );
 
 create table places
@@ -20,8 +22,10 @@ create table places
     latitude        text                                                                 not null,
     longitude       text                                                                 not null,
     menu_img_url    text                                                                 null,
-    category        enum ('CAFE', 'JAPANESE', 'KOREAN', 'NONE', 'RESTAURANT', 'WESTERN') not null,
-    index idx_long_lat (longitude(15), latitude(15))
+    category        enum ('CAFE', 'JAPANESE', 'KOREAN', 'NONE', 'RESTAURANT', 'WESTERN') not null
+
+    FULLTEXT INDEX ft_name_ngram (name) WITH PARSER ngram,
+    INDEX idx_long_lat (longitude(15), latitude(15))
 );
 
 create table places_menuboardphotourl_list