fix: rename validate username to username available

meetacy · Oct 19, 2023 · 3c47b57 · 3c47b57
1 parent 21b5334
commit 3c47b57
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 27 deletions.
diff --git a/api/api-ktor/src/commonMain/kotlin/app/meetacy/sdk/engine/ktor/KtorMeetacyEngine.kt b/api/api-ktor/src/commonMain/kotlin/app/meetacy/sdk/engine/ktor/KtorMeetacyEngine.kt
@@ -71,7 +71,7 @@ public class KtorMeetacyEngine(
             is GetMeRequest -> users.getMe(request) as T
             is GetUserRequest -> users.getUser(request) as T
             is EditUserRequest -> users.editUser(request) as T
-            is ValidateUsernameRequest -> users.validateUsername(request) as T
+            is UsernameAvailableRequest -> users.usernameAvailable(request) as T
             // meetings
             is ListMeetingsHistoryRequest -> meetings.listMeetingsHistory(request) as T
             is ListActiveMeetingsRequest -> meetings.listActiveMeetings(request) as T

diff --git a/api/api-ktor/src/commonMain/kotlin/app/meetacy/sdk/engine/ktor/requests/users/UsersEngine.kt b/api/api-ktor/src/commonMain/kotlin/app/meetacy/sdk/engine/ktor/requests/users/UsersEngine.kt
@@ -5,7 +5,7 @@ import app.meetacy.sdk.engine.ktor.mapToUser
 import app.meetacy.sdk.engine.requests.EditUserRequest
 import app.meetacy.sdk.engine.requests.GetMeRequest
 import app.meetacy.sdk.engine.requests.GetUserRequest
-import app.meetacy.sdk.engine.requests.ValidateUsernameRequest
+import app.meetacy.sdk.engine.requests.UsernameAvailableRequest
 import app.meetacy.sdk.exception.meetacyApiError
 import app.meetacy.sdk.types.annotation.UnsafeConstructor
 import app.meetacy.sdk.types.optional.ifPresent
@@ -85,7 +85,6 @@ internal class UsersEngine(
                     text = jsonObject.toString(),
                     contentType = ContentType.Application.Json
                 )
-
             )
 
         }.body<String>()
@@ -96,14 +95,14 @@ internal class UsersEngine(
     }
 
     @OptIn(UnsafeConstructor::class)
-    suspend fun validateUsername(request: ValidateUsernameRequest): ValidateUsernameRequest.Response {
+    suspend fun usernameAvailable(request: UsernameAvailableRequest): UsernameAvailableRequest.Response {
         val response = base.usersValidatePost(
             validateUsernameRequest = GeneratedValidateUsernameRequest(
                 username = request.username.string
             ),
             apiVersion = request.apiVersion.int.toString()
         )
 
-        return ValidateUsernameRequest.Response(username = Username(response.username))
+        return UsernameAvailableRequest.Response(username = Username(response.username))
     }
 }
diff --git a/...ngine/requests/ValidateUsernameRequest.kt → ...gine/requests/UsernameAvailableRequest.kt b/...ngine/requests/ValidateUsernameRequest.kt → ...gine/requests/UsernameAvailableRequest.kt
@@ -2,8 +2,8 @@ package app.meetacy.sdk.engine.requests
 
 import app.meetacy.sdk.types.user.Username
 
-public data class ValidateUsernameRequest(
+public data class UsernameAvailableRequest(
     val username: Username
-) : MeetacyRequest<ValidateUsernameRequest.Response> {
+) : MeetacyRequest<UsernameAvailableRequest.Response> {
     public data class Response(val username: Username)
 }
diff --git a/api/src/commonMain/kotlin/app/meetacy/sdk/users/AuthorizedUsersApi.kt b/api/src/commonMain/kotlin/app/meetacy/sdk/users/AuthorizedUsersApi.kt
@@ -41,9 +41,7 @@ public class AuthorizedUsersApi(private val api: AuthorizedMeetacyApi) {
         )
     }
 
-    public suspend fun validateUsername(
-        username: String
-    ): Username {
-        return base.validateUsername(username)
+    public suspend fun usernameAvailable(username: Username): Username {
+        return base.usernameAvailable(username)
     }
 }
diff --git a/api/src/commonMain/kotlin/app/meetacy/sdk/users/RegularUserRepository.kt b/api/src/commonMain/kotlin/app/meetacy/sdk/users/RegularUserRepository.kt
@@ -26,9 +26,7 @@ public class RegularUserRepository(
         api.friends.delete(token, data.id)
     }
 
-    public suspend fun validateUsername(
-        username: String
-    ): Username {
-        return api.users.validateUsername(username)
+    public suspend fun usernameAvailable(username: Username): Username {
+        return api.users.usernameAvailable(username)
     }
 }
diff --git a/api/src/commonMain/kotlin/app/meetacy/sdk/users/SelfUserRepository.kt b/api/src/commonMain/kotlin/app/meetacy/sdk/users/SelfUserRepository.kt
@@ -51,9 +51,7 @@ public class SelfUserRepository(
         avatarId: Optional<FileId?> = Optional.Undefined
     ): SelfUserRepository = api.users.edit(token, nickname, username, avatarId)
 
-    public suspend fun validateUsername(
-        username: String
-    ): Username {
-        return api.users.validateUsername(username)
+    public suspend fun usernameAvailable(username: Username): Username {
+        return api.users.usernameAvailable(username)
     }
 }
diff --git a/api/src/commonMain/kotlin/app/meetacy/sdk/users/UsersApi.kt b/api/src/commonMain/kotlin/app/meetacy/sdk/users/UsersApi.kt
@@ -3,8 +3,7 @@ package app.meetacy.sdk.users
 import app.meetacy.sdk.MeetacyApi
 import app.meetacy.sdk.engine.requests.EditUserRequest
 import app.meetacy.sdk.engine.requests.GetUserRequest
-import app.meetacy.sdk.engine.requests.ValidateUsernameRequest
-import app.meetacy.sdk.types.annotation.UnsafeConstructor
+import app.meetacy.sdk.engine.requests.UsernameAvailableRequest
 import app.meetacy.sdk.types.auth.Token
 import app.meetacy.sdk.types.file.FileId
 import app.meetacy.sdk.types.optional.Optional
@@ -49,12 +48,8 @@ public class UsersApi(private val api: MeetacyApi) {
         )
     }
 
-    @OptIn(UnsafeConstructor::class)
-    public suspend fun validateUsername(
-        username: String
-    ): Username {
-        val result = api.engine.execute(ValidateUsernameRequest(username = Username(username)))
-
+    public suspend fun usernameAvailable(username: Username): Username {
+        val result = api.engine.execute(UsernameAvailableRequest(username))
         return result.username
     }
 }