chore: (#261) validation 추가

Team-ComIT · Dec 30, 2022 · 8ca4c39 · 8ca4c39
1 parent 7acb34a
commit 8ca4c39
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 14 deletions.
diff --git a/...entation/src/main/kotlin/team/comit/simtong/domain/notification/NotificationWebAdapter.kt b/...entation/src/main/kotlin/team/comit/simtong/domain/notification/NotificationWebAdapter.kt
@@ -26,10 +26,10 @@ class NotificationWebAdapter(
     @PostMapping
     fun sendNotification(@RequestBody @Valid request: SendNotificationWebRequest) {
         sendNotificationUseCase.execute(
-            userId = request.userId,
-            title = request.title,
-            content = request.content,
-            type = request.type.name,
+            userId = request.userId!!,
+            title = request.title!!,
+            content = request.content!!,
+            type = request.type!!.name,
             identify = request.identify
         )
     }
@@ -38,9 +38,9 @@ class NotificationWebAdapter(
     fun sendMultiNotification(@RequestBody @Valid request: SendMultiNotificationWebRequest) {
         sendNotificationUseCase.execute(
             userIds = request.userIds,
-            title = request.title,
-            content = request.content,
-            type = request.type.name,
+            title = request.title!!,
+            content = request.content!!,
+            type = request.type!!.name,
             identify = request.identify
         )
     }

diff --git a/.../src/main/kotlin/team/comit/simtong/domain/notification/dto/SendNotificationWebRequest.kt b/.../src/main/kotlin/team/comit/simtong/domain/notification/dto/SendNotificationWebRequest.kt
@@ -1,6 +1,8 @@
 package team.comit.simtong.domain.notification.dto
 
 import java.util.UUID
+import javax.validation.constraints.NotBlank
+import javax.validation.constraints.NotNull
 
 /**
  *
@@ -11,10 +13,19 @@ import java.util.UUID
  * @version 1.1.0
  **/
 data class SendNotificationWebRequest(
-    val userId: UUID,
-    val title: String,
-    val content: String,
-    val type: WebNotificationType,
+
+    @field:NotNull
+    val userId: UUID?,
+
+    @field:NotBlank
+    val title: String?,
+
+    @field:NotBlank
+    val content: String?,
+
+    @field:NotNull
+    val type: WebNotificationType?,
+
     val identify: UUID?
 )
 
@@ -28,8 +39,15 @@ data class SendNotificationWebRequest(
  **/
 data class SendMultiNotificationWebRequest(
     val userIds: List<UUID>,
-    val title: String,
-    val content: String,
-    val type: WebNotificationType,
+
+    @field:NotBlank
+    val title: String?,
+
+    @field:NotBlank
+    val content: String?,
+
+    @field:NotNull
+    val type: WebNotificationType?,
+
     val identify: UUID?
 )