[Feat/#216] 공지 수정 시 이미지 최대 20장 첨부 기능 추가

.coderabbit.yaml

@@ -11,7 +11,7 @@ tone_instructions: |
 # 리뷰 설정
 reviews:
   profile: 'assertive'
-  high_level_summary: true
+  high_level_summary: false
   review_status: true
   changed_files_summary: true
   collapse_walkthrough: true

src/main/java/com/amp/domain/audience/dto/response/SavedNoticesResponse.java

@@ -1,10 +1,12 @@
 package com.amp.domain.audience.dto.response;
 
 import com.amp.domain.notice.entity.Bookmark;
+import com.amp.domain.notice.entity.NoticeImage;
 import com.amp.global.common.dto.response.PaginationResponse;
 import lombok.Builder;
 import lombok.Getter;
 
+import java.util.Comparator;
 import java.util.List;
 
 @Getter
@@ -22,7 +24,7 @@ public static class SavedAnnouncementDto {
         private String categoryName;
         private String content;
         private String title;
-        private String imageUrl;
+        private List<String> imageUrls;
 
         public static SavedAnnouncementDto from(Bookmark bookmark) {
             return SavedAnnouncementDto.builder()
@@ -32,7 +34,10 @@ public static SavedAnnouncementDto from(Bookmark bookmark) {
                     .festivalTitle(bookmark.getNotice().getFestival().getTitle())
                     .categoryName(bookmark.getNotice().getFestivalCategory().getCategory().getCategoryName())
                     .title(bookmark.getNotice().getTitle())
-                    .imageUrl(bookmark.getNotice().getImageUrl())
+                    .imageUrls(bookmark.getNotice().getImages().stream()
+                            .sorted(Comparator.comparingInt(NoticeImage::getImageOrder))
+                            .map(NoticeImage::getImageUrl)
+                            .toList())
                     .build();
         }
     }

src/main/java/com/amp/domain/notice/controller/organizer/NoticeCreateController.java

@@ -16,8 +16,11 @@
 import org.springframework.http.ResponseEntity;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
 import org.springframework.security.access.prepost.PreAuthorize;
 
+import java.util.List;
+
 @RestController
 @RequestMapping("/api/v1/festivals")
 @Tag(name = "Notice")
@@ -33,9 +36,10 @@ public class NoticeCreateController {
     @PostMapping(path = "/{festivalId}/notices",
             consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
     public ResponseEntity<BaseResponse<NoticeCreateResponse>> createNotice(
-            @PathVariable("festivalId") @Positive Long festivalId,
-            @ModelAttribute @Valid NoticeCreateRequest request) {
-        NoticeCreateResponse response = noticeService.createNotice(festivalId, request);
+            @PathVariable @Positive Long festivalId,
+            @RequestPart("noticeCreateRequest") @Valid NoticeCreateRequest noticeCreateRequest,
+            @RequestPart(value = "images", required = false) List<MultipartFile> images) {
+        NoticeCreateResponse response = noticeService.createNotice(festivalId, noticeCreateRequest, images);
         return ResponseEntity
                 .status(SuccessStatus.NOTICE_CREATE_SUCCESS.getHttpStatus())
                 .body(BaseResponse.create(SuccessStatus.NOTICE_CREATE_SUCCESS.getMsg(), response));

src/main/java/com/amp/domain/notice/controller/organizer/NoticeUpdateController.java

@@ -2,7 +2,6 @@
 
 import com.amp.domain.notice.dto.request.NoticeUpdateRequest;
 import com.amp.domain.notice.service.organizer.NoticeService;
-import com.amp.domain.notice.service.organizer.NoticeUpdateService;
 import com.amp.global.annotation.ApiErrorCodes;
 import com.amp.global.common.SuccessStatus;
 import com.amp.global.response.success.BaseResponse;
@@ -15,27 +14,30 @@
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
 import org.springframework.security.access.prepost.PreAuthorize;
 
+import java.util.List;
+
 @RestController
 @RequestMapping("/api/v1/notices")
 @Tag(name = "Notice")
 @RequiredArgsConstructor
 @PreAuthorize("hasRole('ORGANIZER')")
 public class NoticeUpdateController {
 
-    private final NoticeUpdateService noticeUpdateService;
     private final NoticeService noticeService;
 
     @Operation(summary = "공지 수정/상단고정", description = "공지 수정 및 상단 고정 여부 선택 api")
     @ApiErrorCodes(SwaggerResponseDescription.FAIL_TO_UPDATE_NOTICE)
     @PutMapping(path = "/{noticeId}",
             consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
     public ResponseEntity<BaseResponse<Void>> updateNotice(
-            @PathVariable("noticeId") @Positive Long noticeId,
-            @ModelAttribute @Valid NoticeUpdateRequest noticeUpdateRequest
+            @PathVariable @Positive Long noticeId,
+            @RequestPart("noticeUpdateRequest") @Valid NoticeUpdateRequest noticeUpdateRequest,
+            @RequestPart(value = "newImages", required = false) List<MultipartFile> newImages
     ) {
-        noticeUpdateService.updateNotice(noticeId, noticeUpdateRequest);
+        noticeService.updateNotice(noticeId, noticeUpdateRequest, newImages);
 
         return ResponseEntity
                 .status(SuccessStatus.UPDATE_NOTICE_SUCCESS.getHttpStatus())
@@ -46,7 +48,7 @@ public ResponseEntity<BaseResponse<Void>> updateNotice(
     @ApiErrorCodes(SwaggerResponseDescription.FAIL_TO_DELETE_NOTICE)
     @DeleteMapping("/{noticeId}")
     public ResponseEntity<BaseResponse<Void>> deleteNotice(
-            @PathVariable("noticeId") @Positive Long noticeId
+            @PathVariable @Positive Long noticeId
     ) {
         noticeService.deleteNotice(noticeId);
 
@@ -57,4 +59,3 @@ public ResponseEntity<BaseResponse<Void>> deleteNotice(
     }
 
 }
-

src/main/java/com/amp/domain/notice/dto/request/NoticeCreateRequest.java

@@ -3,15 +3,12 @@
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
 import jakarta.validation.constraints.Size;
-import org.springframework.web.multipart.MultipartFile;
 
 public record NoticeCreateRequest(
         @NotBlank(message = "공지 제목은 필수값입니다.")
         @Size(max = 50, message = "공지 제목은 최대 50자까지 입력할 수 있습니다.") String title,
         @NotNull(message = "공지 카테고리 값은 필수값입니다.") Long categoryId,
-        MultipartFile image,
         @NotBlank(message = "공지 내용은 필수값입니다.") String content,
         @NotNull(message = "고정 여부 값은 필수 값입니다.") Boolean isPinned
 ) {
 }
-

src/main/java/com/amp/domain/notice/dto/request/NoticeUpdateRequest.java

@@ -3,16 +3,16 @@
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
 import jakarta.validation.constraints.Size;
-import org.springframework.web.multipart.MultipartFile;
+
+import java.util.List;
 
 public record NoticeUpdateRequest(
         @NotNull(message = "페스티벌 아이디는 필수값입니다.") Long festivalId,
         @NotBlank(message = "공지 제목은 필수값입니다.")
         @Size(max = 50, message = "공지 제목은 최대 50자까지 입력할 수 있습니다.") String title,
         @NotNull(message = "공지 카테고리 값은 필수값입니다.") Long categoryId,
-        MultipartFile newImage,
+        List<String> keepImageUrls,
         @NotBlank(message = "공지 내용은 필수값입니다.") String content,
-        boolean isPinned,
-        String previousImageUrl         //기존 첨부이미지에서 이미지 수정 없이 업로드시 기존 이미지url 첨부
+        @NotNull(message = "고정 여부 값은 필수 값입니다.") Boolean isPinned
 ) {
 }

src/main/java/com/amp/domain/notice/dto/response/FestivalNoticeListResponse.java

@@ -1,14 +1,15 @@
 package com.amp.domain.notice.dto.response;
 
+import java.util.List;
+
 public record FestivalNoticeListResponse(
         Long noticeId,
         String categoryName,
         String title,
         String content,
-        String imageUrl,
+        List<String> imageUrls,
         boolean isPinned,
         boolean isSaved,
         String createdAt
 ) {
 }
-

src/main/java/com/amp/domain/notice/dto/response/NoticeDetailResponse.java

@@ -2,18 +2,19 @@
 
 import com.amp.global.common.dto.CategoryData;
 
+import java.util.List;
+
 public record NoticeDetailResponse(
         Long noticeId,
         Long festivalId,
         String festivalTitle,
         CategoryData category,
         String title,
         String content,
-        String imageUrl,
+        List<String> imageUrls,
         boolean isPinned,
         boolean isSaved,
         Author author,
         String createdAt
 ) {
 }
-

src/main/java/com/amp/domain/notice/entity/Notice.java

@@ -9,9 +9,12 @@
 import lombok.Builder;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
+import org.hibernate.annotations.BatchSize;
 import org.hibernate.annotations.SQLRestriction;
 
 import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.List;
 
 @Entity
 @Table(name = "notice")
@@ -42,8 +45,9 @@ public class Notice extends BaseTimeEntity {
     @Column(nullable = false, columnDefinition = "TEXT")
     private String content;
 
-    @Column(name = "image_url", length = 500)
-    private String imageUrl;
+    @OneToMany(mappedBy = "notice", cascade = CascadeType.ALL, orphanRemoval = true)
+    @BatchSize(size = 100)
+    private List<NoticeImage> images = new ArrayList<>();
 
     @Column(name = "is_pinned", nullable = false)
     private Boolean isPinned = false;
@@ -53,30 +57,31 @@ public class Notice extends BaseTimeEntity {
 
     @Builder
     public Notice(Festival festival, FestivalCategory festivalCategory, Organizer organizer,
-                  String title, String content, String imageUrl, Boolean isPinned) {
+                  String title, String content, Boolean isPinned) {
         this.festival = festival;
         this.festivalCategory = festivalCategory;
         this.organizer = organizer;
         this.title = title;
         this.content = content;
-        this.imageUrl = imageUrl;
         this.isPinned = isPinned != null ? isPinned : false;
     }
 
     public void delete() {
         this.deletedAt = LocalDateTime.now();
     }
 
+    public void addImage(NoticeImage image) {
+        this.images.add(image);
+    }
+
     public void update(
             String title,
             String content,
-            String imageUrl,
             Boolean isPinned,
             FestivalCategory festivalCategory
     ) {
         this.title = title;
         this.content = content;
-        this.imageUrl = imageUrl;
         this.isPinned = isPinned;
         this.festivalCategory = festivalCategory;
     }

src/main/java/com/amp/domain/notice/entity/NoticeImage.java

@@ -0,0 +1,42 @@
+package com.amp.domain.notice.entity;
+
+import jakarta.persistence.*;
+import lombok.AccessLevel;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+import static jakarta.persistence.GenerationType.IDENTITY;
+
+@Entity
+@Table(name = "notice_images")
+@Getter
+@NoArgsConstructor(access = AccessLevel.PROTECTED)
+public class NoticeImage {
+    @Id
+    @GeneratedValue(strategy = IDENTITY)
+    private Long id;
+
+    @ManyToOne(fetch = FetchType.LAZY)
+    @JoinColumn(name = "notice_id")
+    private Notice notice;
+
+    @Column(nullable = false, length = 500)
+    private String imageUrl;
+
+    @Column(nullable = false)
+    private int imageOrder;
+
+    private NoticeImage(Notice notice, String imageUrl, int imageOrder) {
+        this.notice = notice;
+        this.imageUrl = imageUrl;
+        this.imageOrder = imageOrder;
+    }
+
+    public static NoticeImage of(Notice notice, String imageUrl, int imageOrder) {
+        return new NoticeImage(notice, imageUrl, imageOrder);
+    }
+
+    public void updateOrder(int imageOrder) {
+        this.imageOrder = imageOrder;
+    }
+}

src/main/java/com/amp/domain/notice/exception/NoticeErrorCode.java

@@ -11,6 +11,7 @@ public enum NoticeErrorCode implements ErrorCode {
     // 400 Bad Request
     NOTICE_ALREADY_DELETED(HttpStatus.BAD_REQUEST, "NTC", "001", "이미 삭제된 공지입니다."),
     PINNED_NOTICE_LIMIT_EXCEEDED(HttpStatus.BAD_REQUEST, "NTC", "002", "상단 고정 공지는 최대 3개까지 가능합니다."),
+    NOTICE_IMAGE_LIMIT_EXCEEDED(HttpStatus.BAD_REQUEST, "NTC", "003", "이미지는 최대 20장까지 업로드 가능합니다."),
 
     // 403 Forbidden
     NOTICE_DELETE_FORBIDDEN(HttpStatus.FORBIDDEN, "NTC", "001", "작성자 유저만 공지글을 삭제할 수 있습니다."),

src/main/java/com/amp/domain/notice/repository/NoticeImageRepository.java

@@ -0,0 +1,7 @@
+package com.amp.domain.notice.repository;
+
+import com.amp.domain.notice.entity.NoticeImage;
+import org.springframework.data.jpa.repository.JpaRepository;
+
+public interface NoticeImageRepository extends JpaRepository<NoticeImage, Long> {
+}

src/main/java/com/amp/domain/notice/repository/NoticeRepository.java

@@ -8,11 +8,9 @@
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
-import org.springframework.stereotype.Repository;
 
 import java.util.Optional;
 
-@Repository
 public interface NoticeRepository extends JpaRepository<Notice, Long> {
     Optional<Notice> findById(Long id);
 

src/main/java/com/amp/domain/notice/service/common/FestivalNoticeService.java

@@ -6,6 +6,7 @@
 import com.amp.domain.notice.dto.response.FestivalNoticeListResponse;
 import com.amp.domain.notice.dto.response.NoticeListResponse;
 import com.amp.domain.notice.entity.Notice;
+import com.amp.domain.notice.entity.NoticeImage;
 import com.amp.domain.notice.exception.NoticeException;
 import com.amp.domain.notice.repository.BookmarkRepository;
 import com.amp.domain.notice.repository.NoticeRepository;
@@ -22,10 +23,7 @@
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
+import java.util.*;
 import java.util.stream.Collectors;
 
 import static com.amp.global.common.dto.TimeFormatter.formatTimeAgo;
@@ -57,12 +55,17 @@ public NoticeListResponse getFestivalNoticeList(Long festivalId, Long categoryId
 
         List<FestivalNoticeListResponse> announcements = noticePage.getContent().stream().map(notice -> {
             boolean isSaved = savedNoticeIds.contains(notice.getId());
+            List<String> imageUrls = notice.getImages().stream()
+                    .sorted(Comparator.comparingInt(NoticeImage::getImageOrder))
+                    .map(NoticeImage::getImageUrl)
+                    .toList();
+
             return new FestivalNoticeListResponse(
                     notice.getId(),
                     notice.getFestivalCategory().getCategory().getCategoryName(),
                     notice.getTitle(),
                     notice.getContent(),
-                    notice.getImageUrl(),
+                    imageUrls,
                     notice.getIsPinned(),
                     isSaved,
                     formatTimeAgo(notice.getCreatedAt())