Merge pull request #92 from prgrms-web-devcourse-final-project/feat/mission

parkjioh · web-flow · commit dd975d0f4a46 · 2025-09-30T12:18:51.000+09:00
fix : gemini -&gt; grok으로 변경
diff --git a/backend/build.gradle.kts b/backend/build.gradle.kts
@@ -3,7 +3,7 @@ plugins {
     id("org.springframework.boot") version "3.5.5"
     id("io.spring.dependency-management") version "1.1.7"
 }
-val springAiVersion by extra("1.0.2")
+val springAiVersion by extra("1.0.0-M6")
 
 group = "com"
 version = "0.0.1-SNAPSHOT"
@@ -17,6 +17,7 @@ java {
 
 repositories {
     mavenCentral()
+
 }
 
 dependencies {
@@ -25,7 +26,6 @@ dependencies {
     implementation("org.springframework.boot:spring-boot-starter-oauth2-client")
     implementation("org.springframework.boot:spring-boot-starter-web")
     implementation("org.springframework.boot:spring-boot-starter-validation")
-    implementation("org.springframework.ai:spring-ai-starter-model-vertex-ai-gemini")
     developmentOnly("org.springframework.boot:spring-boot-devtools")
 
     runtimeOnly("com.h2database:h2")
@@ -50,19 +50,21 @@ dependencies {
     runtimeOnly("io.jsonwebtoken:jjwt-jackson:0.12.6")
 
     implementation("org.springframework.boot:spring-boot-starter-websocket")
-
     implementation ("org.springframework.kafka:spring-kafka")
 
 
-    // 1. Spring AI의 모든 모듈 버전을 일관되게 관리하는 BOM (필수)
-    implementation(enforcedPlatform("org.springframework.ai:spring-ai-bom:$springAiVersion"))
-    // 2. Vertex AI Gemini 모델 스타터
-  //  implementation("org.springframework.ai:spring-ai-vertex-ai-gemini-spring-boot-starter")
+    // Spring AI 의존성
+    implementation("org.springframework.ai:spring-ai-core")
+    implementation("org.springframework.ai:spring-ai-openai-spring-boot-starter")
 
+    implementation("org.springframework.boot:spring-boot-starter-webflux")
+    implementation("org.springframework.retry:spring-retry")
+    implementation("org.springframework.boot:spring-boot-starter-aop")
 }
+
 dependencyManagement {
     imports {
-        mavenBom("org.springframework.ai:spring-ai-bom:$springAiVersion")
+        mavenBom("org.springframework.ai:spring-ai-bom:${property("springAiVersion")}")
     }
 }
 
diff --git a/backend/src/main/java/com/back/BackApplication.java b/backend/src/main/java/com/back/BackApplication.java
@@ -1,44 +1,19 @@
 package com.back;
 
-import com.google.auth.oauth2.GoogleCredentials;
-import jakarta.annotation.PostConstruct;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.cache.annotation.EnableCaching;
 import org.springframework.data.jpa.repository.config.EnableJpaAuditing;
 import org.springframework.scheduling.annotation.EnableAsync;
 
-import java.io.FileInputStream;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-
 @SpringBootApplication
 @EnableJpaAuditing
 @EnableCaching
 @EnableAsync
 public class BackApplication {
-    @Value("${GOOGLE_APPLICATION_CREDENTIALS}")
-    private String googleCredentialsPath;
 
     public static void main(String[] args) {
         SpringApplication.run(BackApplication.class, args);
     }
 
-    @PostConstruct
-    public void setGoogleCredentialsEnv() {
-        Path path = Paths.get(googleCredentialsPath).toAbsolutePath();
-        System.setProperty("GOOGLE_APPLICATION_CREDENTIALS", path.toString());
-        System.out.println("*** Google credentials path set to: " + path);
-
-        try (FileInputStream serviceAccountStream = new FileInputStream(path.toFile())) {
-            GoogleCredentials credentials = GoogleCredentials.fromStream(serviceAccountStream);
-
-            System.out.println("*** Google credentials loaded successfully!");
-            System.out.println("*** Credentials type: " + credentials.getClass().getSimpleName());
-        } catch (Exception e) {
-            System.err.println("*** Failed to load Google credentials: " + e.getMessage());
-        }
-    }
-
 }
diff --git a/backend/src/main/java/com/back/domain/mission/service/AiMissionGeneratorService.java b/backend/src/main/java/com/back/domain/mission/service/AiMissionGeneratorService.java
@@ -1,9 +1,15 @@
 package com.back.domain.mission.service;
 
+import com.back.domain.member.entity.Member;
+import com.back.domain.member.repository.MemberRepository;
 import com.back.domain.mission.dto.ai.AiMissionResult;
 import lombok.RequiredArgsConstructor;
-import org.springframework.stereotype.Service;
 import org.springframework.ai.chat.client.ChatClient;
+import org.springframework.ai.chat.prompt.Prompt;
+import org.springframework.stereotype.Service;
+
+import java.time.LocalDate;
+import java.time.Period;
 
 
 @Service
@@ -68,37 +74,50 @@ private String getDayName(int dayNum) {
     }*/
 
     private final ChatClient chatClient;
+    private final MemberRepository memberRepository;
 
     public AiMissionResult generateMission(String rawGoal, int weeks, Integer memberId) {
-        String prompt = """
+
+        Member member = memberRepository.findById(memberId)
+                .orElseThrow(() -> new RuntimeException("회원이 존재하지 않습니다."));
+
+        int age = Period.between(member.getBirth(), LocalDate.now()).getYears();
+        String gender = member.getGender().name(); // "MALE", "FEMALE", "NONE"
+
+
+        String promptText = """
             너는 미션 플래너야.
             사용자가 목표와 기간을 입력하면 반드시 아래 JSON 구조를 채워서 출력해라.
-            설명은 하지 말고 JSON만 반환해라
-            그리고 제목은 간결하게 정리해서 반환해줘 
+            설명은 하지 말고 JSON만 반환해라.
+            그리고 제목은 간결하게 정리해서 반환해줘.
+            그리고 나이나 성별을 고려할 수 있다면 고려해서 만들어줘.
 
             JSON 형식:
-            {
+            {{
               "goal": "짧고 간결한 목표 문장",
               "category": "EXERCISE | HABIT | MENTAL | LEARNING | CUSTOM",
               "weeklyPlans": [
-                {
+                {{
                   "weekNum": 1,
                   "title": "1주차: 주차별 목표",
                   "dailyTasks": [
-                    { "dayNum": 1, "title": "Day1 활동" },
-                    { "dayNum": 2, "title": "Day2 활동" }
+                    {{ "dayNum": 1, "title": "Day1 활동" }},
+                    {{ "dayNum": 2, "title": "Day2 활동" }}
                   ]
-                }
+                }}
               ]
-            }
+            }}
 
             사용자 입력:
             목표: %s
             기간: %d주
-            """.formatted(rawGoal, weeks);
+            나이 : %d세
+            성별 : %s
+            """.formatted(rawGoal, weeks, age, gender);
+
+        Prompt prompt = new Prompt(promptText);
 
-        return chatClient.prompt()
-                .user(prompt) // ✅ 이렇게 써야 함
+        return chatClient.prompt(prompt)
                 .call()
                 .entity(AiMissionResult.class);
     }
diff --git a/backend/src/main/java/com/back/global/config/ChatClientConfig.java b/backend/src/main/java/com/back/global/config/ChatClientConfig.java
@@ -9,6 +9,8 @@ public class ChatClientConfig {
 
     @Bean
     public ChatClient chatClient(ChatClient.Builder chatClientBuilder) {
-        return chatClientBuilder.build();
+        return chatClientBuilder
+                .defaultSystem("You are a mission planner that generates structured JSON responses.")
+                .build();
     }
 }
diff --git a/backend/src/main/resources/application.yml b/backend/src/main/resources/application.yml
@@ -34,14 +34,13 @@ spring:
         highlight_sql: true
         use_sql_comments: true
   ai:
-    vertex:
-      ai:
-        gemini:
-          project-id: ${VERTEX_PROJECT_ID}
-          location: "us-central1"
-          chat:
-            options:
-              model: "gemini-2.5-flash"
+    openai:
+      api-key: ${OPENROUTER_API_KEY}
+      base-url: https://openrouter.ai/api
+      chat:
+        options:
+          model: x-ai/grok-4-fast:free
+
   security:
     oauth2:
       client:
@@ -105,8 +104,6 @@ management:
         enabled: true                 # /actuator/health/{liveness,readiness} 활성화
       show-details: never             # 프로브 용도면 never 권장(민감정보 차단)
   custom:
-    google:
-      credentials: ${GOOGLE_APPLICATION_CREDENTIALS}
     dev:
       cookieDomain: localhost
       frontUrl: http://${custom.dev.cookieDomain}:3000

Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,8 @@ public class ChatClientConfig {`
`9`	`9`
`10`	`10`	`@Bean`
`11`	`11`	`public ChatClient chatClient(ChatClient.Builder chatClientBuilder) {`
`12`		`- return chatClientBuilder.build();`
	`12`	`+ return chatClientBuilder`
	`13`	`+ .defaultSystem("You are a mission planner that generates structured JSON responses.")`
	`14`	`+ .build();`
`13`	`15`	`}`
`14`	`16`	`}`