[#34] 슬라이드 이미지 관련 로직 추가

account-api/src/main/kotlin/org/kkeunkkeun/pregen/account/infrastructure/security/jwt/JwtAuthFilter.kt

@@ -74,9 +74,6 @@ class JwtAuthFilter(
         } catch (e: PregenException) {
             log.error("Filter error: ${e.message}")
             handleException(request, response, e)
-        } catch (e: Exception) {
-            log.error("Filter error: ${e.message}")
-            handleException(request, response, e, "인증 과정에서 예외가 발생했습니다.")
         }
     }
 

presentation-api/src/main/kotlin/org/kkeunkkeun/pregen/presentation/file/domain/File.kt

@@ -36,7 +36,7 @@ class File(
             return File(
                 null,
                 fileType = IMAGE,
-                path = path,
+                path = path.replace(".", ""),
                 originalName = originalName,
                 generatedName = generatedName,
             )

presentation-api/src/main/kotlin/org/kkeunkkeun/pregen/presentation/file/infrastructure/FileProperties.kt

@@ -10,5 +10,4 @@ data class FileProperties(
     val fullThumbnailPath: String
         get() = "$basePath/$thumbnailPath"
             .replace("//", "/")
-            .replace(".", "")
 }

presentation-api/src/main/kotlin/org/kkeunkkeun/pregen/presentation/file/infrastructure/FileRepositoryImpl.kt

@@ -2,6 +2,7 @@ package org.kkeunkkeun.pregen.presentation.file.infrastructure
 
 import org.kkeunkkeun.pregen.presentation.file.domain.File
 import org.kkeunkkeun.pregen.presentation.file.service.FileRepository
+import org.springframework.data.repository.findByIdOrNull
 import org.springframework.stereotype.Repository
 
 @Repository
@@ -12,4 +13,8 @@ class FileRepositoryImpl(
     override fun save(file: File) {
         fileJpaRepository.save(file)
     }
+
+    override fun findById(fileId: Long?): File? = fileId?.let {
+        fileJpaRepository.findByIdOrNull(it)
+    }
 }

presentation-api/src/main/kotlin/org/kkeunkkeun/pregen/presentation/file/service/FileRepository.kt

@@ -5,4 +5,6 @@ import org.kkeunkkeun.pregen.presentation.file.domain.File
 interface FileRepository {
 
     fun save(file: File)
+
+    fun findById(fileId: Long?): File?
 }

presentation-api/src/main/kotlin/org/kkeunkkeun/pregen/presentation/presentation/presentation/PresentationListResponse.kt

@@ -21,20 +21,27 @@ data class PresentationListResponse(
 
         val timeLimit: PresentationTime,
 
+        val thumbnailPath: String?,
+
         val createdAt: LocalDateTime,
+
+        val modifiedAt: LocalDateTime,
     ) {
 
         companion object {
-            fun from(presentation: Presentation): ListItem {
+            fun from(presentation: Presentation, thumbnailPath: String?): ListItem {
                 val id = presentation.id ?: throw RuntimeException()
                 val createdAt = presentation.createdAt ?: throw RuntimeException()
+                val modifiedAt = presentation.modifiedAt ?: throw RuntimeException()
 
                 return ListItem(
                     id,
                     presentation.title,
                     presentation.getDDay(),
                     PresentationTime.from(presentation.timeLimit),
-                    createdAt
+                    thumbnailPath,
+                    createdAt,
+                    modifiedAt,
                 )
             }
         }

presentation-api/src/main/kotlin/org/kkeunkkeun/pregen/presentation/presentation/presentation/PresentationResponse.kt

@@ -65,7 +65,7 @@ class PresentationResponse {
     ) {
         companion object {
             fun from(slides: List<Slide>): List<SlideDetail> {
-                return slides.map { slide -> SlideDetail(slide.id!!, slide.imageFilePath(), slide.script, slide.memo) }
+                return slides.map { slide -> SlideDetail(slide.id!!, slide.imageFilePath, slide.script, slide.memo) }
             }
         }
     }

presentation-api/src/main/kotlin/org/kkeunkkeun/pregen/presentation/presentation/service/PresentationService.kt

@@ -15,6 +15,7 @@ class PresentationService(
     private val presentationRepository: PresentationRepository,
     private val accountRepository: AccountRepository,
     private val presentationAccessChecker: PresentationAccessChecker,
+    private val thumbnailResolver: PresentationThumbnailResolver
 ) {
 
     fun findListByAccountId(email: String, pageable: Pageable): Page<PresentationListResponse.ListItem> {
@@ -63,6 +64,7 @@ class PresentationService(
     }
 
     private fun generateListItem(presentation: Presentation): PresentationListResponse.ListItem {
-        return PresentationListResponse.ListItem.from(presentation)
+        val thumbnailPath = thumbnailResolver.findThumbnail(presentation.id!!)
+        return PresentationListResponse.ListItem.from(presentation, thumbnailPath)
     }
 }

presentation-api/src/main/kotlin/org/kkeunkkeun/pregen/presentation/presentation/service/PresentationThumbnailResolver.kt

@@ -0,0 +1,21 @@
+package org.kkeunkkeun.pregen.presentation.presentation.service
+
+import org.kkeunkkeun.pregen.presentation.practice.service.PracticeRepository
+import org.kkeunkkeun.pregen.presentation.slide.service.SlideRepository
+import org.springframework.stereotype.Service
+import org.springframework.transaction.annotation.Transactional
+
+@Service
+@Transactional(readOnly = true)
+class PresentationThumbnailResolver(
+    private val practiceRepository: PracticeRepository,
+    private val slideRepository: SlideRepository,
+) {
+
+    fun findThumbnail(presentationId: Long): String? {
+        return practiceRepository.findLatestByPresentationId(presentationId)
+            .let { practice ->
+                slideRepository.findFirstByPracticeId(practice.id!!)
+            }?.imageFilePath
+    }
+}

presentation-api/src/main/kotlin/org/kkeunkkeun/pregen/presentation/slide/domain/Slide.kt

@@ -29,16 +29,15 @@ class Slide(
     var practiceId: Long? = practiceId
         protected set
 
+    val imageFilePath: String?
+        get() = imageFile?.absolutePath
+
     companion object {
         fun from(practiceId: Long, imageFile: File?, request: PresentationRequest.SlideRequest): Slide {
             return Slide(practiceId, imageFile, request.script, request.memo)
         }
     }
 
-    fun imageFilePath(): String? {
-        return imageFile?.absolutePath
-    }
-
     fun unmap() {
         this.practiceId = null
     }

presentation-api/src/main/kotlin/org/kkeunkkeun/pregen/presentation/slide/infrastructure/SlideJpaRepository.kt

@@ -6,4 +6,6 @@ import org.springframework.data.jpa.repository.JpaRepository
 interface SlideJpaRepository: JpaRepository<Slide, Long> {
 
     fun findByPracticeId(practiceId: Long): List<Slide>
+
+    fun findFirstByPracticeId(practiceId: Long): Slide?
 }

presentation-api/src/main/kotlin/org/kkeunkkeun/pregen/presentation/slide/infrastructure/SlideRepositoryImpl.kt

@@ -13,6 +13,10 @@ class SlideRepositoryImpl(
         return slideJpaRepository.findByPracticeId(practiceId)
     }
 
+    override fun findFirstByPracticeId(practiceId: Long): Slide? {
+        return slideJpaRepository.findFirstByPracticeId(practiceId)
+    }
+
     override fun saveAll(slides: List<Slide>) {
         slideJpaRepository.saveAll(slides)
     }

presentation-api/src/main/kotlin/org/kkeunkkeun/pregen/presentation/slide/service/SlideRepository.kt

@@ -6,5 +6,7 @@ interface SlideRepository {
 
     fun findByPracticeId(practiceId: Long): List<Slide>
 
+    fun findFirstByPracticeId(practiceId: Long): Slide?
+
     fun saveAll(slides: List<Slide>)
 }

presentation-api/src/main/kotlin/org/kkeunkkeun/pregen/presentation/slide/service/SlideService.kt

@@ -1,5 +1,6 @@
 package org.kkeunkkeun.pregen.presentation.slide.service
 
+import org.kkeunkkeun.pregen.presentation.file.service.FileRepository
 import org.kkeunkkeun.pregen.presentation.presentation.presentation.PresentationRequest
 import org.kkeunkkeun.pregen.presentation.slide.domain.Slide
 import org.springframework.stereotype.Service
@@ -9,6 +10,7 @@ import org.springframework.transaction.annotation.Transactional
 @Transactional(readOnly = true)
 class SlideService(
     private val slideRepository: SlideRepository,
+    private val fileRepository: FileRepository,
 ) {
 
     fun findByPracticeId(practiceId: Long): List<Slide> {
@@ -17,11 +19,19 @@ class SlideService(
 
     @Transactional
     fun saveAll(practiceId: Long, slideRequests: List<PresentationRequest.SlideRequest>) {
-        val slides = slideRequests.map { request -> Slide.from(practiceId, null, request) } // TODO: add file
+        val slides = slideRequests.map { request -> mapToSlideEntity(practiceId, request) }
 
         slideRepository.saveAll(slides)
     }
 
+    private fun mapToSlideEntity(practiceId: Long, slideRequest: PresentationRequest.SlideRequest): Slide {
+        return Slide.from(
+            practiceId = practiceId,
+            imageFile = fileRepository.findById(slideRequest.imageFileId),
+            request = slideRequest
+        )
+    }
+
     @Transactional
     fun overwrite(practiceId: Long, slideRequests: List<PresentationRequest.SlideRequest>) {
         this.findByPracticeId(practiceId)