feat: 뉴스 CRUD 리팩토링

- 등록, 전체 조회(사진 제외), 상세 조회, 수정(사진 제외), 삭제 구현 완료
- 썸네일 포함한 전체 조회, 사진 관련 수정 기능 구현 예정

Author: ysw789

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

@@ -1,10 +1,13 @@
 package dmu.dasom.api.domain.news.controller;
 
+import dmu.dasom.api.domain.news.dto.NewsCreationResponseDto;
 import dmu.dasom.api.domain.news.dto.NewsRequestDto;
 import dmu.dasom.api.domain.news.dto.NewsResponseDto;
 import dmu.dasom.api.domain.news.service.NewsService;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import io.swagger.v3.oas.annotations.Operation;
+import jakarta.validation.constraints.Min;
+import lombok.RequiredArgsConstructor;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 
@@ -13,44 +16,42 @@
 
 @Tag(name = "NEWS API", description = "뉴스 API")
 @RestController
+@RequiredArgsConstructor
 @RequestMapping("/api/news")
 public class NewsController {
 
     private final NewsService newsService;
 
-    public NewsController(NewsService newsService) {
-        this.newsService = newsService;
-    }
-
-    @Operation(summary = "전체 뉴스 조회")
+    @Operation(summary = "전체 뉴스 조회 (썸네일 포함)")
     @GetMapping
     public ResponseEntity<List<NewsResponseDto>> getAllNews() {
         return ResponseEntity.ok(newsService.getAllNews());
     }
 
-    @Operation(summary = "개별 뉴스 조회")
+    @Operation(summary = "뉴스 상세 조회")
     @GetMapping("/{id}")
-    public ResponseEntity<NewsResponseDto> getNewsById(@PathVariable Long id) {
+    public ResponseEntity<NewsResponseDto> getNewsById(@PathVariable @Min(1) Long id) {
         return ResponseEntity.ok(newsService.getNewsById(id));
     }
 
     @Operation(summary = "뉴스 등록")
     @PostMapping
-    public ResponseEntity<NewsResponseDto> createNews(@Valid @RequestBody NewsRequestDto requestDto) {
+    public ResponseEntity<NewsCreationResponseDto> createNews(@Valid @RequestBody NewsRequestDto requestDto) {
         return ResponseEntity.status(201).body(newsService.createNews(requestDto));
     }
 
     @Operation(summary = "뉴스 수정")
     @PutMapping("/{id}")
-    public ResponseEntity<NewsResponseDto> updateNews(@PathVariable Long id, @Valid @RequestBody NewsRequestDto requestDto) {
+    public ResponseEntity<NewsResponseDto> updateNews(@PathVariable @Min(1) Long id,
+                                                      @Valid @RequestBody NewsRequestDto requestDto) {
         return ResponseEntity.ok(newsService.updateNews(id, requestDto));
     }
 
     @Operation(summary = "뉴스 삭제")
     @DeleteMapping("/{id}")
     public ResponseEntity<Void> deleteNews(@PathVariable Long id) {
         newsService.deleteNews(id);
-        return ResponseEntity.noContent().build();
+        return ResponseEntity.ok().build();
     }
 
-}
+}

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

@@ -0,0 +1,19 @@
+package dmu.dasom.api.domain.news.dto;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotNull;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+@Getter
+@NoArgsConstructor
+@AllArgsConstructor
+@Schema(name = "NewsCreationResponseDto", description = "뉴스 생성 응답 DTO")
+public class NewsCreationResponseDto {
+
+    @NotNull
+    @Schema(description = "뉴스 ID", example = "1")
+    private Long id;
+
+}

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

@@ -1,14 +1,12 @@
 package dmu.dasom.api.domain.news.dto;
 
+import dmu.dasom.api.domain.news.entity.NewsEntity;
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.Size;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
-import org.springframework.web.multipart.MultipartFile;
-
-import java.util.List;
 
 @Getter
 @NoArgsConstructor
@@ -25,7 +23,11 @@ public class NewsRequestDto {
     @Schema(description = "뉴스 내용", example = "새로운 뉴스 내용")
     private String content;
 
-    @Schema(description = "이미지 파일 ID 목록", example = "[1, 2, 3]", nullable = true)
-    private List<Long> fileIds;
+    public NewsEntity toEntity() {
+        return NewsEntity.builder()
+            .title(this.title)
+            .content(this.content)
+            .build();
+    }
 
-}
+}

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

@@ -1,13 +1,18 @@
 package dmu.dasom.api.domain.news.dto;
 
+import dmu.dasom.api.global.file.dto.FileResponseDto;
 import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Getter;
+import lombok.NoArgsConstructor;
 
 import java.time.LocalDateTime;
 import java.util.List;
 
 @Getter
+@NoArgsConstructor
+@AllArgsConstructor
 @Builder
 @Schema(name = "NewsResponseDto", description = "뉴스 응답 DTO")
 public class NewsResponseDto {
@@ -24,15 +29,7 @@ public class NewsResponseDto {
     @Schema(description = "작성일", example = "2025-02-14T12:00:00")
     private LocalDateTime createdAt;
 
-    @Schema(description = "Base64 인코딩된 이미지", example = "[data:image/jpeg;base64,xxxxxx]", nullable = true)
-    private List<String> imageUrls;
+    @Schema(description = "인코딩된 이미지", example = "asdf", nullable = true)
+    private List<FileResponseDto> images;
 
-    public NewsResponseDto(Long id, String title, String content, LocalDateTime createdAt, List<String> imageUrls) {
-        this.id = id;
-        this.title = title;
-        this.content = content;
-        this.createdAt = createdAt;
-        this.imageUrls = imageUrls;
-    }
-
-}
+}

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

@@ -2,12 +2,12 @@
 
 import dmu.dasom.api.domain.common.BaseEntity;
 import dmu.dasom.api.domain.news.dto.NewsResponseDto;
-import dmu.dasom.api.global.file.entity.FileEntity;
+import dmu.dasom.api.global.file.dto.FileResponseDto;
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.persistence.*;
 import lombok.*;
+import org.apache.commons.lang3.ObjectUtils;
 
-import java.util.ArrayList;
 import java.util.List;
 
 @Getter
@@ -30,22 +30,29 @@ public class NewsEntity extends BaseEntity {
     @Column(nullable = false)
     private String content;
 
-    @ElementCollection
-    @CollectionTable(name = "news_images", joinColumns = @JoinColumn(name = "news_id"))
-    @Column(name = "image_data", columnDefinition = "TEXT")
-    private List<String> imageUrls;
-
-    public void update(String title, String content, List<String> imageUrls) {
+    public void update(String title, String content) {
         this.title = title;
         this.content = content;
-        this.imageUrls = imageUrls;
     }
 
-    public NewsResponseDto toResponseDto() {
-        return new NewsResponseDto(id, title, content, getCreatedAt(), imageUrls);
+    public NewsResponseDto toResponseDto(List<FileResponseDto> images) {
+        return NewsResponseDto.builder()
+            .id(this.id)
+            .title(this.title)
+            .content(this.content)
+            .createdAt(getCreatedAt())
+            .images(ObjectUtils.isEmpty(images) ? null : images)
+            .build();
     }
 
-    @OneToMany(mappedBy = "news", cascade = CascadeType.ALL, orphanRemoval = true)
-    private List<FileEntity> images = new ArrayList<>();
+    public NewsResponseDto toResponseDto() {
+        return NewsResponseDto.builder()
+            .id(this.id)
+            .title(this.title)
+            .content(this.content)
+            .createdAt(getCreatedAt())
+            .images(null)
+            .build();
+    }
 
 }

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

@@ -1,7 +1,7 @@
 package dmu.dasom.api.domain.news.service;
 
-import dmu.dasom.api.global.file.dto.FileResponseDto;
-import dmu.dasom.api.global.file.entity.FileEntity;
+import dmu.dasom.api.domain.news.dto.NewsCreationResponseDto;
+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;
@@ -14,58 +14,43 @@
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
-import java.util.stream.Collectors;
 
 @Service
 @RequiredArgsConstructor
+@Transactional(readOnly = true)
 public class NewsService {
 
     private final NewsRepository newsRepository;
     private final FileService fileService;
 
     // 전체 뉴스 조회
     public List<NewsResponseDto> getAllNews() {
-        return newsRepository.findAll().stream()
-                .map(news -> NewsResponseDto.builder()
-                        .id(news.getId())
-                        .title(news.getTitle())
-                        .content(news.getContent())
-                        .createdAt(news.getCreatedAt())
-                        .imageUrls(news.getImageUrls())
-                        .build())
-                .collect(Collectors.toList());
+        List<NewsEntity> news = newsRepository.findAll();
+
+//        List<FileResponseDto> files = fileService.getFirstFileByTypeAndTargetId(
+//            FileType.NEWS,
+//            news.stream()
+//                .map(NewsEntity::getId)
+//                .toList()
+//        );
+
+        return news.stream()
+            .map(NewsEntity::toResponseDto)
+            .toList();
     }
 
     // 개별 뉴스 조회
     public NewsResponseDto getNewsById(Long id) {
         NewsEntity news = newsRepository.findById(id)
                 .orElseThrow(() -> new CustomException(ErrorCode.NOT_FOUND));
 
-        return NewsResponseDto.builder()
-                .id(news.getId())
-                .title(news.getTitle())
-                .content(news.getContent())
-                .createdAt(news.getCreatedAt())
-                .imageUrls(news.getImageUrls())
-                .build();
+        return news.toResponseDto(fileService.getFilesByTypeAndTargetId(FileType.NEWS, id));
     }
 
-    // 뉴스 생성
+    // 뉴스 생성 (생성된 뉴스 ID 반환)
     @Transactional
-    public NewsResponseDto createNews(NewsRequestDto requestDto) {
-        List<FileResponseDto> uploadedFiles = fileService.getFilesByIds(requestDto.getFileIds());
-
-        List<String> base64Images = uploadedFiles.stream()
-                .map(file -> "data:" + file.getFileType() + ";base64," + file.getBase64Data())
-                .collect(Collectors.toList());
-
-        NewsEntity news = NewsEntity.builder()
-                .title(requestDto.getTitle())
-                .content(requestDto.getContent())
-                .imageUrls(base64Images)
-                .build();
-
-        return newsRepository.save(news).toResponseDto();
+    public NewsCreationResponseDto createNews(NewsRequestDto requestDto) {
+        return new NewsCreationResponseDto(newsRepository.save(requestDto.toEntity()).getId());
     }
 
     // 뉴스 수정
@@ -74,14 +59,7 @@ public NewsResponseDto updateNews(Long id, NewsRequestDto requestDto) {
         NewsEntity news = newsRepository.findById(id)
                 .orElseThrow(() -> new CustomException(ErrorCode.NOT_FOUND));
 
-        // fileEntity -> response로 수정
-        List<FileResponseDto> uploadedFiles = fileService.getFilesByIds(requestDto.getFileIds());
-
-        List<String> base64Images = uploadedFiles.stream()
-                .map(file -> "data:" + file.getFileType() + ";base64," + file.getBase64Data())
-                .collect(Collectors.toList());
-
-        news.update(requestDto.getTitle(), requestDto.getContent(), base64Images);
+        news.update(requestDto.getTitle(), requestDto.getContent());
 
         return news.toResponseDto();
     }
@@ -92,6 +70,7 @@ public void deleteNews(Long id) {
         NewsEntity news = newsRepository.findById(id)
                 .orElseThrow(() -> new CustomException(ErrorCode.NOT_FOUND));
 
+        fileService.deleteFilesByTypeAndTargetId(FileType.NEWS, news.getId());
         newsRepository.delete(news);
     }