feat :: os Type을 not null하게 수정

Author: 1210thatman

src/main/kotlin/dsm/pick2024/domain/admin/presentation/dto/request/AdminLoginRequest.kt

@@ -6,5 +6,5 @@ data class AdminLoginRequest(
     val adminId: String,
     val password: String,
     val deviceToken: String?,
-    val os: OSType?
+    val os: OSType
 )

src/main/kotlin/dsm/pick2024/domain/admin/presentation/dto/request/AdminSignUpRequest.kt

@@ -23,5 +23,5 @@ data class AdminSignUpRequest(
     @field:NotBlank
     @field:Size(min = 6, max = 6)
     val secretKey: String,
-    val os: OSType?
+    val os: OSType
 )

src/main/kotlin/dsm/pick2024/domain/admin/service/AdminLoginService.kt

@@ -31,17 +31,13 @@ class AdminLoginService(
         }
 
         request.deviceToken?.let { token ->
-            request.os?.let {
+            adminDeviceTokenPort.save(
                 AdminDeviceToken(
                     adminId = admin.id,
                     deviceToken = token,
-                    os = it
+                    os = request.os
                 )
-            }?.let {
-                adminDeviceTokenPort.save(
-                    it
-                )
-            }
+            )
         }
 
         return jwtTokenProvider.generateToken(request.adminId, admin.role.name)

src/main/kotlin/dsm/pick2024/domain/admin/service/AdminSignUpService.kt

@@ -43,18 +43,14 @@ class AdminSignUpService(
         val savedAdmin = adminSavePort.save(admin)
 
         request.deviceToken?.let { token ->
-            request.os?.let {
+            adminDeviceTokenPort.save(
                 AdminDeviceToken(
                     id = UUID.randomUUID(),
                     adminId = savedAdmin.id,
                     deviceToken = token,
-                    os = it
+                    os = request.os
                 )
-            }?.let {
-                adminDeviceTokenPort.save(
-                    it
-                )
-            }
+            )
         }
 
         return jwtTokenProvider.generateToken(request.accountId, Role.SCH.name)

src/main/kotlin/dsm/pick2024/domain/user/presentation/dto/request/UserLoginRequest.kt

@@ -6,5 +6,5 @@ data class UserLoginRequest(
     val accountId: String,
     val password: String,
     val deviceToken: String?,
-    val os: OSType?
+    val os: OSType
 )

src/main/kotlin/dsm/pick2024/domain/user/presentation/dto/request/UserSignUpRequest.kt

@@ -28,5 +28,5 @@ data class UserSignUpRequest(
     @field:Size(min = 6, max = 6)
     val code: String,
     val deviceToken: String?,
-    val os: OSType?
+    val os: OSType
 )

src/main/kotlin/dsm/pick2024/domain/user/service/UserLoginService.kt

@@ -29,15 +29,13 @@ class UserLoginService(
             throw PasswordMissMatchException
         }
 
-        val token = request.deviceToken
-        val os = request.os
-        if (token != null && os != null) {
+        request.deviceToken?.let { token ->
             saveUserDeviceTokenPort.save(
                 UserDeviceToken(
                     id = UUID.randomUUID(),
                     userId = user.id,
                     deviceToken = token,
-                    os = os
+                    os = request.os
                 )
             )
         }

src/main/kotlin/dsm/pick2024/domain/user/service/UserSignUpService.kt

@@ -51,18 +51,14 @@ class UserSignUpService(
         val savedUser = savePort.save(user)
 
         request.deviceToken?.let { token ->
-            request.os?.let {
+            saveUserDeviceTokenPort.save(
                 UserDeviceToken(
                     id = UUID.randomUUID(),
                     userId = savedUser.id,
                     deviceToken = token,
-                    os = it
+                    os = request.os
                 )
-            }?.let {
-                saveUserDeviceTokenPort.save(
-                    it
-                )
-            }
+            )
         }
 
         setupInitialData(savedUser)