Skip to content

Commit ad71530

Browse files
authored
Merge pull request #198 from DevKor-github/develop
develop -> main 병합
2 parents 98c3628 + c902e1a commit ad71530

File tree

1 file changed

+11
-8
lines changed

1 file changed

+11
-8
lines changed

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

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -210,14 +210,17 @@ public SearchFloorInfoRes searchPlaceByBuildingFloor(Long buildingId, int floor)
210210
List<SearchRoomDetailRes> roomDetailRes = new ArrayList<>(
211211
placeList.stream().map(SearchRoomDetailRes::new).toList());
212212

213-
List<SearchNodeRes> nodeList = nodeRepository.findAllByBuildingAndFloorAndTypeIn(building, floor, List.of(ENTRANCE, STAIR, ELEVATOR))
214-
.stream()
215-
.filter(node -> { // 출입구 중 placeList에 존재하지 않는 것들만 추가
216-
if (node.getType() != ENTRANCE) return true;
217-
return placeList.stream()
218-
.noneMatch(p -> p.getNode().getId().equals(node.getId()));
219-
})
220-
.map(SearchNodeRes::new).toList();
213+
List<SearchNodeRes> nodeList = nodeRepository.findAllByBuildingAndFloorAndTypeIn(building, floor, List.of(ENTRANCE, STAIR, ELEVATOR))
214+
.stream().map(SearchNodeRes::new).toList();
215+
216+
// List<SearchNodeRes> nodeList = nodeRepository.findAllByBuildingAndFloorAndTypeIn(building, floor, List.of(ENTRANCE, STAIR, ELEVATOR))
217+
// .stream()
218+
// .filter(node -> { // 출입구 중 placeList에 존재하지 않는 것들만 추가
219+
// if (node.getType() != ENTRANCE) return true;
220+
// return placeList.stream()
221+
// .noneMatch(p -> p.getNode().getId().equals(node.getId()));
222+
// })
223+
// .map(SearchNodeRes::new).toList();
221224

222225
return new SearchFloorInfoRes(roomDetailRes, nodeList);
223226
}

0 commit comments

Comments
 (0)