Merge pull request #40 from Nexters/feature/39-update-weather-sorting

[#39] 스키장 날씨 조회 API 정렬 기준 추가
Nexters · Jan 15, 2025 · 5e92d74 · 5e92d74
2 parents f65ea02 + e86a9c3
commit 5e92d74
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 5 deletions.
diff --git a/src/main/kotlin/nexters/weski/ski_resort/SkiResortService.kt b/src/main/kotlin/nexters/weski/ski_resort/SkiResortService.kt
@@ -18,7 +18,11 @@ class SkiResortService(
         val skiResorts = skiResortRepository.findAllByOrderByOpeningDateAsc()
         return skiResorts.map { skiResort ->
             val currentWeather = currentWeatherRepository.findBySkiResortResortId(skiResort.resortId)
-            val weeklyWeather = dailyWeatherRepository.findAllBySkiResortResortId(skiResort.resortId)
+            val weeklyWeather = dailyWeatherRepository.findBySkiResortAndForecastDateBetweenOrderByForecastDate(
+                skiResort = skiResort,
+                startDate = LocalDate.now(),
+                endDate = LocalDate.now().plusDays(7)
+            )
 
             SkiResortResponseDto.fromEntity(skiResort, currentWeather, weeklyWeather)
         }
@@ -29,7 +33,11 @@ class SkiResortService(
             .orElseThrow { IllegalArgumentException("해당 ID의 스키장이 존재하지 않습니다.") }
 
         val currentWeather = currentWeatherRepository.findBySkiResortResortId(skiResort.resortId)
-        val weeklyWeather = dailyWeatherRepository.findAllBySkiResortResortId(skiResort.resortId)
+        val weeklyWeather = dailyWeatherRepository.findBySkiResortAndForecastDateBetweenOrderByForecastDate(
+            skiResort = skiResort,
+            startDate = LocalDate.now(),
+            endDate = LocalDate.now().plusDays(7)
+        )
 
         return SkiResortResponseDto.fromEntity(skiResort, currentWeather, weeklyWeather)
     }

diff --git a/src/main/kotlin/nexters/weski/weather/DailyWeatherRepository.kt b/src/main/kotlin/nexters/weski/weather/DailyWeatherRepository.kt
@@ -5,9 +5,15 @@ import org.springframework.data.jpa.repository.JpaRepository
 import java.time.LocalDate
 
 interface DailyWeatherRepository : JpaRepository<DailyWeather, Long> {
-    fun findAllBySkiResortResortId(resortId: Long): List<DailyWeather>
+    fun findBySkiResortAndForecastDateBetweenOrderByForecastDate(
+        skiResort: SkiResort,
+        startDate: LocalDate,
+        endDate: LocalDate
+    ): List<DailyWeather>
+
     fun findBySkiResortAndForecastDate(skiResort: SkiResort, forecastDate: LocalDate): DailyWeather?
-    fun findAllBySkiResortResortIdAndForecastDateBetween(
+
+    fun findAllBySkiResortResortIdAndForecastDateBetweenOrderByForecastDate(
         resortId: Long,
         startDate: LocalDate,
         endDate: LocalDate

diff --git a/src/main/kotlin/nexters/weski/weather/WeatherService.kt b/src/main/kotlin/nexters/weski/weather/WeatherService.kt
@@ -16,7 +16,7 @@ class WeatherService(
         val today = LocalDate.now()
         val after7Days = today.plusDays(7)
 
-        val dailyWeather = dailyWeatherRepository.findAllBySkiResortResortIdAndForecastDateBetween(
+        val dailyWeather = dailyWeatherRepository.findAllBySkiResortResortIdAndForecastDateBetweenOrderByForecastDate(
             resortId = resortId,
             startDate = today,
             endDate = after7Days