Fix 서버 파일/메인이미지 폴더 분리

src/main/kotlin/com/wafflestudio/csereal/common/entity/AttachmentAttachable.kt

@@ -4,4 +4,6 @@ import com.wafflestudio.csereal.core.resource.attachment.database.AttachmentEnti
 
 interface AttachmentAttachable {
     val attachments: List<AttachmentEntity>
+
+    fun getAttachmentFolder(): String
 }

src/main/kotlin/com/wafflestudio/csereal/common/entity/MainImageAttachable.kt

@@ -3,5 +3,7 @@ package com.wafflestudio.csereal.common.entity
 import com.wafflestudio.csereal.core.resource.mainImage.database.MainImageEntity
 
 interface MainImageAttachable {
-    val mainImage: MainImageEntity?
+    var mainImage: MainImageEntity?
+
+    fun getMainImageFolder(): String
 }

src/main/kotlin/com/wafflestudio/csereal/core/about/database/AboutEntity.kt

@@ -89,4 +89,8 @@ class AboutEntity(
         assert(postType == AboutPostType.FUTURE_CAREERS)
         searchContent = createContent(name, description, statNames, companyNames)
     }
+
+    override fun getAttachmentFolder() = "attachment/about"
+
+    override fun getMainImageFolder() = "mainImage/about"
 }

src/main/kotlin/com/wafflestudio/csereal/core/academics/database/AcademicsEntity.kt

@@ -48,4 +48,6 @@ class AcademicsEntity(
             )
         }
     }
+
+    override fun getAttachmentFolder() = "attachment/academics"
 }

src/main/kotlin/com/wafflestudio/csereal/core/council/database/CouncilEntity.kt

@@ -33,6 +33,8 @@ class CouncilEntity(
                 name = req.name
             )
     }
+
+    override fun getMainImageFolder() = "mainImage/council"
 }
 
 enum class CouncilType {

src/main/kotlin/com/wafflestudio/csereal/core/council/database/CouncilFileEntity.kt

@@ -21,4 +21,6 @@ class CouncilFileEntity(
 
     @OneToMany(mappedBy = "councilFile", cascade = [CascadeType.ALL], orphanRemoval = true)
     override val attachments: MutableList<AttachmentEntity> = mutableListOf()
-) : BaseTimeEntity(), AttachmentAttachable
+) : BaseTimeEntity(), AttachmentAttachable {
+    override fun getAttachmentFolder() = "attachment/council"
+}

src/main/kotlin/com/wafflestudio/csereal/core/member/database/ProfessorEntity.kt

@@ -77,6 +77,8 @@ class ProfessorEntity(
         this.lab = lab
         lab.professors.add(this)
     }
+
+    override fun getMainImageFolder() = "mainImage/professor"
 }
 
 enum class ProfessorStatus(

src/main/kotlin/com/wafflestudio/csereal/core/member/database/StaffEntity.kt

@@ -51,4 +51,6 @@ class StaffEntity(
         this.phone = staffDto.phone
         this.email = staffDto.email
     }
+
+    override fun getMainImageFolder() = "mainImage/staff"
 }

src/main/kotlin/com/wafflestudio/csereal/core/news/database/NewsEntity.kt

@@ -70,4 +70,8 @@ class NewsEntity(
         this.isImportant = updateNewsRequest.isImportant
         this.importantUntil = if (updateNewsRequest.isImportant) updateNewsRequest.importantUntil else null
     }
+
+    override fun getAttachmentFolder() = "attachment/news"
+
+    override fun getMainImageFolder() = "mainImage/news"
 }

src/main/kotlin/com/wafflestudio/csereal/core/notice/database/NoticeEntity.kt

@@ -61,4 +61,6 @@ class NoticeEntity(
         this.isImportant = updateNoticeRequest.isImportant
         this.importantUntil = if (updateNoticeRequest.isImportant) updateNoticeRequest.importantUntil else null
     }
+
+    override fun getAttachmentFolder() = "attachment/notice"
 }

src/main/kotlin/com/wafflestudio/csereal/core/recruit/database/RecruitEntity.kt

@@ -16,4 +16,6 @@ class RecruitEntity(
 
     @OneToOne
     override var mainImage: MainImageEntity? = null
-) : BaseTimeEntity(), MainImageAttachable
+) : BaseTimeEntity(), MainImageAttachable {
+    override fun getMainImageFolder() = "mainImage/research"
+}

src/main/kotlin/com/wafflestudio/csereal/core/research/database/ResearchEntity.kt

@@ -44,4 +44,6 @@ class ResearchEntity(
             )
         }
     }
+
+    override fun getMainImageFolder() = "mainImage/research"
 }

src/main/kotlin/com/wafflestudio/csereal/core/resource/attachment/database/AttachmentEntity.kt

@@ -19,6 +19,8 @@ class AttachmentEntity(
     @Column(unique = true)
     val filename: String,
 
+    val folder: String? = null,
+
     val attachmentsOrder: Int,
     val size: Long,
 
@@ -57,4 +59,8 @@ class AttachmentEntity(
     @ManyToOne(fetch = FetchType.LAZY)
     @JoinColumn(name = "council_file_id")
     var councilFile: CouncilFileEntity? = null
-) : BaseTimeEntity()
+) : BaseTimeEntity() {
+    fun filePath(): String {
+        return if (folder.isNullOrBlank()) return filename else "$folder/$filename"
+    }
+}

src/main/kotlin/com/wafflestudio/csereal/core/resource/attachment/service/AttachmentService.kt

@@ -21,6 +21,7 @@ import org.springframework.data.repository.findByIdOrNull
 import org.springframework.stereotype.Service
 import org.springframework.transaction.annotation.Transactional
 import org.springframework.web.multipart.MultipartFile
+import java.lang.invoke.WrongMethodTypeException
 import java.nio.file.Files
 import java.nio.file.Paths
 
@@ -53,22 +54,25 @@ class AttachmentServiceImpl(
     private val eventPublisher: ApplicationEventPublisher
 ) : AttachmentService {
     override fun uploadAttachmentInLabEntity(labEntity: LabEntity, requestAttachment: MultipartFile): AttachmentDto {
-        Files.createDirectories(Paths.get(path))
+        val folder = "attachment/lab"
+        val uploadDir = Paths.get(path, folder)
+        Files.createDirectories(uploadDir)
 
         val timeMillis = System.currentTimeMillis()
 
         val filename = "${timeMillis}_${requestAttachment.originalFilename}"
-        val totalFilename = path + filename
-        val saveFile = Paths.get(totalFilename)
+        val saveFile = Paths.get(path, folder, filename)
         requestAttachment.transferTo(saveFile)
 
         val attachment = AttachmentEntity(
             filename = filename,
+            folder = folder,
             attachmentsOrder = 1,
             size = requestAttachment.size
         )
 
         labEntity.pdf = attachment
+        attachment.lab = labEntity
         attachmentRepository.save(attachment)
 
         return AttachmentDto(
@@ -83,20 +87,22 @@ class AttachmentServiceImpl(
         contentEntityType: AttachmentAttachable,
         requestAttachments: List<MultipartFile>
     ): List<AttachmentDto> {
-        Files.createDirectories(Paths.get(path))
+        val folder = contentEntityType.getAttachmentFolder()
+        val uploadDir = Paths.get(path, folder)
+        Files.createDirectories(uploadDir)
 
         val attachmentsList = mutableListOf<AttachmentDto>()
 
         for ((index, requestAttachment) in requestAttachments.withIndex()) {
             val timeMillis = System.currentTimeMillis()
 
             val filename = "${timeMillis}_${requestAttachment.originalFilename}"
-            val totalFilename = path + filename
-            val saveFile = Paths.get(totalFilename)
+            val saveFile = uploadDir.resolve(filename)
             requestAttachment.transferTo(saveFile)
 
             val attachment = AttachmentEntity(
                 filename = filename,
+                folder = folder,
                 attachmentsOrder = index + 1,
                 size = requestAttachment.size
             )
@@ -124,7 +130,7 @@ class AttachmentServiceImpl(
                 attachmentDto = AttachmentResponse(
                     id = attachment.id,
                     name = attachment.filename.substringAfter("_"),
-                    url = "${endpointProperties.backend}/v1/file/${attachment.filename}",
+                    url = "${endpointProperties.backend}/v1/file/${attachment.filePath()}",
                     bytes = attachment.size
                 )
             }
@@ -142,7 +148,7 @@ class AttachmentServiceImpl(
                     val attachmentDto = AttachmentResponse(
                         id = attachment.id,
                         name = attachment.filename.substringAfter("_"),
-                        url = "${endpointProperties.backend}/v1/file/${attachment.filename}",
+                        url = "${endpointProperties.backend}/v1/file/${attachment.filePath()}",
                         bytes = attachment.size
                     )
                     list.add(attachmentDto)
@@ -170,7 +176,7 @@ class AttachmentServiceImpl(
 
     @Transactional
     override fun deleteAttachment(attachment: AttachmentEntity) {
-        val fileDirectory = path + attachment.filename
+        val fileDirectory = path + attachment.filePath()
         attachmentRepository.delete(attachment)
         eventPublisher.publishEvent(FileDeleteEvent(fileDirectory))
     }
@@ -217,6 +223,10 @@ class AttachmentServiceImpl(
                 contentEntity.attachments.add(attachment)
                 attachment.councilFile = contentEntity
             }
+
+            else -> {
+                throw WrongMethodTypeException("파일을 엔티티에 연결할 수 없습니다")
+            }
         }
     }
 }

src/main/kotlin/com/wafflestudio/csereal/core/resource/common/api/FileController.kt

@@ -26,13 +26,12 @@ class FileController(
     private val uploadPath: String,
     private val endpointProperties: EndpointProperties
 ) {
-
-    @GetMapping("/{filename:.+}")
+    @GetMapping("/{*filepath}")
     fun serveFile(
-        @PathVariable filename: String,
+        @PathVariable filepath: String,
         request: HttpServletRequest
     ): ResponseEntity<Resource> {
-        val file = Paths.get(uploadPath, filename)
+        val file = Paths.get(uploadPath, filepath)
         val resource = UrlResource(file.toUri())
 
         if (resource.exists() || resource.isReadable) {
@@ -41,6 +40,7 @@ class FileController(
 
             headers.contentType = MediaType.parseMediaType(contentType ?: "application/octet-stream")
 
+            val filename = filepath.substringAfterLast("/")
             val originalFilename = filename.substringAfter("_")
             val encodedFilename = URLEncoder.encode(originalFilename, UTF_8.toString()).replace("+", "%20")
 
@@ -69,7 +69,7 @@ class FileController(
                 val saveFile = Paths.get(totalFilename)
                 file.transferTo(saveFile)
 
-                val imageUrl = "${endpointProperties.backend}/v1/file/$filename"
+                val imageUrl = "/v1/file/$filename"
 
                 results.add(
                     UploadFileInfo(
@@ -93,9 +93,12 @@ class FileController(
     }
 
     @PreAuthorize("hasRole('STAFF')")
-    @DeleteMapping("/{filename:.+}")
-    fun deleteFile(@PathVariable filename: String): ResponseEntity<Any> {
-        val file = Paths.get(uploadPath, filename)
+    @DeleteMapping("/{*filepath}")
+    fun deleteFile(
+        @PathVariable filepath: String,
+        request: HttpServletRequest
+    ): ResponseEntity<Any> {
+        val file = Paths.get(uploadPath, filepath)
 
         if (Files.exists(file)) {
             Files.delete(file)

src/main/kotlin/com/wafflestudio/csereal/core/resource/mainImage/database/MainImageEntity.kt

@@ -10,7 +10,13 @@ class MainImageEntity(
     @Column(unique = true)
     val filename: String,
 
+    val folder: String? = null,
+
     val imagesOrder: Int,
     val size: Long
 
-) : BaseTimeEntity()
+) : BaseTimeEntity() {
+    fun filePath(): String {
+        return if (folder.isNullOrBlank()) return filename else "$folder/$filename"
+    }
+}