Get user by username

api/api-ktor/src/commonMain/kotlin/app/meetacy/sdk/engine/ktor/KtorMeetacyEngine.kt

@@ -127,7 +127,8 @@ public class KtorMeetacyEngine(
             is EmitFriendsLocationRequest -> friends.streamFriendsLocation(request) as T
             // users
             is GetMeRequest -> users.getMe(request) as T
-            is GetUserRequest -> users.getUser(request) as T
+            is GetUserByIdRequest -> users.getUserById(request) as T
+            is GetUserByUsernameRequest -> users.getUserByUsername(request) as T
             is EditUserRequest -> users.editUser(request) as T
             is UsernameAvailableRequest -> users.usernameAvailable(request) as T
             // meetings

api/api-ktor/src/commonMain/kotlin/app/meetacy/sdk/engine/ktor/exception/getException.kt

@@ -3,6 +3,7 @@ package app.meetacy.sdk.engine.ktor.exception
 import app.meetacy.sdk.engine.ktor.response.ServerResponse
 import app.meetacy.sdk.exception.MeetacyInternalException
 import app.meetacy.sdk.exception.MeetacyUnauthorizedException
+import app.meetacy.sdk.exception.MeetacyUserNotFoundException
 import app.meetacy.sdk.exception.MeetacyUsernameAlreadyOccupiedException
 
 internal fun getException(
@@ -11,6 +12,7 @@ internal fun getException(
     return when (error.errorCode) {
         MeetacyUnauthorizedException.CODE -> MeetacyUnauthorizedException(error.errorMessage)
         MeetacyUsernameAlreadyOccupiedException.CODE -> MeetacyUsernameAlreadyOccupiedException(error.errorMessage)
+        MeetacyUserNotFoundException.CODE -> MeetacyUserNotFoundException(error.errorMessage)
         else -> MeetacyInternalException(error.errorMessage)
     }
 }

api/api-ktor/src/commonMain/kotlin/app/meetacy/sdk/engine/ktor/requests/users/UsersEngine.kt

@@ -3,10 +3,7 @@ package app.meetacy.sdk.engine.ktor.requests.users
 import app.meetacy.sdk.engine.ktor.apiVersion
 import app.meetacy.sdk.engine.ktor.response.bodyAsSuccess
 import app.meetacy.sdk.engine.ktor.token
-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.UsernameAvailableRequest
+import app.meetacy.sdk.engine.requests.*
 import app.meetacy.sdk.types.optional.map
 import app.meetacy.sdk.types.serializable.file.FileIdSerializable
 import app.meetacy.sdk.types.serializable.file.serializable
@@ -26,32 +23,33 @@ internal class UsersEngine(
 ) {
     private val baseUrl = baseUrl / "users"
 
-    private fun toBody() = GetUserBody(null)
-
     suspend fun getMe(request: GetMeRequest): GetMeRequest.Response {
         val url = baseUrl / "get"
-        val body = toBody()
-        val response = httpClient.post(url.string) {
+        val response = httpClient.get(url.string) {
             apiVersion(request.apiVersion)
             token(request.token)
-            setBody(body)
         }.bodyAsSuccess<UserDetailsSerializable>()
         return GetMeRequest.Response(response.type() as SelfUserDetails)
     }
 
-    @Serializable
-    private data class GetUserBody(val id: UserIdSerializable?)
-    private fun GetUserRequest.toBody() = GetUserBody(userId?.serializable())
+    suspend fun getUserById(request: GetUserByIdRequest): GetUserByIdRequest.Response {
+        val url = baseUrl / "get"
+        val response = httpClient.get(url.string) {
+            apiVersion(request.apiVersion)
+            token(request.token)
+            parameter("id", request.userId.string)
+        }.bodyAsSuccess<UserDetailsSerializable>()
+        return GetUserByIdRequest.Response(response.type())
+    }
 
-    suspend fun getUser(request: GetUserRequest): GetUserRequest.Response {
+    suspend fun getUserByUsername(request: GetUserByUsernameRequest): GetUserByUsernameRequest.Response {
         val url = baseUrl / "get"
-        val body = request.toBody()
-        val response = httpClient.post(url.string) {
+        val response = httpClient.get(url.string) {
             apiVersion(request.apiVersion)
             token(request.token)
-            setBody(body)
+            parameter("username", request.username.string)
         }.bodyAsSuccess<UserDetailsSerializable>()
-        return GetUserRequest.Response(response.type())
+        return GetUserByUsernameRequest.Response(response.type())
     }
 
     @Serializable

api/src/commonMain/kotlin/app/meetacy/sdk/engine/requests/GetUserRequest.kt → api/src/commonMain/kotlin/app/meetacy/sdk/engine/requests/GetUserByIdRequest.kt

@@ -4,9 +4,9 @@ import app.meetacy.sdk.types.auth.Token
 import app.meetacy.sdk.types.user.UserDetails
 import app.meetacy.sdk.types.user.UserId
 
-public data class GetUserRequest(
+public data class GetUserByIdRequest(
     val token: Token,
-    val userId: UserId?
-) : MeetacyRequest<GetUserRequest.Response> {
+    val userId: UserId
+) : MeetacyRequest<GetUserByIdRequest.Response> {
     public data class Response(val user: UserDetails)
 }

api/src/commonMain/kotlin/app/meetacy/sdk/engine/requests/GetUserByUsernameRequest.kt

@@ -0,0 +1,13 @@
+package app.meetacy.sdk.engine.requests
+
+import app.meetacy.sdk.types.auth.Token
+import app.meetacy.sdk.types.user.UserDetails
+import app.meetacy.sdk.types.user.UserId
+import app.meetacy.sdk.types.user.Username
+
+public data class GetUserByUsernameRequest(
+    val token: Token,
+    val username: Username
+) : MeetacyRequest<GetUserByUsernameRequest.Response> {
+    public data class Response(val user: UserDetails)
+}

api/src/commonMain/kotlin/app/meetacy/sdk/exception/MeetacyUserNotFoundException.kt

@@ -0,0 +1,11 @@
+package app.meetacy.sdk.exception
+
+public class MeetacyUserNotFoundException(message: String) : MeetacyResponseException(
+    code = CODE,
+    message = message,
+    cause = null
+) {
+    public companion object {
+        public const val CODE: Int = 8
+    }
+}

api/src/commonMain/kotlin/app/meetacy/sdk/users/AuthorizedUsersApi.kt

@@ -1,6 +1,7 @@
 package app.meetacy.sdk.users
 
 import app.meetacy.sdk.AuthorizedMeetacyApi
+import app.meetacy.sdk.engine.requests.GetUserByUsernameRequest
 import app.meetacy.sdk.types.auth.Token
 import app.meetacy.sdk.types.file.FileId
 import app.meetacy.sdk.types.optional.Optional
@@ -24,6 +25,11 @@ public class AuthorizedUsersApi(private val api: AuthorizedMeetacyApi) {
         return AuthorizedUserDetailsRepository.of(user.data, api)
     }
 
+    public suspend fun get(username: Username): AuthorizedUserDetailsRepository {
+        val user = base.get(token, username)
+        return AuthorizedUserDetailsRepository.of(user.data, api)
+    }
+
     public suspend fun edit(
         nickname: String,
         username: Username?,

api/src/commonMain/kotlin/app/meetacy/sdk/users/UsersApi.kt

@@ -2,7 +2,8 @@ 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.GetUserByIdRequest
+import app.meetacy.sdk.engine.requests.GetUserByUsernameRequest
 import app.meetacy.sdk.engine.requests.UsernameAvailableRequest
 import app.meetacy.sdk.types.auth.Token
 import app.meetacy.sdk.types.file.FileId
@@ -20,7 +21,12 @@ import app.meetacy.sdk.types.user.Username
  */
 public class UsersApi(private val api: MeetacyApi) {
     public suspend fun get(token: Token, userId: UserId): UserDetailsRepository {
-        val user = api.engine.execute(GetUserRequest(token, userId)).user
+        val user = api.engine.execute(GetUserByIdRequest(token, userId)).user
+        return UserDetailsRepository.of(user, api)
+    }
+
+    public suspend fun get(token: Token, username: Username): UserDetailsRepository {
+        val user = api.engine.execute(GetUserByUsernameRequest(token, username)).user
         return UserDetailsRepository.of(user, api)
     }
 

gradle/libs.versions.toml

@@ -2,7 +2,7 @@
 
 kotlin = "1.9.0"
 ktor = "2.3.6"
-meetacySdk = "0.0.64"
+meetacySdk = "0.0.65"
 
 # kotlinx
 kotlinxCoroutines = "1.6.4"