Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,13 @@ dependencies {

// apache
implementation 'org.apache.pdfbox:pdfbox:2.0.27'

// docx4j
implementation 'org.docx4j:docx4j-JAXB-ReferenceImpl:8.3.3'
implementation 'org.glassfish.jaxb:jaxb-runtime:2.3.1'
implementation 'org.docx4j:docx4j-export-fo:8.3.3'


}

dependencyManagement {
Expand Down
25 changes: 25 additions & 0 deletions src/main/java/com/haru/api/domain/meeting/entity/Keyword.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
package com.haru.api.domain.meeting.entity;

import com.haru.api.global.common.entity.BaseEntity;
import jakarta.persistence.*;
import lombok.*;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;

@Entity
@Table(name = "keywords")
@Getter
@Builder
@DynamicUpdate
@DynamicInsert
@NoArgsConstructor(access = AccessLevel.PROTECTED)
@AllArgsConstructor
public class Keyword extends BaseEntity {

@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
private Long id;

@Column(nullable = false, unique = true)
private String name;
}
18 changes: 18 additions & 0 deletions src/main/java/com/haru/api/domain/meeting/entity/Meeting.java
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;

import java.util.ArrayList;
import java.util.List;

@Entity
@Table(name = "meetings")
@Getter
Expand Down Expand Up @@ -40,6 +43,11 @@ public class Meeting extends BaseEntity {
@JoinColumn(name = "workspace_id")
private Workspace workspace;

@OneToMany(mappedBy = "meeting", cascade = CascadeType.ALL, orphanRemoval = true)
private List<MeetingKeyword> meetingKeywords = new ArrayList<>();



private Meeting(String title, String agendaResult, User user, Workspace workspace) {
this.title = title;
this.agendaResult = agendaResult;
Expand All @@ -56,4 +64,14 @@ public void updateTitle(String title) {
public void updateProceeding(String proceeding) {
this.proceeding = proceeding;
}


// 연관관계 편의 메서드
public void addTag(Keyword keyword) {
MeetingKeyword meetingKeyword = MeetingKeyword.builder()
.meeting(this)
.keyword(keyword)
.build();
this.meetingKeywords.add(meetingKeyword);
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
package com.haru.api.domain.meeting.entity;

import com.haru.api.global.common.entity.BaseEntity;
import jakarta.persistence.*;
import lombok.*;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;

@Entity
@Table(name = "meeting_tags")
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

테이블명 수정해야할 것 같습니다!

@Getter
@Builder
@DynamicUpdate
@DynamicInsert
@NoArgsConstructor(access = AccessLevel.PROTECTED)
@AllArgsConstructor
public class MeetingKeyword extends BaseEntity {

@Id @GeneratedValue(strategy = GenerationType.IDENTITY)
private Long id;

@ManyToOne(fetch = FetchType.LAZY)
@JoinColumn(name = "meeting_id")
private Meeting meeting;

@ManyToOne(fetch = FetchType.LAZY)
@JoinColumn(name = "keyword_id")
private Keyword keyword;
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
package com.haru.api.domain.meeting.repository;

import com.haru.api.domain.meeting.entity.Keyword;
import org.springframework.data.jpa.repository.JpaRepository;

import java.util.Optional;

public interface KeywordRepository extends JpaRepository<Keyword, Long> {
Optional<Keyword> findByName(String name);
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
package com.haru.api.domain.meeting.repository;

import com.haru.api.domain.meeting.entity.MeetingKeyword;
import org.springframework.data.jpa.repository.JpaRepository;

public interface MeetingKeywordRepository extends JpaRepository<MeetingKeyword, Long> {
}
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,10 @@
import com.haru.api.domain.meeting.dto.MeetingRequestDTO;
import com.haru.api.domain.meeting.dto.MeetingResponseDTO;
import com.haru.api.domain.meeting.entity.Meeting;
import com.haru.api.domain.meeting.entity.Keyword;
import com.haru.api.domain.meeting.repository.MeetingRepository;
import com.haru.api.domain.meeting.repository.MeetingKeywordRepository;
import com.haru.api.domain.meeting.repository.KeywordRepository;
import com.haru.api.domain.user.entity.User;
import com.haru.api.domain.user.repository.UserRepository;
import com.haru.api.domain.workspace.entity.Workspace;
Expand All @@ -15,10 +18,26 @@
import com.haru.api.global.apiPayload.exception.handler.WorkspaceHandler;
import com.haru.api.infra.api.client.ChatGPTClient;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.apache.pdfbox.pdmodel.PDDocument;
import org.apache.pdfbox.rendering.PDFRenderer;
import org.apache.pdfbox.text.PDFTextStripper;
import org.docx4j.Docx4J;
import org.docx4j.TextUtils;
import org.docx4j.openpackaging.packages.WordprocessingMLPackage;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.multipart.MultipartFile;

import javax.imageio.ImageIO;
import java.awt.image.BufferedImage;
import java.io.*;
import java.util.ArrayList;
import java.util.Base64;
import java.util.Collections;
import java.util.List;

@Slf4j
@Service
@RequiredArgsConstructor
@Transactional(readOnly = true)
Expand All @@ -27,6 +46,8 @@ public class MeetingCommandServiceImpl implements MeetingCommandService {
private final UserRepository userRepository;
private final WorkspaceRepository workspaceRepository;
private final MeetingRepository meetingRepository;
private final KeywordRepository keywordRepository;
private final MeetingKeywordRepository meetingKeywordRepository;
private final ChatGPTClient chatGPTClient;

@Override
Expand All @@ -42,20 +63,47 @@ public MeetingResponseDTO.createMeetingResponse createMeeting(
Workspace foundWorkspace = workspaceRepository.findById(request.getWorkspaceId())
.orElseThrow(() -> new WorkspaceHandler(ErrorStatus.WORKSPACE_NOT_FOUND));

// agendaFile을 openAi 활용하여 요약 - 미구현
String agendaResult = chatGPTClient.summarizePdf(agendaFile)
String extractedText = extractTextFromFile(agendaFile);

// agendaFile을 openAi 활용하여 요약
String agendaResult = chatGPTClient.summarizeDocument(extractedText)
.block();


String agendaKeywords = "";
String agendaSummary = "요약 생성에 실패했습니다.";

if (agendaResult != null && agendaResult.contains("|||")) {
String[] parts = agendaResult.split("\\|\\|\\|");
if (parts.length == 2) {
agendaKeywords = parts[0].trim();
agendaSummary = parts[1].trim();
} else {
agendaSummary = agendaResult.trim();
}
}

Meeting newMeeting = Meeting.createInitialMeeting(
request.getTitle(),
agendaResult,
agendaSummary,
foundUser,
foundWorkspace
);

Meeting savedMeeting = meetingRepository.save(newMeeting);
if (!agendaKeywords.isEmpty()) {
String[] keywordsArray = agendaKeywords.split(",");
for (String keyword : keywordsArray) {
String trimmedKeyword = keyword.trim();
if (trimmedKeyword.isEmpty()) continue;

Keyword tag = keywordRepository.findByName(trimmedKeyword)
.orElseGet(() -> keywordRepository.save(Keyword.builder().name(trimmedKeyword).build()));

newMeeting.addTag(tag);
}
}

Meeting savedMeeting = meetingRepository.save(newMeeting);

return MeetingConverter.toCreateMeetingResponse(savedMeeting);
}
Expand Down Expand Up @@ -97,4 +145,87 @@ public void deleteMeeting(Long userId, Long meetingId) {

meetingRepository.delete(meeting);
}


private List<String> convertFileToImages(MultipartFile file) {
if (file == null || file.isEmpty()) {
return Collections.emptyList();
}

String filename = file.getOriginalFilename();
try {
if (filename != null && filename.toLowerCase().endsWith(".pdf")) {
return convertPdfToImages(file.getInputStream());
} else if (filename != null && filename.toLowerCase().endsWith(".docx")) {
return convertDocxToImages(file.getInputStream());
} else {
return Collections.emptyList();
}
} catch (Exception e) {
throw new RuntimeException("파일을 이미지로 변환하는 중 오류가 발생했습니다.", e);
}
}

/**
* PDF 스트림을 이미지(Base64) 리스트로 변환
*/
private List<String> convertPdfToImages(InputStream inputStream) throws IOException {
List<String> base64Images = new ArrayList<>();
try (PDDocument document = PDDocument.load(inputStream)) {
PDFRenderer pdfRenderer = new PDFRenderer(document);
for (int i = 0; i < document.getNumberOfPages(); i++) {
BufferedImage bufferedImage = pdfRenderer.renderImageWithDPI(i, 300);
ByteArrayOutputStream baos = new ByteArrayOutputStream();
ImageIO.write(bufferedImage, "png", baos);
base64Images.add(Base64.getEncoder().encodeToString(baos.toByteArray()));
}
}
return base64Images;
}

/**
* DOCX 스트림을 이미지(Base64) 리스트로 변환 (내부적으로 PDF로 변환 후 처리)
* docx의 폰트들을 서버에 다운로드해야지 사용가능 (CI) - 현재 불가능
*/
private List<String> convertDocxToImages(InputStream inputStream) throws Exception {
// docx -> pdf 변환
WordprocessingMLPackage wordMLPackage = WordprocessingMLPackage.load(inputStream);
ByteArrayOutputStream pdfOutputStream = new ByteArrayOutputStream();
Docx4J.toPDF(wordMLPackage, pdfOutputStream);

return convertPdfToImages(new ByteArrayInputStream(pdfOutputStream.toByteArray()));
}

/**
* MultipartFile을 받아 파일 형식에 따라 텍스트를 추출합니다.
*/
private String extractTextFromFile(MultipartFile file) {
if (file == null || file.isEmpty()) {
return "";
}

String filename = file.getOriginalFilename();
try (InputStream inputStream = file.getInputStream()) {
if (filename != null && filename.toLowerCase().endsWith(".pdf")) {
// PDF에서 텍스트 추출
try (PDDocument document = PDDocument.load(inputStream)) {
PDFTextStripper stripper = new PDFTextStripper();
return stripper.getText(document);
}
} else if (filename != null && filename.toLowerCase().endsWith(".docx")) {
// DOCX에서 텍스트 추출
WordprocessingMLPackage wordMLPackage = WordprocessingMLPackage.load(inputStream);
// StringWriter를 사용하여 문서의 모든 텍스트 파트를 더 안정적으로 추출합니다.
StringWriter stringWriter = new StringWriter();
TextUtils.extractText(wordMLPackage.getMainDocumentPart(), stringWriter);
return stringWriter.toString();
} else {
log.warn("지원하지 않는 파일 형식입니다: {}", filename);
return "";
}
} catch (Exception e) {
log.error("파일에서 텍스트를 추출하는 중 오류가 발생했습니다.", e);
throw new RuntimeException("파일 텍스트 추출에 실패했습니다.", e);
}
}
}
Loading