Merge pull request #312 from HaRu-Developers/dev

deploy 4.4

Author: djlim2425

src/main/java/com/haru/api/domain/meeting/controller/MeetingController.java

@@ -5,6 +5,8 @@
 import com.haru.api.domain.meeting.entity.Meeting;
 import com.haru.api.domain.meeting.service.MeetingCommandService;
 import com.haru.api.domain.meeting.service.MeetingQueryService;
+import com.haru.api.domain.snsEvent.entity.enums.Format;
+import com.haru.api.domain.snsEvent.entity.enums.ListType;
 import com.haru.api.domain.user.entity.User;
 import com.haru.api.domain.workspace.entity.Workspace;
 import com.haru.api.global.annotation.AuthMeeting;
@@ -170,11 +172,12 @@ public ApiResponse<String> endMeeting(
     @GetMapping("{meetingId}/ai-proceeding/download")
     public ApiResponse<MeetingResponseDTO.proceedingDownLoadLinkResponse> downloadMeeting(
             @PathVariable("meetingId") String meetingId,
+            @RequestParam Format format,
             @Parameter(hidden = true) @AuthUser User user,
             @Parameter(hidden = true) @AuthMeeting Meeting meeting
     ){
 
-        MeetingResponseDTO.proceedingDownLoadLinkResponse response = meetingQueryService.downloadMeeting(user, meeting);
+        MeetingResponseDTO.proceedingDownLoadLinkResponse response = meetingQueryService.downloadMeeting(user, meeting, format);
 
         return ApiResponse.onSuccess(response);
 

src/main/java/com/haru/api/domain/meeting/entity/Meeting.java

@@ -46,7 +46,10 @@ public class Meeting extends BaseEntity implements Documentable {
 
     // AI 회의록 정리본 파일
     @Column(columnDefinition = "TEXT")
-    private String proceedingKeyName;
+    private String proceedingPdfKeyName;
+
+    @Column(columnDefinition = "TEXT")
+    private String proceedingWordKeyName;
 
     @Column(columnDefinition = "TEXT")
     private String thumbnailKeyName;
@@ -77,7 +80,8 @@ public void updateTitle(String title) {
     public void updateProceeding(String proceeding) {
         this.proceeding = proceeding;
     }
-    public void initProceedingKeyName(String proceedingKeyName) { this.proceedingKeyName = proceedingKeyName; }
+    public void initProceedingPdfKeyName(String proceedingPdfKeyName) { this.proceedingPdfKeyName = proceedingPdfKeyName; }
+    public void initProceedingWordKeyName(String proceedingWordKeyName) { this.proceedingWordKeyName = proceedingWordKeyName; }
     public void initThumbnailKeyName(String thumbnailKeyName) { this.thumbnailKeyName = thumbnailKeyName; }
     public void initStartTime(LocalDateTime startTime) {
         this.startTime = startTime;

src/main/java/com/haru/api/domain/meeting/service/MeetingCommandServiceImpl.java

@@ -139,7 +139,7 @@ public void updateMeetingTitle(User user, Meeting meeting, MeetingRequestDTO.upd
 
         meeting.updateTitle(request.getTitle());
 
-        markdownFileUploader.updateFileTitle(meeting.getProceedingKeyName(), request.getTitle());
+        markdownFileUploader.updateFileTitle(meeting.getProceedingPdfKeyName(), request.getTitle());
 
         meetingRepository.save(meeting);
     }
@@ -148,18 +148,22 @@ public void updateMeetingTitle(User user, Meeting meeting, MeetingRequestDTO.upd
     @Transactional
     @DeleteDocument
     public void deleteMeeting(User user, Meeting meeting) {
+        Meeting foundMeeting = meetingRepository.findById(meeting.getId())
+                .orElseThrow(() -> new MeetingHandler(ErrorStatus.MEETING_NOT_FOUND));
 
-        UserWorkspace foundUserWorkspace = userWorkspaceRepository.findByUserIdAndWorkspaceId(user.getId(), meeting.getWorkspace().getId())
+        UserWorkspace foundUserWorkspace = userWorkspaceRepository.findByUserIdAndWorkspaceId(user.getId(), foundMeeting.getWorkspace().getId())
                 .orElseThrow(() -> new UserWorkspaceHandler(ErrorStatus.USER_WORKSPACE_NOT_FOUND));
 
-        if (!meeting.getCreator().getId().equals(user.getId()) && !foundUserWorkspace.getAuth().equals(Auth.ADMIN)) {
+        if (!foundMeeting.getCreator().getId().equals(user.getId()) && !foundUserWorkspace.getAuth().equals(Auth.ADMIN)) {
             throw new MemberHandler(ErrorStatus.MEMBER_NO_AUTHORITY);
         }
 
-        markdownFileUploader.deleteFileAndThumbnail(meeting.getProceedingKeyName(), meeting.getThumbnailKeyName());
-        markdownFileUploader.deleteS3File(meeting.getAudioFileKey());
+        markdownFileUploader.deleteS3File(foundMeeting.getProceedingPdfKeyName());
+        markdownFileUploader.deleteS3File(foundMeeting.getThumbnailKeyName());
+        markdownFileUploader.deleteS3File(foundMeeting.getProceedingWordKeyName());
+        markdownFileUploader.deleteS3File(foundMeeting.getAudioFileKey());
 
-        meetingRepository.delete(meeting);
+        meetingRepository.delete(foundMeeting);
     }
 
     @Override
@@ -237,11 +241,13 @@ public void processAfterMeeting(AudioSessionBuffer sessionBuffer) {
                 // --- PDF 및 썸네일 생성/업데이트 로직 시작 ---
                 try {
                     // 생성된 PDF를 S3에 업로드
-                    String pdfKey = markdownFileUploader.createOrUpdatePdf(analysisResult, "proceedings/", currentMeeting.getProceedingKeyName(), currentMeeting.getTitle());
-                    currentMeeting.initProceedingKeyName(pdfKey);
+                    String pdfKey = markdownFileUploader.createOrUpdatePdf(analysisResult, "meeting/pdf", currentMeeting.getProceedingPdfKeyName(), currentMeeting.getTitle());
+                    String wordKey = markdownFileUploader.createOrUpdateWord(analysisResult, "meeting/word", currentMeeting.getProceedingWordKeyName(), currentMeeting.getTitle());
+                    currentMeeting.initProceedingPdfKeyName(pdfKey);
+                    currentMeeting.initProceedingWordKeyName(wordKey);
 
                     // 썸네일 생성 및 업데이트
-                    String newThumbnailKey = markdownFileUploader.createOrUpdateThumbnail(pdfKey, "meetings/" + currentMeeting.getId(), currentMeeting.getThumbnailKeyName());
+                    String newThumbnailKey = markdownFileUploader.createOrUpdateThumbnail(pdfKey, "meeting" + currentMeeting.getId(), currentMeeting.getThumbnailKeyName());
                     currentMeeting.initThumbnailKeyName(newThumbnailKey); // Meeting 엔티티에 썸네일 키 저장
                     log.info("회의록 썸네일 생성/업데이트 완료. Key: {}", newThumbnailKey);
 

src/main/java/com/haru/api/domain/meeting/service/MeetingQueryService.java

@@ -2,6 +2,7 @@
 
 import com.haru.api.domain.meeting.dto.MeetingResponseDTO;
 import com.haru.api.domain.meeting.entity.Meeting;
+import com.haru.api.domain.snsEvent.entity.enums.Format;
 import com.haru.api.domain.user.entity.User;
 import com.haru.api.domain.workspace.entity.Workspace;
 
@@ -15,7 +16,7 @@ public interface MeetingQueryService {
 
     MeetingResponseDTO.TranscriptResponse getTranscript(User user, Meeting meeting);
 
-    MeetingResponseDTO.proceedingDownLoadLinkResponse downloadMeeting(User user, Meeting meeting);
+    MeetingResponseDTO.proceedingDownLoadLinkResponse downloadMeeting(User user, Meeting meeting, Format format);
 
     MeetingResponseDTO.proceedingVoiceLinkResponse getMeetingVoiceFile(User user, Meeting meeting);
 }

src/main/java/com/haru/api/domain/meeting/service/MeetingQueryServiceImpl.java

@@ -4,6 +4,7 @@
 import com.haru.api.domain.meeting.dto.MeetingResponseDTO;
 import com.haru.api.domain.meeting.entity.Meeting;
 import com.haru.api.domain.meeting.repository.MeetingRepository;
+import com.haru.api.domain.snsEvent.entity.enums.Format;
 import com.haru.api.domain.user.entity.User;
 import com.haru.api.domain.workspace.entity.Workspace;
 import com.haru.api.global.annotation.TrackLastOpened;
@@ -64,9 +65,18 @@ public MeetingResponseDTO.TranscriptResponse getTranscript(User user, Meeting me
     }
 
     @Override
-    public MeetingResponseDTO.proceedingDownLoadLinkResponse downloadMeeting(User user, Meeting meeting){
-
-        String proceedingKeyName = meeting.getProceedingKeyName();
+    public MeetingResponseDTO.proceedingDownLoadLinkResponse downloadMeeting(User user, Meeting meeting, Format format){
+        String proceedingKeyName;
+        switch (format) {
+            case PDF:
+                proceedingKeyName = meeting.getProceedingPdfKeyName();
+                break;
+            case DOCX:
+                proceedingKeyName = meeting.getProceedingWordKeyName();
+                break;
+            default:
+                throw new MeetingHandler(ErrorStatus.MEETING_INVALID_FILE_FORMAT);
+        }
 
         if (proceedingKeyName == null || proceedingKeyName.isBlank()) {
             throw new MeetingHandler(ErrorStatus.MEETING_PROCEEDING_NOT_FOUND);

src/main/java/com/haru/api/global/apiPayload/code/status/ErrorStatus.java

@@ -45,6 +45,7 @@ public enum ErrorStatus implements BaseErrorCode {
     MEETING_AUDIO_FILE_UPLOAD_FAIL(HttpStatus.INTERNAL_SERVER_ERROR, "MEETING4003", "음성 파일을 s3에 업로드하는데 오류가 발생했습니다."),
     MEETING_FILE_UPLOAD_FAIL(HttpStatus.INTERNAL_SERVER_ERROR, "MEETING4004", "음성 파일을 s3에 업로드하는데 오류가 발생했습니다."),
     MEETING_PROCEEDING_NOT_FOUND(HttpStatus.BAD_REQUEST, "MEETING4005", "AI회의록이 없습니다"),
+    MEETING_INVALID_FILE_FORMAT(HttpStatus.BAD_REQUEST, "MEETING4006", "잘못된 다운로드 파일 형식입니다."),
 
     // 인가 관련 에러
     AUTHORIZATION_EXCEPTION(HttpStatus.UNAUTHORIZED, "AUTHORIZATION4001", "인증에 실패하였습니다."),

src/main/java/com/haru/api/infra/s3/MarkdownFileUploader.java

@@ -11,6 +11,7 @@
 public class MarkdownFileUploader {
 
     private final MarkdownToPdfConverter markdownToPdfConverter;
+    private final MarkdownToWordConverter markdownToWordConverter;
     private final ThumbnailGeneratorService thumbnailGeneratorService;
     private final AmazonS3Manager amazonS3Manager;
 
@@ -48,6 +49,29 @@ public String createOrUpdatePdf(String markdownText, String featurePath, String
         return pdfKeyToUse;
     }
 
+    public String createOrUpdateWord(String markdownText, String featurePath, String existingWordKey, String fileTitle) {
+        // 1. Markdown을 Word 데이터로 변환
+        byte[] wordBytes = markdownToWordConverter.convert(markdownText);
+
+        // 2. 사용할 Word 키 결정
+        String wordKeyToUse;
+        if (existingWordKey != null && !existingWordKey.isBlank()) {
+            wordKeyToUse = existingWordKey;
+            log.info("기존 Word 파일 갱신을 시작합니다. Key: {}", wordKeyToUse);
+        } else {
+            wordKeyToUse = amazonS3Manager.generateKeyName(featurePath) + ".docx";
+            log.info("새로운 Word 파일 생성을 시작합니다. New Key: {}", wordKeyToUse);
+        }
+
+        // 3. 결정된 키로 Word 파일을 S3에 업로드
+        String contentType = "application/vnd.openxmlformats-officedocument.wordprocessingml.document";
+        amazonS3Manager.uploadFileWithTitle(wordKeyToUse, wordBytes, contentType, fileTitle);
+        log.info("Word 파일 업로드/갱신 성공. Key: {}", wordKeyToUse);
+
+        // 4. 사용된 Word의 key를 반환
+        return wordKeyToUse;
+    }
+
     /**
      * 썸네일만 생성 및 업로드
      * 기존 PDF 파일의 key를 받아 썸네일을 생성하고 S3에 업로드

src/main/java/com/haru/api/infra/s3/MarkdownToPdfConverter.java

@@ -7,14 +7,29 @@
 import org.commonmark.renderer.html.HtmlRenderer;
 import org.springframework.stereotype.Component;
 
-import java.io.ByteArrayOutputStream;
-import java.io.File;
+import java.io.*;
 
 @Slf4j
 @Component
 public class MarkdownToPdfConverter {
 
-    // Markdown 문자열 -> HTML , HTML -> PDF byte[] 변환
+    private static final byte[] FONT_BYTES;
+
+    // 클래스가 로드될 때 폰트 파일을 딱 한 번만 읽어서 byte 배열에 저장합니다.
+    static {
+        String fontPath = "templates/NotoSansKR-Regular.ttf";
+        try (InputStream in = MarkdownToPdfConverter.class.getClassLoader().getResourceAsStream(fontPath)) {
+            if (in == null) {
+                throw new IOException("폰트 파일을 클래스패스에서 찾을 수 없습니다: " + fontPath);
+            }
+            FONT_BYTES = in.readAllBytes();
+            log.info("폰트 파일 로드 성공: {}, Size: {} bytes", fontPath, FONT_BYTES.length);
+        } catch (Exception e) {
+            log.error("초기화 중 폰트 파일을 로드하는 데 실패했습니다.", e);
+            throw new RuntimeException("폰트 파일 로딩 실패", e);
+        }
+    }
+
     public byte[] convert(String markdownText) {
         try {
             // 1. Markdown -> HTML
@@ -27,9 +42,31 @@ public byte[] convert(String markdownText) {
             try (ByteArrayOutputStream os = new ByteArrayOutputStream()) {
                 PdfRendererBuilder builder = new PdfRendererBuilder();
                 builder.useFastMode();
-                // 폰트
-                builder.useFont(new File(getClass().getClassLoader().getResource("/templates/NotoSansKR-Regular.ttf").getFile()), "NanumGothic");
-                builder.withHtmlContent(htmlContent, null);
+
+                builder.useFont(() -> new ByteArrayInputStream(FONT_BYTES), "NotoSansKR");
+
+                // [수정] meta 태그를 /> 로 닫아주어 XML 파싱 오류 해결
+                String styledHtml = "<html>"
+                        + "<head>"
+                        + "<meta charset=\"UTF-8\" />"
+                        + "<style>"
+                        + "body { font-family: 'NotoSansKR'; font-size: 12px; }"
+                        + "h1, h2, h3, h4, h5, h6 { font-weight: bold; margin-top: 1.2em; margin-bottom: 0.6em; }"
+                        + "h1 { font-size: 2em; }"
+                        + "h2 { font-size: 1.5em; }"
+                        + "p { margin-bottom: 1em; line-height: 1.6; }"
+                        + "strong { font-weight: bold; }"
+                        + "ul, ol { padding-left: 25px; margin-bottom: 1em; }"
+                        + "li { margin-bottom: 0.5em; }"
+                        + "hr { border: 0; border-top: 1px solid #ccc; margin: 2em 0; }"
+                        + "</style>"
+                        + "</head>"
+                        + "<body>"
+                        + htmlContent
+                        + "</body>"
+                        + "</html>";
+
+                builder.withHtmlContent(styledHtml, null);
                 builder.toStream(os);
                 builder.run();
                 log.info("Markdown to PDF 변환 성공");
@@ -41,4 +78,3 @@ public byte[] convert(String markdownText) {
         }
     }
 }
-

src/main/java/com/haru/api/infra/s3/MarkdownToWordConverter.java

@@ -0,0 +1,55 @@
+package com.haru.api.infra.s3;
+
+import lombok.extern.slf4j.Slf4j;
+import org.apache.poi.xwpf.usermodel.XWPFDocument;
+import org.apache.poi.xwpf.usermodel.XWPFParagraph;
+import org.apache.poi.xwpf.usermodel.XWPFRun;
+import org.commonmark.node.Node;
+import org.commonmark.parser.Parser;
+import org.commonmark.renderer.text.TextContentRenderer;
+import org.springframework.stereotype.Component;
+
+import java.io.ByteArrayOutputStream;
+
+@Slf4j
+@Component
+public class MarkdownToWordConverter {
+
+    /**
+     * Markdown 문자열을 .docx 파일의 byte 배열로 변환합니다.
+     *
+     * @param markdownText 변환할 Markdown 내용
+     * @return .docx 파일의 byte 배열
+     */
+    public byte[] convert(String markdownText) {
+        try {
+            // 1. Markdown을 서식이 없는 일반 텍스트로 1차 변환합니다.
+            Parser parser = Parser.builder().build();
+            Node document = parser.parse(markdownText);
+            TextContentRenderer renderer = TextContentRenderer.builder().build();
+            String plainText = renderer.render(document);
+
+            // 2. Apache POI를 사용하여 새로운 Word 문서를 생성합니다.
+            try (XWPFDocument wordDocument = new XWPFDocument();
+                 ByteArrayOutputStream os = new ByteArrayOutputStream()) {
+
+                // 3. 변환된 텍스트를 문단별로 나누어 Word 문서에 추가합니다.
+                String[] lines = plainText.split("\\r?\\n");
+                for (String line : lines) {
+                    XWPFParagraph paragraph = wordDocument.createParagraph();
+                    XWPFRun run = paragraph.createRun();
+                    run.setText(line);
+                }
+
+                // 4. 생성된 Word 문서를 byte 배열로 저장하여 반환합니다.
+                wordDocument.write(os);
+                log.info("Markdown to Word 변환 성공 (using Apache POI)");
+                return os.toByteArray();
+            }
+
+        } catch (Exception e) {
+            log.error("Markdown to Word 변환 중 오류 발생 (using Apache POI)", e);
+            throw new RuntimeException("Word 데이터 생성에 실패했습니다.", e);
+        }
+    }
+}