prgrms-web-devcourse-final-project
diff --git a/‎build.gradle‎
Lines changed: 5 additions & 0 deletions b/‎build.gradle‎
Lines changed: 5 additions & 0 deletions
diff --git a/‎src/main/java/sevenstar/marineleisure/favorite/service/FavoriteServiceImpl.java‎
Lines changed: 2 additions & 2 deletions b/‎src/main/java/sevenstar/marineleisure/favorite/service/FavoriteServiceImpl.java‎
Lines changed: 2 additions & 2 deletions
diff --git a/‎src/main/java/sevenstar/marineleisure/global/api/config/RestTemplateConfig.java‎
Lines changed: 19 additions & 1 deletion b/‎src/main/java/sevenstar/marineleisure/global/api/config/RestTemplateConfig.java‎
Lines changed: 19 additions & 1 deletion
diff --git a/‎src/main/java/sevenstar/marineleisure/global/api/kakao/KakaoApiClient.java‎
Lines changed: 36 additions & 0 deletions b/‎src/main/java/sevenstar/marineleisure/global/api/kakao/KakaoApiClient.java‎
Lines changed: 36 additions & 0 deletions
diff --git a/‎src/main/java/sevenstar/marineleisure/global/api/kakao/dto/RegionResponse.java‎
Lines changed: 29 additions & 0 deletions b/‎src/main/java/sevenstar/marineleisure/global/api/kakao/dto/RegionResponse.java‎
Lines changed: 29 additions & 0 deletions
diff --git a/‎src/main/java/sevenstar/marineleisure/global/api/kakao/service/PresetSchedulerService.java‎
Lines changed: 41 additions & 0 deletions b/‎src/main/java/sevenstar/marineleisure/global/api/kakao/service/PresetSchedulerService.java‎
Lines changed: 41 additions & 0 deletions
diff --git a/‎src/main/java/sevenstar/marineleisure/global/api/khoa/KhoaApiClient.java‎
Lines changed: 11 additions & 28 deletions b/‎src/main/java/sevenstar/marineleisure/global/api/khoa/KhoaApiClient.java‎
Lines changed: 11 additions & 28 deletions
diff --git a/‎src/main/java/sevenstar/marineleisure/global/api/khoa/dto/item/FishingItem.java‎
Lines changed: 2 additions & 0 deletions b/‎src/main/java/sevenstar/marineleisure/global/api/khoa/dto/item/FishingItem.java‎
Lines changed: 2 additions & 0 deletions
diff --git a/‎src/main/java/sevenstar/marineleisure/global/api/khoa/dto/item/MudflatItem.java‎
Lines changed: 2 additions & 0 deletions b/‎src/main/java/sevenstar/marineleisure/global/api/khoa/dto/item/MudflatItem.java‎
Lines changed: 2 additions & 0 deletions
diff --git a/‎src/main/java/sevenstar/marineleisure/global/api/khoa/dto/item/ScubaItem.java‎
Lines changed: 2 additions & 0 deletions b/‎src/main/java/sevenstar/marineleisure/global/api/khoa/dto/item/ScubaItem.java‎
Lines changed: 2 additions & 0 deletions
@@ -74,6 +74,11 @@ dependencies {
 
     // pdf parsing
     implementation 'org.apache.pdfbox:pdfbox:3.0.5'
+
+    // db migration
+    implementation 'org.flywaydb:flyway-core'
+    implementation 'org.flywaydb:flyway-mysql'
+
 }
 
 dependencyManagement {
 
@@ -16,6 +16,7 @@
 import sevenstar.marineleisure.favorite.repository.FavoriteRepository;
 import sevenstar.marineleisure.global.exception.CustomException;
 import sevenstar.marineleisure.global.exception.enums.FavoriteErrorCode;
+import sevenstar.marineleisure.global.exception.enums.SpotErrorCode;
 import sevenstar.marineleisure.spot.domain.OutdoorSpot;
 import sevenstar.marineleisure.spot.repository.OutdoorSpotRepository;
 
@@ -45,9 +46,8 @@ public FavoriteSpot searchFavoriteById(Long id) {
 	@Transactional
 	public Long createFavorite(Long id) {
 		Long currentMemberId = getCurrentUserId();
-		// 우선 즐겨찾기를 못찾았다고 넣었지만, 나중에 Spot에러코드 추가되면 그걸로 교체 예정입니다.
 		OutdoorSpot outdoorSpot = spotRepository.findById(id)
-			.orElseThrow(() -> new CustomException(FavoriteErrorCode.FAVORITE_NOT_FOUND));
+			.orElseThrow(() -> new CustomException(SpotErrorCode.SPOT_NOT_FOUND));
 
 		FavoriteSpot createdFavoriteSpot = FavoriteSpot.builder()
 			.memberId(currentMemberId)
 
@@ -1,14 +1,32 @@
 package sevenstar.marineleisure.global.api.config;
 
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.http.client.ClientHttpRequestInterceptor;
 import org.springframework.web.client.RestTemplate;
 
 @Configuration
 public class RestTemplateConfig {
+	@Value("${kakao.login.api_key}")
+	private String kakaoRestApiKey;
 
 	@Bean
-	public RestTemplate restTemplate() {
+	public RestTemplate apiRestTemplate() {
 		return new RestTemplate();
 	}
+
+	@Bean
+	public RestTemplate kakaoRestTemplate() {
+		RestTemplate restTemplate = new RestTemplate();
+
+		ClientHttpRequestInterceptor interceptor = (request, body, execution) -> {
+			request.getHeaders().add("Authorization", String.format("KakaoAK %s", kakaoRestApiKey));
+			return execution.execute(request, body);
+		};
+
+		restTemplate.getInterceptors().add(interceptor);
+		return restTemplate;
+	}
 }
@@ -0,0 +1,36 @@
+package sevenstar.marineleisure.global.api.kakao;
+
+import java.net.URI;
+
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.http.HttpMethod;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Component;
+import org.springframework.util.LinkedMultiValueMap;
+import org.springframework.util.MultiValueMap;
+import org.springframework.web.client.RestTemplate;
+
+import lombok.RequiredArgsConstructor;
+import sevenstar.marineleisure.global.api.kakao.dto.RegionResponse;
+import sevenstar.marineleisure.global.utils.UriBuilder;
+
+@Component
+@RequiredArgsConstructor
+public class KakaoApiClient {
+	@Value("${kakao.map.uri}")
+	private String kakaoMapUri;
+
+	private final RestTemplate kakaoRestTemplate;
+
+	public ResponseEntity<RegionResponse> get(float latitude, float longitude) {
+		MultiValueMap<String, String> params = new LinkedMultiValueMap<>();
+		params.add("y", String.valueOf(latitude));
+		params.add("x", String.valueOf(longitude));
+
+		URI uri = UriBuilder.buildQueryParameter(kakaoMapUri, params);
+
+		return kakaoRestTemplate.exchange(uri, HttpMethod.GET, null, RegionResponse.class);
+	}
+
+}
@@ -0,0 +1,29 @@
+package sevenstar.marineleisure.global.api.kakao.dto;
+
+import java.util.List;
+
+import lombok.Data;
+
+@Data
+public class RegionResponse {
+	private Meta meta;
+	private List<Document> documents;
+
+	@Data
+	public static class Meta {
+		private int total_count;
+	}
+
+	@Data
+	public static class Document {
+		private String region_type;
+		private String code;
+		private String address_name;
+		private String region_1depth_name;
+		private String region_2depth_name;
+		private String region_3depth_name;
+		private String region_4depth_name;
+		private double x;
+		private double y;
+	}
+}
@@ -0,0 +1,41 @@
+package sevenstar.marineleisure.global.api.kakao.service;
+
+import java.time.LocalDate;
+
+import org.springframework.stereotype.Service;
+
+import lombok.RequiredArgsConstructor;
+import sevenstar.marineleisure.global.enums.Region;
+import sevenstar.marineleisure.global.enums.TotalIndex;
+import sevenstar.marineleisure.spot.domain.BestSpot;
+import sevenstar.marineleisure.spot.repository.OutdoorSpotRepository;
+import sevenstar.marineleisure.spot.repository.SpotPresetRepository;
+
+@Service
+@RequiredArgsConstructor
+public class PresetSchedulerService {
+	private static final double PRESET_RADIUS = 200_000;
+	private final OutdoorSpotRepository outdoorSpotRepository;
+	private final SpotPresetRepository spotPresetRepository;
+
+	public void updateRegionApi() {
+		LocalDate now = LocalDate.now();
+		BestSpot emptySpot = new BestSpot(-1L, "없는 지역입니다", TotalIndex.NONE);
+		for (Region region : Region.getAllKoreaRegion()) {
+			BestSpot bestSpotInFishing = outdoorSpotRepository.findBestSpotInFishing(region.getLatitude(),
+				region.getLongitude(), now, PRESET_RADIUS).map(BestSpot::new).orElse(emptySpot);
+			BestSpot bestSpotInMudflat = outdoorSpotRepository.findBestSpotInMudflat(region.getLatitude(),
+				region.getLongitude(), now, PRESET_RADIUS).map(BestSpot::new).orElse(emptySpot);
+			BestSpot bestSpotInScuba = outdoorSpotRepository.findBestSpotInScuba(region.getLatitude(),
+				region.getLongitude(), now, PRESET_RADIUS).map(BestSpot::new).orElse(emptySpot);
+			BestSpot bestSpotInSurfing = outdoorSpotRepository.findBestSpotInSurfing(region.getLatitude(),
+				region.getLongitude(), now, PRESET_RADIUS).map(BestSpot::new).orElse(emptySpot);
+
+			spotPresetRepository.upsert(region.name(), bestSpotInFishing.getSpotId(), bestSpotInFishing.getName(),
+				bestSpotInFishing.getTotalIndex().name(), bestSpotInMudflat.getSpotId(), bestSpotInMudflat.getName(),
+				bestSpotInMudflat.getTotalIndex().name(), bestSpotInScuba.getSpotId(), bestSpotInScuba.getName(),
+				bestSpotInScuba.getTotalIndex().name(), bestSpotInSurfing.getSpotId(), bestSpotInSurfing.getName(),
+				bestSpotInSurfing.getTotalIndex().name());
+		}
+	}
+}
@@ -11,8 +11,6 @@
 
 import lombok.RequiredArgsConstructor;
 import sevenstar.marineleisure.global.api.config.properties.KhoaProperties;
-import sevenstar.marineleisure.global.api.khoa.dto.common.ApiResponse;
-import sevenstar.marineleisure.global.api.khoa.dto.item.FishingItem;
 import sevenstar.marineleisure.global.enums.ActivityCategory;
 import sevenstar.marineleisure.global.enums.FishingType;
 import sevenstar.marineleisure.global.utils.DateUtils;
@@ -21,11 +19,11 @@
 @Component
 @RequiredArgsConstructor
 public class KhoaApiClient {
-	private final RestTemplate restTemplate;
+	private final RestTemplate apiRestTemplate;
 	private final KhoaProperties khoaProperties;
 
 	/**
-	 * khoa api get 요청(갯벌체험, 서핑, 스쿠버다이빙)
+	 * khoa api get 요청(낚시, 갯벌체험, 서핑, 스쿠버다이빙)
 	 * @param responseType response 타입
 	 * @param reqDate 요청 일자
 	 * @param page
@@ -35,31 +33,16 @@ public class KhoaApiClient {
 	 * @param <T>
 	 */
 	public <T> ResponseEntity<T> get(ParameterizedTypeReference<T> responseType, LocalDate reqDate, int page, int size,
-		ActivityCategory category) {
+		ActivityCategory category, FishingType gubun) {
+		URI uri;
 		if (category == ActivityCategory.FISHING) {
-			// TODO : handling exception
-			// throw new IllegalAccessException();
+			uri = UriBuilder.buildQueryParameter(khoaProperties.getBaseUrl(),
+				khoaProperties.getPath(ActivityCategory.FISHING),
+				khoaProperties.getParams(DateUtils.formatTime(reqDate), page, size, gubun.getDescription()));
+		} else {
+			uri = UriBuilder.buildQueryParameter(khoaProperties.getBaseUrl(), khoaProperties.getPath(category),
+				khoaProperties.getParams(DateUtils.formatTime(reqDate), page, size));
 		}
-		URI uri = UriBuilder.buildQueryParameter(khoaProperties.getBaseUrl(), khoaProperties.getPath(category),
-			khoaProperties.getParams(DateUtils.formatTime(reqDate), page, size));
-		return restTemplate.exchange(uri, HttpMethod.GET, null, responseType);
+		return apiRestTemplate.exchange(uri, HttpMethod.GET, null, responseType);
 	}
-
-	/**
-	 * khoa api get 요청(낚시)
-	 * @param responseType response 타입
-	 * @param reqDate 요청 일자
-	 * @param page
-	 * @param size
-	 * @param gubun 선상 / 갯바위 중 하나
-	 * @return response
-	 */
-	public ResponseEntity<ApiResponse<FishingItem>> get(
-		ParameterizedTypeReference<ApiResponse<FishingItem>> responseType, LocalDate reqDate, int page, int size,
-		FishingType gubun) {
-		URI uri = UriBuilder.buildQueryParameter(khoaProperties.getBaseUrl(),
-			khoaProperties.getPath(ActivityCategory.FISHING), khoaProperties.getParams(DateUtils.formatTime(reqDate), page, size, gubun.getDescription()));
-		return restTemplate.exchange(uri, HttpMethod.GET, null, responseType);
-	}
-
 }
@@ -4,10 +4,12 @@
 import java.time.LocalDate;
 
 import lombok.Getter;
+import lombok.NoArgsConstructor;
 import sevenstar.marineleisure.global.enums.ActivityCategory;
 import sevenstar.marineleisure.global.utils.DateUtils;
 
 @Getter
+@NoArgsConstructor
 public class FishingItem implements KhoaItem {
 	private String seafsPstnNm;
 	private double lat;
 
@@ -4,10 +4,12 @@
 import java.time.LocalDate;
 
 import lombok.Getter;
+import lombok.NoArgsConstructor;
 import sevenstar.marineleisure.global.enums.ActivityCategory;
 import sevenstar.marineleisure.global.utils.DateUtils;
 
 @Getter
+@NoArgsConstructor
 public class MudflatItem implements KhoaItem {
 	private String mdftExpcnVlgNm;       // 마을 이름
 	private double lat;                  // 위도
 
@@ -4,10 +4,12 @@
 import java.time.LocalDate;
 
 import lombok.Getter;
+import lombok.NoArgsConstructor;
 import sevenstar.marineleisure.global.enums.ActivityCategory;
 import sevenstar.marineleisure.global.utils.DateUtils;
 
 @Getter
+@NoArgsConstructor
 public class ScubaItem implements KhoaItem {
 	private String skscExpcnRgnNm;     // 체험 지역명
 	private double lat;                // 위도