Skip to content

refactor/feat: Post·PostImage B 구조 적용(트랜잭션 분리) — create · update 동시 반영 + 테스트 픽스처 안정화 #135

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
hwijae33 merged 12 commits into from
Oct 21, 2025
Merged

refactor/feat: Post·PostImage B 구조 적용(트랜잭션 분리) — create · update 동시 반영 + 테스트 픽스처 안정화 #135

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
ce8ce9f
test: Member 닉네임 UNIQUE 대응 및 PW 컬럼 반영으로 테스트 픽스처 정리
hwijae33 Sep 30, 2025
2ff83ee
feat(post-images): savePostImages 분해로 TX 범위 최적화
hwijae33 Sep 30, 2025
b79f167
refactor(post): createPost에서 업로드 선행 + DB-only 저장으로 TX 범위 축소
hwijae33 Sep 30, 2025
0364519
refactor(post-images): 선택삭제 3분할(DB-only·afterCommit S3·래퍼)로 TX 범위 축소
hwijae33 Sep 30, 2025
49ba1f0
refactor(post-images): 조회 readOnly 적용 및 전체삭제 DB-first·afterCommit S3
hwijae33 Sep 30, 2025
61ec973
refactor(post): updatePost TX 경량화 + 조회 readOnly 트랜잭션 적용
hwijae33 Sep 30, 2025
7ab0b55
refactor(post): applyTextIfChanged 도입으로 no-op save 방지
hwijae33 Sep 30, 2025
5dbf225
refactor(posts): @Transactional을 updatePost로 이동(기존 updatePostTx에서 제거)…
hwijae33 Oct 1, 2025
745a44d
refactor(postImages): deleteSelectedImagesDbOnly에 @Transactional(REQU…
hwijae33 Oct 1, 2025
3d76dfc
test(refactor): PostService create/update 로직 분리 및 PostImageService 책임…
hwijae33 Oct 1, 2025
a8a3ff8
dev → feat-posts 병합: 테스트 오류 대응
hwijae33 Oct 19, 2025
e09f82d
test: 필요없는 주석 삭제
hwijae33 Oct 21, 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
159 changes: 101 additions & 58 deletions src/main/java/kr/co/pinup/postImages/service/PostImageService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,25 @@
package kr.co.pinup.postImages.service;

import jakarta.transaction.Transactional;
import kr.co.pinup.custom.s3.exception.ImageDeleteFailedException;
import kr.co.pinup.postImages.model.dto.PostImageUploadRequest;
import org.springframework.transaction.annotation.Propagation;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.transaction.support.TransactionSynchronization;
import org.springframework.transaction.support.TransactionSynchronizationManager;

import kr.co.pinup.custom.logging.AppLogger;
import kr.co.pinup.custom.logging.model.dto.ErrorLog;
import kr.co.pinup.custom.logging.model.dto.InfoLog;
import kr.co.pinup.custom.logging.model.dto.WarnLog;
import kr.co.pinup.custom.s3.S3Service;
import kr.co.pinup.custom.s3.exception.ImageDeleteFailedException;

import kr.co.pinup.postImages.PostImage;
import kr.co.pinup.postImages.exception.postimage.PostImageDeleteFailedException;
import kr.co.pinup.postImages.exception.postimage.PostImageNotFoundException;
import kr.co.pinup.postImages.exception.postimage.PostImageSaveFailedException;
import kr.co.pinup.postImages.model.dto.CreatePostImageRequest;
import kr.co.pinup.postImages.model.dto.PostImageResponse;
import kr.co.pinup.postImages.model.dto.PostImageUploadRequest;

import kr.co.pinup.postImages.model.dto.UpdatePostImageRequest;
import kr.co.pinup.postImages.repository.PostImageRepository;
import kr.co.pinup.posts.Post;
Expand All @@ -35,102 +42,138 @@ public class PostImageService {

private static final String PATH_PREFIX = "post";

@Transactional
public List<PostImage> savePostImages(PostImageUploadRequest postImageUploadRequest, Post post) {
if (postImageUploadRequest.getImages() == null || postImageUploadRequest.getImages().isEmpty()) {
public List<String> uploadImagesOnly(CreatePostImageRequest req) {
if (req.getImages() == null || req.getImages().isEmpty()) {
throw new PostImageNotFoundException("업로드할 이미지가 없습니다.");
}

List<String> imageUrls = uploadFiles(postImageUploadRequest.getImages(),PATH_PREFIX);
List<String> imageUrls = uploadFiles(req.getImages(), PATH_PREFIX);

appLogger.info(new InfoLog("이미지 업로드 완료")
.setStatus("201")
.addDetails("count", String.valueOf(imageUrls.size())));

return imageUrls;
}

@Transactional
public List<PostImage> saveImageUrls(Post post, List<String> imageUrls) {
if (imageUrls == null || imageUrls.isEmpty()) {
throw new PostImageNotFoundException("저장할 이미지 URL이 없습니다.");
}

List<PostImage> postImages = imageUrls.stream()
.map(s3Url -> new PostImage(post, s3Url))
.collect(Collectors.toList());

try {
postImageRepository.saveAll(postImages);
appLogger.info(new InfoLog("이미지 저장 완료")
appLogger.info(new InfoLog("이미지 DB 저장 완료")
.setStatus("201")
.setTargetId(post.getId().toString())
.addDetails("count", String.valueOf(postImages.size())));
return postImages;

} catch (Exception e) {
appLogger.error(new ErrorLog("이미지 저장 실패", e)
appLogger.error(new ErrorLog("이미지 DB 저장 실패", e)
.setStatus("500")
.setTargetId(post.getId().toString())
.addDetails("reason", e.getMessage()));
throw new PostImageSaveFailedException("이미지 저장 중 문제가 발생했습니다.", e);
}
}

return postImages;
public void cleanupUploadedOnRollback(List<String> uploadedUrls) {
if (uploadedUrls == null || uploadedUrls.isEmpty()) return;
if (!TransactionSynchronizationManager.isSynchronizationActive()) {
appLogger.warn(new WarnLog("롤백 보상 등록 불가(트랜잭션 바깥)")
.addDetails("count", String.valueOf(uploadedUrls.size())));
return;
}
TransactionSynchronizationManager.registerSynchronization(new TransactionSynchronization() {
@Override public void afterCompletion(int status) {
if (status == STATUS_ROLLED_BACK) deleteS3ByUrlsQuietly(uploadedUrls);
}
});
}

public void deleteS3ByUrlsQuietly(List<String> imageUrls) {
if (imageUrls == null || imageUrls.isEmpty()) return;
for (String url : imageUrls) {
String key = PATH_PREFIX + "/" + s3Service.extractFileName(url);
try { s3Service.deleteFromS3(key); }
catch (Exception ex) {
appLogger.warn(new WarnLog("보상 삭제 실패")
.addDetails("file", key).addDetails("reason", ex.getMessage()));
}
}
}

@Transactional
public void deleteAllByPost(Long postId) {
List<PostImage> postImages = postImageRepository.findByPostId(postId);
if (postImages.isEmpty()) {
return;
}
try {
postImages.forEach(postImage -> {
String fileUrl = postImage.getS3Url();
String fileName = PATH_PREFIX+ "/" + s3Service.extractFileName(fileUrl);
if (postImages.isEmpty()) return;

s3Service.deleteFromS3(fileName);
});
List<String> urls = postImages.stream().map(PostImage::getS3Url).collect(Collectors.toList());
try {
postImageRepository.deleteAllByPostId(postId);
appLogger.info(new InfoLog("전체 이미지 삭제 완료").setTargetId(postId.toString()));
appLogger.info(new InfoLog("전체 이미지 DB 삭제 완료").setTargetId(postId.toString()));
} catch (Exception e) {
appLogger.error(new ErrorLog("전체 이미지 삭제 실패", e).setStatus("500").setTargetId(postId.toString()).addDetails("reason", e.getMessage()));
appLogger.error(new ErrorLog("전체 이미지 DB 삭제 실패", e)
.setStatus("500").setTargetId(postId.toString())
.addDetails("reason", e.getMessage()));
throw new PostImageDeleteFailedException("이미지 삭제 중 문제가 발생했습니다.", e);
}
deleteS3QuietlyAfterCommit(urls);
}


@Transactional
public void deleteSelectedImages(Long postId, UpdatePostImageRequest updatePostImageRequest) {
List<String> imagesToDelete = updatePostImageRequest.getImagesToDelete();

if (imagesToDelete != null && !imagesToDelete.isEmpty()) {
List<PostImage> postImages = postImageRepository.findByPostIdAndS3UrlIn(postId, imagesToDelete);

postImages.forEach(postImage -> {
String fileUrl = postImage.getS3Url();
String fileName = PATH_PREFIX+ "/" + s3Service.extractFileName(fileUrl);
try {
s3Service.deleteFromS3(fileName);
} catch (ImageDeleteFailedException e) {
appLogger.error(new ErrorLog("S3 이미지 삭제 실패", e)
.setTargetId(postId.toString())
.setStatus("500")
.addDetails("file", fileName));
throw new ImageDeleteFailedException("이미지 삭제 중 문제가 발생했습니다.", e);
}
});
List<String> reqUrls = updatePostImageRequest.getImagesToDelete();
List<String> actuallyDeleted = deleteSelectedImagesDbOnly(postId, reqUrls);
deleteS3QuietlyAfterCommit(actuallyDeleted);
}

try {
postImageRepository.deleteAll(postImages);
appLogger.info(new InfoLog("선택 이미지 삭제 완료")
.setTargetId(postId.toString())
.addDetails("count", String.valueOf(postImages.size())));
} catch (Exception e) {
appLogger.error(new ErrorLog("DB 이미지 삭제 실패", e)
.setTargetId(postId.toString())
.setStatus("500")
.addDetails("reason", e.getMessage()));
throw new PostImageDeleteFailedException("이미지 삭제 중 문제가 발생했습니다.", e);
}
} else {
@Transactional(propagation = Propagation.REQUIRES_NEW)
public List<String> deleteSelectedImagesDbOnly(Long postId, List<String> imagesToDelete) {
if (imagesToDelete == null || imagesToDelete.isEmpty()) {
appLogger.warn(new WarnLog("삭제 요청 이미지 없음")
.setTargetId(postId.toString())
.setStatus("400"));
.setTargetId(postId.toString()).setStatus("400"));
throw new PostImageNotFoundException("삭제할 이미지 URL이 없습니다.");
}
}

List<PostImage> targets = postImageRepository.findByPostIdAndS3UrlIn(postId, imagesToDelete);
try {
if (!targets.isEmpty()) {
postImageRepository.deleteAll(targets);
appLogger.info(new InfoLog("선택 이미지 DB 삭제 완료")
.setTargetId(postId.toString())
.addDetails("count", String.valueOf(targets.size())));
}

public PostImage findFirstImageByPostId(Long postId) {
return postImageRepository.findTopByPostIdOrderByIdAsc(postId);
return targets.stream().map(PostImage::getS3Url).collect(Collectors.toList());
} catch (Exception e) {
appLogger.error(new ErrorLog("DB 이미지 삭제 실패", e)
.setTargetId(postId.toString()).setStatus("500")
.addDetails("reason", e.getMessage()));
throw new PostImageDeleteFailedException("이미지 삭제 중 문제가 발생했습니다.", e);
}
}

public void deleteS3QuietlyAfterCommit(List<String> imageUrls) {
if (imageUrls == null || imageUrls.isEmpty()) return;
if (TransactionSynchronizationManager.isSynchronizationActive()) {
TransactionSynchronizationManager.registerSynchronization(new TransactionSynchronization() {
@Override public void afterCommit() {
deleteS3ByUrlsQuietly(imageUrls);
}
});
} else {
deleteS3ByUrlsQuietly(imageUrls);
}
Comment thread
hwijae33 marked this conversation as resolved.
}

@Transactional(readOnly = true)
public List<PostImageResponse> findImagesByPostId(Long postId) {
log.debug("이미지 목록 조회: postId={}", postId);
List<PostImage> postImages = postImageRepository.findByPostId(postId);
Expand Down
15 changes: 15 additions & 0 deletions src/main/java/kr/co/pinup/posts/Post.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@

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

@Getter
@Builder(toBuilder = true)
Expand Down Expand Up @@ -75,5 +76,19 @@ public void increaseLikeCount() {
}

public void decreaseLikeCount() {if (this.likeCount > 0) {this.likeCount --;}}

public boolean applyTextIfChanged(String newTitle, String newContent) {
boolean changed = false;

if (newTitle != null && !Objects.equals(this.title, newTitle)) {
this.title = newTitle;
changed = true;
}
if (newContent != null && !Objects.equals(this.content, newContent)) {
this.content = newContent;
changed = true;
}
return changed;
}
}

Loading