[#12] refactor : 날짜, 시간, 가격 다르게 나오는 거 수정

Author: sss4920

skyscanner/src/main/java/org/third/thirdseminar/controller/dto/response/AirResultDto.java

@@ -1,8 +1,8 @@
 package org.third.thirdseminar.controller.dto.response;
 import org.third.thirdseminar.domain.TimeRange;
 
-public record AirResultDto(DateDto dateDto, Long airId, String airName, TimeRange startTime, TimeRange endTime) {
-	public static AirResultDto of(DateDto dateDto, Long airId, String airName, TimeRange startTime, TimeRange endTime) {
+public record AirResultDto(DateDto dateDto, Long airId, String airName, TimeRangeDto startTime, TimeRangeDto endTime) {
+	public static AirResultDto of(DateDto dateDto, Long airId, String airName, TimeRangeDto startTime, TimeRangeDto endTime) {
 		return new AirResultDto(dateDto, airId, airName, startTime, endTime);
 	}
 

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

@@ -25,15 +25,15 @@ public class MainService {
 
 	public List<CardDto> getCards(){
 		SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd E");
-		NumberFormat priceFormat = NumberFormat.getCurrencyInstance();
-		priceFormat.setCurrency(Currency.getInstance("KRW"));
+		NumberFormat priceFormat = NumberFormat.getInstance(Locale.getDefault());
+
 		return reservationJpaRepository.findAllExcludingCity("삿포로").stream().map((reservation)->
 			CardDto.of(reservation.getCityName(),
 				reservation.getCountry(),
 				format.format(reservation.getStartDate()),
 				format.format(reservation.getEndDate()),
 				reservation.getAir().getAirName(),
-				priceFormat.format(providerMinPrice(reservation.getTickets()))+"원")
+				priceFormat.format(providerMinPrice(reservation.getTickets()))+"원 출발")
 		).collect(Collectors.toList());
 	}
 

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

@@ -86,6 +86,7 @@ private TimeRangeDto TimeRangeFormat(TimeRange timeRange){
         String endTime = timeRange.getEnd().format( DateTimeFormatter.ofPattern( "H:mm" ));
         String during = timeRange.getDuring().format(DateTimeFormatter.ofPattern("H시간 mm분"));
 
+
         return new TimeRangeDto(startTime, endTime, during);
     }
 

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

@@ -1,33 +1,37 @@
 package org.third.thirdseminar.service;
 
 import java.text.DecimalFormat;
+import java.time.format.DateTimeFormatter;
 import java.util.List;
 import java.util.stream.Collectors;
 
 import org.springframework.stereotype.Service;
 import org.third.thirdseminar.controller.dto.request.TicketRequestDto;
 import org.third.thirdseminar.controller.dto.response.DateDto;
 import org.third.thirdseminar.controller.dto.response.TicketDto;
+import org.third.thirdseminar.controller.dto.response.TimeRangeDto;
 import org.third.thirdseminar.domain.Air;
 import org.third.thirdseminar.controller.dto.response.AirResultDto;
 import org.third.thirdseminar.domain.Reservation;
+import org.third.thirdseminar.domain.TimeRange;
 import org.third.thirdseminar.exception.Error;
 import org.third.thirdseminar.exception.model.NotFoundException;
 import org.third.thirdseminar.infrastructure.AirJpaRepository;
 import org.third.thirdseminar.infrastructure.ReservationJpaRepository;
 import org.third.thirdseminar.infrastructure.TicketJpaRepository;
 
 import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 
 @Service
+@Slf4j
 @RequiredArgsConstructor
 public class TicketService {
 	private final ReservationJpaRepository reservationJpaRepository;
 	private final AirJpaRepository airJpaRepository;
 	private final TicketJpaRepository ticketJpaRepository;
 	private final DecimalFormat df = new DecimalFormat("###,###");
 
-
 	public List<TicketDto> getTicketList(){
 		return ticketJpaRepository.findAll().stream().map(
 			(ticket)->
@@ -49,11 +53,20 @@ public AirResultDto getAirInformation(TicketRequestDto ticketRequestDto){
 			dateDto,
 			air.getAirId(),
 			air.getAirName(),
-			reservation.getStartTime(),
-			reservation.getEndTime()
+			TimeRangeFormat(reservation.getStartTime()),
+			TimeRangeFormat(reservation.getEndTime())
 		);
 	}
 
+	private TimeRangeDto TimeRangeFormat(TimeRange timeRange){
+		String startTime = timeRange.getStart().format( DateTimeFormatter.ofPattern( "HH:mm" ));
+		String endTime = timeRange.getEnd().format( DateTimeFormatter.ofPattern( "HH:mm" ));
+		String during = timeRange.getDuring().format(DateTimeFormatter.ofPattern("H시간 mm분"));
+
+
+		return new TimeRangeDto(startTime, endTime, during);
+	}
+