Merge 93dbcf9 into fe04a03

Author: gunwoong1630

build.gradle

@@ -81,6 +81,8 @@ dependencies {
     implementation 'org.flywaydb:flyway-mysql'
     implementation 'com.github.ben-manes.caffeine:caffeine:3.1.8'
 
+    // circuit breaker dependencies
+    implementation 'io.github.resilience4j:resilience4j-spring-boot3:2.2.0'
 }
 
 dependencyManagement {

src/main/java/sevenstar/marineleisure/alert/controller/AlertController.java

@@ -1,13 +1,16 @@
 package sevenstar.marineleisure.alert.controller;
 
 import java.util.List;
+import java.util.Map;
+import java.util.Set;
 
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import lombok.RequiredArgsConstructor;
+import sevenstar.marineleisure.alert.dto.response.JellyfishResponse;
 import sevenstar.marineleisure.alert.dto.response.JellyfishResponseDto;
 import sevenstar.marineleisure.alert.dto.vo.JellyfishDetailVO;
 import sevenstar.marineleisure.alert.mapper.AlertMapper;
@@ -26,9 +29,11 @@ public class AlertController {
 	 * @return 해파리 발생 관련 정보
 	 */
 	@GetMapping("/jellyfish")
-	public ResponseEntity<BaseResponse<JellyfishResponseDto>> getJellyfishList() {
+	public ResponseEntity<BaseResponse<JellyfishResponse>> getJellyfishList() {
 		List<JellyfishDetailVO> items = jellyfishService.search();
-		JellyfishResponseDto result = alertMapper.toResponseDto(items);
+		Map<String, Set<String>> map = jellyfishService.convert(items);
+
+		JellyfishResponse result = alertMapper.toResponseDto(items.getFirst().getReportDate(), map);
 		return BaseResponse.success(result);
 	}
 

src/main/java/sevenstar/marineleisure/alert/dto/response/JellyfishResponse.java

@@ -0,0 +1,17 @@
+package sevenstar.marineleisure.alert.dto.response;
+
+import java.time.LocalDate;
+import java.util.Map;
+import java.util.Set;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class JellyfishResponse {
+	private LocalDate reposrtDate;
+	private Map<String, Set<String>> jellyfish;
+}

src/main/java/sevenstar/marineleisure/alert/mapper/AlertMapper.java

@@ -1,39 +1,19 @@
 package sevenstar.marineleisure.alert.mapper;
 
 import java.time.LocalDate;
-import java.util.List;
+import java.util.Map;
+import java.util.Set;
 
 import org.springframework.stereotype.Component;
 
 import lombok.RequiredArgsConstructor;
-import sevenstar.marineleisure.alert.dto.response.JellyfishResponseDto;
-import sevenstar.marineleisure.alert.dto.vo.JellyfishDetailVO;
-import sevenstar.marineleisure.alert.dto.vo.JellyfishRegionVO;
-import sevenstar.marineleisure.alert.dto.vo.JellyfishSpeciesVO;
-import sevenstar.marineleisure.global.enums.DensityLevel;
-import sevenstar.marineleisure.global.enums.ToxicityLevel;
+import sevenstar.marineleisure.alert.dto.response.JellyfishResponse;
 
 @Component
 @RequiredArgsConstructor
 public class AlertMapper {
 
-	public JellyfishResponseDto toResponseDto(List<JellyfishDetailVO> detailList) {
-		if (detailList.isEmpty()) {
-			return null;
-		}
-		LocalDate reportDate = detailList.get(0).getReportDate();
-
-		List<JellyfishRegionVO> regions = detailList.stream()
-			.map(detail -> new JellyfishRegionVO(
-				detail.getRegion(),
-				new JellyfishSpeciesVO(
-					detail.getSpecies(),
-					ToxicityLevel.valueOf(detail.getToxicity()).getDescription(),
-					DensityLevel.valueOf(detail.getDensityType()).getDescription()
-				)
-			))
-			.toList();
-
-		return new JellyfishResponseDto(reportDate, regions);
+	public JellyfishResponse toResponseDto(LocalDate reportDate, Map<String, Set<String>> map) {
+		return new JellyfishResponse(reportDate, map);
 	}
 }

src/main/java/sevenstar/marineleisure/alert/service/JellyfishService.java

@@ -3,8 +3,13 @@
 import java.io.File;
 import java.io.IOException;
 import java.time.LocalDate;
+import java.util.HashMap;
+import java.util.HashSet;
 import java.util.List;
+import java.util.Map;
+import java.util.Set;
 
+import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.client.RestTemplate;
@@ -56,7 +61,7 @@ public JellyfishSpecies searchByName(String name) {
 	/**
 	 * 웹에서 크롤링 해 Pdf를 DB에 적재합니다.
 	 */
-	// @Scheduled(cron = "0 0 0 ? * FRI")
+	@Scheduled(cron = "0 0 0 ? * FRI")
 	// 금요일 00시에 동작합니다.
 	@Transactional
 	public void updateLatestReport() {
@@ -104,4 +109,15 @@ public void updateLatestReport() {
 		}
 	}
 
+	public Map<String, Set<String>> convert(List<JellyfishDetailVO> jellyfish) {
+		Map<String, Set<String>> map = new HashMap<>();
+		for (JellyfishDetailVO detail : jellyfish) {
+			if (map.containsKey(detail.getSpecies())) {
+				map.get(detail.getSpecies()).add(detail.getRegion());
+			} else {
+				map.put(detail.getSpecies(), new HashSet<>(List.of(detail.getRegion())));
+			}
+		}
+		return map;
+	}
 }

src/main/java/sevenstar/marineleisure/alert/util/JellyfishExtractor.java

@@ -9,6 +9,7 @@
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
 
+import io.github.resilience4j.circuitbreaker.annotation.CircuitBreaker;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import sevenstar.marineleisure.alert.dto.vo.ParsedJellyfishVO;
@@ -21,6 +22,7 @@ public class JellyfishExtractor {
 	private final OpenAiChatModel chatModel;
 	private final ObjectMapper objectMapper;
 
+	@CircuitBreaker(name = "openai-api", fallbackMethod = "fallbackExtractJellyfishData")
 	public List<ParsedJellyfishVO> extractJellyfishData(String text) {
 		try {
 			String instruction = """
@@ -71,4 +73,9 @@ public List<ParsedJellyfishVO> extractJellyfishData(String text) {
 			return List.of();
 		}
 	}
+
+	public List<ParsedJellyfishVO> fallbackExtractJellyfishData(String text, Throwable t) {
+		log.error("OpenAI API 호출에 실패하여 fallback 메서드가 실행되었습니다. message: {}", t.getMessage());
+		return List.of();
+	}
 }

src/main/java/sevenstar/marineleisure/global/api/kakao/KakaoApiClient.java

@@ -1,8 +1,8 @@
 package sevenstar.marineleisure.global.api.kakao;
 
 import java.net.URI;
+import java.util.List;
 
-import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.HttpMethod;
 import org.springframework.http.ResponseEntity;
@@ -11,18 +11,22 @@
 import org.springframework.util.MultiValueMap;
 import org.springframework.web.client.RestTemplate;
 
+import io.github.resilience4j.circuitbreaker.annotation.CircuitBreaker;
 import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import sevenstar.marineleisure.global.api.kakao.dto.RegionResponse;
 import sevenstar.marineleisure.global.utils.UriBuilder;
 
 @Component
 @RequiredArgsConstructor
+@Slf4j
 public class KakaoApiClient {
 	@Value("${kakao.map.uri}")
 	private String kakaoMapUri;
 
 	private final RestTemplate kakaoRestTemplate;
 
+	@CircuitBreaker(name = "kakao-api", fallbackMethod = "fallbackKakaoApi")
 	public ResponseEntity<RegionResponse> get(float latitude, float longitude) {
 		MultiValueMap<String, String> params = new LinkedMultiValueMap<>();
 		params.add("y", String.valueOf(latitude));
@@ -33,4 +37,13 @@ public ResponseEntity<RegionResponse> get(float latitude, float longitude) {
 		return kakaoRestTemplate.exchange(uri, HttpMethod.GET, null, RegionResponse.class);
 	}
 
+	public ResponseEntity<RegionResponse> fallbackKakaoApi(float latitude, float longitude, Throwable t) {
+		log.error("Kakao API 호출에 실패하여 fallback 메서드가 실행되었습니다. message: {}", t.getMessage());
+		RegionResponse fallbackResponse = new RegionResponse();
+		RegionResponse.Document fallbackDocument = new RegionResponse.Document();
+		fallbackDocument.setAddress_name("알 수 없는 지역");
+		fallbackResponse.setDocuments(List.of(fallbackDocument));
+		return ResponseEntity.ok(fallbackResponse);
+	}
+
 }

src/main/java/sevenstar/marineleisure/global/api/scheduler/SchedulerService.java

@@ -27,19 +27,6 @@ public class SchedulerService {
 
 	private final Executor taskExecutor;
 
-	// public SchedulerService(
-	// 	KhoaApiService khoaApiService,
-	// 	OpenMeteoService openMeteoService,
-	// 	PresetSchedulerService presetSchedulerService,
-	// 	SpotViewQuartileRepository spotViewQuartileRepository,
-	// 	@Qualifier("applicationTaskExecutor") Executor taskExecutor   // ★ 여기
-	// ) {
-	// 	this.khoaApiService          = khoaApiService;
-	// 	this.openMeteoService        = openMeteoService;
-	// 	this.presetSchedulerService  = presetSchedulerService;
-	// 	this.spotViewQuartileRepository = spotViewQuartileRepository;
-	// 	this.taskExecutor            = taskExecutor;
-	// }
 	/**
 	 * 앞으로의 스케줄링 전략에 의해 수정될 부분입니다.
 	 * @author guwnoong

src/main/resources/application.yml

@@ -3,3 +3,16 @@ spring:
     name: MarineLeisure
   profiles:
     active: prod
+
+resilience4j.circuitbreaker:
+  instances:
+    openai-api:
+      sliding-window-size: 10 # 최근 10개의 요청을 기반으로 실패율 계산
+      failure-rate-threshold: 50 # 실패율이 50% 이상이면 서킷을 OPEN
+      wait-duration-in-open-state: 10s # 서킷이 OPEN된 상태를 10초간 유지
+      permitted-number-of-calls-in-half-open-state: 5 # HALF-OPEN 상태에서 5개의 테스트 요청을 허용
+    kakao-api:
+      sliding-window-size: 10 # 최근 10개의 요청을 기반으로 실패율 계산
+      failure-rate-threshold: 50 # 실패율이 50% 이상이면 서킷을 OPEN
+      wait-duration-in-open-state: 10s # 서킷이 OPEN된 상태를 10초간 유지
+      permitted-number-of-calls-in-half-open-state: 5 # HALF-OPEN 상태에서 5개의 테스트 요청을 허용