Dev

.github/workflows/deploy.yml

@@ -0,0 +1,71 @@
+name: Deploy to EC2 with Docker hub
+
+on:
+  push:
+    branches:
+      - main
+
+jobs:
+  deploy:
+    runs-on: ubuntu-latest
+
+    steps:
+      # 소스코드 체크아웃
+      - name: Checkout code
+        uses: actions/checkout@v5
+
+      # Gradle 실행 권한 부여
+      - name: Make gradlew executable
+        run: chmod +x ./gradlew
+
+      # Docker hub 로그인
+      - name: Log in to Docker Hub
+        uses: docker/[email protected]
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+      # Dockerfile을 사용하여 이미지를 빌드하고 Docker Hub에 푸시합니다.
+      - name: Build and push Docker image
+        uses: docker/[email protected]
+        with:
+          context: .
+          file: ./Dockerfile
+          push: true
+          # Docker 레이어 캐시 활성화
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
+          tags: |
+            ${{ secrets.DOCKER_USERNAME }}/gitdeun:latest
+            ${{ secrets.DOCKER_USERNAME }}/gitdeun:${{ github.sha }}
+
+      # 3. EC2에서 환경 변수를 설정하고 애플리케이션 실행
+      - name: Deploy via SSH
+        uses: appleboy/[email protected]
+        with:
+          host: ${{secrets.EC2_HOST}}
+          username: ${{secrets.EC2_USERNAME}}
+          key: ${{ secrets.EC2_PRIVATE_KEY }}
+          port: 22
+          script: |
+            set -eux
+            # Docker Hub 로그인
+            echo "${{ secrets.DOCKERHUB_TOKEN }}" | docker login -u "${{ secrets.DOCKER_USERNAME }}" --password-stdin
+            # 최신 이미지 가져오기
+            docker network create gitdeun-network || true
+            # 최신 커밋 SHA로 배포(불변 태그)
+            IMAGE="${{ secrets.DOCKER_USERNAME }}/gitdeun:${{ github.sha }}"
+            docker pull "$IMAGE"
+            docker stop gitdeun || true
+            docker rm gitdeun || true
+            docker run -d \
+              --name gitdeun \
+              --restart unless-stopped \
+              --env SPRING_PROFILES_ACTIVE=prod,s3Bucket \
+              --env-file ${{ secrets.EC2_TARGET_PATH }}/.env \
+              --network gitdeun-network \
+              -p 8080:8080 \
+              -v ${{ secrets.EC2_TARGET_PATH }}/logs:/app/logs \
+              "$IMAGE"
+            # 오래된 이미지 정리
+            docker image prune -f --filter "until=168h"

src/main/java/com/teamEWSN/gitdeun/codereference/controller/CodeReferenceController.java

@@ -26,8 +26,9 @@ public ResponseEntity<ReferenceResponse> createCodeReference(
         @PathVariable Long mapId,
         @PathVariable String nodeKey,
         @Valid @RequestBody CreateRequest request,
+        @RequestHeader("Authorization") String authorizationHeader,
         @AuthenticationPrincipal CustomUserDetails userDetails) {
-        return ResponseEntity.status(HttpStatus.CREATED).body(codeReferenceService.createReference(mapId, nodeKey, userDetails.getId(), request));
+        return ResponseEntity.status(HttpStatus.CREATED).body(codeReferenceService.createReference(mapId, nodeKey, userDetails.getId(), request, authorizationHeader));
     }
 
     // 특정 코드 참조 상세 조회
@@ -55,8 +56,9 @@ public ResponseEntity<ReferenceResponse> updateCodeReference(
         @PathVariable Long mapId,
         @PathVariable Long refId,
         @Valid @RequestBody CreateRequest request,
+        @RequestHeader("Authorization") String authorizationHeader,
         @AuthenticationPrincipal CustomUserDetails userDetails) {
-        return ResponseEntity.ok(codeReferenceService.updateReference(mapId, refId, userDetails.getId(), request));
+        return ResponseEntity.ok(codeReferenceService.updateReference(mapId, refId, userDetails.getId(), request, authorizationHeader));
     }
 
     // 코드 참조 삭제

src/main/java/com/teamEWSN/gitdeun/codereference/service/CodeReferenceService.java

@@ -9,13 +9,18 @@
 import com.teamEWSN.gitdeun.common.exception.ErrorCode;
 import com.teamEWSN.gitdeun.common.exception.GlobalException;
 import com.teamEWSN.gitdeun.common.fastapi.FastApiClient;
+import com.teamEWSN.gitdeun.common.fastapi.dto.NodeDto;
+import com.teamEWSN.gitdeun.mindmap.dto.MindmapGraphResponseDto;
 import com.teamEWSN.gitdeun.mindmap.entity.Mindmap;
 import com.teamEWSN.gitdeun.mindmap.repository.MindmapRepository;
+import com.teamEWSN.gitdeun.mindmap.util.FileContentCache;
+import com.teamEWSN.gitdeun.mindmap.util.MindmapGraphCache;
 import com.teamEWSN.gitdeun.mindmapmember.service.MindmapAuthService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.time.LocalDateTime;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -27,10 +32,12 @@ public class CodeReferenceService {
     private final MindmapRepository mindmapRepository;
     private final MindmapAuthService mindmapAuthService;
     private final CodeReferenceMapper codeReferenceMapper;
+    private final MindmapGraphCache mindmapGraphCache;
+    private final FileContentCache fileContentCache;
     private final FastApiClient fastApiClient;
 
     @Transactional
-    public ReferenceResponse createReference(Long mapId, String nodeKey, Long userId, CreateRequest request) {
+    public ReferenceResponse createReference(Long mapId, String nodeKey, Long userId, CreateRequest request, String authorizationHeader) throws GlobalException {
         // 1. 권한 확인
         if (!mindmapAuthService.hasEdit(mapId, userId)) {
             throw new GlobalException(ErrorCode.FORBIDDEN_ACCESS);
@@ -40,6 +47,8 @@ public ReferenceResponse createReference(Long mapId, String nodeKey, Long userId
         Mindmap mindmap = mindmapRepository.findById(mapId)
             .orElseThrow(() -> new GlobalException(ErrorCode.MINDMAP_NOT_FOUND));
 
+        validateCodeReferenceRequest(mindmap, nodeKey, request, authorizationHeader);
+
         // 3. CodeReference 엔티티 생성 및 저장
         CodeReference codeReference = CodeReference.builder()
             .mindmap(mindmap)
@@ -51,7 +60,6 @@ public ReferenceResponse createReference(Long mapId, String nodeKey, Long userId
 
         CodeReference savedReference = codeReferenceRepository.save(codeReference);
 
-        // 4. DTO로 변환하여 반환
         return codeReferenceMapper.toReferenceResponse(savedReference);
     }
 
@@ -77,7 +85,6 @@ public ReferenceDetailResponse getReferenceDetail(Long mapId, Long refId, Long u
 
     @Transactional(readOnly = true)
     public List<ReferenceResponse> getReferencesForNode(Long mapId, String nodeKey, Long userId) {
-        // 1. 권한 확인 (읽기)
         if (!mindmapAuthService.hasView(mapId, userId)) {
             throw new GlobalException(ErrorCode.FORBIDDEN_ACCESS);
         }
@@ -92,7 +99,7 @@ public List<ReferenceResponse> getReferencesForNode(Long mapId, String nodeKey,
     }
 
     @Transactional
-    public ReferenceResponse updateReference(Long mapId, Long refId, Long userId, CreateRequest request) {
+    public ReferenceResponse updateReference(Long mapId, Long refId, Long userId, CreateRequest request, String authorizationHeader) {
         // 1. 권한 확인
         if (!mindmapAuthService.hasEdit(mapId, userId)) {
             throw new GlobalException(ErrorCode.FORBIDDEN_ACCESS);
@@ -102,6 +109,8 @@ public ReferenceResponse updateReference(Long mapId, Long refId, Long userId, Cr
         CodeReference codeReference = codeReferenceRepository.findByMindmapIdAndId(mapId, refId)
             .orElseThrow(() -> new GlobalException(ErrorCode.CODE_REFERENCE_NOT_FOUND));
 
+        validateCodeReferenceRequest(codeReference.getMindmap(), codeReference.getNodeKey(), request, authorizationHeader);
+
         // 3. 엔티티 정보 업데이트
         codeReference.update(request.getFilePath(), request.getStartLine(), request.getEndLine());
 
@@ -136,4 +145,36 @@ private String extractLines(String fullContent, Integer startLine, Integer endLi
         }
         return sb.toString();
     }
+
+    // 코드 참조 검증
+    private void validateCodeReferenceRequest(Mindmap mindmap, String nodeKey, CreateRequest request, String authorizationHeader) {
+        String repoUrl = mindmap.getRepo().getGithubRepoUrl();
+        LocalDateTime lastCommit = mindmap.getRepo().getLastCommit();
+
+        // 그래프 데이터에서 노드 정보 가져오기
+        MindmapGraphResponseDto graphData = mindmapGraphCache.getGraphWithHybridCache(repoUrl, lastCommit, authorizationHeader);
+        NodeDto targetNode = graphData.getNodes().stream()
+            .filter(node -> nodeKey.equals(node.getKey()))
+            .findFirst()
+            .orElseThrow(() -> new GlobalException(ErrorCode.NODE_NOT_FOUND));
+
+        // 요청된 filePath가 노드에 실제 포함된 파일인지 확인
+        boolean fileExists = targetNode.getRelatedFiles().stream()
+            .anyMatch(file -> request.getFilePath().equals(file.getFilePath()));
+        if (!fileExists) {
+            throw new GlobalException(ErrorCode.FILE_NOT_FOUND_IN_NODE);
+        }
+
+        // 파일의 전체 내용을 가져와 총 라인 수 계산
+        String fileContent = fileContentCache.getFileContentWithCache(repoUrl, request.getFilePath(), lastCommit, authorizationHeader);
+        int totalLines = fileContent.split("\\r?\\n").length;
+
+        // 요청된 라인 범위(startLine, endLine)가 유효한지 확인
+        Integer start = request.getStartLine();
+        Integer end = request.getEndLine();
+        if (start <= 0 || start > end || end > totalLines) {
+            throw new GlobalException(ErrorCode.INVALID_LINE_RANGE);
+        }
+    }
+
 }

src/main/java/com/teamEWSN/gitdeun/codereview/controller/CodeReviewController.java

@@ -27,7 +27,7 @@ public class CodeReviewController {
     private final CodeReviewService codeReviewService;
 
     // 노드에 대한 코드 리뷰 생성
-    @PostMapping(value = "/mindmaps/{mapId}/nodes/{nodeKey}/code-reviews", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
+    @PostMapping(value = "/mindmaps/{mapId}/nodes/{nodeKey}/code-reviews", consumes = {MediaType.APPLICATION_JSON_VALUE, MediaType.MULTIPART_FORM_DATA_VALUE})
     public ResponseEntity<ReviewResponse> createNodeCodeReview(
         @PathVariable Long mapId,
         @PathVariable String nodeKey,
@@ -38,7 +38,7 @@ public ResponseEntity<ReviewResponse> createNodeCodeReview(
     }
 
     // 코드 참조에 대한 코드 리뷰 생성
-    @PostMapping(value = "/references/{refId}/code-reviews", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
+    @PostMapping(value = "/references/{refId}/code-reviews", consumes = {MediaType.APPLICATION_JSON_VALUE, MediaType.MULTIPART_FORM_DATA_VALUE})
     public ResponseEntity<ReviewResponse> createReferenceCodeReview(
             @PathVariable Long refId,
             @Valid @RequestPart("request") CreateRequest request,

src/main/java/com/teamEWSN/gitdeun/codereview/dto/CodeReviewRequestDtos.java

@@ -12,7 +12,7 @@ public class CodeReviewRequestDtos {
     @Getter
     @NoArgsConstructor
     public static class CreateRequest {
-        @NotEmpty(message = "첫 댓글 내용은 비워둘 수 없습니다.")
+        @NotEmpty(message = "댓글 내용은 비워둘 수 없습니다.")
         private String content;
         private EmojiType emojiType;
     }

src/main/java/com/teamEWSN/gitdeun/comment/controller/CommentController.java

@@ -24,7 +24,7 @@ public class CommentController {
     private final CommentService commentService;
 
     // 특정 코드 리뷰에 댓글 또는 대댓글 작성
-    @PostMapping(value = "/code-reviews/{reviewId}/comments", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
+    @PostMapping(value = "/code-reviews/{reviewId}/comments", consumes = {MediaType.APPLICATION_JSON_VALUE, MediaType.MULTIPART_FORM_DATA_VALUE})
     public ResponseEntity<CommentResponse> createComment(
         @PathVariable Long reviewId,
         @Valid @RequestPart("request") CreateRequest request,

src/main/java/com/teamEWSN/gitdeun/comment/entity/Comment.java

@@ -11,7 +11,9 @@
 
 import java.time.LocalDateTime;
 import java.util.ArrayList;
+import java.util.HashSet;
 import java.util.List;
+import java.util.Set;
 
 @Entity
 @Getter
@@ -41,11 +43,11 @@ public class Comment extends AuditedEntity {
 
     @Builder.Default
     @OneToMany(mappedBy = "parentComment")
-    private List<Comment> replies = new ArrayList<>();
+    private Set<Comment> replies = new HashSet<>();
 
     @Builder.Default
     @OneToMany(mappedBy = "comment", cascade = CascadeType.ALL, orphanRemoval = true)
-    private List<CommentAttachment> attachments = new ArrayList<>();
+    private Set<CommentAttachment> attachments = new HashSet<>();
 
     @Column(columnDefinition = "TEXT", nullable = false)
     private String content;

src/main/java/com/teamEWSN/gitdeun/comment/service/CommentAttachmentService.java

@@ -13,6 +13,7 @@
 
 import java.util.Collections;
 import java.util.List;
+import java.util.Set;
 import java.util.stream.Collectors;
 import java.util.stream.IntStream;
 
@@ -61,7 +62,7 @@ private AttachmentType determineAttachmentType(String mimeType) {
      * 첨부파일 목록을 S3와 DB에서 모두 삭제 (Hard Delete)
      */
     @Transactional
-    public void deleteAttachments(List<CommentAttachment> attachments) {
+    public void deleteAttachments(Set<CommentAttachment> attachments) {
         if (CollectionUtils.isEmpty(attachments)) {
             return;
         }

src/main/java/com/teamEWSN/gitdeun/comment/service/CommentService.java

@@ -25,6 +25,7 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 import java.util.stream.Collectors;
 
 @Service
@@ -108,7 +109,7 @@ public List<CommentResponse> getCommentsAsTree(Long reviewId) {
         return topLevelComments;
     }
 
-    @Transactional(readOnly = true)
+    @Transactional
     public List<AttachmentResponse> addAttachmentsToComment(Long commentId, Long userId, List<MultipartFile> files) {
         Comment comment = commentRepository.findById(commentId)
             .orElseThrow(() -> new GlobalException(ErrorCode.COMMENT_NOT_FOUND));
@@ -170,7 +171,7 @@ public void deleteAttachment(Long attachmentId, Long userId) {
             throw new GlobalException(ErrorCode.FORBIDDEN_ACCESS);
         }
 
-        attachmentService.deleteAttachments(List.of(attachment));
+        attachmentService.deleteAttachments(Set.of(attachment));
     }
 
     @Transactional

src/main/java/com/teamEWSN/gitdeun/common/exception/ErrorCode.java

@@ -88,7 +88,8 @@ public enum ErrorCode {
     COMMENT_NOT_FOUND(HttpStatus.NOT_FOUND, "REVIEW-003", "해당 댓글을 찾을 수 없습니다."),
     CANNOT_RESOLVE_REPLY(HttpStatus.BAD_REQUEST, "REVIEW-004", "대댓글은 해결 상태로 변경할 수 없습니다."),
     EMOJI_ON_REPLY_NOT_ALLOWED(HttpStatus.BAD_REQUEST, "REVIEW-005", "이모지는 최상위 댓글에만 추가할 수 있습니다."),
-
+    FILE_NOT_FOUND_IN_NODE(HttpStatus.NOT_FOUND, "REVIEW-006", "해당 노드에서 파일을 찾을 수 없습니다."),
+    INVALID_LINE_RANGE(HttpStatus.NOT_FOUND, "REVIEW-007", "유효한 코드 블록 범위가 아닙니다."),
 
     // 방문기록 관련
     HISTORY_NOT_FOUND(HttpStatus.NOT_FOUND, "VISITHISTORY-001", "방문 기록을 찾을 수 없습니다."),

src/main/java/com/teamEWSN/gitdeun/common/fastapi/FastApiClient.java

@@ -399,6 +399,7 @@ public static class SuggestionAutoResponse {
         private Integer total_target_files;
         private Integer created;
         private List<AutoScopeItem> items;
+        private String aggregate_node_key;
     }
 
     @Getter

src/main/java/com/teamEWSN/gitdeun/common/util/CacheType.java

@@ -9,7 +9,8 @@ public enum CacheType {
     SERVICE_AUTOCOMPLETE("serviceAutocomplete", 2, 1200),   // 자동완성 캐시
     USER_SKILLS("userSkills", 1, 500),    // 사용자 개발기술 캐시
     MINDMAP_GRAPH_L1("mindmapGraphL1", 100, 1), // 30분, 최대 100개
-    VISIT_HISTORY_SUMMARY("visitHistorySummary", 1000, 1); // 1시간, 최대 1000개
+    VISIT_HISTORY_SUMMARY("visitHistorySummary", 1000, 1), // 1시간, 최대 1000개
+    FILE_CONTENT_L1("fileContentL1", 500, 1);
 
     private final String cacheName;
     private final int expiredAfterWrite;  // 시간(hour) 단위

src/main/java/com/teamEWSN/gitdeun/mindmap/dto/FileWithCodeDto.java

@@ -0,0 +1,20 @@
+package com.teamEWSN.gitdeun.mindmap.dto;
+
+import com.teamEWSN.gitdeun.common.fastapi.dto.RelatedFileDto;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+@Getter
+public class FileWithCodeDto {
+    private final String fileName;
+    private final String filePath;
+    private final String codeContents;
+    private final int lineCount;
+
+    public FileWithCodeDto(RelatedFileDto relatedFile, String codeContents) {
+        this.fileName = relatedFile.getFileName();
+        this.filePath = relatedFile.getFilePath();
+        this.codeContents = codeContents;
+        this.lineCount = codeContents == null ? 0 : codeContents.split("\\r?\\n").length;
+    }
+}

src/main/java/com/teamEWSN/gitdeun/mindmap/dto/NodeCodeResponseDto.java

@@ -12,6 +12,5 @@
 public class NodeCodeResponseDto {
     private String nodeKey;
     private String nodeLabel;
-    private List<RelatedFileDto> filePaths;
-    private Map<RelatedFileDto, String> codeContents; // filePath -> full code content
+    private List<FileWithCodeDto> files;
 }