[#17] bug: 리팩터링 완료 및 테스트완료

Author: sss4920

skyscanner/src/main/java/org/third/thirdseminar/controller/AirReservationController.java

@@ -1,6 +1,10 @@
 package org.third.thirdseminar.controller;
 
+import java.util.Date;
+
 import lombok.RequiredArgsConstructor;
+
+import org.springframework.format.annotation.DateTimeFormat;
 import org.springframework.web.bind.annotation.*;
 import org.third.thirdseminar.common.ApiResponse;
 import org.third.thirdseminar.controller.dto.request.AirReservationRequest;
@@ -18,8 +22,9 @@ public class AirReservationController {
     private final ReservationService reservationServcie;
 
     @GetMapping("/reservations")
-    public ApiResponse<AirReservationResponse> getReservertaions(@RequestBody AirReservationRequest request){
-        return ApiResponse.success(Success.GET_RESERVATION_SUCCESS,reservationServcie.getReservations(request));
+    public ApiResponse<AirReservationResponse> getReservertaions(@RequestParam @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) Date startDate,
+        @RequestParam @DateTimeFormat(iso = DateTimeFormat.ISO.DATE)Date endDate){
+        return ApiResponse.success(Success.GET_RESERVATION_SUCCESS,reservationServcie.getReservations(startDate,endDate));
     }
 
     @PostMapping("/reservation")

skyscanner/src/main/java/org/third/thirdseminar/controller/TicketController.java

@@ -1,10 +1,13 @@
 package org.third.thirdseminar.controller;
 
+import java.util.Date;
+
+import org.springframework.format.annotation.DateTimeFormat;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 import org.third.thirdseminar.common.ApiResponse;
-import org.third.thirdseminar.controller.dto.request.TicketRequestDto;
 import org.third.thirdseminar.controller.dto.response.TicketPageDto;
 import org.third.thirdseminar.exception.Success;
 import org.third.thirdseminar.service.TicketService;
@@ -18,9 +21,9 @@ public class TicketController {
 	private final TicketService ticketService;
 
 	@GetMapping("/ticket")
-	public ApiResponse<TicketPageDto> getTicket(@RequestBody TicketRequestDto ticketRequestDto){
+	public ApiResponse<TicketPageDto> getTicket(@RequestParam @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) Date startDate, @RequestParam @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) Date endDate, @RequestParam Long reservationId){
 		return ApiResponse.success(Success.GET_TICKET_SUCCESS, TicketPageDto.of(
-			ticketService.getAirInformation(ticketRequestDto),
+			ticketService.getAirInformation(startDate,endDate,reservationId),
 			ticketService.getTicketList())
 		);
 	}

skyscanner/src/main/java/org/third/thirdseminar/service/ReservationService.java

@@ -34,7 +34,7 @@ public class ReservationService {
     private final ReservationResultJpaRepository reservationResultJpaRepository;
     private final DecimalFormat df = new DecimalFormat("###,###");
 
-    public AirReservationResponse getReservations(AirReservationRequest reqeust){
+    public AirReservationResponse getReservations(Date startDate, Date endDate){
         List<ReservationMinPriceDTO> reservationMinPriceDtoList = reservationJpaRepository.findReservations("일본").stream().map(
                 row -> ReservationMinPriceDTO.of(
                         (Reservation) row[0],
@@ -47,7 +47,7 @@ public AirReservationResponse getReservations(AirReservationRequest reqeust){
             Reservation reservation = reservationMinPriceDTO.reservation();
             airList.add(ReservationDto.of(reservation, df.format(reservationMinPriceDTO.minPrice()), TimeRangeFormat(reservation.getStartTime()), TimeRangeFormat(reservation.getEndTime())));
         }
-        DateDto dateDto = new DateDto(reqeust.startDate(), reqeust.endDate());
+        DateDto dateDto = new DateDto(startDate, endDate);
         return new AirReservationResponse(dateDto, airList);
     }
 

skyscanner/src/main/java/org/third/thirdseminar/service/TicketService.java

@@ -2,6 +2,7 @@
 
 import java.text.DecimalFormat;
 import java.time.format.DateTimeFormatter;
+import java.util.Date;
 import java.util.List;
 import java.util.Optional;
 import java.util.stream.Collectors;
@@ -45,12 +46,12 @@ public List<TicketDto> getTicketList(){
 					ticket.getComment())).collect(Collectors.toList());
 	}
 
-	public AirResultDto getAirInformation(TicketRequestDto ticketRequestDto){
-		Reservation reservation = reservationJpaRepository.findById(ticketRequestDto.reservationId())
+	public AirResultDto getAirInformation(Date startDate, Date endDate, Long reservationId){
+		Reservation reservation = reservationJpaRepository.findById(reservationId)
 			.orElseThrow( ()-> new NotFoundException(Error.RESERVATION_NOT_FOUND, Error.RESERVATION_NOT_FOUND.getMessage())
 		);
 		Air air= reservation.getAir();
-		DateDto dateDto = new DateDto(ticketRequestDto.startDate(), ticketRequestDto.endDate());	//date 객체 주워오기
+		DateDto dateDto = new DateDto(startDate, endDate);	//date 객체 주워오기
 
 		return AirResultDto.of(
 			dateDto,