feat: 뉴스 수정 요청 이미지 삭제 요청 처리 구현

- 파일 업로드 API를 통해 추가할 이미지 별도 업로드

Author: ysw789

src/main/java/dmu/dasom/api/domain/news/controller/NewsController.java

@@ -1,9 +1,6 @@
 package dmu.dasom.api.domain.news.controller;
 
-import dmu.dasom.api.domain.news.dto.NewsCreationResponseDto;
-import dmu.dasom.api.domain.news.dto.NewsListResponseDto;
-import dmu.dasom.api.domain.news.dto.NewsRequestDto;
-import dmu.dasom.api.domain.news.dto.NewsResponseDto;
+import dmu.dasom.api.domain.news.dto.*;
 import dmu.dasom.api.domain.news.service.NewsService;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import io.swagger.v3.oas.annotations.Operation;
@@ -44,7 +41,7 @@ public ResponseEntity<NewsCreationResponseDto> createNews(@Valid @RequestBody Ne
     @Operation(summary = "뉴스 수정")
     @PutMapping("/{id}")
     public ResponseEntity<NewsResponseDto> updateNews(@PathVariable @Min(1) Long id,
-                                                      @Valid @RequestBody NewsRequestDto requestDto) {
+                                                      @Valid @RequestBody NewsUpdateRequestDto requestDto) {
         return ResponseEntity.ok(newsService.updateNews(id, requestDto));
     }
 

src/main/java/dmu/dasom/api/domain/news/dto/NewsUpdateRequestDto.java

@@ -0,0 +1,27 @@
+package dmu.dasom.api.domain.news.dto;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.Size;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+@Getter
+@NoArgsConstructor
+@AllArgsConstructor
+@Schema(name = "NewsUpdateRequestDto", description = "뉴스 수정 요청 DTO")
+public class NewsUpdateRequestDto {
+
+    @Size(max = 100, message = "뉴스 제목은 최대 100자입니다.")
+    @Schema(description = "수정할 뉴스 제목", example = "뉴스 제목", nullable = true)
+    private String title;
+
+    @Schema(description = "수정할 뉴스 내용", example = "뉴스 내용", nullable = true)
+    private String content;
+
+    @Schema(description = "삭제할 이미지 ID 목록", example = "[1, 2, 3]", nullable = true)
+    private List<Long> deleteImageIds;
+
+}

src/main/java/dmu/dasom/api/domain/news/entity/NewsEntity.java

@@ -8,9 +8,11 @@
 import jakarta.persistence.*;
 import lombok.*;
 import org.apache.commons.lang3.ObjectUtils;
+import org.hibernate.annotations.DynamicUpdate;
 
 import java.util.List;
 
+@DynamicUpdate
 @Getter
 @Entity
 @Table(name = "news")
@@ -46,16 +48,6 @@ public NewsResponseDto toResponseDto(List<FileResponseDto> images) {
             .build();
     }
 
-    public NewsResponseDto toResponseDto() {
-        return NewsResponseDto.builder()
-            .id(this.id)
-            .title(this.title)
-            .content(this.content)
-            .createdAt(getCreatedAt())
-            .images(null)
-            .build();
-    }
-
     public NewsListResponseDto toListResponseDto(FileResponseDto file) {
         return NewsListResponseDto.builder()
             .id(this.id)

src/main/java/dmu/dasom/api/domain/news/service/NewsService.java

@@ -1,17 +1,15 @@
 package dmu.dasom.api.domain.news.service;
 
-import dmu.dasom.api.domain.news.dto.NewsCreationResponseDto;
-import dmu.dasom.api.domain.news.dto.NewsListResponseDto;
+import dmu.dasom.api.domain.news.dto.*;
 import dmu.dasom.api.global.file.dto.FileResponseDto;
 import dmu.dasom.api.global.file.enums.FileType;
 import dmu.dasom.api.global.file.service.FileService;
 import dmu.dasom.api.domain.common.exception.CustomException;
 import dmu.dasom.api.domain.common.exception.ErrorCode;
-import dmu.dasom.api.domain.news.dto.NewsRequestDto;
-import dmu.dasom.api.domain.news.dto.NewsResponseDto;
 import dmu.dasom.api.domain.news.entity.NewsEntity;
 import dmu.dasom.api.domain.news.repository.NewsRepository;
 import lombok.RequiredArgsConstructor;
+import org.apache.commons.lang3.ObjectUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -60,13 +58,17 @@ public NewsCreationResponseDto createNews(NewsRequestDto requestDto) {
 
     // 뉴스 수정
     @Transactional
-    public NewsResponseDto updateNews(Long id, NewsRequestDto requestDto) {
+    public NewsResponseDto updateNews(Long id, NewsUpdateRequestDto requestDto) {
         NewsEntity news = newsRepository.findById(id)
                 .orElseThrow(() -> new CustomException(ErrorCode.NOT_FOUND));
 
         news.update(requestDto.getTitle(), requestDto.getContent());
 
-        return news.toResponseDto();
+        // 삭제 요청된 이미지 삭제
+        if (ObjectUtils.isNotEmpty(requestDto.getDeleteImageIds()))
+            fileService.deleteFilesById(news, requestDto.getDeleteImageIds());
+
+        return news.toResponseDto(fileService.getFilesByTypeAndTargetId(FileType.NEWS, id));
     }
 
     // 뉴스 삭제

src/main/java/dmu/dasom/api/global/file/service/FileService.java

@@ -2,6 +2,7 @@
 
 import dmu.dasom.api.domain.common.exception.CustomException;
 import dmu.dasom.api.domain.common.exception.ErrorCode;
+import dmu.dasom.api.domain.news.entity.NewsEntity;
 import dmu.dasom.api.global.file.dto.FileResponseDto;
 import dmu.dasom.api.global.file.entity.FileEntity;
 import dmu.dasom.api.global.file.enums.FileType;
@@ -62,6 +63,17 @@ public void deleteFilesByTypeAndTargetId(FileType fileType, Long targetId) {
             fileRepository.deleteAll(files);
     }
 
+    public void deleteFilesById(NewsEntity news, List<Long> fileIds) {
+        List<FileEntity> files = fileRepository.findAllById(fileIds);
+
+        List<FileEntity> filesToDelete = files.stream()
+            .filter(file -> file.getTargetId().equals(news.getId()))
+            .toList();
+
+        if (ObjectUtils.isNotEmpty(filesToDelete))
+            fileRepository.deleteAll(filesToDelete);
+    }
+
     public Map<Long, FileResponseDto> getFirstFileByTypeAndTargetIds(FileType fileType, List<Long> targetIds) {
         if (targetIds.isEmpty()) {
             return Map.of();