Merge pull request #207 from prgrms-web-devcourse-final-project/develop

메인 머지(10/12)

Author: dooongdaeng

.github/workflows/deploy.yml

@@ -89,9 +89,14 @@ jobs:
       - name: .env 파일 생성
         env:
           DOT_ENV: ${{ secrets.DOT_ENV }}
+          AI_API_KEY: ${{ secrets.AI_API_KEY }}
+          AI_BASE_URL: ${{ secrets.AI_BASE_URL }}
         run: |
           mkdir -p "${{ env.BACKEND_DIR }}"
           printf "%s" "${DOT_ENV}" > "${{ env.BACKEND_DIR }}/.env"
+          echo "" >> "${{ env.BACKEND_DIR }}/.env"
+          echo "AI_API_KEY=${AI_API_KEY}" >> "${{ env.BACKEND_DIR }}/.env"
+          echo "AI_BASE_URL=${AI_BASE_URL}" >> "${{ env.BACKEND_DIR }}/.env"
 
       - name: Docker Buildx 설치
         uses: docker/setup-buildx-action@v3
@@ -216,4 +221,4 @@ jobs:
                 | xargs -r docker rmi
             } || true
 
-            echo "✅ 배포 완료!"
+            echo "✅ 배포 완료!"

back/.env.default

@@ -3,3 +3,5 @@ DB_USERNAME=NEED_TO_SET
 DB_PASSWORD=NEED_TO_SET
 MAIL_USERNAME=NEED_TO_SET
 MAIL_PASSWORD=NEED_TO_SET
+AI_API_KEY=NEED_TO_SET
+AI_BASE_URL=NEED_TO_SET

back/build.gradle.kts

@@ -3,6 +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.3")
 
 group = "com"
 version = "0.0.1-SNAPSHOT"
@@ -72,6 +73,14 @@ dependencies {
 
 	// Sentry
 	implementation("io.sentry:sentry-spring-boot-starter-jakarta:8.19.1")
+
+	// AI
+	implementation("org.springframework.ai:spring-ai-starter-model-openai")
+}
+dependencyManagement {
+	imports {
+		mavenBom("org.springframework.ai:spring-ai-bom:$springAiVersion")
+	}
 }
 
 tasks.withType<Test> {

back/src/main/java/com/back/domain/file/video/service/FileManager.java

@@ -18,14 +18,14 @@ public class FileManager {
     public PresignedUrlResponse getUploadUrl() {
         String uuid = UUID.randomUUID().toString();
         Integer expires = 5;
-        URL url = s3Service.generateUploadUrl("videos", uuid, expires);
+        URL url = s3Service.generateUploadUrl("videos/"+uuid, expires);
         LocalDateTime expiresAt = LocalDateTime.now().plusMinutes(expires);
         return new PresignedUrlResponse(url, expiresAt);
     }
 
     public PresignedUrlResponse getDownloadUrl(String objectKey) {
         Integer expires = 60;
-        URL url = s3Service.generateDownloadUrl("videos", objectKey, expires);
+        URL url = s3Service.generateDownloadUrl(objectKey, expires);
         LocalDateTime expiresAt = LocalDateTime.now().plusMinutes(expires);
         return new PresignedUrlResponse(url, expiresAt);
     }

back/src/main/java/com/back/domain/file/video/service/S3Service.java

@@ -2,6 +2,7 @@
 
 import com.back.global.exception.ServiceException;
 import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import software.amazon.awssdk.services.s3.S3Client;
 import software.amazon.awssdk.services.s3.model.*;
@@ -17,8 +18,12 @@
 public class S3Service {
     private final S3Presigner presigner;
     private final S3Client s3Client;
+    @Value("${aws.s3.bucket}")
+    private String bucket;
+
+    public URL generateUploadUrl(String objectKey, Integer expireMinutes) {
+        validateRequest(objectKey);
 
-    public URL generateUploadUrl(String bucket, String objectKey, Integer expireMinutes) {
         PutObjectRequest request = PutObjectRequest.builder()
                 .bucket(bucket)
                 .key(objectKey)
@@ -33,19 +38,15 @@ public URL generateUploadUrl(String bucket, String objectKey, Integer expireMinu
             throw new ServiceException("500", "Presigned URL 생성 실패");
         }
 
-        URL url = presignedRequest.url();
-
-        return url;
+        return presignedRequest.url();
     }
 
-    public URL generateUploadUrl(String bucket, String objectKey) {
-        validateRequest(bucket, objectKey);
-
-        return generateUploadUrl(bucket, objectKey, 30);
+    public URL generateUploadUrl(String objectKey) {
+        return generateUploadUrl(objectKey, 30);
     }
 
-    public URL generateDownloadUrl(String bucket, String objectKey, Integer expireHours) {
-        isExist(bucket, objectKey);
+    public URL generateDownloadUrl(String objectKey, Integer expireMinutes) {
+        isExist(objectKey);
 
         GetObjectRequest request = GetObjectRequest.builder()
                 .bucket(bucket)
@@ -54,25 +55,22 @@ public URL generateDownloadUrl(String bucket, String objectKey, Integer expireHo
 
         PresignedGetObjectRequest presignedRequest =
                 presigner.presignGetObject(builder -> builder
-                        .signatureDuration(Duration.ofMinutes(expireHours))
+                        .signatureDuration(Duration.ofMinutes(expireMinutes))
                         .getObjectRequest(request));
 
         if (presignedRequest == null) {
             throw new ServiceException("500", "Presigned URL 생성 실패");
         }
 
-        URL url = presignedRequest.url();
-
-        return url;
+        return presignedRequest.url();
     }
 
-    public URL generateDownloadUrl(String bucket, String objectKey) {
-        validateRequest(bucket, objectKey);
-
-        return generateDownloadUrl(bucket, objectKey, 60);
+    public URL generateDownloadUrl(String objectKey) {
+        return generateDownloadUrl(objectKey, 60);
     }
 
-    public void isExist(String bucket, String objectKey) {
+    public void isExist(String objectKey) {
+        validateRequest(objectKey);
         try {
             HeadObjectRequest headRequest = HeadObjectRequest.builder()
                     .bucket(bucket)
@@ -87,9 +85,9 @@ public void isExist(String bucket, String objectKey) {
         }
     }
 
-    public void validateRequest(String bucket, String objectKey) {
-        if (bucket == null || bucket.isEmpty() || objectKey == null || objectKey.isEmpty()) {
-            throw new ServiceException("400", "버킷 이름과 객체 키는 필수입니다.");
+    public void validateRequest(String objectKey) {
+        if (objectKey == null || objectKey.isEmpty()) {
+            throw new ServiceException("400", "객체 키는 필수입니다.");
         }
     }
 }

back/src/main/java/com/back/domain/post/comment/controller/PostCommentController.java

@@ -21,15 +21,15 @@
 import java.util.List;
 
 @RestController
-@RequestMapping("/post/comment")
+@RequestMapping("/post")
 @RequiredArgsConstructor
 public class PostCommentController {
 
     private final Rq rq;
     private final PostCommentService postCommentService;
 
     @Operation(summary = "댓글 생성", description = "comment는 공백이나 Null이 될 수 없습니다. comment의 글자 수 제한은 없습니다.")
-    @PostMapping("/post/{post_id}")
+    @PostMapping("/{post_id}/comment")
     public RsData<Void> createComment(@PathVariable Long post_id,
                                       @Valid @RequestBody CommentCreateRequest commentCreateRequest
     ) {
@@ -47,7 +47,7 @@ public RsData<List<CommentAllResponse>> getAllPostComment(@PathVariable Long pos
     }
 
     @Operation(summary = "댓글 삭제", description = "commentId는 공백이나 Null이 될 수 없습니다.")
-    @DeleteMapping("/post/{post_id}/comment")
+    @DeleteMapping("/{post_id}/comment")
     public RsData<Void> removePostComment(@PathVariable @Positive Long post_id
             , @RequestBody @Valid CommentDeleteRequest commentDeleteRequest) {
         Member member = rq.getActor();
@@ -58,7 +58,7 @@ public RsData<Void> removePostComment(@PathVariable @Positive Long post_id
     }
 
     @Operation(summary = "댓글 수정", description = "commentId, content는 공백이나 Null이 될 수 없습니다. content의 글자 수 제한은 없습니다. ")
-    @PutMapping("/post/{post_id}/comment/")
+    @PutMapping("/{post_id}/comment")
     public RsData<Void> updatePostComment(@PathVariable Long post_id
             , @Valid @RequestBody CommentModifyRequest commentModifyRequest) {
         Member member = rq.getActor();

back/src/main/java/com/back/domain/roadmap/roadmap/dto/response/TextFieldIntegrationResponse.java

@@ -0,0 +1,8 @@
+package com.back.domain.roadmap.roadmap.dto.response;
+
+public record TextFieldIntegrationResponse(
+        String learningAdvice,
+        String recommendedResources,
+        String learningGoals
+) {
+}

back/src/main/java/com/back/domain/roadmap/roadmap/repository/MentorRoadmapRepository.java

@@ -41,13 +41,15 @@ public interface MentorRoadmapRepository extends JpaRepository<MentorRoadmap, Lo
     boolean existsByMentor(Mentor mentor);
 
     /**
-     * 직업 ID로 멘토 로드맵 목록 조회 (노드 포함)
+     * 직업 ID로 멘토 로드맵 목록 조회 (노드 및 Task 포함)
      * - 특정 직업에 속한 멘토들의 로드맵 목록 조회
      * - 통합된 직업 로드맵 생성용
+     * - Task까지 fetch하여 트랜잭션 외부에서도 접근 가능하도록 보장
      */
     @Query("""
-    SELECT mr FROM MentorRoadmap mr
+    SELECT DISTINCT mr FROM MentorRoadmap mr
     LEFT JOIN FETCH mr.nodes n
+    LEFT JOIN FETCH n.task t
     WHERE mr.mentor.jobId = :jobId
     ORDER BY mr.id, n.stepOrder
     """)

back/src/main/java/com/back/domain/roadmap/roadmap/service/JobRoadmapBatchIntegrator.java

@@ -18,7 +18,7 @@ public class JobRoadmapBatchIntegrator {
     private final JobRoadmapIntegrationProcessor processor;
     private static final int MAX_RETRY = 3;
 
-    @Scheduled(fixedDelay = 120000)  // 2분
+    @Scheduled(fixedDelay = 3600000)  // 1시간 (3600000ms)
     public void integrate() {
         List<JobRoadmapIntegrationQueue> pendingQueues = queueRepository.findAllOrderByRequestedAt();
 

back/src/main/java/com/back/domain/roadmap/roadmap/service/JobRoadmapIntegrationProcessor.java

@@ -13,7 +13,7 @@
 @Slf4j
 public class JobRoadmapIntegrationProcessor {
     private final JobRoadmapIntegrationQueueRepository queueRepository;
-    private final JobRoadmapIntegrationServiceV2 integrationService;
+    private final JobRoadmapIntegrationServiceV3 integrationService;
 
     /**
      * 단일 큐 항목 처리 (통합 + 큐 삭제를 하나의 트랜잭션으로)