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
4 changes: 4 additions & 0 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,10 @@ dependencies {
implementation platform("io.awspring.cloud:spring-cloud-aws-dependencies:3.1.1")
implementation 'io.awspring.cloud:spring-cloud-aws-starter-s3'
implementation 'org.apache.httpcomponents:httpclient:4.5.14'

//Event
implementation 'org.springframework.retry:spring-retry'
implementation 'org.springframework:spring-aspects'
}

dependencyManagement {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ BaseResponse<LinkDuplicateCheckRes> checkDuplicate(
);

@Operation(summary = "링크 생성", description = "새로운 링크를 저장합니다")
BaseResponse<LinkDetailRes> createLink(
BaseResponse<LinkRes> createLink(
@Valid LinkCreateReq request,
Member member
);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -61,11 +61,11 @@ public BaseResponse<LinkDuplicateCheckRes> checkDuplicate(

@Override
@PostMapping
public BaseResponse<LinkDetailRes> createLink(
public BaseResponse<LinkRes> createLink(
@RequestBody LinkCreateReq request,
@AuthMember Member member
) {
LinkDetailRes response = linkFacade.createLink(
LinkRes response = linkFacade.createLink(
member,
request.url(),
request.title(),
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
package com.sofa.linkiving.domain.link.event;

import org.springframework.retry.annotation.Backoff;
import org.springframework.retry.annotation.Recover;
import org.springframework.retry.annotation.Retryable;
import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Component;
import org.springframework.transaction.event.TransactionPhase;
import org.springframework.transaction.event.TransactionalEventListener;
Expand All @@ -21,43 +25,27 @@ public class LinkEventListener {
private final SummaryQueue summaryQueue;

/**
* 링크 생성 완료 이벤트 처리
* 트랜잭션 커밋 후에만 실행되어 롤백 시 큐에 추가되지 않음
* 트랜잭션 커밋 후 비동기로 큐 적재 실행
* 실패 시 100ms 간격으로 최대 3회 재시도
*/
@Async
@Retryable(
value = Exception.class,
maxAttempts = 3,
backoff = @Backoff(delay = 100)
)
@TransactionalEventListener(phase = TransactionPhase.AFTER_COMMIT)
public void handleLinkCreated(LinkCreatedEvent event) {
log.info("Link created event received (after commit) - linkId: {}", event.linkId());

int maxRetries = 3;
int retryCount = 0;
boolean success = false;

while (retryCount < maxRetries && !success) {
try {
summaryQueue.addToQueue(event.linkId());
success = true;
} catch (Exception e) {
retryCount++;
log.warn("Failed to add link to summary queue (attempt {}/{}): linkId={}, error={}",
retryCount, maxRetries, event.linkId(), e.getMessage());
summaryQueue.addToQueue(event.linkId());
log.info("Link created event received & queued async - linkId: {}", event.linkId());
}

if (retryCount >= maxRetries) {
// 최종 실패 시 에러 로그 및 모니터링 알림
log.error("Failed to add link to summary queue after {} retries - linkId: {}. "
+ "Summary generation will be skipped for this link.",
maxRetries, event.linkId(), e);
// TODO: 관리자 알림 또는 실패 큐에 저장하여 수동 처리 가능하도록 개선 필요
} else {
// 재시도 전 짧은 대기
try {
Thread.sleep(100L * retryCount); // 100ms, 200ms, 300ms
} catch (InterruptedException ie) {
Thread.currentThread().interrupt();
log.error("Retry interrupted for linkId: {}", event.linkId());
break;
}
}
}
}
/**
* 최대 재시도 횟수 초과 시 최종 실패 처리 로직
*/
@Recover
public void recover(Exception exception, LinkCreatedEvent event) {
log.error("Final failure to queue link after retries - linkId: {}", event.linkId(), exception);
// TODO: 관리자 알림, 슬랙 발송 또는 실패 큐 적재 등 후속 처리
}
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package com.sofa.linkiving.domain.link.facade;

import org.springframework.context.ApplicationEventPublisher;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

Expand All @@ -13,13 +14,13 @@
import com.sofa.linkiving.domain.link.dto.response.LinkDuplicateCheckRes;
import com.sofa.linkiving.domain.link.dto.response.LinkRes;
import com.sofa.linkiving.domain.link.dto.response.MetaScrapeRes;
import com.sofa.linkiving.domain.link.dto.response.RagInitialSummaryRes;
import com.sofa.linkiving.domain.link.dto.response.RagRegenerateSummaryRes;
import com.sofa.linkiving.domain.link.dto.response.RegenerateSummaryRes;
import com.sofa.linkiving.domain.link.dto.response.SummaryRes;
import com.sofa.linkiving.domain.link.entity.Link;
import com.sofa.linkiving.domain.link.entity.Summary;
import com.sofa.linkiving.domain.link.enums.Format;
import com.sofa.linkiving.domain.link.event.LinkCreatedEvent;
import com.sofa.linkiving.domain.link.service.LinkService;
import com.sofa.linkiving.domain.link.service.SummaryService;
import com.sofa.linkiving.domain.link.util.OgTagCrawler;
Expand All @@ -36,16 +37,16 @@ public class LinkFacade {
private final OgTagCrawler ogTagCrawler;
private final SummaryService summaryService;
private final ImageUploader imageUploader;
private final ApplicationEventPublisher eventPublisher;
private final SummaryClient summaryClient;

public LinkDetailRes createLink(Member member, String url, String title, String memo, String imageUrl) {
public LinkRes createLink(Member member, String url, String title, String memo, String imageUrl) {
String storedImageUrl = imageUploader.uploadFromUrl(imageUrl);
Link link = linkService.createLink(member, url, title, memo, storedImageUrl);
RagInitialSummaryRes res = summaryClient.initialSummary(link.getId(), member.getId(),
link.getTitle(), link.getUrl(), link.getMemo());
Summary summary = summaryService.createSummary(link, Format.CONCISE, res.summary());

return LinkDetailRes.of(link, summary);
eventPublisher.publishEvent(new LinkCreatedEvent(link.getId()));

return LinkRes.from(link);
}

public LinkRes updateLink(Long linkId, Member member, String title, String memo) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,12 @@ public Link findById(Long linkId, Member member) {
.orElseThrow(() -> new BusinessException(LinkErrorCode.LINK_NOT_FOUND));
}

public Link findById(Long linkId) {
return linkRepository.findById(linkId)
.filter(link -> !link.isDeleted())
.orElseThrow(() -> new BusinessException(LinkErrorCode.LINK_NOT_FOUND));
}

public LinkDto findByIdWithSummary(Long linkId, Member member) {
return linkRepository.findByIdAndMemberWithSummaryAndIsDeleteFalse(linkId, member)
.orElseThrow(() -> new BusinessException(LinkErrorCode.LINK_NOT_FOUND));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,12 @@

import java.util.Optional;

import org.springframework.context.ApplicationEventPublisher;
import org.springframework.stereotype.Service;

import com.sofa.linkiving.domain.link.dto.internal.LinkDto;
import com.sofa.linkiving.domain.link.dto.internal.LinksDto;
import com.sofa.linkiving.domain.link.entity.Link;
import com.sofa.linkiving.domain.link.error.LinkErrorCode;
import com.sofa.linkiving.domain.link.event.LinkCreatedEvent;
import com.sofa.linkiving.domain.member.entity.Member;
import com.sofa.linkiving.global.error.exception.BusinessException;

Expand All @@ -23,7 +21,6 @@ public class LinkService {

private final LinkCommandService linkCommandService;
private final LinkQueryService linkQueryService;
private final ApplicationEventPublisher eventPublisher;

public Link createLink(Member member, String url, String title, String memo, String imageUrl) {
if (linkQueryService.existsByUrl(member, url)) {
Expand All @@ -33,8 +30,6 @@ public Link createLink(Member member, String url, String title, String memo, Str
Link link = linkCommandService.saveLink(member, url, title, memo, imageUrl);
log.info("Link created - id: {}, memberId: {}, url: {}", link.getId(), member.getId(), url);

eventPublisher.publishEvent(new LinkCreatedEvent(link.getId()));

return link;
}

Expand Down Expand Up @@ -72,6 +67,10 @@ public void deleteLink(Long linkId, Member member) {
log.info("Link soft deleted - id: {}, memberId: {}", linkId, member.getId());
}

public Link getLink(Long linkId) {
return linkQueryService.findById(linkId);
}

public Link getLink(Long linkId, Member member) {
return linkQueryService.findById(linkId, member);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,5 +37,18 @@ public Summary save(Link link, Format format, String content) {
.build()
);
}

public Summary initialSave(Link link, Format format, String content) {
summaryRepository.clearSelectedByLinkId(link.getId());

return summaryRepository.save(
Summary.builder()
.link(link)
.format(format)
.content(content)
.selected(true)
.build()
);
}
}

Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,10 @@ public Summary createSummary(Link link, Format format, String summary) {
return summaryCommandService.save(link, format, summary);
}

public Summary createInitialSummary(Link link, String summary) {
return summaryCommandService.initialSave(link, Format.CONCISE, summary);
}

public void selectSummary(Long linkId, Long summaryId) {
summaryCommandService.selectSummary(linkId, summaryId);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,13 @@

import org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;

import com.sofa.linkiving.domain.link.ai.SummaryClient;
import com.sofa.linkiving.domain.link.config.SummaryWorkerProperties;
import com.sofa.linkiving.domain.link.dto.response.RagInitialSummaryRes;
import com.sofa.linkiving.domain.link.entity.Link;
import com.sofa.linkiving.domain.link.entity.Summary;
import com.sofa.linkiving.domain.link.enums.Format;
import com.sofa.linkiving.domain.link.repository.LinkRepository;
import com.sofa.linkiving.domain.link.repository.SummaryRepository;
import com.sofa.linkiving.infra.feign.AiServerClient;
import com.sofa.linkiving.infra.feign.dto.SummaryRequest;
import com.sofa.linkiving.infra.feign.dto.SummaryResponse;
import com.sofa.linkiving.domain.link.service.LinkService;
import com.sofa.linkiving.domain.link.service.SummaryService;

import jakarta.annotation.PostConstruct;
import jakarta.annotation.PreDestroy;
Expand All @@ -29,9 +25,9 @@ public class SummaryWorker {

private final SummaryQueue summaryQueue;
private final SummaryWorkerProperties properties;
private final LinkRepository linkRepository;
private final SummaryRepository summaryRepository;
private final AiServerClient aiServerClient;
private final SummaryService summaryService;
private final LinkService linkService;
private final SummaryClient summaryClient;
private volatile boolean running = true;
private Thread workerThread;

Expand Down Expand Up @@ -79,52 +75,21 @@ private void processQueue() throws InterruptedException {
log.info("Processing link for summary - linkId: {}", linkId);

try {
generateAndSaveSummary(linkId);
Link link = linkService.getLink(linkId);

RagInitialSummaryRes res = summaryClient.initialSummary(
link.getId(),
link.getMember().getId(),
link.getTitle(),
link.getUrl(),
link.getMemo()
);

if (res != null) {
summaryService.createInitialSummary(link, res.summary());
}
} catch (Exception e) {
log.error("Failed to generate summary for linkId: {}", linkId, e);
}
}

@Transactional
public void generateAndSaveSummary(Long linkId) {
// 1. Link 조회
Link link = linkRepository.findById(linkId)
.orElseThrow(() -> new IllegalArgumentException("Link not found: " + linkId));

log.debug("Link found - url: {}, title: {}", link.getUrl(), link.getTitle());

// 2. RAG 서버에 요약 요청
SummaryRequest request = SummaryRequest.of(
link.getId(),
link.getMember().getId(),
link.getUrl(),
link.getTitle(),
link.getMemo()
);
log.info("Requesting summary to AI server - linkId: {}, userId: {}", request.linkId(), request.userId());
SummaryResponse[] responses = aiServerClient.generateSummary(request);
if (responses == null || responses.length == 0) {
log.warn("AI server returned empty summary response - linkId: {}", linkId);
return;
}
if (responses.length > 1) {
log.warn("AI server returned multiple summaries, using the first - linkId: {}, size: {}", linkId,
responses.length);
}
SummaryResponse response = responses[0];

log.info("Summary generated for linkId: {}", linkId);

// 3. Summary 엔티티 생성 및 저장
boolean isFirstSummary = !summaryRepository.existsByLinkIdAndSelectedTrue(linkId);
Summary summary = Summary.builder()
.link(link)
.format(Format.CONCISE)
.content(response.summary())
.selected(isFirstSummary)
.build();

summaryRepository.save(summary);
log.info("Summary saved for linkId: {}", linkId);
}
}
11 changes: 11 additions & 0 deletions src/main/java/com/sofa/linkiving/global/config/AsyncConfig.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
package com.sofa.linkiving.global.config;

import org.springframework.context.annotation.Configuration;
import org.springframework.retry.annotation.EnableRetry;
import org.springframework.scheduling.annotation.EnableAsync;

@EnableRetry
@EnableAsync
@Configuration
public class AsyncConfig {
}
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
import org.springframework.messaging.handler.invocation.HandlerMethodArgumentResolver;
import org.springframework.messaging.simp.config.ChannelRegistration;
import org.springframework.messaging.simp.config.MessageBrokerRegistry;
import org.springframework.scheduling.annotation.EnableAsync;
import org.springframework.web.socket.config.annotation.EnableWebSocketMessageBroker;
import org.springframework.web.socket.config.annotation.StompEndpointRegistry;
import org.springframework.web.socket.config.annotation.WebSocketMessageBrokerConfigurer;
Expand All @@ -18,7 +17,6 @@

@Configuration
@EnableWebSocketMessageBroker
@EnableAsync
@RequiredArgsConstructor
public class WebSocketConfig implements WebSocketMessageBrokerConfigurer {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,8 @@ public class RagChatServiceTest {

private Member member;
private Chat chat;
private Long chatId = 1L;
private String userMessage = "테스트 질문";
private final Long chatId = 1L;
private final String userMessage = "테스트 질문";

@BeforeEach
void setUp() {
Expand Down
Loading