Merge pull request #149 from DevKor-github/fix/search

fix: 통합 검색 오류 수정

Author: dlwls423

src/main/java/devkor/com/teamcback/domain/place/entity/PlaceType.java

@@ -6,35 +6,36 @@
 @Getter
 @RequiredArgsConstructor
 public enum PlaceType {
-    CLASSROOM("클래스룸"),
-    TOILET("화장실"),
-    MEN_TOILET("남자화장실"),
-    WOMEN_TOILET("여자화장실"),
-    MEN_HANDICAPPED_TOILET("남자장애인화장실"),
-    WOMEN_HANDICAPPED_TOILET("여자장애인화장실"),
-    VENDING_MACHINE("자판기"),
-    WATER_PURIFIER("정수기"),
-    PRINTER("프린터"),
-    LOUNGE("라운지"),
-    CAFE("카페"),
-    SMOKING_BOOTH("흡연부스"),
-    CONVENIENCE_STORE("편의점"),
-    CAFETERIA("식당"),
-    READING_ROOM("열람실"),
-    STUDY_ROOM("스터디룸"),
-    SLEEPING_ROOM("수면실"),
-    SHOWER_ROOM("샤워실"),
-    LOCKER("사물함"),
-    BANK("은행"),
-    TRASH_CAN("쓰레기통"),
-    GYM("헬스장"),
-    BICYCLE_RACK("자전거보관소"),
-    BENCH("벤치"),
-    SHUTTLE_BUS("셔틀버스정거장"),
-    BOOK_RETURN_MACHINE("도서반납기"),
-    TUMBLER_WASHER("텀블러세척기"),
-    ONESTOP_AUTO_MACHINE("원스탑무인발급기"),
-    KOYEON("고연전주점");
+    CLASSROOM("클래스룸", new String[]{}),
+    TOILET("화장실", new String[]{}),
+    MEN_TOILET("남자화장실", new String[]{}),
+    WOMEN_TOILET("여자화장실", new String[]{}),
+    MEN_HANDICAPPED_TOILET("남자장애인화장실", new String[]{}),
+    WOMEN_HANDICAPPED_TOILET("여자장애인화장실", new String[]{}),
+    VENDING_MACHINE("자판기", new String[]{"벤딩머신"}),
+    WATER_PURIFIER("정수기", new String[]{"물나오는"}),
+    PRINTER("프린터", new String[]{"프린트기", "프린터기", "인쇄기"}),
+    LOUNGE("라운지", new String[]{"공부하기좋은곳", "쉴곳", "쉬는", "휴식공간"}),
+    CAFE("카페", new String[]{"커피"}),
+    SMOKING_BOOTH("흡연부스", new String[]{"흡연구역", "담배"}),
+    CONVENIENCE_STORE("편의점", new String[]{"컨비니언스스토어"}),
+    CAFETERIA("식당", new String[]{"학식", "밥먹는곳"}),
+    READING_ROOM("열람실", new String[]{"독서실"}),
+    STUDY_ROOM("스터디룸", new String[]{"단체모임", "회의실"}),
+    SLEEPING_ROOM("수면실", new String[]{"자기좋은곳", "자는곳"}),
+    SHOWER_ROOM("샤워실", new String[]{"씻는데"}),
+    LOCKER("사물함", new String[]{"락커"}),
+    BANK("은행", new String[]{"ATM", "에이티엠기"}),
+    TRASH_CAN("쓰레기통", new String[]{"휴지통"}),
+    GYM("헬스장", new String[]{"휘트니스센터", "피트니스센터", "운동"}),
+    BICYCLE_RACK("자전거보관소", new String[]{}),
+    BENCH("벤치", new String[]{"의자"}),
+    SHUTTLE_BUS("셔틀버스정거장", new String[]{"셔틀버스버정"}),
+    BOOK_RETURN_MACHINE("도서반납기", new String[]{"책반납기계", "도서반납기계"}),
+    TUMBLER_WASHER("텀블러세척기", new String[]{}),
+    ONESTOP_AUTO_MACHINE("원스탑무인발급기", new String[]{"원스톱무인발급기", "증명서", "ONE-STOP", "ONESTOP"}),
+    KOYEON("고연전주점", new String[]{});
 
     private final String name;
+    private final String[] nickname;
 }

src/main/java/devkor/com/teamcback/domain/place/repository/PlaceRepository.java

@@ -26,5 +26,5 @@ public interface PlaceRepository extends JpaRepository<Place, Long> {
 
     Place findByBuildingAndFloorAndMaskIndex(Building building, double floor, Integer maskIndex);
 
-    List<Place> findAllByBuildingAndTypeInOrderByFloor(Building building, List<PlaceType> types);
+    List<Place> findAllByBuildingAndTypeInAndAvailabilityOrderByFloor(Building building, List<PlaceType> types, boolean availability);
 }

src/main/java/devkor/com/teamcback/domain/search/dto/response/GlobalSearchRes.java

@@ -47,7 +47,7 @@ public boolean equals(Object o) {
         if (this == o) return true;
         if (o == null || getClass() != o.getClass()) return false;
         GlobalSearchRes that = (GlobalSearchRes) o;
-        return name.equals(that.name);
+        return name.equals(that.name) && locationType.equals(that.locationType);
     }
 
     @Override

src/main/java/devkor/com/teamcback/domain/search/service/SearchService.java

@@ -511,16 +511,22 @@ private List<Place> getPlaces(String word, Building building) {
             // 초성으로만 구성된 경우
             if(hangeulUtils.isConsonantOnly(word)) placeNicknames.addAll(placeNicknameRepository.findByChosungContainingAndPlaceInOrderByNickname(hangeulUtils.extractChosung(word), places, limit));
 
+            // 중복을 제거하여 List에 저장
             resultPlaces.addAll(placeNicknames.stream()
                 .map(PlaceNickname::getPlace)
                 .distinct()
                 .toList());
 
             // 빌딩 + 편의시설명의 경우를 GlobalSearchRes로 추가하기 (Ex. 하나스퀘어 카페)
-            // word가 편의시설명과 부분일치하는지 확인하기(outerTagTypes)
+            // word가 편의시설명과 부분일치하는지 확인하기(outerTagTypes) && 빌딩에 해당 시설이 있는지 확인
             for (PlaceType type : outerTagTypes) {
-                if(type.getName().contains(word)) {
-                    resultPlaces.add(new Place(type, building));
+                if((type.getName().contains(word) || Arrays.stream(type.getNickname()).anyMatch(nickname -> nickname.contains(word)))) {
+                    List<Place> tempPlace = placeRepository.findAllByBuildingAndType(building, type);
+                    if(!tempPlace.isEmpty()) {
+                        resultPlaces.addAll(tempPlace);
+                        resultPlaces.add(new Place(type, building));
+                    }
+
                 }
             }
         }
@@ -529,25 +535,25 @@ else if(building == null) { // 빌딩 제한 없는 전체 검색
             // 초성으로만 구성된 경우
             if(hangeulUtils.isConsonantOnly(word)) placeNicknames.addAll( placeNicknameRepository.findAllByChosungContainingOrderByNickname(hangeulUtils.extractChosung(word), limit));
 
+            // 중복을 제거하여 List에 저장
             resultPlaces.addAll(placeNicknames.stream()
                 .map(PlaceNickname::getPlace)
                 .distinct()
                 .toList());
 
             // 자체가 편의시설명인 경우 : 야외 태그
             for (PlaceType type : outerTagTypes) {
-                if(type.getName().contains(word)) {
+                if(type.getName().contains(word) || Arrays.stream(type.getNickname()).anyMatch(nickname -> nickname.contains(word))) {
                     resultPlaces.add(new Place(type, findBuilding(0L)));
                 }
             }
         }
-        // 중복을 제거하여 List에 저장
         return resultPlaces;
     }
 
     // 특정 건물 및 타입 리스트에 속하는 편의시설 검색
     private List<Place> getFacilitiesByBuildingAndTypes(Building building, List<PlaceType> types) {
-        return placeRepository.findAllByBuildingAndTypeInOrderByFloor(building, types);
+        return placeRepository.findAllByBuildingAndTypeInAndAvailabilityOrderByFloor(building, types, true);
     }
 
     // 특정 건물 및 타입에 속하는 편의시설 검색 (화장실 검색하는 경우 - 다른 화장실 모두 포함하도록)