refactor: (#711) nullable & null체크 추가

team-aliens · Aug 20, 2024 · e2f84d5 · e2f84d5
1 parent 463abed
commit e2f84d5
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 11 deletions.
diff --git a/dms-core/src/main/kotlin/team/aliens/dms/domain/auth/dto/SignInRequest.kt b/dms-core/src/main/kotlin/team/aliens/dms/domain/auth/dto/SignInRequest.kt
@@ -3,5 +3,5 @@ package team.aliens.dms.domain.auth.dto
 data class SignInRequest(
     val accountId: String,
     val password: String,
-    val deviceToken: String
+    val deviceToken: String?
 )
diff --git a/dms-core/src/main/kotlin/team/aliens/dms/domain/auth/usecase/SignInUseCase.kt b/dms-core/src/main/kotlin/team/aliens/dms/domain/auth/usecase/SignInUseCase.kt
@@ -29,16 +29,18 @@ class SignInUseCase(
         )
         val availableFeatures = schoolService.getAvailableFeaturesBySchoolId(user.schoolId)
 
-        if (notificationService.checkDeviceTokenByUserId(user.id))
-            notificationService.deleteDeviceTokenByUserId(user.id)
-
-        notificationService.saveDeviceToken(
-            DeviceToken(
-                userId = user.id,
-                schoolId = user.schoolId,
-                token = request.deviceToken
+        request.deviceToken?.let {
+            if (notificationService.checkDeviceTokenByUserId(user.id))
+                notificationService.deleteDeviceTokenByUserId(user.id)
+
+            notificationService.saveDeviceToken(
+                DeviceToken(
+                    userId = user.id,
+                    schoolId = user.schoolId,
+                    token = request.deviceToken
+                )
             )
-        )
+        }
 
         return TokenFeatureResponse.of(tokenResponse, availableFeatures)
     }

diff --git a/dms-presentation/src/main/kotlin/team/aliens/dms/domain/auth/dto/request/SignInWebRequest.kt b/dms-presentation/src/main/kotlin/team/aliens/dms/domain/auth/dto/request/SignInWebRequest.kt
@@ -13,6 +13,6 @@ data class SignInWebRequest(
     @field:Size(min = 8, max = 20)
     val password: String,
 
-    val deviceToken: String = "default"
+    val deviceToken: String?
 
 )