[BLOOM-041] validation 추가, api 마이너 수정 #46

build.gradle.kts

@@ -35,7 +35,10 @@ dependencies {
     implementation("com.fasterxml.jackson.module:jackson-module-kotlin")
     implementation("org.jetbrains.kotlin:kotlin-reflect")
     runtimeOnly("com.mysql:mysql-connector-j")
-    runtimeOnly("com.h2database:h2")
+    testImplementation("com.h2database:h2")
+
+    // Validation
+    implementation("org.springframework.boot:spring-boot-starter-validation")
 
     // Configuration
     annotationProcessor("org.springframework.boot:spring-boot-configuration-processor")

src/main/kotlin/dnd11th/blooming/api/controller/image/ImageController.kt

@@ -3,14 +3,14 @@ package dnd11th.blooming.api.controller.image
 import dnd11th.blooming.api.dto.image.ImageFavoriteModifyRequest
 import dnd11th.blooming.api.dto.image.ImageSaveRequest
 import dnd11th.blooming.api.service.image.ImageService
+import jakarta.validation.Valid
 import org.springframework.web.bind.annotation.DeleteMapping
 import org.springframework.web.bind.annotation.PatchMapping
 import org.springframework.web.bind.annotation.PathVariable
 import org.springframework.web.bind.annotation.PostMapping
 import org.springframework.web.bind.annotation.RequestBody
 import org.springframework.web.bind.annotation.RequestMapping
 import org.springframework.web.bind.annotation.RestController
-import java.time.LocalDate
 
 @RestController
 @RequestMapping("/api/v1/myplants")
@@ -20,14 +20,16 @@ class ImageController(
     @PostMapping("/{myPlantId}/image")
     override fun saveImage(
         @PathVariable myPlantId: Long,
-        @RequestBody request: ImageSaveRequest,
-    ) = imageService.saveImage(myPlantId, request, LocalDate.now())
+        @RequestBody @Valid request: ImageSaveRequest,
+    ) = imageService.saveImage(myPlantId, request.toImageCreateDto())
 
     @PatchMapping("/image/{imageId}")
     override fun modifyFavorite(
         @PathVariable imageId: Long,
-        @RequestBody request: ImageFavoriteModifyRequest,
-    ) = imageService.modifyFavorite(imageId, request)
+        @RequestBody @Valid request: ImageFavoriteModifyRequest,
+    ) {
+        imageService.modifyFavorite(imageId, request.favorite!!)
+    }
 
     @DeleteMapping("/image/{imageId}")
     override fun deleteImage(

src/main/kotlin/dnd11th/blooming/api/controller/location/LocationController.kt

@@ -5,6 +5,7 @@ import dnd11th.blooming.api.dto.location.LocationResponse
 import dnd11th.blooming.api.dto.location.LocationSaveRequest
 import dnd11th.blooming.api.dto.location.LocationSaveResponse
 import dnd11th.blooming.api.service.location.LocationService
+import jakarta.validation.Valid
 import org.springframework.web.bind.annotation.DeleteMapping
 import org.springframework.web.bind.annotation.GetMapping
 import org.springframework.web.bind.annotation.PatchMapping
@@ -21,16 +22,16 @@ class LocationController(
 ) : LocationApi {
     @PostMapping
     override fun saveLocation(
-        @RequestBody request: LocationSaveRequest,
-    ): LocationSaveResponse = locationService.saveLocation(request)
+        @RequestBody @Valid request: LocationSaveRequest,
+    ): LocationSaveResponse = locationService.saveLocation(request.toLocationCreateDto())
 
     @GetMapping
     override fun findAllLocation(): List<LocationResponse> = locationService.findAllLocation()
 
     @PatchMapping("/{locationId}")
     override fun modifyLocation(
         @PathVariable locationId: Long,
-        @RequestBody request: LocationModifyRequest,
+        @RequestBody @Valid request: LocationModifyRequest,
     ): LocationResponse = locationService.modifyLocation(locationId, request)
 
     @DeleteMapping("/{locationId}")

src/main/kotlin/dnd11th/blooming/api/controller/myplant/MyPlantController.kt

@@ -11,6 +11,7 @@ import dnd11th.blooming.api.dto.myplant.MyPlantSaveRequest
 import dnd11th.blooming.api.dto.myplant.MyPlantSaveResponse
 import dnd11th.blooming.api.dto.myplant.MyPlantSortParam
 import dnd11th.blooming.api.service.myplant.MyPlantService
+import jakarta.validation.Valid
 import org.springframework.web.bind.annotation.DeleteMapping
 import org.springframework.web.bind.annotation.GetMapping
 import org.springframework.web.bind.annotation.PatchMapping
@@ -29,8 +30,8 @@ class MyPlantController(
 ) : MyPlantApi {
     @PostMapping
     override fun saveMyPlant(
-        @RequestBody request: MyPlantSaveRequest,
-    ): MyPlantSaveResponse = myPlantService.saveMyPlant(request, LocalDate.now())
+        @RequestBody @Valid request: MyPlantSaveRequest,
+    ): MyPlantSaveResponse = myPlantService.saveMyPlant(request.toMyPlantCreateDto(), request.locationId!!)
 
     @GetMapping
     override fun findAllMyPlant(
@@ -48,7 +49,7 @@ class MyPlantController(
     @PatchMapping("/{myPlantId}")
     override fun modifyMyPlant(
         @PathVariable myPlantId: Long,
-        @RequestBody request: MyPlantModifyRequest,
+        @RequestBody @Valid request: MyPlantModifyRequest,
     ) = myPlantService.modifyMyPlant(myPlantId, request)
 
     @DeleteMapping("/{myPlantId}")
@@ -69,12 +70,12 @@ class MyPlantController(
     @PatchMapping("/{myPlantId}/healthcheck")
     override fun modifyMyPlantHealthCheck(
         @PathVariable myPlantId: Long,
-        @RequestBody request: MyPlantHealthCheckRequest,
+        @RequestBody @Valid request: MyPlantHealthCheckRequest,
     ) = myPlantService.modifyMyPlantHealthCheck(myPlantId, request)
 
     @PatchMapping("/{myPlantId}/alarm")
     override fun modifyMyPlantAlarm(
         @PathVariable myPlantId: Long,
-        @RequestBody request: AlarmModifyRequest,
+        @RequestBody @Valid request: AlarmModifyRequest,
     ) = myPlantService.modifyMyPlantAlarm(myPlantId, request)
 }

src/main/kotlin/dnd11th/blooming/api/controller/user/UserController.kt

@@ -4,6 +4,7 @@ import dnd11th.blooming.api.dto.user.IdTokenRequest
 import dnd11th.blooming.api.dto.user.TokenResponse
 import dnd11th.blooming.api.service.user.SocialLoginService
 import dnd11th.blooming.domain.entity.user.OauthProvider
+import jakarta.validation.Valid
 import org.springframework.web.bind.annotation.PathVariable
 import org.springframework.web.bind.annotation.PostMapping
 import org.springframework.web.bind.annotation.RequestBody
@@ -18,7 +19,7 @@ class UserController(
     @PostMapping("/login/{provider}")
     fun login(
         @PathVariable provider: String,
-        @RequestBody idTokenRequest: IdTokenRequest,
+        @RequestBody @Valid idTokenRequest: IdTokenRequest,
     ): TokenResponse {
         return socialLoginService.socialLogin(OauthProvider.from(provider), idTokenRequest.idToken)
     }

src/main/kotlin/dnd11th/blooming/api/dto/home/HomeResponse.kt

@@ -12,6 +12,7 @@ data class HomeResponse(
     @field:Schema(description = "내 식물 정보 리스트")
     val myPlantInfo: List<MyPlantHomeResponse>,
     // TODO : 식물 일러스트 응답 추가 필요
+    // val illustUrl: String,
 ) {
     companion object {
         fun from(

src/main/kotlin/dnd11th/blooming/api/dto/home/MyPlantHomeResponse.kt

@@ -10,7 +10,7 @@ import java.time.LocalDate
 )
 data class MyPlantHomeResponse(
     @field:Schema(description = "내 식물 ID", example = "1")
-    val myPlantId: Long,
+    val myPlantId: Long?,
     @field:Schema(description = "내 식물 별명", example = "뿡뿡이")
     val nickname: String,
     @field:Schema(description = "내 식물 학명", example = "몬스테라 델리오사")

src/main/kotlin/dnd11th/blooming/api/dto/image/ImageCreateDto.kt

@@ -0,0 +1,5 @@
+package dnd11th.blooming.api.dto.image
+
+data class ImageCreateDto(
+    val url: String,
+)

src/main/kotlin/dnd11th/blooming/api/dto/image/ImageFavoriteModifyRequest.kt

@@ -1,12 +1,14 @@
 package dnd11th.blooming.api.dto.image
 
 import io.swagger.v3.oas.annotations.media.Schema
+import jakarta.validation.constraints.NotNull
 
 @Schema(
     name = "Image Favorite Modify Request",
     description = "이미지 즐겨찾기 수정 요청",
 )
 data class ImageFavoriteModifyRequest(
     @field:Schema(description = "즐겨찾기 여부", example = "true")
-    val favorite: Boolean,
+    @field:NotNull(message = "즐겨찾기 여부는 필수값입니다.")
+    val favorite: Boolean?,
 )

src/main/kotlin/dnd11th/blooming/api/dto/image/ImageResponse.kt

@@ -21,7 +21,7 @@ data class ImageResponse(
             ImageResponse(
                 imageUrl = image.url,
                 favorite = image.favorite,
-                createdDate = image.createdDate,
+                createdDate = image.createdDate.toLocalDate(),
             )
 
         fun fromList(images: List<Image>): List<ImageResponse> =

src/main/kotlin/dnd11th/blooming/api/dto/image/ImageSaveRequest.kt

@@ -1,27 +1,19 @@
 package dnd11th.blooming.api.dto.image
 
-import dnd11th.blooming.domain.entity.Image
-import dnd11th.blooming.domain.entity.MyPlant
 import io.swagger.v3.oas.annotations.media.Schema
-import java.time.LocalDate
+import jakarta.validation.constraints.NotBlank
 
 @Schema(
     name = "Image Save Request",
     description = "이미지를 저장하는 요청",
 )
 data class ImageSaveRequest(
     @field:Schema(description = "이미지 URL", example = "image.com/17")
-    val imageUrl: String,
+    @field:NotBlank(message = "URL은 필수값입니다.")
+    val imageUrl: String?,
 ) {
-    fun toImage(
-        myPlant: MyPlant,
-        now: LocalDate,
-    ): Image =
-        Image(
-            url = imageUrl,
-            favorite = false,
-            currentDate = now,
-        ).also {
-            it.setMyPlantRelation(myPlant)
-        }
+    fun toImageCreateDto(): ImageCreateDto =
+        ImageCreateDto(
+            url = imageUrl!!,
+        )
 }

src/main/kotlin/dnd11th/blooming/api/dto/location/LocationCreateDto.kt

@@ -0,0 +1,5 @@
+package dnd11th.blooming.api.dto.location
+
+data class LocationCreateDto(
+    val name: String,
+)

src/main/kotlin/dnd11th/blooming/api/dto/location/LocationModifyRequest.kt

@@ -1,12 +1,14 @@
 package dnd11th.blooming.api.dto.location
 
 import io.swagger.v3.oas.annotations.media.Schema
+import jakarta.validation.constraints.NotBlank
 
 @Schema(
     name = "Location Modify Request",
     description = "위치 수정 요청",
 )
 data class LocationModifyRequest(
     @field:Schema(description = "수정할 위치 이름", example = "거실")
-    val name: String,
+    @field:NotBlank(message = "새로운 위치명은 필수값입니다.")
+    val name: String?,
 )

src/main/kotlin/dnd11th/blooming/api/dto/location/LocationResponse.kt

@@ -9,7 +9,7 @@ import io.swagger.v3.oas.annotations.media.Schema
 )
 data class LocationResponse(
     @field:Schema(description = "위치 ID", example = "3")
-    val id: Long,
+    val id: Long?,
     @field:Schema(description = "위치 이름", example = "베란다")
     val name: String,
 ) {

src/main/kotlin/dnd11th/blooming/api/dto/location/LocationSaveRequest.kt

@@ -1,18 +1,19 @@
 package dnd11th.blooming.api.dto.location
 
-import dnd11th.blooming.domain.entity.Location
 import io.swagger.v3.oas.annotations.media.Schema
+import jakarta.validation.constraints.NotBlank
 
 @Schema(
     name = "Location Save Request",
     description = "위치 저장 요청",
 )
 data class LocationSaveRequest(
+    @field:NotBlank(message = "새로운 위치명은 필수값입니다.")
     @field:Schema(description = "새로운 위치 이름", example = "부엌")
-    val name: String,
+    val name: String?,
 ) {
-    fun toLocation(): Location =
-        Location(
-            name = name,
+    fun toLocationCreateDto(): LocationCreateDto =
+        LocationCreateDto(
+            name = name!!,
         )
 }

src/main/kotlin/dnd11th/blooming/api/dto/location/LocationSaveResponse.kt

@@ -9,7 +9,7 @@ import io.swagger.v3.oas.annotations.media.Schema
 )
 class LocationSaveResponse(
     @field:Schema(description = "저장된 위치 ID", example = "4")
-    val id: Long,
+    val id: Long?,
     @field:Schema(description = "위치 이름", example = "부엌")
     val name: String,
 ) {

src/main/kotlin/dnd11th/blooming/api/dto/myplant/AlarmModifyRequest.kt

@@ -2,29 +2,33 @@ package dnd11th.blooming.api.dto.myplant
 
 import dnd11th.blooming.domain.entity.Alarm
 import io.swagger.v3.oas.annotations.media.Schema
+import jakarta.validation.constraints.NotNull
 
 @Schema(
     name = "Alarm Modify Request",
     description = "알림 수정 요청",
 )
 data class AlarmModifyRequest(
     @field:Schema(description = "물주기 알림 여부", example = "true")
-    val waterAlarm: Boolean,
+    @field:NotNull(message = "물주기 알림 여부는 필수값입니다.")
+    val waterAlarm: Boolean?,
     @field:Schema(description = "물주기 알림 주기", example = "4")
     val waterPeriod: Int?,
     @field:Schema(description = "비료주기 알림 여부", example = "false")
-    val fertilizerAlarm: Boolean,
+    @field:NotNull(message = "비료주기 알림 여부는 필수값입니다.")
+    val fertilizerAlarm: Boolean?,
     @field:Schema(description = "비료주기 알림 주기", example = "45")
     val fertilizerPeriod: Int?,
     @field:Schema(description = "건강확인 알림 여부", example = "true")
-    val healthCheckAlarm: Boolean,
+    @field:NotNull(message = "건강확인 알림 여부는 필수값입니다.")
+    val healthCheckAlarm: Boolean?,
 ) {
     fun toAlarm(): Alarm =
         Alarm(
-            waterAlarm = waterAlarm,
+            waterAlarm = waterAlarm!!,
             waterPeriod = waterPeriod,
-            fertilizerAlarm = fertilizerAlarm,
+            fertilizerAlarm = fertilizerAlarm!!,
             fertilizerPeriod = fertilizerPeriod,
-            healthCheckAlarm = healthCheckAlarm,
+            healthCheckAlarm = healthCheckAlarm!!,
         )
 }

src/main/kotlin/dnd11th/blooming/api/dto/myplant/MyPlantCreateDto.kt

@@ -0,0 +1,15 @@
+package dnd11th.blooming.api.dto.myplant
+
+import java.time.LocalDate
+
+data class MyPlantCreateDto(
+    val nickname: String,
+    val startDate: LocalDate,
+    val lastWateredDate: LocalDate,
+    val lastFertilizerDate: LocalDate,
+    val waterAlarm: Boolean,
+    val waterPeriod: Int?,
+    val fertilizerAlarm: Boolean,
+    val fertilizerPeriod: Int?,
+    val healthCheckAlarm: Boolean,
+)

src/main/kotlin/dnd11th/blooming/api/dto/myplant/MyPlantHealthCheckRequest.kt

@@ -1,12 +1,14 @@
 package dnd11th.blooming.api.dto.myplant
 
 import io.swagger.v3.oas.annotations.media.Schema
+import jakarta.validation.constraints.NotNull
 
 @Schema(
     name = "HealthCheck Alarm Modify Request",
     description = "건강확인 알림 변경 요청",
 )
 data class MyPlantHealthCheckRequest(
     @field:Schema(description = "건강확인 알림 여부", example = "true")
-    val healthCheck: Boolean,
+    @field:NotNull(message = "건강확인 알림 여부는 필수값입니다.")
+    val healthCheck: Boolean?,
 )

src/main/kotlin/dnd11th/blooming/api/dto/myplant/MyPlantIdWithImageUrl.kt

@@ -0,0 +1,6 @@
+package dnd11th.blooming.api.dto.myplant
+
+data class MyPlantIdWithImageUrl(
+    val imageUrl: String,
+    val myPlantId: Long,
+)

src/main/kotlin/dnd11th/blooming/api/dto/myplant/MyPlantModifyRequest.kt

@@ -1,6 +1,7 @@
 package dnd11th.blooming.api.dto.myplant
 
 import io.swagger.v3.oas.annotations.media.Schema
+import jakarta.validation.constraints.PastOrPresent
 import java.time.LocalDate
 
 @Schema(
@@ -13,9 +14,12 @@ data class MyPlantModifyRequest(
     @field:Schema(description = "변경할 위치 ID", example = "4")
     val locationId: Long?,
     @field:Schema(description = "변경할 키우기 시작한 날짜", example = "2024-05-17")
+    @field:PastOrPresent(message = "키우기 시작한 날짜는 미래일 수 없습니다.")
     val startDate: LocalDate?,
     @field:Schema(description = "변경할 마지막으로 물 준 날짜", example = "2024-05-17")
+    @field:PastOrPresent(message = "마지막으로 물 준 날짜는 미래일 수 없습니다.")
     val lastWateredDate: LocalDate?,
     @field:Schema(description = "변경할 마지막으로 비료 준 날짜", example = "2024-05-17")
+    @field:PastOrPresent(message = "마지막으로 비료 준 날짜는 미래일 수 없습니다.")
     val lastFertilizerDate: LocalDate?,
 )