[feat] 동일한 활동점수가 2개 이상이면 2개만 반환하도록 변경

Author: hyunmuam

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

@@ -16,5 +16,5 @@ public interface PlaceRepository extends JpaRepository<Place, Long> {
 
 	List<Place> findAllByCanSurfingIsTrue();
 
-	List<Place> findAllByCanPaddingIsTrue();
+	List<Place> findAllByCanPaddlingIsTrue();
 }

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

@@ -104,7 +104,7 @@ private List<Place> getPlaceByActivity(Activity activity) {
 				return placeRepository.findAllByCanSurfingIsTrue();
 			}
 			case PADDlING -> {
-				return placeRepository.findAllByCanPaddingIsTrue();
+				return placeRepository.findAllByCanPaddlingIsTrue();
 			}
 			default -> {
 				return new ArrayList<>();

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

@@ -6,9 +6,10 @@
 import java.time.format.DateTimeFormatter;
 import java.time.temporal.ChronoUnit;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.Comparator;
-import java.util.HashMap;
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -102,20 +103,31 @@ public WeatherDetail getWeatherDetail(Long placeId, int date, int hour) {
 	}
 
 	private List<String> getRecommendActivities(Weather weather, List<TideRecord> tideRecords) {
-		Map<Activity, Integer> activityScores = new HashMap<>();
+		List<Activity> activities = Arrays.asList(
+			SNORKELING,
+			SWIMMING,
+			DIVING,
+			SURFING,
+			PADDlING
+		);
+
+		Map<Activity, Integer> activityScores = new LinkedHashMap<>();
 
-		activityScores.put(SNORKELING, calculateSnorkelingScore(weather, tideRecords));
-		activityScores.put(SWIMMING, calculateSwimmingScore(weather, tideRecords));
-		activityScores.put(DIVING, calculateDivingScore(weather, tideRecords));
-		activityScores.put(PADDlING, calculatePaddlingScore(weather, tideRecords));
-		activityScores.put(SURFING, calculateSurfingScore(weather, tideRecords));
+		for (Activity activity : activities) {
+			int score = calculateActivityScore(activity, weather, tideRecords);
+			activityScores.put(activity, score);
+		}
 
 		int maxScore = Collections.max(activityScores.values());
 
-		return activityScores.entrySet().stream()
+		List<String> recommendedActivities = activityScores.entrySet().stream()
 			.filter(entry -> entry.getValue() == maxScore)
 			.map(entry -> entry.getKey().getValue())
 			.collect(Collectors.toList());
+
+		return recommendedActivities.size() > 1
+			? recommendedActivities.subList(0, 2)
+			: recommendedActivities;
 	}
 
 	// Calculate Point
@@ -636,5 +648,16 @@ private LocalDateTime toLocalDateTime(int date, int hour) {
 		DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyyMMddHH");
 		return LocalDateTime.parse(dateTimeString, formatter);
 	}
+
+	private int calculateActivityScore(Activity activity, Weather weather, List<TideRecord> tideRecords) {
+		return switch (activity) {
+			case SNORKELING -> calculateSnorkelingScore(weather, tideRecords);
+			case SWIMMING -> calculateSwimmingScore(weather, tideRecords);
+			case DIVING -> calculateDivingScore(weather, tideRecords);
+			case SURFING -> calculateSurfingScore(weather, tideRecords);
+			case PADDlING -> calculatePaddlingScore(weather, tideRecords);
+			default -> 0;
+		};
+	}
 }