From be108a4a8a577e1a9fa2453067b181ed2b15cc2d Mon Sep 17 00:00:00 2001 From: challonsy Date: Mon, 17 Feb 2025 02:46:17 +0900 Subject: [PATCH] fix : deals null imgArray on patch logic --- src/main/java/muit/backend/domain/entity/member/Post.java | 4 ++-- .../muit/backend/service/postService/PostServiceImpl.java | 7 +++++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/main/java/muit/backend/domain/entity/member/Post.java b/src/main/java/muit/backend/domain/entity/member/Post.java index 985af6c..803fdd8 100644 --- a/src/main/java/muit/backend/domain/entity/member/Post.java +++ b/src/main/java/muit/backend/domain/entity/member/Post.java @@ -80,10 +80,10 @@ public void changeMusical(Musical musical){ } public void changeImg(List newImgList, List oldImgList){ - if(oldImgList.size()!=this.images.size()){//기존 사진 개수가 달라졌으면 + if(oldImgList!=null&&oldImgList.size()!=this.images.size()){//기존 사진 개수가 달라졌으면 this.images.retainAll(oldImgList);//dto에서 보내준 이미지만 남기고 삭제된 항목은 고아객체 만들기 } - if(!newImgList.isEmpty()){ + if(newImgList!=null&&!newImgList.isEmpty()){ this.images.addAll(newImgList);//새로운 이미지 추가된 건 따로 추가 } } diff --git a/src/main/java/muit/backend/service/postService/PostServiceImpl.java b/src/main/java/muit/backend/service/postService/PostServiceImpl.java index ce42f32..1ee90d3 100644 --- a/src/main/java/muit/backend/service/postService/PostServiceImpl.java +++ b/src/main/java/muit/backend/service/postService/PostServiceImpl.java @@ -166,8 +166,11 @@ public PostResponseDTO.GeneralPostResponseDTO editPost(Long postId, PatchPostReq } //기존 이미지 url->UuidFile화 - List dtoImgs = requestDTO.getOriginalImgUrls().stream().map(file-> - uuidFileService.getUuidFileByFileUrl(file).orElseThrow(()->new GeneralException(ErrorStatus.IMAGE_NOT_FOUND))).toList(); + List dtoImgs = null; + if(requestDTO.getOriginalImgUrls()!=null&&!requestDTO.getOriginalImgUrls().isEmpty()){ + requestDTO.getOriginalImgUrls().stream().map(file-> + uuidFileService.getUuidFileByFileUrl(file).orElseThrow(()->new GeneralException(ErrorStatus.IMAGE_NOT_FOUND))).toList(); + } //수정된 이미지 s3 생성 List newImgs = new ArrayList<>();