feat: 뉴스 목록 썸네일 포함 응답 구현

Author: ysw789

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

@@ -1,6 +1,7 @@
 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.service.NewsService;
@@ -24,7 +25,7 @@ public class NewsController {
 
     @Operation(summary = "전체 뉴스 조회 (썸네일 포함)")
     @GetMapping
-    public ResponseEntity<List<NewsResponseDto>> getAllNews() {
+    public ResponseEntity<List<NewsListResponseDto>> getAllNews() {
         return ResponseEntity.ok(newsService.getAllNews());
     }
 

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

@@ -0,0 +1,31 @@
+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;
+
+@Getter
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+@Schema(name = "NewsListResponseDto", description = "뉴스 리스트 응답 DTO")
+public class NewsListResponseDto {
+
+    @Schema(description = "소식 ID", example = "1")
+    private Long id;
+
+    @Schema(description = "뉴스 제목", example = "제목")
+    private String title;
+
+    @Schema(description = "작성일", example = "2025-02-14T12:00:00")
+    private LocalDateTime createdAt;
+
+    @Schema(description = "인코딩된 이미지", example = "asdf", nullable = true)
+    private FileResponseDto image;
+
+}

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

@@ -1,6 +1,7 @@
 package dmu.dasom.api.domain.news.entity;
 
 import dmu.dasom.api.domain.common.BaseEntity;
+import dmu.dasom.api.domain.news.dto.NewsListResponseDto;
 import dmu.dasom.api.domain.news.dto.NewsResponseDto;
 import dmu.dasom.api.global.file.dto.FileResponseDto;
 import io.swagger.v3.oas.annotations.media.Schema;
@@ -55,4 +56,13 @@ public NewsResponseDto toResponseDto() {
             .build();
     }
 
+    public NewsListResponseDto toListResponseDto(FileResponseDto file) {
+        return NewsListResponseDto.builder()
+            .id(this.id)
+            .title(this.title)
+            .createdAt(getCreatedAt())
+            .image(file)
+            .build();
+    }
+
 }

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

@@ -1,6 +1,8 @@
 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.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;
@@ -14,6 +16,7 @@
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
+import java.util.Map;
 
 @Service
 @RequiredArgsConstructor
@@ -24,18 +27,20 @@ public class NewsService {
     private final FileService fileService;
 
     // 전체 뉴스 조회
-    public List<NewsResponseDto> getAllNews() {
+    public List<NewsListResponseDto> getAllNews() {
         List<NewsEntity> news = newsRepository.findAll();
 
-//        List<FileResponseDto> files = fileService.getFirstFileByTypeAndTargetId(
-//            FileType.NEWS,
-//            news.stream()
-//                .map(NewsEntity::getId)
-//                .toList()
-//        );
+        List<Long> newsIds = news.stream()
+            .map(NewsEntity::getId)
+            .toList();
+
+        Map<Long, FileResponseDto> firstFileMap = fileService.getFirstFileByTypeAndTargetIds(
+            FileType.NEWS,
+            newsIds
+        );
 
         return news.stream()
-            .map(NewsEntity::toResponseDto)
+            .map(newsEntity -> newsEntity.toListResponseDto(firstFileMap.get(newsEntity.getId())))
             .toList();
     }
 

src/main/java/dmu/dasom/api/global/file/repository/FileRepository.java

@@ -15,8 +15,8 @@ public interface FileRepository extends JpaRepository<FileEntity, Long> {
 
     List<FileEntity> findByFileTypeAndTargetId(FileType fileType, Long targetId);
 
-    @Query("SELECT f FROM FileEntity f WHERE f.fileType = :fileType AND f.targetId = :targetId")
-    Optional<FileEntity> findFirstByFileTypeAndTargetIds(@Param("fileType") FileType fileType,
-                                             @Param("targetId") Long targetId);
+    @Query("SELECT f FROM FileEntity f WHERE f.fileType = :fileType AND f.targetId IN :targetIds AND f.id IN " +
+        "(SELECT MIN(f2.id) FROM FileEntity f2 WHERE f2.fileType = :fileType AND f2.targetId = f.targetId)")
+    List<FileEntity> findFirstFilesByTypeAndTargetIds(@Param("fileType") FileType fileType, @Param("targetIds") List<Long> targetIds);
 
 }

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

@@ -14,6 +14,7 @@
 import java.io.IOException;
 import java.util.Base64;
 import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 
 @Service
@@ -61,6 +62,21 @@ public void deleteFilesByTypeAndTargetId(FileType fileType, Long targetId) {
             fileRepository.deleteAll(files);
     }
 
+    public Map<Long, FileResponseDto> getFirstFileByTypeAndTargetIds(FileType fileType, List<Long> targetIds) {
+        if (targetIds.isEmpty()) {
+            return Map.of();
+        }
+
+        List<FileEntity> firstFiles = fileRepository.findFirstFilesByTypeAndTargetIds(fileType, targetIds);
+
+        return firstFiles.stream()
+            .collect(Collectors.toMap(
+                FileEntity::getTargetId,
+                FileEntity::toResponseDto,
+                (existing, replacement) -> existing
+            ));
+    }
+
     private List<FileEntity> findByFileTypeAndTargetId(FileType fileType, Long targetId) {
         return fileRepository.findByFileTypeAndTargetId(fileType, targetId);
     }