prgrms-web-devcourse-final-project
diff --git a/‎build.gradle‎
Lines changed: 3 additions & 1 deletion b/‎build.gradle‎
Lines changed: 3 additions & 1 deletion
diff --git a/‎src/main/java/sevenstar/marineleisure/MarineLeisureApplication.java‎
Lines changed: 4 additions & 2 deletions b/‎src/main/java/sevenstar/marineleisure/MarineLeisureApplication.java‎
Lines changed: 4 additions & 2 deletions
diff --git a/‎src/main/java/sevenstar/marineleisure/global/api/kakao/service/PresetSchedulerService.java‎
Lines changed: 9 additions & 0 deletions b/‎src/main/java/sevenstar/marineleisure/global/api/kakao/service/PresetSchedulerService.java‎
Lines changed: 9 additions & 0 deletions
diff --git a/‎src/main/java/sevenstar/marineleisure/global/api/openmeteo/dto/service/OpenMeteoService.java‎
Lines changed: 5 additions & 82 deletions b/‎src/main/java/sevenstar/marineleisure/global/api/openmeteo/dto/service/OpenMeteoService.java‎
Lines changed: 5 additions & 82 deletions
diff --git a/‎src/main/java/sevenstar/marineleisure/global/api/scheduler/SchedulerService.java‎
Lines changed: 38 additions & 7 deletions b/‎src/main/java/sevenstar/marineleisure/global/api/scheduler/SchedulerService.java‎
Lines changed: 38 additions & 7 deletions
diff --git a/‎src/main/java/sevenstar/marineleisure/global/config/AsyncConfig.java‎
Lines changed: 23 additions & 0 deletions b/‎src/main/java/sevenstar/marineleisure/global/config/AsyncConfig.java‎
Lines changed: 23 additions & 0 deletions
diff --git a/‎src/main/java/sevenstar/marineleisure/global/util/PkceUtil.java‎
Lines changed: 31 additions & 0 deletions b/‎src/main/java/sevenstar/marineleisure/global/util/PkceUtil.java‎
Lines changed: 31 additions & 0 deletions
diff --git a/‎src/main/java/sevenstar/marineleisure/global/util/StateEncryptionUtil.java‎
Lines changed: 3 additions & 3 deletions b/‎src/main/java/sevenstar/marineleisure/global/util/StateEncryptionUtil.java‎
Lines changed: 3 additions & 3 deletions
@@ -40,7 +40,8 @@ dependencies {
     testAnnotationProcessor 'org.projectlombok:lombok'
     testImplementation 'org.springframework.boot:spring-boot-starter-test'
     testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
-
+    // 인메모리 캐시
+    implementation 'com.github.ben-manes.caffeine:caffeine:3.1.6'
     // jwt
     implementation 'io.jsonwebtoken:jjwt-api:0.12.6'
     runtimeOnly 'io.jsonwebtoken:jjwt-impl:0.12.6'
@@ -78,6 +79,7 @@ dependencies {
     // db migration
     implementation 'org.flywaydb:flyway-core'
     implementation 'org.flywaydb:flyway-mysql'
+    implementation 'com.github.ben-manes.caffeine:caffeine:3.1.8'
 
 }
 
 
@@ -3,14 +3,16 @@
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.data.jpa.repository.config.EnableJpaAuditing;
+import org.springframework.cache.annotation.EnableCaching;
+import org.springframework.scheduling.annotation.EnableAsync;
 
 import sevenstar.marineleisure.global.api.config.properties.KhoaProperties;
 import sevenstar.marineleisure.global.api.config.properties.OpenMeteoProperties;
-import sevenstar.marineleisure.global.api.config.properties.OpenMeteoProperties;
 
 @SpringBootApplication
 @EnableConfigurationProperties({KhoaProperties.class, OpenMeteoProperties.class})
+@EnableAsync
+@EnableCaching
 public class MarineLeisureApplication {
 
 	public static void main(String[] args) {
 
@@ -2,7 +2,9 @@
 
 import java.time.LocalDate;
 
+import org.springframework.cache.annotation.CacheEvict;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import lombok.RequiredArgsConstructor;
 import sevenstar.marineleisure.global.enums.Region;
@@ -18,10 +20,12 @@ public class PresetSchedulerService {
 	private final OutdoorSpotRepository outdoorSpotRepository;
 	private final SpotPresetRepository spotPresetRepository;
 
+	@Transactional
 	public void updateRegionApi() {
 		LocalDate now = LocalDate.now();
 		BestSpot emptySpot = new BestSpot(-1L, "없는 지역입니다", TotalIndex.NONE);
 		for (Region region : Region.getAllKoreaRegion()) {
+			evictRegionCache(region);
 			BestSpot bestSpotInFishing = outdoorSpotRepository.findBestSpotInFishing(region.getLatitude(),
 				region.getLongitude(), now, PRESET_RADIUS).map(BestSpot::new).orElse(emptySpot);
 			BestSpot bestSpotInMudflat = outdoorSpotRepository.findBestSpotInMudflat(region.getLatitude(),
@@ -38,4 +42,9 @@ public void updateRegionApi() {
 				bestSpotInSurfing.getTotalIndex().name());
 		}
 	}
+
+	@CacheEvict(value = "spotPresetPreviews", key = "#region.name()")
+	public void evictRegionCache(Region region) {
+		// 아무 동작 없음
+	}
 }
@@ -1,101 +1,24 @@
 package sevenstar.marineleisure.global.api.openmeteo.dto.service;
 
 import java.time.LocalDate;
-import java.time.LocalDateTime;
+import java.util.List;
 
-import org.springframework.core.ParameterizedTypeReference;
-import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import lombok.RequiredArgsConstructor;
-import sevenstar.marineleisure.forecast.repository.FishingRepository;
-import sevenstar.marineleisure.forecast.repository.MudflatRepository;
-import sevenstar.marineleisure.forecast.repository.ScubaRepository;
-import sevenstar.marineleisure.forecast.repository.SurfingRepository;
-import sevenstar.marineleisure.global.api.openmeteo.OpenMeteoApiClient;
-import sevenstar.marineleisure.global.api.openmeteo.dto.common.OpenMeteoReadResponse;
-import sevenstar.marineleisure.global.api.openmeteo.dto.item.SunTimeItem;
-import sevenstar.marineleisure.global.api.openmeteo.dto.item.UvIndexItem;
-import sevenstar.marineleisure.spot.domain.OutdoorSpot;
-import sevenstar.marineleisure.spot.repository.OutdoorSpotRepository;
+import sevenstar.marineleisure.spot.dto.detail.provider.ActivityProvider;
 
 @Service
 @RequiredArgsConstructor
-@Transactional(readOnly = true)
 public class OpenMeteoService {
-	private final OpenMeteoApiClient openMeteoApiClient;
-	private final OutdoorSpotRepository outdoorSpotRepository;
-	private final FishingRepository fishingRepository;
-	private final MudflatRepository mudflatRepository;
-	private final ScubaRepository scubaRepository;
-	private final SurfingRepository surfingRepository;
+	private final List<ActivityProvider> providers;
 
-	// TODO : exception , refactoring
 	@Transactional
 	public void updateApi(LocalDate startDate, LocalDate endDate) {
-		// update fishing uvIndex
-		for (Long spotId : fishingRepository.findByForecastDateBetween(startDate, endDate)) {
-			OutdoorSpot outdoorSpot = outdoorSpotRepository.findById(spotId).orElseThrow();
-			UvIndexItem uvIndex = getUvIndex(startDate, endDate, outdoorSpot.getLatitude().doubleValue(),
-				outdoorSpot.getLongitude().doubleValue());
-			for (int i = 0; i < uvIndex.getTime().size(); i++) {
-				Float uvIndexValue = uvIndex.getUvIndexMax().get(i);
-				LocalDate date = uvIndex.getTime().get(i);
-				fishingRepository.updateUvIndex(uvIndexValue, spotId, date);
-			}
+		for (ActivityProvider provider : providers) {
+			provider.update(startDate, endDate);
 		}
-
-		// update mudflat uvIndex
-		for (Long spotId : mudflatRepository.findByForecastDateBetween(startDate, endDate)) {
-			OutdoorSpot outdoorSpot = outdoorSpotRepository.findById(spotId).orElseThrow();
-			UvIndexItem uvIndex = getUvIndex(startDate, endDate, outdoorSpot.getLatitude().doubleValue(),
-				outdoorSpot.getLongitude().doubleValue());
-			for (int i = 0; i < uvIndex.getTime().size(); i++) {
-				Float uvIndexValue = uvIndex.getUvIndexMax().get(i);
-				LocalDate date = uvIndex.getTime().get(i);
-				mudflatRepository.updateUvIndex(uvIndexValue, spotId, date);
-			}
-		}
-
-		// update scuba sunrise and sunset
-		for (Long spotId : scubaRepository.findByForecastDateBetween(startDate, endDate)) {
-			OutdoorSpot outdoorSpot = outdoorSpotRepository.findById(spotId).orElseThrow();
-			SunTimeItem sunTimeItem = getSunTimes(startDate, endDate, outdoorSpot.getLatitude().doubleValue(),
-				outdoorSpot.getLongitude().doubleValue());
-			for (int i = 0; i < sunTimeItem.getTime().size(); i++) {
-				LocalDateTime sunrise = sunTimeItem.getSunrise().get(i);
-				LocalDateTime sunset = sunTimeItem.getSunset().get(i);
-				LocalDate date = sunTimeItem.getTime().get(i);
-				scubaRepository.updateSunriseAndSunset(sunrise.toLocalTime(), sunset.toLocalTime(), spotId, date);
-			}
-		}
-
-		// update surfing uvIndex
-		for (Long spotId : surfingRepository.findByForecastDateBetween(startDate, endDate)) {
-			OutdoorSpot outdoorSpot = outdoorSpotRepository.findById(spotId).orElseThrow();
-			UvIndexItem uvIndex = getUvIndex(startDate, endDate, outdoorSpot.getLatitude().doubleValue(),
-				outdoorSpot.getLongitude().doubleValue());
-			for (int i = 0; i < uvIndex.getTime().size(); i++) {
-				Float uvIndexValue = uvIndex.getUvIndexMax().get(i);
-				LocalDate date = uvIndex.getTime().get(i);
-				surfingRepository.updateUvIndex(uvIndexValue, spotId, date);
-			}
-		}
-
 	}
 
-	private SunTimeItem getSunTimes(LocalDate startDate, LocalDate endDate, double latitude, double longitude) {
-		ResponseEntity<OpenMeteoReadResponse<SunTimeItem>> response = openMeteoApiClient.getSunTimes(
-			new ParameterizedTypeReference<>() {
-			}, startDate, endDate, latitude, longitude);
-		return response.getBody().getDaily();
-	}
-
-	private UvIndexItem getUvIndex(LocalDate startDate, LocalDate endDate, double latitude, double longitude) {
-		ResponseEntity<OpenMeteoReadResponse<UvIndexItem>> response = openMeteoApiClient.getUvIndex(
-			new ParameterizedTypeReference<>() {
-			}, startDate, endDate, latitude, longitude);
-		return response.getBody().getDaily();
-	}
 }
@@ -1,10 +1,11 @@
 package sevenstar.marineleisure.global.api.scheduler;
 
 import java.time.LocalDate;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.Executor;
 
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -14,29 +15,59 @@
 import sevenstar.marineleisure.spot.repository.SpotViewQuartileRepository;
 
 @Service
-@RequiredArgsConstructor
-@Transactional(readOnly = true)
 @Slf4j
+@RequiredArgsConstructor
 public class SchedulerService {
 	public static final int MAX_UPDATE_DAY = 3;
 	private final KhoaApiService khoaApiService;
 	private final OpenMeteoService openMeteoService;
 	private final PresetSchedulerService presetSchedulerService;
 	private final SpotViewQuartileRepository spotViewQuartileRepository;
 
+
+	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
 	 */
 	@Scheduled(initialDelay = 0, fixedDelay = 86400000)
-	@Transactional
 	public void scheduler() {
 		LocalDate today = LocalDate.now();
 		LocalDate endDate = today.plusDays(MAX_UPDATE_DAY);
+
+		// 1. khoaApiService 먼저 실행 (순차적)
 		khoaApiService.updateApi(today, endDate);
-		openMeteoService.updateApi(today, endDate);
-		presetSchedulerService.updateRegionApi();
-		spotViewQuartileRepository.upsertQuartile();
+
+		// 2. 나머지 작업들을 병렬로 실행
+		CompletableFuture<Void> openMeteoFuture = CompletableFuture.runAsync(() -> {
+			openMeteoService.updateApi(today, endDate);
+		}, taskExecutor);
+
+		CompletableFuture<Void> presetSchedulerFuture = CompletableFuture.runAsync(() -> {
+			presetSchedulerService.updateRegionApi();
+		}, taskExecutor);
+
+		CompletableFuture<Void> spotViewQuartileFuture = CompletableFuture.runAsync(() -> {
+			spotViewQuartileRepository.upsertQuartile();
+		}, taskExecutor);
+
+		// 모든 병렬 작업이 완료될 때까지 기다림
+		CompletableFuture.allOf(openMeteoFuture, presetSchedulerFuture, spotViewQuartileFuture).join();
+
 		log.info("=== update data ===");
 	}
 }
@@ -0,0 +1,23 @@
+package sevenstar.marineleisure.global.config;
+
+import java.util.concurrent.Executor;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.scheduling.annotation.EnableAsync;
+import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
+
+@Configuration
+@EnableAsync
+public class AsyncConfig {
+
+    @Bean(name = "taskExecutor")
+    public Executor taskExecutor() {
+        ThreadPoolTaskExecutor executor = new ThreadPoolTaskExecutor();
+        executor.setCorePoolSize(2); // 기본 스레드 수
+        executor.setMaxPoolSize(4);  // 최대 스레드 수
+        executor.setQueueCapacity(100); // 큐 용량
+        executor.setThreadNamePrefix("Async-Task-With-Sevenball-");
+        executor.initialize();
+        return executor;
+    }
+}
@@ -0,0 +1,31 @@
+package sevenstar.marineleisure.global.util;
+
+import java.security.MessageDigest;
+import java.security.SecureRandom;
+import java.util.Base64;
+
+import org.springframework.stereotype.Component;
+
+@Component
+public class PkceUtil {
+	public String generateCodeVerifier() {
+		SecureRandom random = new SecureRandom();
+		byte[] bytes = new byte[64];
+		random.nextBytes(bytes);
+		return Base64.getUrlEncoder().withoutPadding().encodeToString(bytes);
+	}
+
+	public String generateCodeChallenge(String codeVerifier) {
+		try {
+			MessageDigest digest = MessageDigest.getInstance("SHA-256");
+			byte[] bytes = digest.digest(codeVerifier.getBytes());
+			return Base64.getUrlEncoder().withoutPadding().encodeToString(bytes);
+		} catch (Exception e) {
+			throw new RuntimeException("Failed to generate code challenge", e);
+		}
+	}
+
+	public boolean verifyCodeChallenge(String codeChallenge, String codeVerifier) {
+		return false;
+	}
+}
@@ -39,6 +39,7 @@ public String encryptState(String state) {
         }
     }
 
+
     /**
      * 암호화된 상태 값을 복호화.
      *
@@ -67,8 +68,7 @@ public String decryptState(String encryptedState) {
      */
     public boolean validateState(String state, String encryptedState) {
         try {
-            String decryptedState = decryptState(encryptedState);
-            return decryptedState.equals(state);
+            return decryptState(encryptedState).equals(state);
         } catch (Exception e) {
             return false;
         }
@@ -87,4 +87,4 @@ private SecretKeySpec generateKey(String key) throws NoSuchAlgorithmException {
         keyBytes = Arrays.copyOf(keyBytes, 16); // AES-128 키 길이
         return new SecretKeySpec(keyBytes, "AES");
     }
-}
+}
Original file line number	Diff line number	Diff line change
`@@ -39,6 +39,7 @@ public String encryptState(String state) {`
`39`	`39`	`}`
`40`	`40`	`}`
`41`	`41`
	`42`	`+`
`42`	`43`	`/**`
`43`	`44`	`* 암호화된 상태 값을 복호화.`
`44`	`45`	`*`
`@@ -67,8 +68,7 @@ public String decryptState(String encryptedState) {`
`67`	`68`	`*/`
`68`	`69`	`public boolean validateState(String state, String encryptedState) {`
`69`	`70`	`try {`
`70`		`- String decryptedState = decryptState(encryptedState);`
`71`		`- return decryptedState.equals(state);`
	`71`	`+ return decryptState(encryptedState).equals(state);`
`72`	`72`	`} catch (Exception e) {`
`73`	`73`	`return false;`
`74`	`74`	`}`
`@@ -87,4 +87,4 @@ private SecretKeySpec generateKey(String key) throws NoSuchAlgorithmException {`
`87`	`87`	`keyBytes = Arrays.copyOf(keyBytes, 16); // AES-128 키 길이`
`88`	`88`	`return new SecretKeySpec(keyBytes, "AES");`
`89`	`89`	`}`
`90`		`-}`
	`90`	`+}`