Skip to content

[Fix] canvas 이미지 URL 변환 오류 수정 - presigned URL로 변환 후 AI 처리 가능 #199

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
gaeunee2 merged 2 commits into from
Feb 18, 2026
Merged

[Fix] canvas 이미지 URL 변환 오류 수정 - presigned URL로 변환 후 AI 처리 가능 #199

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1826f94
fix: canvas 이미지 URL 변환 오류 수정 - presigned URL로 변환 후 AI 처리 가능
Feb 18, 2026
ce0cf86
fix: 중복 ID 제거 로직 추가
Feb 18, 2026
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
54 changes: 35 additions & 19 deletions src/main/java/com/proovy/domain/conversation/service/ChatServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,14 +141,8 @@ public Flux<ProovyAiStreamEvent> streamConversation(Long userId, ConversationReq
ChatMessage savedUserMessage = chatMessageRepository.save(userMessage);
chatMessageRepository.flush(); // ID 확보 후 MessageAsset 저장 가능

// 4-1. 메시지-자산 연결 저장 (mentionedAssetIds + canvasImageIds)
List<Long> allAssetIds = new ArrayList<>();
if (request.getMentionedAssetIds() != null) {
allAssetIds.addAll(request.getMentionedAssetIds());
}
if (request.getCanvasImageIds() != null) {
allAssetIds.addAll(request.getCanvasImageIds());
}
// 4-1. 메시지-자산 연결 저장 (mentionedAssetIds + canvasImageIds, 중복 제거)
List<Long> allAssetIds = mergeDistinctAssetIds(request.getMentionedAssetIds(), request.getCanvasImageIds());
if (!allAssetIds.isEmpty()) {
List<Asset> assets = assetRepository.findAllByIdInAndUserId(allAssetIds, userId);
if (assets.size() != allAssetIds.size()) {
Expand Down Expand Up @@ -179,9 +173,10 @@ public Flux<ProovyAiStreamEvent> streamConversation(Long userId, ConversationReq
.build();
ChatMessage savedAiMessage = chatMessageRepository.save(aiMessage);

// 6. 자산 URL 변환
List<String> filesUrl = convertAssetIdsToUrls(request.getMentionedAssetIds(), userId);
log.info("[Chat] 자산 URL 변환 완료 - assetIds: {}, filesUrl: {}", request.getMentionedAssetIds(), filesUrl);
// 6. 자산 URL 변환 (mentionedAssetIds + canvasImageIds 모두 포함, 중복 제거)
List<String> filesUrl = convertAssetIdsToUrls(allAssetIds, userId);
log.info("[Chat] 자산 URL 변환 완료 - mentionedAssetIds: {}, canvasImageIds: {}, filesUrl count: {}",
request.getMentionedAssetIds(), request.getCanvasImageIds(), filesUrl.size());

return new StreamInitData(chatSession, note, savedAiMessage, threadIdToUse, filesUrl);
});
Expand Down Expand Up @@ -211,8 +206,8 @@ public Flux<ProovyAiStreamEvent> streamConversation(Long userId, ConversationReq
.authToken(accessToken) // Spring 인증 토큰 전달
.build();

log.info("[Chat] Proovy-ai 요청 생성 - threadId: {}, filesUrl: {}, message: {}",
finalThreadIdToUse, filesUrl, request.getText());
log.info("[Chat] Proovy-ai 요청 생성 - threadId: {}, filesUrl count: {}, message: {}",
finalThreadIdToUse, filesUrl.size(), request.getText());

// 8. SSE 스트리밍 호출
final StringBuilder contentBuilder = new StringBuilder();
Expand Down Expand Up @@ -485,28 +480,49 @@ private List<String> convertAssetIdsToUrls(List<Long> assetIds, Long userId) {
return Collections.emptyList();
}

List<Asset> assets = assetRepository.findAllByIdInAndUserId(assetIds, userId);
log.info("[Chat] 자산 조회 결과 - 요청: {}, 조회됨: {}, userId: {}", assetIds, assets.size(), userId);
List<Long> distinctAssetIds = assetIds.stream()
.filter(Objects::nonNull)
.distinct()
.collect(Collectors.toList());

if (distinctAssetIds.size() != assetIds.size()) {
log.debug("[Chat] 자산 ID 중복/NULL 제거 - 원본: {}, 정제 후: {}", assetIds.size(), distinctAssetIds.size());
}

List<Asset> assets = assetRepository.findAllByIdInAndUserId(distinctAssetIds, userId);
log.info("[Chat] 자산 조회 결과 - 요청: {}, 조회됨: {}, userId: {}", distinctAssetIds, assets.size(), userId);

if (assets.size() != assetIds.size()) {
if (assets.size() != distinctAssetIds.size()) {
log.warn("[Chat] 일부 자산 조회 실패 - 요청: {}, 조회됨: {}",
assetIds.size(), assets.size());
distinctAssetIds.size(), assets.size());
}

List<String> urls = assets.stream()
.map(asset -> {
// Presigned URL 생성 (15분 유효)
String url = s3Service.generatePresignedDownloadUrl(
asset.getS3Key(), asset.getFileName(), 15);
log.info("[Chat] Presigned URL 생성 - assetId: {}, s3Key: {}, url: {}",
asset.getId(), asset.getS3Key(), url);
log.debug("[Chat] Presigned URL 생성 - assetId: {}, s3Key: {}",
asset.getId(), asset.getS3Key());
return url;
})
.collect(Collectors.toList());

return urls;
}

private List<Long> mergeDistinctAssetIds(List<Long> mentionedAssetIds, List<Long> canvasImageIds) {
LinkedHashSet<Long> merged = new LinkedHashSet<>();
if (mentionedAssetIds != null) {
merged.addAll(mentionedAssetIds);
}
if (canvasImageIds != null) {
merged.addAll(canvasImageIds);
}
merged.remove(null);
return new ArrayList<>(merged);
}

/**
* 기능 검증
*/
Expand Down