refactor: 파일저장 로직수정

Author: dohy-eon

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

@@ -5,20 +5,13 @@
 import dmu.dasom.api.domain.news.service.NewsService;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.responses.ApiResponse;
-import io.swagger.v3.oas.annotations.responses.ApiResponses;
-import io.swagger.v3.oas.annotations.media.Content;
-import io.swagger.v3.oas.annotations.media.ExampleObject;
-import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 
 import jakarta.validation.Valid;
-import org.springframework.web.multipart.MultipartFile;
-
 import java.util.List;
 
-@Tag(name = "NEWS API", description = "다솜소식 API")
+@Tag(name = "NEWS API", description = "뉴스 API")
 @RestController
 @RequestMapping("/api/news")
 public class NewsController {
@@ -29,57 +22,31 @@ public NewsController(NewsService newsService) {
         this.newsService = newsService;
     }
 
-    // 전체 조회
-    @Operation(summary = "소식 조회", description = "리스트로 조회")
-    @ApiResponse(responseCode = "200", description = "정상 응답",
-            content = @Content(mediaType = "application/json"))
+    @Operation(summary = "전체 뉴스 조회")
     @GetMapping
     public ResponseEntity<List<NewsResponseDto>> getAllNews() {
-        List<NewsResponseDto> newsList = newsService.getAllNews();
-        return ResponseEntity.ok(newsList);
+        return ResponseEntity.ok(newsService.getAllNews());
     }
 
-    // 개별 조회
-    @Operation(summary = "소식 상세 조회", description = "ID로 특정 소식을 조회")
-    @ApiResponses({
-            @ApiResponse(responseCode = "200", description = "조회 성공"),
-            @ApiResponse(responseCode = "400", description = "소식을 찾을 수 없음")
-    })
+    @Operation(summary = "개별 뉴스 조회")
     @GetMapping("/{id}")
     public ResponseEntity<NewsResponseDto> getNewsById(@PathVariable Long id) {
-        NewsResponseDto responseDto = newsService.getNewsById(id);
-        return ResponseEntity.ok(responseDto);
+        return ResponseEntity.ok(newsService.getNewsById(id));
     }
 
-    // 생성 (multipart/form-data 사용)
-    @Operation(summary = "소식 등록", description = "새로운 소식을 등록")
-    @PostMapping(consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
-    public ResponseEntity<NewsResponseDto> createNews(
-            @Valid @RequestPart("news") NewsRequestDto requestDto, // JSON 데이터 받기
-            @RequestPart(value = "images", required = false) List<MultipartFile> imageFiles // 이미지 파일 받기
-    ) {
-        NewsResponseDto responseDto = newsService.createNews(requestDto, imageFiles);
-        return ResponseEntity.status(201).body(responseDto);
+    @Operation(summary = "뉴스 등록")
+    @PostMapping
+    public ResponseEntity<NewsResponseDto> createNews(@Valid @RequestBody NewsRequestDto requestDto) {
+        return ResponseEntity.status(201).body(newsService.createNews(requestDto));
     }
 
-    // 수정 (multipart/form-data 사용)
-    @Operation(summary = "소식 수정", description = "ID로 특정 소식을 수정")
-    @PutMapping(value = "/{id}", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
-    public ResponseEntity<NewsResponseDto> updateNews(
-            @PathVariable Long id,
-            @Valid @RequestPart("news") NewsRequestDto requestDto,
-            @RequestPart(value = "images", required = false) List<MultipartFile> imageFiles
-    ) {
-        NewsResponseDto updatedNews = newsService.updateNews(id, requestDto, imageFiles);
-        return ResponseEntity.ok(updatedNews);
+    @Operation(summary = "뉴스 수정")
+    @PutMapping("/{id}")
+    public ResponseEntity<NewsResponseDto> updateNews(@PathVariable Long id, @Valid @RequestBody NewsRequestDto requestDto) {
+        return ResponseEntity.ok(newsService.updateNews(id, requestDto));
     }
 
-    // 삭제
-    @Operation(summary = "소식 삭제", description = "ID로 특정 소식을 삭제")
-    @ApiResponses({
-            @ApiResponse(responseCode = "204", description = "삭제 성공"),
-            @ApiResponse(responseCode = "400", description = "소식을 찾을 수 없음")
-    })
+    @Operation(summary = "뉴스 삭제")
     @DeleteMapping("/{id}")
     public ResponseEntity<Void> deleteNews(@PathVariable Long id) {
         newsService.deleteNews(id);

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

@@ -25,8 +25,6 @@ public class NewsRequestDto {
     @Schema(description = "뉴스 내용", example = "새로운 뉴스 내용")
     private String content;
 
-    @Size(max = 255, message = "이미지 URL은 최대 255자입니다.")
-    @Schema(description = "뉴스 이미지 URL", example = "http://example.com/image.jpg", nullable = true)
-    private List<MultipartFile> images;
-
+    @Schema(description = "이미지 파일 ID 목록", example = "[1, 2, 3]", nullable = true)
+    private List<Long> fileIds;
 }

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

@@ -1,7 +1,6 @@
 package dmu.dasom.api.domain.news.entity;
 
 import dmu.dasom.api.domain.common.BaseEntity;
-import dmu.dasom.api.domain.common.Status;
 import dmu.dasom.api.domain.news.dto.NewsResponseDto;
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.persistence.*;
@@ -20,39 +19,27 @@ public class NewsEntity extends BaseEntity {
 
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
-    @Schema(description = "뉴스 ID", example = "1")
     private Long id;
 
     @Column(nullable = false, length = 100)
-    @Schema(description = "뉴스 제목", example = "뉴스 예제 제목")
     private String title;
 
     @Lob
     @Column(nullable = false)
-    @Schema(description = "뉴스 내용", example = "뉴스 예제 내용")
     private String content;
 
     @ElementCollection
     @CollectionTable(name = "news_images", joinColumns = @JoinColumn(name = "news_id"))
     @Column(name = "image_url", length = 255)
-    @Schema(description = "뉴스 이미지 URL 리스트", example = "[\"https://example.com/image1.jpg\", \"https://example.com/image2.jpg\"]")
     private List<String> imageUrls;
 
-    // 뉴스 상태 업데이트
-    public void updateStatus(Status status) {
-        super.updateStatus(status);
-    }
-
-    // NewsEntity → NewsResponseDto 변환
-    public NewsResponseDto toResponseDto() {
-        return new NewsResponseDto(id, title, content, getCreatedAt(), imageUrls);
-    }
-
-    // 수정 메서드
     public void update(String title, String content, List<String> imageUrls) {
         this.title = title;
         this.content = content;
         this.imageUrls = imageUrls;
     }
 
+    public NewsResponseDto toResponseDto() {
+        return new NewsResponseDto(id, title, content, getCreatedAt(), imageUrls);
+    }
 }

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

@@ -1,5 +1,7 @@
 package dmu.dasom.api.domain.news.service;
 
+import dmu.dasom.api.global.file.entity.FileEntity;
+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;
@@ -9,7 +11,6 @@
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.multipart.MultipartFile;
 
 import java.util.List;
 import java.util.stream.Collectors;
@@ -19,54 +20,52 @@
 public class NewsService {
 
     private final NewsRepository newsRepository;
-    private final NewsImageService newsImageService;
+    private final FileService fileService;
 
-    // 전체 조회
+    // 전체 뉴스 조회
     public List<NewsResponseDto> getAllNews() {
         return newsRepository.findAll().stream()
                 .map(NewsEntity::toResponseDto)
                 .collect(Collectors.toList());
     }
 
-    // 개별 조회
+    // 개별 뉴스 조회
     public NewsResponseDto getNewsById(Long id) {
         return newsRepository.findById(id)
                 .map(NewsEntity::toResponseDto)
                 .orElseThrow(() -> new CustomException(ErrorCode.NOT_FOUND));
     }
 
-    // 생성
+    // 뉴스 생성
     @Transactional
-    public NewsResponseDto createNews(NewsRequestDto requestDto, List<MultipartFile> imageFiles) {
-        // 이미지 업로드 후 URL 리스트 받아오기
-        List<String> uploadedImageUrls = newsImageService.uploadImages(imageFiles);  // URL 리스트 생성
+    public NewsResponseDto createNews(NewsRequestDto requestDto) {
+        List<FileEntity> uploadedFiles = fileService.getFilesByIds(requestDto.getFileIds());
+        List<String> imageUrls = uploadedFiles.stream().map(FileEntity::getFilePath).collect(Collectors.toList());
 
         NewsEntity news = NewsEntity.builder()
                 .title(requestDto.getTitle())
                 .content(requestDto.getContent())
-                .imageUrls(uploadedImageUrls)  // 이미지 URL 리스트 저장
+                .imageUrls(imageUrls)
                 .build();
 
-        NewsEntity savedNews = newsRepository.save(news);
-        return savedNews.toResponseDto();
+        return newsRepository.save(news).toResponseDto();
     }
 
-    // 수정
+    // 뉴스 수정
     @Transactional
-    public NewsResponseDto updateNews(Long id, NewsRequestDto requestDto, List<MultipartFile> imageFiles) {
-        // 뉴스 엔티티 찾기
+    public NewsResponseDto updateNews(Long id, NewsRequestDto requestDto) {
         NewsEntity news = newsRepository.findById(id)
                 .orElseThrow(() -> new CustomException(ErrorCode.NOT_FOUND));
 
-        // 이미지 업로드 후 URL 리스트 받아오기
-        List<String> uploadedImageUrls = newsImageService.uploadImages(imageFiles);
+        List<FileEntity> uploadedFiles = fileService.getFilesByIds(requestDto.getFileIds());
+        List<String> imageUrls = uploadedFiles.stream().map(FileEntity::getFilePath).collect(Collectors.toList());
 
-        news.update(requestDto.getTitle(), requestDto.getContent(), uploadedImageUrls);
+        news.update(requestDto.getTitle(), requestDto.getContent(), imageUrls);
 
         return news.toResponseDto();
     }
 
-    // 삭제
+    // 뉴스 삭제
     @Transactional
     public void deleteNews(Long id) {
         NewsEntity news = newsRepository.findById(id)

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

@@ -0,0 +1,28 @@
+package dmu.dasom.api.global.file.controller;
+
+import dmu.dasom.api.global.file.service.FileService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.RequiredArgsConstructor;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.util.List;
+
+@Tag(name = "File API", description = "파일 업로드 API")
+@RestController
+@RequestMapping("/api/global/file")
+@RequiredArgsConstructor
+public class FileController {
+
+    private final FileService fileService;
+
+    @Operation(summary = "파일 업로드", description = "여러 개의 파일 업로드 + 파일 ID 리스트를 반환")
+    @PostMapping("/upload")
+    public ResponseEntity<List<Long>> uploadFiles(@RequestParam("files") List<MultipartFile> files) {
+        List<Long> fileIds = fileService.uploadFiles(files);
+        return ResponseEntity.ok(fileIds);
+    }
+
+}