[feat] summary 요청 및 응답 변경

Author: hyunmuam

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

@@ -24,16 +24,15 @@
 public class WeatherController {
 
 	private final WeatherService weatherService;
-
+	
 	@Operation(summary = "등록장소에서의 활동 추천도 조회", description = "입력된 위치의 활동 추천도 리스트를 조회")
 	@GetMapping("/summary")
-	public ResponseEntity<List<WeatherSummary>> getWeatherSummary(
-		@Parameter(description = "등록 장소 ID")
-		@RequestParam("id")
-		Long id,
-		@Parameter(description = "activity(스노클링 - snorkeling, 다이빙 - diving, 해수욕 - swimming, 서핑 - surfing, 카약/패들보드 - kayakingPaddleBoarding)")
-		@RequestParam("category") String category) {
-		return ResponseEntity.ok().body(weatherService.getWeatherSummary(id, category));
+	public ResponseEntity<WeatherSummary> getWeatherSummary(
+		@RequestParam("id") Long id,
+		@RequestParam("date") int date,
+		@RequestParam("hour") int hour
+	) {
+		return ResponseEntity.ok().body(weatherService.getWeatherSummary(id, date, hour));
 	}
 
 	@Operation(summary = "등록장소의 세부 날씨 조회", description = "등록 장소의 세부 날씨 조회")

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

@@ -5,6 +5,8 @@
 import java.util.Optional;
 
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
 
 import nambang_swag.bada_on.constant.TideObservatory;
 import nambang_swag.bada_on.entity.TideRecord;
@@ -16,4 +18,8 @@ Optional<TideRecord> findByDateAndTideObservatoryAndTidalTime(int date, TideObse
 
 	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,
+		@Param("tideObservatory") TideObservatory tideObservatory);
+
 }

src/main/java/nambang_swag/bada_on/response/WeatherSummary.java

@@ -1,20 +1,55 @@
 package nambang_swag.bada_on.response;
 
-import lombok.Builder;
-import lombok.Getter;
+import java.util.List;
 
-@Getter
-public class WeatherSummary {
-	private int date;
-	private int hour;
-	private int score;
-	private String message;
+import nambang_swag.bada_on.constant.Activity;
+import nambang_swag.bada_on.entity.Weather;
 
-	@Builder
-	public WeatherSummary(int date, int hour, int score, String message) {
-		this.date = date;
-		this.hour = hour;
-		this.score = score;
-		this.message = message;
+public record WeatherSummary(
+	int date,
+	int hour,
+	List<String> warning,
+	Activity recommendActivity,
+	String skyCondition,
+	float temperature,
+	String wind,
+	float tideHeight,
+	float waveHeight
+) {
+	public static WeatherSummary of(Weather weather, List<String> warning, Activity recommendActivity,
+		float tideHeight) {
+		return new WeatherSummary(
+			weather.getDate(),
+			weather.getTime(),
+			warning,
+			recommendActivity,
+			getSkyCondition(weather),
+			weather.getHourlyTemperature(),
+			getWindString(weather.getWindSpeed()),
+			tideHeight,
+			weather.getWaveHeight()
+		);
+	}
+
+	private static String getSkyCondition(Weather weather) {
+		if (weather.getHourlySnowAccumulation() > 0) {
+			return "눈";
+		} else if (weather.getHourlyPrecipitation() > 0) {
+			return "비";
+		} else {
+			return weather.getSkyCondition().getDescription();
+		}
+	}
+
+	private static String getWindString(float windSpeed) {
+		if (windSpeed >= 0f && windSpeed < 2f) {
+			return "매우 약함";
+		} else if (windSpeed >= 2f && windSpeed < 4f) {
+			return "약함";
+		} else if (windSpeed >= 4f && windSpeed < 7f) {
+			return "적당";
+		} else {
+			return "강함";
+		}
 	}
 }

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

@@ -1,10 +1,13 @@
 package nambang_swag.bada_on.service;
 
+import static nambang_swag.bada_on.constant.Activity.*;
+
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.time.temporal.ChronoUnit;
 import java.util.ArrayList;
 import java.util.Comparator;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -15,14 +18,14 @@
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import nambang_swag.bada_on.constant.Activity;
-import nambang_swag.bada_on.constant.Message;
 import nambang_swag.bada_on.constant.PrecipitationType;
 import nambang_swag.bada_on.constant.SkyCondition;
 import nambang_swag.bada_on.constant.TideObservatory;
 import nambang_swag.bada_on.entity.Place;
 import nambang_swag.bada_on.entity.TideRecord;
 import nambang_swag.bada_on.entity.Weather;
 import nambang_swag.bada_on.exception.PlaceNotFound;
+import nambang_swag.bada_on.exception.WeatherNotFound;
 import nambang_swag.bada_on.repository.PlaceRepository;
 import nambang_swag.bada_on.repository.TideRepository;
 import nambang_swag.bada_on.repository.WeatherRepository;
@@ -40,39 +43,22 @@ public class WeatherService {
 	private final TideRepository tideRepository;
 	private final PlaceRepository placeRepository;
 
-	public List<WeatherSummary> getWeatherSummary(Long id, String stringActivity) {
+	public WeatherSummary getWeatherSummary(Long id, int date, int hour) {
 		Place place = placeRepository.findById(id).orElseThrow(PlaceNotFound::new);
-		Activity activity = Activity.from(stringActivity);
-		LocalDateTime now = LocalDateTime.now();
-		int today = Integer.parseInt(now.format(DateTimeFormatter.ofPattern("yyyyMMdd")));
-		int yesterday = Integer.parseInt(now.minusDays(1).format(DateTimeFormatter.ofPattern("yyyyMMdd")));
-		int tomorrow = Integer.parseInt(now.plusDays(1).format(DateTimeFormatter.ofPattern("yyyyMMdd")));
+		Weather weather = weatherRepository.findByDateAndTimeAndPlace(date, hour * 100, place)
+			.orElseThrow(WeatherNotFound::new);
 
+		List<Integer> relevantDates = calculateRelevantDates();
 		TideObservatory tideObservatory = TideObservatory.findNearest(place.getLatitude(), place.getLongitude());
-		List<TideRecord> todayTide = tideRepository.findAllByDateAndTideObservatory(today, tideObservatory);
-		List<TideRecord> yesterdayTide = tideRepository.findAllByDateAndTideObservatory(yesterday, tideObservatory);
-		List<TideRecord> tomorrowTide = tideRepository.findAllByDateAndTideObservatory(tomorrow, tideObservatory);
-		List<TideRecord> tideRecords = new ArrayList<>();
-		tideRecords.addAll(yesterdayTide);
-		tideRecords.addAll(todayTide);
-		tideRecords.addAll(tomorrowTide);
-
-		List<WeatherSummary> weatherSummaryList = new ArrayList<>();
-		List<Weather> weathers = weatherRepository.findWeatherByPlaceIdWithDateGreaterThan(
-			place.getId(), today);
-		for (Weather weather : weathers) {
-			int score = calculateScore(activity, weather, tideRecords);
-			String message = Message.from(activity.getValue(), score);
-			if (weather.isUpdated()) {
-				weatherSummaryList.add(WeatherSummary.builder()
-					.date(weather.getDate())
-					.hour(weather.getTime() / 100)
-					.score(score)
-					.message(message)
-					.build());
-			}
-		}
-		return weatherSummaryList;
+		List<TideRecord> tideRecords = tideRepository.findAllByDatesAndTideObservatory(relevantDates, tideObservatory);
+
+		int tidePercentage = calculateTidePercentage(tideRecords);
+		return WeatherSummary.of(
+			weather,
+			new ArrayList<>(),
+			getRecommendActivity(weather, tideRecords),
+			tidePercentage
+		);
 	}
 
 	public List<WeatherDetail> getWeatherDetail(Long placeId) {
@@ -102,26 +88,19 @@ public List<WeatherDetail> getWeatherDetail(Long placeId) {
 		return result;
 	}
 
-	private int calculateScore(Activity activity, Weather weather, List<TideRecord> tideRecords) {
-		switch (activity) {
-			case SNORKELING -> {
-				return calculateSnorkelingScore(weather, tideRecords);
-			}
-			case SURFING -> {
-				return calculateSurfingScore(weather, tideRecords);
-			}
-			case DIVING -> {
-				return calculateDivingScore(weather, tideRecords);
-			}
-			case SWIMMING -> {
-				return calculateSwimmingScore(weather, tideRecords);
-			}
-			case KAYAKING_AND_PADDLE_BOARDING -> {
-				return calculateKayakingPaddleBoardingScore(weather, tideRecords);
-			}
-		}
+	private Activity getRecommendActivity(Weather weather, List<TideRecord> tideRecords) {
+		Map<Activity, Integer> activityScores = new HashMap<>();
 
-		return 0;
+		activityScores.put(SNORKELING, calculateSnorkelingScore(weather, tideRecords));
+		activityScores.put(SWIMMING, calculateSwimmingScore(weather, tideRecords));
+		activityScores.put(DIVING, calculateDivingScore(weather, tideRecords));
+		activityScores.put(KAYAKING_AND_PADDLE_BOARDING, calculateKayakingPaddleBoardingScore(weather, tideRecords));
+		activityScores.put(SURFING, calculateSurfingScore(weather, tideRecords));
+
+		return activityScores.entrySet().stream()
+			.max(Map.Entry.comparingByValue())
+			.orElseThrow(() -> new IllegalStateException("No activity scores available"))
+			.getKey();
 	}
 
 	// Calculate Point
@@ -601,5 +580,15 @@ 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))  // 내일
+		);
+	}
 }