fix: 카페 이미지 3개 초과하여 저장 시 예외 반환하는 로직 버그 수정 (#140)

* fix: modified cafeImagesCounts filtering logic to include isUsed column * style: modify ExceedCageImagesTotalCountsException message * refact: extract method for cafe image ownership and isused check
mocacong · Dec 9, 2023 · b32fde2 · b32fde2
1 parent 0dbdf7a
commit b32fde2
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/src/main/java/mocacong/server/exception/badrequest/ExceedCageImagesTotalCountsException.java b/src/main/java/mocacong/server/exception/badrequest/ExceedCageImagesTotalCountsException.java
@@ -2,6 +2,6 @@
 
 public class ExceedCageImagesTotalCountsException extends BadRequestException{
     public ExceedCageImagesTotalCountsException() {
-        super("카페 이미지는 3개 이상 등록하실 수 없습니다.", 2008);
+        super("카페 이미지는 4개 이상 등록하실 수 없습니다.", 2008);
     }
 }
diff --git a/src/main/java/mocacong/server/service/CafeService.java b/src/main/java/mocacong/server/service/CafeService.java
@@ -349,13 +349,17 @@ public CafeImagesSaveResponse saveCafeImage(Long memberId, String mapId, List<Mu
     private void validateOwnedCafeImagesCounts(Cafe cafe, Member member, List<MultipartFile> requestCafeImages) {
         List<CafeImage> currentOwnedCafeImages = cafe.getCafeImages()
                 .stream()
-                .filter(cafeImage -> cafeImage.isOwned(member))
+                .filter(cafeImage -> isOwnedAndUsed(cafeImage, member))
                 .collect(Collectors.toList());
         if (currentOwnedCafeImages.size() + requestCafeImages.size() > CAFE_IMAGES_PER_MEMBER_LIMIT_COUNTS) {
             throw new ExceedCageImagesTotalCountsException();
         }
     }
 
+    private boolean isOwnedAndUsed(CafeImage cafeImage, Member member) {
+        return cafeImage.isOwned(member) && cafeImage.getIsUsed();
+    }
+
     @Transactional(readOnly = true)
     public CafeImagesResponse findCafeImages(Long memberId, String mapId, Integer page, int count) {
         Cafe cafe = cafeRepository.findByMapId(mapId)