운영배포

.github/workflows/cd.yml

@@ -35,6 +35,13 @@ jobs:
       - name: Build with Gradle Wrapper
         run: ./gradlew clean build
 
+      - name: Upload test report on failure
+        if: failure()
+        uses: actions/upload-artifact@v4
+        with:
+          name: test-report
+          path: build/reports/tests/test
+
       - name: Upload build artifact # only cd.yml
         uses: actions/upload-artifact@v4
         with:
@@ -71,6 +78,7 @@ jobs:
           key: ${{ secrets.NCP_SSH_PRIVATE_KEY }}
           script: |
             cd ${{ secrets.NCP_SERVER_PATH }}
+            chmod -R 755 log
             # 실행 중인 애플리케이션 중지 및 중지 실패 시 action 중단 방지
             if [ -f pid.file ]; then
               kill $(cat pid.file) || true
@@ -80,7 +88,7 @@ jobs:
 
             # 새 애플리케이션 실행 - 일단 임시로 와일드 카드 사용
             TIMESTAMP=$(date +%Y%m%d_%H%M%S)
-            nohup java -jar -Dspring.profiles.active=dev *-SNAPSHOT.jar > dev_${TIMESTAMP}.log 2>&1 & echo $! > pid.file
+            nohup java -jar -Dspring.profiles.active=dev *-SNAPSHOT.jar > /dev/null 2>&1 & echo $! > pid.file
             echo "Development server deploy done."
 
   # product
@@ -112,6 +120,7 @@ jobs:
           key: ${{ secrets.NCP_SSH_PRIVATE_KEY }}
           script: |
             cd ${{ secrets.NCP_SERVER_PATH }}
+            chmod -R 755 log
             # 실행 중인 애플리케이션 중지 및 중지 실패 시 action 중단 방지
             if [ -f pid.file ]; then
               kill $(cat pid.file) || true
@@ -120,6 +129,5 @@ jobs:
             fi
 
             # 새 애플리케이션 실행 - 일단 임시로 와일드 카드 사용
-            TIMESTAMP=$(date +%Y%m%d_%H%M%S)
-            nohup java -jar -Dspring.profiles.active=prod *-SNAPSHOT.jar > prod_${TIMESTAMP}.log 2>&1 & echo $! > pid.file
+            nohup java -jar -Dspring.profiles.active=prod *-SNAPSHOT.jar > /prod/null 2>&1 & echo $! > pid.file
             echo "Production server deploy done."

.github/workflows/ci.yml

@@ -26,7 +26,21 @@ jobs:
           java-version: '17'
           distribution: 'temurin'
 
-      # Configure Gradle for optimal use in GitHub Actions, including caching of downloaded dependencies.
+      - name: Start Elasticsearch & Kibana
+        run: |
+            docker compose up -d
+            timeout 120s bash -c '
+            until [[ "$(curl -s http://localhost:9200/_cluster/health | jq -r ".status" 2>/dev/null)" =~ ^(green|yellow)$ ]]; do
+              echo "Waiting for Elasticsearch"
+              sleep 5
+            done
+            echo "-- ES health is ok "
+            '
+
+      - name: Check ES container logs
+        run: docker compose logs --tail=50 elasticsearch || true
+
+    # Configure Gradle for optimal use in GitHub Actions, including caching of downloaded dependencies.
       # See: https://github.com/gradle/actions/blob/main/setup-gradle/README.md
       - name: Setup Gradle
         uses: gradle/actions/setup-gradle@v4
@@ -41,3 +55,10 @@ jobs:
 
       - name: Build with Gradle Wrapper
         run: ./gradlew clean build
+
+      - name: Upload test report on failure
+        if: failure()
+        uses: actions/upload-artifact@v4
+        with:
+          name: test-report
+          path: build/reports/tests/test

.gitignore

@@ -38,6 +38,5 @@ out/
 
 ### properties ###
 application.properties
-application-local.properties
 application-dev.properties
 application-prod.properties

build.gradle

@@ -36,8 +36,38 @@ dependencies {
 	testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
 	// Swagger
 	implementation group: 'org.springdoc', name: 'springdoc-openapi-starter-webmvc-ui', version: '2.8.9'
+	// Spring Cloud AWS
+	implementation "io.awspring.cloud:spring-cloud-aws-starter-s3:3.3.1"
 	// S3
 	implementation group: 'com.amazonaws', name: 'aws-java-sdk-s3', version: '1.12.787'
+
+	//jwt
+	implementation 'io.jsonwebtoken:jjwt-api:0.11.5'
+	runtimeOnly   'io.jsonwebtoken:jjwt-impl:0.11.5'
+	runtimeOnly   'io.jsonwebtoken:jjwt-jackson:0.11.5'
+
+	// Milvus Java SDK
+	implementation group: 'io.milvus', name: 'milvus-sdk-java', version: '2.5.10'
+	// Flyway
+	implementation group: 'org.flywaydb', name: 'flyway-mysql', version: '11.10.2'
+	implementation 'org.flywaydb:flyway-core'
+
+
+	// elastic search
+	implementation 'org.springframework.boot:spring-boot-starter-data-elasticsearch'
+
+	//Spring Batch
+	implementation 'org.springframework.boot:spring-boot-starter-batch'
+	implementation 'org.springframework.batch:spring-batch-core'
+	testImplementation 'org.springframework.batch:spring-batch-test'
+	implementation 'jakarta.persistence:jakarta.persistence-api'
+
+	// Tika
+	implementation 'org.apache.tika:tika-core:3.1.0'
+
+	//로그인 관련
+	implementation 'org.apache.commons:commons-lang3:3.14.0'
+
 }
 
 tasks.named('test') {

docker-compose.yml

@@ -0,0 +1,48 @@
+version: '3.8'
+services:
+  elasticsearch:
+    image: docker.elastic.co/elasticsearch/elasticsearch:8.6.0
+    container_name: elasticsearch
+    environment:
+      - discovery.type=single-node
+      - xpack.security.enabled=false
+      - xpack.security.http.ssl.enabled=false
+
+    command: >
+      bash -c "
+        if [ ! -d '/usr/share/elasticsearch/plugins/analysis-nori' ]; then
+          elasticsearch-plugin install --batch analysis-nori;
+        fi &&
+        /usr/local/bin/docker-entrypoint.sh eswrapper
+      "
+
+    ports:
+      - "9200:9200"
+      - "9300:9300"
+
+    extra_hosts:
+      - "elasticsearch:127.0.0.1"
+    volumes:
+      - esdata:/usr/share/elasticsearch/data
+    networks:
+      - es_network
+
+  kibana:
+    image: docker.elastic.co/kibana/kibana:8.6.0
+    container_name: kibana
+    environment:
+      - ELASTICSEARCH_HOSTS=http://elasticsearch:9200
+    ports:
+      - "5601:5601"
+    depends_on:
+      - elasticsearch
+    networks:
+      - es_network
+
+networks:
+  es_network:
+    driver: bridge
+
+volumes:
+  esdata:
+    driver: local

src/main/java/com/batch/client/MigrationClient.java

@@ -0,0 +1,136 @@
+package com.batch.client;
+
+import java.io.IOException;
+import java.net.URI;
+import java.nio.charset.StandardCharsets;
+import java.util.Collections;
+import java.util.List;
+import java.util.Optional;
+
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.http.HttpRequest;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.HttpStatusCode;
+import org.springframework.http.MediaType;
+import org.springframework.http.client.ClientHttpResponse;
+import org.springframework.stereotype.Service;
+import org.springframework.web.client.RestClient;
+import org.springframework.web.util.UriComponentsBuilder;
+
+import com.batch.dto.AreaBasedListResponse;
+import com.batch.dto.CategoryCodeResponse;
+import com.batch.dto.ContentTypeId;
+import com.batch.dto.DetailImageResponse;
+import com.batch.dto.DetailInfoResponse;
+
+import lombok.extern.slf4j.Slf4j;
+
+@Service
+@Slf4j
+public class MigrationClient {
+
+	@Value("${tour.api.base-url}")
+	private String baseUrl;
+
+	@Value("${tour.api.service-key}")
+	private String serviceKey;
+
+	private RestClient restClient;
+
+	public MigrationClient(RestClient.Builder restClientBuilder) {
+		this.restClient = restClientBuilder.build();
+	}
+
+	private static void handle(HttpRequest request, ClientHttpResponse response) throws IOException {
+		// 5xx 서버 에러 처리
+		String errorBody = new String(response.getBody().readAllBytes(), StandardCharsets.UTF_8);
+		log.error("에러 응답 areaBasedList API ({} {}): Status {}, Body: {}",
+			request.getMethod(), request.getURI(), response.getStatusCode(), errorBody);
+		throw new RuntimeException("AreaBasedList API 호출 오류 : " + errorBody);
+	}
+
+	// areaBasedList
+	public AreaBasedListResponse getAreaBasedLists(int pageNo, int numOfRows, String contentTypeId, String modifiedTime) {
+		UriComponentsBuilder uri = UriComponentsBuilder.fromUriString(baseUrl + "/areaBasedList")
+			.queryParam("serviceKey", serviceKey)
+			.queryParam("pageNo", pageNo)
+			.queryParam("numOfRows", numOfRows)
+			.queryParam("MobileOS", "ETC")
+			.queryParam("MobileApp", "CatsGoToGedog")
+			.queryParam("contentTypeId", contentTypeId) // 관광타입(12:관광지, 14:문화시설, 15:축제공연행사, 28:레포츠, 32:숙박, 38:쇼핑, 39:음식점) ID
+			.queryParam("_type", "json");
+
+		if(modifiedTime != null && !modifiedTime.isEmpty()) {
+			uri.queryParam("modifiedtime", modifiedTime);
+		}
+		URI fullUri = uri.encode(StandardCharsets.UTF_8).build().toUri();
+
+		log.info("API Request URL (areaBasedList) : {}", uri.toUriString());
+
+		try {
+			return restClient.get()
+				.uri(fullUri)
+				.accept(MediaType.APPLICATION_JSON)
+				.retrieve()
+				.onStatus(HttpStatus.BAD_REQUEST::equals, (request, response) -> {
+					String errorBody = new String(response.getBody().readAllBytes(), StandardCharsets.UTF_8);
+					log.error("에러 응답 areaBasedList API ({} {}): Status {}, Body {}",request.getMethod(), request.getURI(), response.getStatusCode(), errorBody);
+				})
+				.onStatus(HttpStatusCode::is4xxClientError, MigrationClient::handle)
+				.onStatus(HttpStatusCode::is5xxServerError, MigrationClient::handle)
+				.body(AreaBasedListResponse.class);
+		}catch (RuntimeException e) {
+			log.error("areaBasedList API 요청중 오류 발생 : {}", e.getMessage(), e);
+			throw e; // 배치 스탭에서 재시도/스킵 위해 재throw
+		}catch (Exception e) {// 기타 exception
+			log.error("areaBasedList API 요청중 예상치 못한 오류 발생: {}", e.getMessage(), e);
+			throw new RuntimeException("areaBasedList API 요청중 예상치 못한 오류 발생", e);
+		}
+	}
+
+	public AreaBasedListResponse getAreaBasedLists(int pageNo, int numOfRows, String contentTypeId) {
+		return getAreaBasedLists(pageNo, numOfRows, contentTypeId, null);
+	}
+
+	// categoryCode
+	public List<CategoryCodeResponse.Item> getCategoryCode(String contentTypeId, String cat1, String cat2) {
+		UriComponentsBuilder uri = UriComponentsBuilder.fromUriString(baseUrl + "/categoryCode")
+			.queryParam("serviceKey", serviceKey)
+			.queryParam("pageNo", 1)
+			.queryParam("numOfRows", 100)
+			.queryParam("MobileOS", "ETC")
+			.queryParam("MobileApp", "CatsGoToGedog")
+			.queryParam("contentTypeId", contentTypeId) // 관광타입(12:관광지, 14:문화시설, 15:축제공연행사, 28:레포츠, 32:숙박, 38:쇼핑, 39:음식점) ID
+			.queryParam("_type", "json");
+		if(cat1 != null && !cat1.isEmpty()) {
+			uri.queryParam("cat1", cat1);
+		}
+		if(cat2 != null && !cat2.isEmpty()) {
+			uri.queryParam("cat2", cat2);
+		}
+		URI fullUri = uri.encode(StandardCharsets.UTF_8).build().toUri();
+
+		try {
+			CategoryCodeResponse response = restClient.get()
+				.uri(fullUri)
+				.accept(MediaType.APPLICATION_JSON)
+				.retrieve()
+				.onStatus(HttpStatusCode::isError, MigrationClient::handle)
+				.body(CategoryCodeResponse.class);
+			return Optional.ofNullable(response)
+				.map(CategoryCodeResponse::getResponse)
+				.map(CategoryCodeResponse.Response::getBody)
+				.map(CategoryCodeResponse.Body::getItems)
+				.map(CategoryCodeResponse.Items::getItem)
+				.orElse(Collections.emptyList());
+		} catch (RuntimeException e) {
+			log.error("categoryCode API 요청 중 오류 발생 (contentTypeId: {}, cat1: {}, cat2: {}): {}",
+				contentTypeId, cat1, cat2, e.getMessage(), e);
+			return Collections.emptyList();
+		} catch (Exception e) {
+			log.error("categoryCode API 요청 중 예상치 못한 오류 발생 (contentTypeId: {}, cat1: {}, cat2: {}): {}",
+				contentTypeId, cat1, cat2, e.getMessage(), e);
+			return Collections.emptyList();
+		}
+	}
+}