feat: 폴더 내부 이미지 조회시 updatedAt dto에 추가

Author: JJhwan7099

src/main/kotlin/com/keeply/api/folder/dto/FolderResponseDTO.kt

@@ -33,10 +33,12 @@ class FolderResponseDTO {
         @Schema(description = "폴더 저장, 미분류 여부")
         val isCategorized: Boolean,
         @Schema(description = "미분류 이미지 삭제 예정 시각")
-        @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss")
-        val scheduledDeleteAt: LocalDate? = null,
+        @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd")
+        val scheduledDeleteAt: LocalDateTime? = null,
         @Schema(description = "미분류 이미지 보관 남은 일수")
         val daysUntilDeletion: Long? = null,
+        @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss")
+        val updatedAt: LocalDateTime? = null,
     )
 
     data class FolderList(

src/main/kotlin/com/keeply/api/folder/service/FolderService.kt

@@ -94,12 +94,13 @@ class FolderService (
 
         val result = folder.images.map { image ->
             FolderResponseDTO.ImageInfo(
-                image.id!!,
-                s3Service.generatePresignedUrl(image.s3Key!!),
-                image.insight,
-                image.tag!!.name,
-                image.isCategorized,
-                image.scheduledDeleteAt,
+                imageId = image.id!!,
+                presignedUrl = s3Service.generatePresignedUrl(image.s3Key!!),
+                insight = image.insight,
+                tag = image.tag?.name,
+                isCategorized = image.isCategorized,
+                scheduledDeleteAt = image.scheduledDeleteAt,
+                updatedAt = image.updatedAt
             )
         }
 
@@ -123,7 +124,8 @@ class FolderService (
                 image.tag?.name,
                 image.isCategorized,
                 image.scheduledDeleteAt,
-                daysUntilDeletion
+                daysUntilDeletion,
+                image.updatedAt
             )
         }
 

src/main/kotlin/com/keeply/api/home/service/HomeService.kt

@@ -40,7 +40,7 @@ class HomeService(
         var scheduledToDeleteImageList: List<ImageInfo> = imagesOrderByUpdatedAtDesc
             .mapNotNull{
                 image ->
-                if(!image.isCategorized && image.scheduledDeleteAt!! == LocalDate.now()) {
+                if(!image.isCategorized && image.scheduledDeleteAt!!.toLocalDate() == LocalDate.now()) {
                     ImageInfo(
                         imageId = image.id!!,
                         presignedUrl = s3Service.generatePresignedUrl(image.s3Key!!),

src/main/kotlin/com/keeply/api/image/controller/ImageController.kt

@@ -53,7 +53,7 @@ class ImageController (
     fun saveImageWithoutFolder(
         @AuthenticationPrincipal userDetails: CustomUserDetails,
         @RequestPart("file") file: MultipartFile,
-        @RequestParam("folder", required = false) folderId: Long?,
+        @RequestParam("folderId", required = false) folderId: Long?,
     ): ResponseEntity<ApiResponse<ImageResponseDTO.SaveResponseDTO>> {
         val apiResponse = if(folderId==null) imageService.saveUncategorizedImage(userDetails.userId, file)
         else imageService.saveImage(userDetails.userId, file, folderId)

src/main/kotlin/com/keeply/api/image/dto/ImageResponseDTO.kt

@@ -2,7 +2,7 @@ package com.keeply.api.image.dto
 
 import com.fasterxml.jackson.annotation.JsonFormat
 import io.swagger.v3.oas.annotations.media.Schema
-import java.time.LocalDate
+import java.time.LocalDateTime
 
 class ImageResponseDTO {
     data class SaveResponseDTO(
@@ -30,7 +30,7 @@ class ImageResponseDTO {
         val isCategorized: Boolean,
         @Schema(description = "미분류 이미지 삭제 예정 시각")
         @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd")
-        val scheduledDeleteAt: LocalDate? = null,
+        val scheduledDeleteAt: LocalDateTime? = null,
         @Schema(description = "미분류 이미지 보관 남은 일수")
         val daysUntilDeletion: Long? = null,
     )

src/main/kotlin/com/keeply/api/image/service/ImageService.kt

@@ -112,7 +112,7 @@ class ImageService (
             base64Image = base64Image,
         )
         image.isCategorized = false
-        image.scheduledDeleteAt = image.createdAt!!.toLocalDate().plusDays(30)
+        image.scheduledDeleteAt = image.createdAt!!.plusDays(30)
         return ApiResponse<ImageResponseDTO.SaveResponseDTO>(
             success = true,
             response = ImageResponseDTO.SaveResponseDTO(

src/main/kotlin/com/keeply/domain/image/entity/Image.kt

@@ -31,7 +31,7 @@ class Image(
     var size: Long = 0,
 
     var isCategorized: Boolean = true,
-    var scheduledDeleteAt: LocalDate? = null
+    var scheduledDeleteAt: LocalDateTime? = null
 
 ) : BaseTimeEntity() {
     companion object {
@@ -46,7 +46,7 @@ class Image(
         private var tag: Tag? = null
         private var size: Long = 0
         private var isCategorized: Boolean = true
-        private var scheduledDeleteAt: LocalDate? = null
+        private var scheduledDeleteAt: LocalDateTime? = null
 
         fun insight(insight: String?) = apply { this.insight = insight }
         fun s3Key(s3Key: String?) = apply { this.s3Key = s3Key }
@@ -55,7 +55,7 @@ class Image(
         fun tag(tag: Tag?) = apply { this.tag = tag }
         fun size(size: Long) = apply { this.size = size }
         fun isCategorized(isCategorized: Boolean) = apply {this.isCategorized = isCategorized }
-        fun scheduledDeleteAt(date: LocalDate?) = apply { this.scheduledDeleteAt = date}
+        fun scheduledDeleteAt(scheduledDeletedAt: LocalDateTime?) = apply { this.scheduledDeleteAt = scheduledDeletedAt}
 
         fun build(): Image = Image(
             insight = insight,