[fix] 요청한 날짜와 시간에 맞는 조석 정보 반환하도록 수정

Author: hyunmuam

src/main/java/nambang_swag/bada_on/controller/GlobalExceptionHandler.java

@@ -52,7 +52,7 @@ public ResponseEntity<ErrorResponse> badaOnExceptionHandler(BadaOnException e) {
 
 	@ExceptionHandler(Exception.class)
 	public ResponseEntity<ErrorResponse> exceptionHandler(Exception e) {
-		log.error(e.toString());
+		log.error("internal server error", e);
 		ErrorResponse body = ErrorResponse.builder()
 			.code("500")
 			.message("Internal Server Error")

src/main/java/nambang_swag/bada_on/repository/TideRepository.java

@@ -16,9 +16,7 @@ public interface TideRepository extends JpaRepository<TideRecord, Long> {
 	Optional<TideRecord> findByDateAndTideObservatoryAndTidalTime(int date, TideObservatory tideObservatory,
 		LocalDateTime time);
 
-	List<TideRecord> findAllByDateAndTideObservatory(int date, TideObservatory tideObservatory);
-
-	@Query("SELECT t FROM TideRecord t WHERE t.date IN :dates AND t.tideObservatory = :tideObservatory")
-	List<TideRecord> findAllByDatesAndTideObservatory(@Param("dates") List<Integer> dates,
+	@Query("SELECT t FROM TideRecord t WHERE t.date >= :first AND t.date <= :last AND t.tideObservatory = :tideObservatory")
+	List<TideRecord> findAllByDatesAndTideObservatory(@Param("first") int first, @Param("last") int last,
 		@Param("tideObservatory") TideObservatory tideObservatory);
 }

src/main/java/nambang_swag/bada_on/repository/WeatherRepository.java

@@ -14,9 +14,7 @@ public interface WeatherRepository extends JpaRepository<Weather, Integer> {
 
 	Optional<Weather> findByDateAndTimeAndPlace(int date, int time, Place place);
 
-	@Query("SELECT w FROM Weather w WHERE w.place.id = :placeId AND w.date >= :date")
-	List<Weather> findWeatherByPlaceIdWithDateGreaterThan(@Param("placeId") Long placeId, @Param("date") int date);
-
-	@Query("SELECT w FROM Weather w WHERE w.date > :date OR (w.date = :date AND w.time >= :time) AND w.isUpdated = true")
+	@Query("SELECT w FROM Weather w WHERE w.date >= :date AND w.isUpdated = true")
 	List<Weather> getWeatherIsUpdated(@Param("date") int date, @Param("time") int time);
+
 }

src/main/java/nambang_swag/bada_on/service/ExternalApiService.java

@@ -105,7 +105,7 @@ public void getUltraShortTermNowCast() {
 	public void getTidalForecast() {
 		log.info("조석예보 정보 수집 시작");
 		LocalDateTime now = LocalDateTime.now();
-		for (int i = 0; i < 3; i++) {
+		for (int i = -1; i < 6; i++) {
 			LocalDateTime time = now.plusDays(i);
 			for (TideObservatory tideObservatory : TideObservatory.values()) {
 				try {

src/main/java/nambang_swag/bada_on/service/WeatherService.java

@@ -50,9 +50,12 @@ public WeatherSummary getWeatherSummary(Long id, int date, int hour) {
 		Weather weather = weatherRepository.findByDateAndTimeAndPlace(date, hour * 100, place)
 			.orElseThrow(WeatherNotFound::new);
 
-		List<Integer> relevantDates = calculateRelevantDates();
+		DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyyMMdd");
+		LocalDateTime requestTime = toLocalDateTime(date, hour);
+		int first = Integer.parseInt(requestTime.minusDays(1).format(formatter));
+		int last = Integer.parseInt(requestTime.plusDays(1).format(formatter));
 		TideObservatory tideObservatory = TideObservatory.findNearest(place.getLatitude(), place.getLongitude());
-		List<TideRecord> tideRecords = tideRepository.findAllByDatesAndTideObservatory(relevantDates, tideObservatory);
+		List<TideRecord> tideRecords = tideRepository.findAllByDatesAndTideObservatory(first, last, tideObservatory);
 
 		int tidePercentage = calculateTidePercentage(tideRecords);
 		return WeatherSummary.of(
@@ -67,21 +70,31 @@ public WeatherDetail getWeatherDetail(Long placeId, int date, int hour) {
 		Place place = placeRepository.findById(placeId).orElseThrow(PlaceNotFound::new);
 		Weather weather = weatherRepository.findByDateAndTimeAndPlace(date, hour * 100, place)
 			.orElseThrow(WeatherNotFound::new);
-
-		List<Integer> relevantDates = calculateRelevantDates();
+		
+		DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyyMMdd");
+		LocalDateTime requestTime = toLocalDateTime(date, hour);
+		int first = Integer.parseInt(requestTime.minusDays(1).format(formatter));
+		int last = Integer.parseInt(requestTime.plusDays(1).format(formatter));
 		TideObservatory tideObservatory = TideObservatory.findNearest(place.getLatitude(), place.getLongitude());
-		List<TideRecord> tideRecords = tideRepository.findAllByDatesAndTideObservatory(relevantDates, tideObservatory);
+		List<TideRecord> tideRecords = tideRepository.findAllByDatesAndTideObservatory(first, last, tideObservatory);
 
-		LocalDateTime now = LocalDateTime.now();
-		TideInfo closestPreviousTideRecord = findClosestPreviousTideRecord(tideRecords, now);
-		TideInfo closestNextTideRecord = findClosestNextTideRecord(tideRecords, now);
+		TideInfo closestPreviousTideRecord = findClosestPreviousTideRecord(tideRecords, requestTime);
+		TideInfo closestNextTideRecord = findClosestNextTideRecord(tideRecords, requestTime);
+
+		List<TideInfo> tideInfoList = new ArrayList<>();
+		if (closestPreviousTideRecord != null) {
+			tideInfoList.add(closestPreviousTideRecord);
+		}
+		if (closestNextTideRecord != null) {
+			tideInfoList.add(closestNextTideRecord);
+		}
 
 		getAllScores(weather, tideRecords);
 		int tidePercentage = calculateTidePercentage(tideRecords);
 		return WeatherDetail.of(
 			weather,
 			new ArrayList<>(),
-			List.of(closestPreviousTideRecord, closestNextTideRecord),
+			tideInfoList,
 			getAllScores(weather, tideRecords),
 			tidePercentage
 		);
@@ -580,16 +593,6 @@ public List<AvailableTime> getAvailableTime(Integer date, Integer hour) {
 			.toList();
 	}
 
-	private List<Integer> calculateRelevantDates() {
-		LocalDateTime now = LocalDateTime.now();
-		DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyyMMdd");
-		return List.of(
-			Integer.parseInt(now.minusDays(1).format(formatter)), // 어제
-			Integer.parseInt(now.format(formatter)),             // 오늘
-			Integer.parseInt(now.plusDays(1).format(formatter))  // 내일
-		);
-	}
-
 	private List<ActivityScore> getAllScores(Weather weather, List<TideRecord> tideRecords) {
 		List<ActivityScore> scores = new ArrayList<>();
 		scores.add(new ActivityScore(SNORKELING.getValue(), calculateSnorkelingScore(weather, tideRecords)));
@@ -616,5 +619,16 @@ private TideInfo findClosestNextTideRecord(List<TideRecord> tideRecords, LocalDa
 			.map(record -> new TideInfo(record.getTidalLevel(), record.getTidalTime(), record.getCode()))
 			.orElse(null); // Optional에서 직접 null 반환
 	}
+
+	private LocalDateTime toLocalDateTime(int date, int hour) {
+		String dateTimeString = "";
+		if (hour == 0) {
+			dateTimeString = String.format("%08d0000", date);
+		} else {
+			dateTimeString = String.format("%08d%02d", date, hour);
+		}
+		DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyyMMddHHmm");
+		return LocalDateTime.parse(dateTimeString, formatter);
+	}
 }