Skip to content

[feat] 게시글 삭제 구현 진행중 #317

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
merged 2 commits into from
Oct 15, 2025
Merged

[feat] 게시글 삭제 구현 진행중 #317

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2c4711d
[feat] 게시글 삭제 구현 진행중
seok6555 Oct 14, 2025
f8069a3
[feat] 게시글 삭제 구현 진행중
seok6555 Oct 15, 2025
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: 2 additions & 2 deletions src/main/java/com/back/domain/post/post/dto/request/PostUpdateRequestDto.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ public record PostUpdateRequestDto(
PostStatus status,
String title,
String content,
// 기존 이미지 중 유지할 이미지 ID 목록
List<Long> keepImageIds,
// 기존 이미지 중 유지할 이미지 URL 목록
List<String> keepImageUrls,
String videoUrl,
List<String> tags
) {
Expand Down
66 changes: 43 additions & 23 deletions src/main/java/com/back/domain/post/post/service/PostService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,10 @@
import com.back.global.file.dto.UploadedFileDto;
import com.back.global.file.service.FileService;
import com.back.global.rq.Rq;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.NoSuchElementException;
import java.util.Optional;
import java.util.function.Function;
import java.util.stream.Collectors;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
Expand Down Expand Up @@ -148,21 +147,28 @@ public PostResponseDto updatePost(Long postId, PostUpdateRequestDto reqBody, Lis
if (reqBody.content() != null && !reqBody.content().isBlank()) {
post.updateContent(reqBody.content());
}

List<String> addedImgUrls = List.of();
List<String> uploadedFileNames = List.of();

if (images != null && !images.isEmpty()) {
// 새 이미지 업로드
List<UploadedFileDto> uploaded = fileService.uploadFiles(images);
List<String> uploadedFileNames = uploaded.stream().map(UploadedFileDto::fileName).toList();
addedImgUrls = uploaded.stream().map(UploadedFileDto::url).toList();
uploadedFileNames = uploaded.stream().map(UploadedFileDto::fileName).toList();
}

// 요청 DTO에서 "유지할 이미지 ID 목록" 꺼내기
List<Long> keepIds = Optional.ofNullable(reqBody.keepImageIds()).orElse(List.of());
// 요청 DTO에서 "유지할 이미지 URL 목록" 꺼내기
List<String> keepImageUrls = new ArrayList<>(
Optional.ofNullable(reqBody.keepImageUrls()).orElse(List.of()));
keepImageUrls.addAll(addedImgUrls);

// 현재 게시글의 이미지들을 (id -> 객체) 매핑으로 변환
Map<Long, PostImage> existingById = post.getImages().stream()
.collect(Collectors.toMap(PostImage::getId, Function.identity()));
// 🔹 현재 게시글의 모든 이미지 가져오기
List<PostImage> existingImages = new ArrayList<>(post.getImages());

// 삭제될 이미지 (DB + S3)
List<PostImage> toRemove = post.getImages().stream()
.filter(img -> !keepIds.contains(img.getId()))
.filter(img -> !keepImageUrls.contains(img.getUrl()))
.toList();

List<String> deleteKeysAfterCommit = toRemove.stream()
Expand All @@ -174,33 +180,40 @@ public PostResponseDto updatePost(Long postId, PostUpdateRequestDto reqBody, Lis

// 유지할 이미지 정렬
int order = 0;
for (Long keepId : keepIds) {
PostImage img = existingById.get(keepId);
if (img != null) img.updateSortOrder(order++);
for (String url : keepImageUrls) {
// 기존 이미지인지 확인
PostImage existing = existingImages.stream()
.filter(img -> img.getUrl().equals(url))
.findFirst()
.orElse(null);

if (existing != null) {
existing.updateSortOrder(order++);
} else {
// 새로 추가된 이미지
post.getImages().add(PostImage.builder()
.post(post)
.fileName(extractFileNameFromUrl(url)) // URL에서 파일명 추출 함수 아래 참고
.url(url)
.sortOrder(order++)
.build());
}
}

// 새 이미지 추가
for (UploadedFileDto u : uploaded) {
post.getImages().add(PostImage.builder()
.post(post)
.fileName(u.fileName())
.url(u.url())
.sortOrder(order++)
.build());
}
List<String> uploadedNames = new ArrayList<>(uploadedFileNames);

// 트랜잭션 완료 후 처리
TransactionSynchronizationManager.registerSynchronization(new TransactionSynchronization() {
@Override
public void afterCompletion(int status) {
if (status == STATUS_ROLLED_BACK) {
uploadedFileNames.forEach(fileService::deleteFile);
uploadedNames.forEach(fileService::deleteFile);
} else if (status == STATUS_COMMITTED) {
deleteKeysAfterCommit.forEach(fileService::deleteFile);
}
}
});
}

if (reqBody.videoUrl() != null && !reqBody.videoUrl().isBlank()) {
post.updateVideo(reqBody.videoUrl());
}
Expand All @@ -212,6 +225,13 @@ public void afterCompletion(int status) {
return new PostResponseDto(post);
}

private String extractFileNameFromUrl(String url) {
if (url == null) return null;
int lastSlash = url.lastIndexOf('/');
return (lastSlash != -1) ? url.substring(lastSlash + 1) : url;
}


// 게시글 삭제 로직
@Transactional
public void deletePost(Long postId) {
Expand Down