Merge pull request #24 from Nexters/feature/23-current-weather-max-mi…

…n-temp-bug [#23] 오늘 날씨 최고/최저 기온 업데이트 오류 수정
Nexters · Nov 17, 2024 · 01d51b1 · 01d51b1
2 parents 52eb036 + 94582ef
commit 01d51b1
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 4 deletions.
diff --git a/src/main/kotlin/nexters/weski/batch/ExternalWeatherService.kt b/src/main/kotlin/nexters/weski/batch/ExternalWeatherService.kt
@@ -29,8 +29,13 @@ class ExternalWeatherService(
 
     @Transactional
     fun updateCurrentWeather() {
-        val baseDate = LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyyMMdd"))
         val baseTime = getBaseTime()
+        val baseLocalDateTime = if (baseTime == "2300") {
+            LocalDateTime.now().minusDays(1)
+        } else {
+            LocalDateTime.now()
+        }
+        val baseDate = baseLocalDateTime.format(DateTimeFormatter.ofPattern("yyyyMMdd"))
         skiResortRepository.findAll().forEach { resort ->
             val url = "https://apis.data.go.kr/1360000/VilageFcstInfoService_2.0/getUltraSrtNcst" +
                     "?serviceKey=$apiKey" +
@@ -62,6 +67,9 @@ class ExternalWeatherService(
     private fun getBaseTime(): String {
         val now = LocalDateTime.now().minusHours(1)
         val hour = now.hour.toString().padStart(2, '0')
+        if (hour == "23") {
+            return "0000"
+        }
         return "${hour}00"
     }
 
@@ -91,11 +99,21 @@ class ExternalWeatherService(
         val feelsLike = calculateFeelsLike(temperature, windSpeed)
         val condition = determineCondition(data)
         val description = generateDescription(condition, temperature)
-
+        val dailyWeather = dailyWeatherRepository.findBySkiResortAndForecastDate(resort, LocalDate.now())[0]
+        // dailyWeather.maxTemp보다 temperature이 높으면 maxTemp를 업데이트
+        if (temperature > dailyWeather.maxTemp) {
+            dailyWeather.maxTemp = temperature
+            dailyWeatherRepository.save(dailyWeather)
+        }
+        // dailyWeather.minTemp보다 temperature이 낮으면 minTemp을 업데이트
+        if (temperature < dailyWeather.minTemp) {
+            dailyWeather.minTemp = temperature
+            dailyWeatherRepository.save(dailyWeather)
+        }
         return CurrentWeather(
             temperature = temperature,
-            maxTemp = data["TMX"]?.toDoubleOrNull()?.toInt() ?: temperature,
-            minTemp = data["TMN"]?.toDoubleOrNull()?.toInt() ?: temperature,
+            maxTemp = dailyWeather.maxTemp,
+            minTemp = dailyWeather.minTemp,
             feelsLike = feelsLike,
             condition = condition,
             description = description,

diff --git a/src/main/kotlin/nexters/weski/weather/DailyWeatherRepository.kt b/src/main/kotlin/nexters/weski/weather/DailyWeatherRepository.kt
@@ -2,9 +2,11 @@ package nexters.weski.weather
 
 import nexters.weski.ski_resort.SkiResort
 import org.springframework.data.jpa.repository.JpaRepository
+import java.time.LocalDate
 
 interface DailyWeatherRepository : JpaRepository<DailyWeather, Long> {
     fun findAllBySkiResortResortId(resortId: Long): List<DailyWeather>
     fun deleteByDDayGreaterThanEqual(dDay: Int)
     fun findBySkiResortAndDDay(skiResort: SkiResort, dDay: Int): DailyWeather?
+    fun findBySkiResortAndForecastDate(skiResort: SkiResort, forecastDate: LocalDate): List<DailyWeather>
 }