Merge pull request #52 from hanghaebnb/feature/51

[CHORE] - 검색어기능 비회원도 가능하도록 수정 #51
hanghaebnb · Dec 28, 2022 · 02f25a2 · 02f25a2
2 parents e28df5e + bb8dc6f
commit 02f25a2
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 8 deletions.
diff --git a/src/main/java/com/cloneweek/hanghaebnb/common/config/WebSecurityConfig.java b/src/main/java/com/cloneweek/hanghaebnb/common/config/WebSecurityConfig.java
@@ -42,6 +42,7 @@ public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Excepti
                 .antMatchers("/api/users/**").permitAll()
                 .antMatchers("/email/**").permitAll()
                 .antMatchers(HttpMethod.GET, "/api/rooms/main").permitAll()
+                .antMatchers(HttpMethod.GET, "/api/rooms/search").permitAll()
                 .anyRequest().authenticated()
                 .and()
                 .addFilterBefore(new JwtAuthFilter(jwtUtil),UsernamePasswordAuthenticationFilter.class);

diff --git a/src/main/java/com/cloneweek/hanghaebnb/controller/RoomController.java b/src/main/java/com/cloneweek/hanghaebnb/controller/RoomController.java
@@ -51,10 +51,9 @@ public ResponseEntity<List<UnClientResponseDto>> getnoclientRooms(@PageableDefau
 
     //숙소 키워드 조회
     @GetMapping("/rooms/search") // '/api/rooms/search?keyword=제목&page=0&size=2'
-    public ResponseEntity<List<RoomResponseDto>> search(@AuthenticationPrincipal UserDetailsImpl userDetails,
-                                                        @PageableDefault(sort = "createdAt", direction = Sort.Direction.DESC) Pageable pageable,
-                                                        String keyword){
-        return ResponseEntity.ok(roomService.search(keyword, pageable, userDetails.getUser()));
+    public ResponseEntity<List<UnClientResponseDto>> search(@PageableDefault(sort = "createdAt", direction = Sort.Direction.DESC) Pageable pageable,
+                                                            String keyword){
+        return ResponseEntity.ok(roomService.search(keyword, pageable));
     }
 
     //숙소 정보 수정
@@ -80,7 +79,7 @@ public ResponseEntity<ResponseMsgDto> saveLike(@PathVariable Long roomId,
         return ResponseEntity.ok().body(roomService.saveLike(roomId, userDetails.getUser()));
     }
 
-    // 게시글 좋아요 취소
+    // 숙소 좋아요 취소
     @DeleteMapping("/rooms/{roomId}/like")
     public ResponseEntity<ResponseMsgDto> cancelLike(@PathVariable Long roomId,
                                                      @AuthenticationPrincipal UserDetailsImpl userDetails) {

diff --git a/src/main/java/com/cloneweek/hanghaebnb/service/RoomService.java b/src/main/java/com/cloneweek/hanghaebnb/service/RoomService.java
@@ -92,15 +92,16 @@ public List<UnClientResponseDto> getnoclientRooms(Pageable pageable) {
 
     //숙소 키워드 검색
     @Transactional(readOnly = true)
-    public List<RoomResponseDto> search(String keyword, Pageable pageable, User user) {
+    public List<UnClientResponseDto> search(String keyword, Pageable pageable) {
         Page<Room> roomList = roomRepository.findByTitleContaining(keyword, pageable);
-        List<RoomResponseDto> roomResponseDtos = new ArrayList<>();
+
+        List<UnClientResponseDto> roomResponseDtos = new ArrayList<>();
         for (Room room : roomList) {
             List<String> imageFileList = new ArrayList<>();
             for (ImageFile imageFile : room.getImageFileList()) {
                 imageFileList.add(imageFile.getPath());
             }
-            roomResponseDtos.add(new RoomResponseDto(room, (checkLike(room.getId(), user)), imageFileList));
+            roomResponseDtos.add(new UnClientResponseDto(room, imageFileList));
         }
 
         return roomResponseDtos;