🚀 Deploy: Ver1.0.0 배포

.github/workflows/dev-deploy.yml

@@ -24,6 +24,11 @@ jobs:
     - name: Make gradlew executable
       run: chmod +x ./gradlew
 
+    - name: Copy Dictionary
+      run: |
+        mkdir -p src/main/resources
+        echo '${{ secrets.DICTIONARY }}' > src/main/resources/unique_symptoms.json
+
     - name: Build Spring Boot (JAR)
       run: ./gradlew bootJar -Penv=test
 
@@ -38,7 +43,7 @@ jobs:
 
     - name: Wait for test server to be healthy
       run: |
-        echo "🔍 Checking https://yakplus-test.techlog.dev/actuator/health ..."
+        echo "🔍 Checking https://yakplus-batch.techlog.dev/actuator/health ..."
         curl --silent --fail \
              --retry 5 --retry-connrefused --retry-delay 5 \
-             https://yakplus-test.techlog.dev/actuator/health
+             https://yakplus-batch.techlog.dev/actuator/health

build.gradle

@@ -21,6 +21,8 @@ configurations {
 
 repositories {
     mavenCentral()
+    maven { url 'https://repo.spring.io/milestone' }
+    maven { url 'https://repo.spring.io/snapshot' }
 }
 
 dependencies {
@@ -46,6 +48,16 @@ dependencies {
     implementation 'org.springframework.boot:spring-boot-starter-data-elasticsearch'
     implementation 'org.elasticsearch.client:elasticsearch-rest-high-level-client:7.17.10'
 
+    // OpenAi
+    implementation 'org.springframework.ai:spring-ai-openai-spring-boot-starter:1.0.0-M5'
+
+
+    // Spring-Batch
+    implementation 'org.springframework.boot:spring-boot-starter-batch'
+
+    // Swagger
+    implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.7.0'
+
     // build.gradle
     if (project.hasProperty('env') && project.env == 'test') {
         dependencies {

src/main/java/com/likelion/backendplus4/yakplus/YakplusApplication.java

@@ -1,14 +1,11 @@
 package com.likelion.backendplus4.yakplus;
 
-import com.likelion.backendplus4.yakplus.common.configuration.LogbackConfig;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 
 @SpringBootApplication
 public class YakplusApplication {
-    public static void main(String[] args) {
-        LogbackConfig logbackConfig = new LogbackConfig();
-        logbackConfig.configure();
-        SpringApplication.run(YakplusApplication.class, args);
-    }
+	public static void main(String[] args) {
+		SpringApplication.run(YakplusApplication.class, args);
+	}
 }

src/main/java/com/likelion/backendplus4/yakplus/common/configuration/AllJobConfig.java

@@ -0,0 +1,60 @@
+package com.likelion.backendplus4.yakplus.common.configuration;
+
+import lombok.RequiredArgsConstructor;
+import org.springframework.batch.core.Job;
+import org.springframework.batch.core.Step;
+import org.springframework.batch.core.job.builder.JobBuilder;
+import org.springframework.batch.core.repository.JobRepository;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * 공통 배치 Job 설정을 위한 클래스입니다.
+ * <p>
+ * 이 클래스는 의약품 정보를 수집하는 배치 Job을 정의합니다.
+ * <p>
+ * @field jobName Job 이름
+ * @since 2025-05-02
+ */
+@Configuration
+@RequiredArgsConstructor
+public class AllJobConfig {
+
+    private final String jobName = "drugScrapJob";
+
+    /**
+     * 의약품 정보를 수집하는 Batch Job 정의
+     *
+     * @param jobRepository      JobRepository 인스턴스
+     * @param totalPageCheckStep 전체 페이지 수 확인 Step
+     * @param drugDetailStep     상세 정보 수집 Step
+     * @return 구성된 Job 인스턴스
+     * @author 함예정
+     * @since 2025-05-02
+     */
+    @Bean
+    public Job drugScrapJob(JobRepository jobRepository,
+                            Step totalPageCheckStep,
+                            Step drugDetailStep,
+                            Step imageTotalPageCheckStep,
+                            Step imageMasterStep,
+                            Step switchModelStepToOpenAi,
+                            Step openAiEmbedStep,
+                            Step switchModelStepToKmBert,
+                            Step kmBertEmbedStep,
+                            Step switchModelStepToKrSBert,
+                            Step krSBertEmbedStep) {
+        return new JobBuilder(jobName, jobRepository)
+                .start(totalPageCheckStep)
+                .next(drugDetailStep)
+                .next(imageTotalPageCheckStep)
+                .next(imageMasterStep)
+                .next(switchModelStepToOpenAi)
+                .next(openAiEmbedStep)
+                .next(switchModelStepToKmBert)
+                .next(kmBertEmbedStep)
+                .next(switchModelStepToKrSBert)
+                .next(krSBertEmbedStep)
+                .build();
+    }
+}

src/main/java/com/likelion/backendplus4/yakplus/drug/infrastructure/config/ApiRestTemplateConfig.java → src/main/java/com/likelion/backendplus4/yakplus/common/configuration/ApiRestTemplateConfig.java

@@ -1,4 +1,4 @@
-package com.likelion.backendplus4.yakplus.drug.infrastructure.config;
+package com.likelion.backendplus4.yakplus.common.configuration;
 
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -7,11 +7,17 @@
 /**
  * Api 요청을 보내기 위한 RestTemplate 빈 생성
  *
- * @since 2025-04-15
- * @author 함예정
  */
 @Configuration
 public class ApiRestTemplateConfig {
+
+	/**
+	 * RestTemplate 빈을 생성합니다.
+	 *
+	 * @return RestTemplate
+	 * @since 2025-04-15
+	 * @author 함예정
+	 */
 	@Bean
 	public RestTemplate restTemplate() {
 		return new RestTemplate();

src/main/java/com/likelion/backendplus4/yakplus/common/configuration/BatchExecutorConfig.java

@@ -0,0 +1,58 @@
+package com.likelion.backendplus4.yakplus.common.configuration;
+
+import com.likelion.backendplus4.yakplus.common.logging.trace.decorator.MdcTaskDecorator;
+import lombok.RequiredArgsConstructor;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.core.task.TaskExecutor;
+import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
+
+/**
+ * 의약품 상세정보 수집을 위한 Spring Batch 설정 클래스
+ */
+@Configuration
+@RequiredArgsConstructor
+public class BatchExecutorConfig {
+    private final MdcTaskDecorator mdcTaskDecorator;
+    private final String normalExecutorName = "normalExecutor";
+    private final String singleItemExecutorName = "singleItemExecutor";
+
+    /**
+     * 일반적인 작업처리를 위한 ThreadPool 기반 TaskExecutor 설정
+     *
+     * @return TaskExecutor 인스턴스
+     * @author 함예정
+     * @since 2025-05-02
+     */
+    @Bean(normalExecutorName)
+    public TaskExecutor taskExecutor() {
+        ThreadPoolTaskExecutor executor = new ThreadPoolTaskExecutor();
+        executor.setCorePoolSize(5);
+        executor.setMaxPoolSize(10);
+        executor.setQueueCapacity(10);
+        executor.setTaskDecorator(mdcTaskDecorator);
+        executor.setThreadNamePrefix("normalExecutor-");
+        executor.initialize();
+        return executor;
+    }
+
+    /**
+     * 단일 아이템 단위로 처리하는 작업을 위한 
+     * ThreadPool 기반 TaskExecutor 설정
+     *
+     * @return TaskExecutor 인스턴스
+     * @author 함예정
+     * @since 2025-05-02
+     */
+    @Bean(singleItemExecutorName)
+    public TaskExecutor taskExecutorMoreThreads() {
+        ThreadPoolTaskExecutor executor = new ThreadPoolTaskExecutor();
+        executor.setCorePoolSize(10);
+        executor.setMaxPoolSize(10);
+        executor.setQueueCapacity(20);
+        executor.setTaskDecorator(mdcTaskDecorator);
+        executor.setThreadNamePrefix("singleItemExecutor-");
+        executor.initialize();
+        return executor;
+    }
+}

src/main/java/com/likelion/backendplus4/yakplus/common/configuration/LogbackConfig.java

@@ -11,6 +11,7 @@
 import jakarta.annotation.PostConstruct;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Configuration;
 
 import java.nio.file.Files;
@@ -25,11 +26,16 @@
  */
 @Configuration
 public class LogbackConfig {
-    private static final String LOG_DIRECTORY = "logs";
-    private static final String LOG_FILE_NAME = "like-lion.log";
-    private static final String LOG_PATTERN = "%d{yyyy-MM-dd HH:mm:ss} %-5level %logger{36} - %msg%n";
-    private static final int MAX_HISTORY = 30;
-    private static final String TOTAL_SIZE_CAP = "1GB";
+    @Value("${log.rolling.directory}")
+    private String LOG_DIRECTORY;
+    @Value("${log.rolling.file-name}")
+    private String LOG_FILE_NAME;
+    @Value("${log.rolling.pattern}")
+    private String LOG_PATTERN;
+    @Value("${log.rolling.max-history}")
+    private int MAX_HISTORY;
+    @Value("${log.rolling.total-size-cap}")
+    private String TOTAL_SIZE_CAP;
 
     /**
      * 로깅 설정을 초기화하는 메서드

src/main/java/com/likelion/backendplus4/yakplus/common/configuration/OpenaiConfig.java

@@ -0,0 +1,17 @@
+package com.likelion.backendplus4.yakplus.common.configuration;
+
+import org.springframework.ai.openai.api.OpenAiApi;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+public class OpenaiConfig {
+	@Value("${spring.ai.openai.api-key}")
+	private String apiKey;
+
+	@Bean
+	public OpenAiApi openaiApi() {
+        return new OpenAiApi(apiKey);
+	}
+}

src/main/java/com/likelion/backendplus4/yakplus/common/configuration/SwaggerConfig.java

@@ -0,0 +1,21 @@
+package com.likelion.backendplus4.yakplus.common.configuration;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+
+import io.swagger.v3.oas.models.OpenAPI;
+import io.swagger.v3.oas.models.info.Info;
+
+@Configuration
+public class SwaggerConfig {
+
+    @Bean
+    public OpenAPI openAPI() {
+        return new OpenAPI()
+                .info(new Info()
+                        .title("YakPlus API")
+                        .description("YakPlus 프로젝트의 API 문서입니다.")
+                        .version("1.0.0"));
+    }
+}

src/main/java/com/likelion/backendplus4/yakplus/common/configuration/WebConfig.java

@@ -2,7 +2,7 @@
 
 import com.likelion.backendplus4.yakplus.common.interceptor.LogInterceptor;
 import lombok.RequiredArgsConstructor;
-import org.springframework.beans.factory.annotation.Autowired;
+
 import org.springframework.context.annotation.Configuration;
 import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;