fix: 파일저장 인코딩 수정

Author: dohy-eon

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

@@ -27,4 +27,5 @@ public class NewsRequestDto {
 
     @Schema(description = "이미지 파일 ID 목록", example = "[1, 2, 3]", nullable = true)
     private List<Long> fileIds;
+
 }

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

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

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

@@ -30,7 +30,7 @@ public class NewsEntity extends BaseEntity {
 
     @ElementCollection
     @CollectionTable(name = "news_images", joinColumns = @JoinColumn(name = "news_id"))
-    @Column(name = "image_url", length = 255)
+    @Column(name = "image_data", columnDefinition = "TEXT")
     private List<String> imageUrls;
 
     public void update(String title, String content, List<String> imageUrls) {
@@ -42,4 +42,5 @@ public void update(String title, String content, List<String> imageUrls) {
     public NewsResponseDto toResponseDto() {
         return new NewsResponseDto(id, title, content, getCreatedAt(), imageUrls);
     }
+
 }

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

@@ -25,27 +25,43 @@ public class NewsService {
     // 전체 뉴스 조회
     public List<NewsResponseDto> getAllNews() {
         return newsRepository.findAll().stream()
-                .map(NewsEntity::toResponseDto)
+                .map(news -> NewsResponseDto.builder()
+                        .id(news.getId())
+                        .title(news.getTitle())
+                        .content(news.getContent())
+                        .createdAt(news.getCreatedAt())
+                        .imageUrls(news.getImageUrls())
+                        .build())
                 .collect(Collectors.toList());
     }
 
     // 개별 뉴스 조회
     public NewsResponseDto getNewsById(Long id) {
-        return newsRepository.findById(id)
-                .map(NewsEntity::toResponseDto)
+        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();
     }
 
     // 뉴스 생성
     @Transactional
     public NewsResponseDto createNews(NewsRequestDto requestDto) {
         List<FileEntity> uploadedFiles = fileService.getFilesByIds(requestDto.getFileIds());
-        List<String> imageUrls = uploadedFiles.stream().map(FileEntity::getFilePath).collect(Collectors.toList());
+
+        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(imageUrls)
+                .imageUrls(base64Images)
                 .build();
 
         return newsRepository.save(news).toResponseDto();
@@ -58,9 +74,12 @@ public NewsResponseDto updateNews(Long id, NewsRequestDto requestDto) {
                 .orElseThrow(() -> new CustomException(ErrorCode.NOT_FOUND));
 
         List<FileEntity> uploadedFiles = fileService.getFilesByIds(requestDto.getFileIds());
-        List<String> imageUrls = uploadedFiles.stream().map(FileEntity::getFilePath).collect(Collectors.toList());
 
-        news.update(requestDto.getTitle(), requestDto.getContent(), imageUrls);
+        List<String> base64Images = uploadedFiles.stream()
+                .map(file -> "data:" + file.getFileType() + ";base64," + file.getBase64Data())
+                .collect(Collectors.toList());
+
+        news.update(requestDto.getTitle(), requestDto.getContent(), base64Images);
 
         return news.toResponseDto();
     }

src/main/java/dmu/dasom/api/global/file/controller/FileController.java

@@ -1,28 +1,31 @@
 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);
     }
 
+    // 파일 조회
+    @GetMapping("/{fileId}")
+    public ResponseEntity<String> getFile(@PathVariable Long fileId) {
+        return ResponseEntity.ok(fileService.getFileBase64(fileId));
+    }
+
 }

src/main/java/dmu/dasom/api/global/file/entity/FileEntity.java

@@ -3,9 +3,9 @@
 import jakarta.persistence.*;
 import lombok.*;
 
+@Getter
 @Entity
 @Table(name = "files")
-@Getter
 @NoArgsConstructor
 @AllArgsConstructor
 @Builder
@@ -14,15 +14,18 @@ public class FileEntity {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Long id;
+
     @Column(nullable = false)
     private String originalName;
-    @Column(nullable = false)
-    private String storedName;
-    @Column(nullable = false)
-    private String filePath;
+
+    @Lob
+    @Column(name = "base64data", nullable = false, columnDefinition = "CLOB")
+    private String base64Data;
+
     @Column(nullable = false)
     private String fileType;
+
     @Column(nullable = false)
     private Long fileSize;
 
-}
+}

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

@@ -6,13 +6,9 @@
 import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
 
-import java.io.File;
 import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.StandardCopyOption;
+import java.util.Base64;
 import java.util.List;
-import java.util.UUID;
 import java.util.stream.Collectors;
 
 @Service
@@ -21,44 +17,36 @@ public class FileService {
 
     private final FileRepository fileRepository;
 
-    //파일은 db로 저장하고 일단 물리적으로 uploads/ 에 저장되게
-    private static final String FILE_DIR = "uploads/";
-
     public List<Long> uploadFiles(List<MultipartFile> files) {
-        return files.stream()
-                .map(this::storeFile)
-                .map(fileRepository::save)
-                .map(FileEntity::getId)
-                .collect(Collectors.toList());
-    }
-
-    private FileEntity storeFile(MultipartFile file) {
-        try {
-            File uploadDir = new File(FILE_DIR);
-            if (!uploadDir.exists()) {
-                uploadDir.mkdirs();
+        List<FileEntity> savedFiles = files.stream().map(file -> {
+            try {
+                byte[] bytes = file.getBytes();
+                String base64Encoded = Base64.getEncoder().encodeToString(bytes);
+                return FileEntity.builder()
+                        .originalName(file.getOriginalFilename())
+                        .base64Data(base64Encoded)
+                        .fileType(file.getContentType())
+                        .fileSize(file.getSize())
+                        .build();
+            } catch (IOException e) {
+                throw new RuntimeException("파일 인코딩 실패", e);
             }
+        }).collect(Collectors.toList());
 
-            String originalFilename = file.getOriginalFilename();
-            String storedFilename = UUID.randomUUID().toString() + "_" + originalFilename;
-            Path filePath = Path.of(FILE_DIR + storedFilename);
+        return fileRepository.saveAll(savedFiles).stream().map(FileEntity::getId).collect(Collectors.toList());
+    }
 
-            Files.copy(file.getInputStream(), filePath, StandardCopyOption.REPLACE_EXISTING);
+    // 파일 하나 조회
+    public String getFileBase64(Long fileId) {
+        FileEntity file = fileRepository.findById(fileId)
+                .orElseThrow(() -> new RuntimeException("파일을 찾을 수 없음"));
 
-            return FileEntity.builder()
-                    .originalName(originalFilename)
-                    .storedName(storedFilename)
-                    .filePath(filePath.toString())
-                    .fileType(file.getContentType())
-                    .fileSize(file.getSize())
-                    .build();
-        } catch (IOException e) {
-            throw new RuntimeException("파일 저장 중 오류 발생: " + e.getMessage(), e);
-        }
+        return "data:" + file.getFileType() + ";base64," + file.getBase64Data();
     }
 
+    // 파일 여러개 조회
     public List<FileEntity> getFilesByIds(List<Long> fileIds) {
         return fileRepository.findAllById(fileIds);
     }
-
+    
 }