Develop

src/main/java/ybe/mini/travelserver/domain/accommodation/controller/AccommodationController.java

@@ -3,7 +3,7 @@
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.HttpStatus;
 import org.springframework.web.bind.annotation.*;
-import ybe.mini.travelserver.domain.accommodation.dto.AccommodationAndRoomResponse;
+import ybe.mini.travelserver.domain.accommodation.dto.AccommodationDetailGetResponse;
 import ybe.mini.travelserver.domain.accommodation.dto.AccommodationGetResponse;
 import ybe.mini.travelserver.domain.accommodation.entity.AreaCode;
 import ybe.mini.travelserver.domain.accommodation.service.AccommodationService;
@@ -13,7 +13,7 @@
 
 @RestController
 @RequiredArgsConstructor
-@RequestMapping("/temp/accommodations")
+@RequestMapping("/accommodations")
 public class AccommodationController {
 
     private final AccommodationService accommodationService;
@@ -26,18 +26,18 @@ public ResponseDto<List<AccommodationGetResponse>> searchAccommodations(
     ) {
         int numOfRows = 10;
         List<AccommodationGetResponse> accommodations =
-                accommodationService.bringAccommodationsFromAPI(pageNo, numOfRows, keyword, areaCode);
+                accommodationService.bringAccommodations(pageNo, numOfRows, keyword, areaCode);
         return new ResponseDto<>(HttpStatus.OK.value(), accommodations);
     }
 
-    @GetMapping("/{accommodationId}")
-    public ResponseDto<AccommodationAndRoomResponse> getAccommodationAndRooms(
-            @PathVariable Long accommodationId,
-            @RequestParam(required = false, defaultValue = "_") String keyword
+    @GetMapping
+    public ResponseDto<AccommodationDetailGetResponse> searchAccommodations(
+            @RequestParam String keyword,
+            @RequestParam(value = "area-code") AreaCode areaCode
     ) {
-        AccommodationAndRoomResponse accommodationAndRoomResponse
-                = accommodationService.bringAccommodationAndRoomsFromAPI(accommodationId, keyword);
-        return new ResponseDto<>(HttpStatus.OK.value(), accommodationAndRoomResponse);
+        AccommodationDetailGetResponse accommodationDetailGetResponse =
+                accommodationService.bringAccommodationFromAPI(keyword, areaCode);
+        return new ResponseDto<>(HttpStatus.OK.value(), accommodationDetailGetResponse);
     }
 
 }

src/main/java/ybe/mini/travelserver/domain/accommodation/dto/AccommodationDetailGetResponse.java

@@ -0,0 +1,28 @@
+package ybe.mini.travelserver.domain.accommodation.dto;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import lombok.Builder;
+import ybe.mini.travelserver.domain.accommodation.entity.Accommodation;
+import ybe.mini.travelserver.domain.room.dto.RoomGetResponse;
+
+import java.util.List;
+
+@JsonIgnoreProperties(ignoreUnknown = true)
+public record AccommodationDetailGetResponse(
+        Long Id,
+        String name,
+        String address,
+        String image
+) {
+    @Builder
+    public static AccommodationDetailGetResponse fromEntity(
+            Accommodation accommodation
+    ) {
+        return new AccommodationDetailGetResponse(
+                accommodation.getId(),
+                accommodation.getName(),
+                accommodation.getLocation().getAddress(),
+                accommodation.getImage()
+        );
+    }
+}

src/main/java/ybe/mini/travelserver/domain/accommodation/service/AccommodationService.java

@@ -3,16 +3,14 @@
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import ybe.mini.travelserver.domain.accommodation.dto.AccommodationAndRoomResponse;
+import ybe.mini.travelserver.domain.accommodation.dto.AccommodationDetailGetResponse;
 import ybe.mini.travelserver.domain.accommodation.dto.AccommodationGetResponse;
 import ybe.mini.travelserver.domain.accommodation.entity.Accommodation;
 import ybe.mini.travelserver.domain.accommodation.entity.AreaCode;
 import ybe.mini.travelserver.domain.accommodation.repository.AccommodationRepository;
-import ybe.mini.travelserver.domain.room.dto.RoomGetResponse;
-import ybe.mini.travelserver.domain.room.entity.Room;
-import ybe.mini.travelserver.domain.room.service.RoomService;
 import ybe.mini.travelserver.global.api.TourAPIService;
 
+import java.util.Collections;
 import java.util.List;
 import java.util.Objects;
 
@@ -22,37 +20,35 @@
 public class AccommodationService {
 
     private final AccommodationRepository accommodationRepository;
-    private final RoomService roomService;
     private final TourAPIService tourAPIService;
 
-    public List<AccommodationGetResponse> bringAccommodationsFromAPI(
+    public List<AccommodationGetResponse> bringAccommodations(
             int pageNo, int numOfRows,
             String keyword, AreaCode areaCode
     ) {
+        if (pageNo <= 0) {
+            return Collections.emptyList();
+        }
+
+        String areaCodeString = (areaCode != null) ? String.valueOf(areaCode.getCode()) : null;
+
         List<Accommodation> accommodations =
-                tourAPIService.bringAccommodationsForSearch(
+                tourAPIService.bringAccommodations(
                         pageNo,
                         numOfRows,
                         keyword,
-                        String.valueOf(areaCode.getCode()));
+                        areaCodeString);
 
         return getResponseList(accommodations);
     }
 
-    public AccommodationAndRoomResponse bringAccommodationAndRoomsFromAPI(
-            Long accommodationId,
-            String keyword
-    ) {
-        Accommodation accommodation = tourAPIService.bringAccommodation(accommodationId, keyword);
-        AccommodationGetResponse accommodationGetResponse = AccommodationGetResponse.fromEntity(accommodation);
-        List<Room> rooms = tourAPIService.bringRooms(accommodationId);
-        List<RoomGetResponse> roomGetResponseList =
-                rooms.stream()
-                        .map(RoomGetResponse::fromEntity)
-                        .toList();
-        return AccommodationAndRoomResponse.fromEntity(accommodationGetResponse, roomGetResponseList);
-    }
+    public AccommodationDetailGetResponse bringAccommodationFromAPI(String keyword, AreaCode areaCode) {
+        String areaCodeString = (areaCode != null) ? String.valueOf(areaCode.getCode()) : null;
 
+        Accommodation accommodation =
+                tourAPIService.bringAccommodation(keyword, areaCodeString);
+        return AccommodationDetailGetResponse.fromEntity(accommodation);
+    }
 
     @Transactional(readOnly = true)
     public List<AccommodationGetResponse> bringAccommodations(String keyword, String areaCode) {
@@ -71,14 +67,6 @@ public List<AccommodationGetResponse> bringAccommodations(String keyword, String
         return getResponseList(accommodations);
     }
 
-    @Transactional(readOnly = true)
-    public AccommodationAndRoomResponse bringAccommodationAndRooms(Long accommodationId) {
-        Accommodation accommodation = bringAccommodation(accommodationId);
-        AccommodationGetResponse accommodationGetResponse = AccommodationGetResponse.fromEntity(accommodation);
-        List<RoomGetResponse> roomGetResponseList = roomService.bringRooms(accommodationId);
-        return AccommodationAndRoomResponse.fromEntity(accommodationGetResponse, roomGetResponseList);
-    }
-
 
     private Accommodation bringAccommodation(Long accommodationId) {
         return accommodationRepository