更新

app/src/main/java/com/aiosman/riderpro/data/AccountService.kt

@@ -1,8 +1,11 @@
 package com.aiosman.riderpro.data
 
+import com.aiosman.riderpro.data.api.ApiClient
+import com.aiosman.riderpro.data.api.LoginUserRequestBody
+import com.aiosman.riderpro.data.api.RegisterRequestBody
 import com.aiosman.riderpro.test.TestDatabase
 
-data class AccountProfile(
+data class AccountProfileEntity(
     val id: Int,
     val followerCount: Int,
     val followingCount: Int,
@@ -10,33 +13,72 @@ data class AccountProfile(
     val avatar: String,
     val bio: String,
     val country: String,
+    val isFollowing: Boolean
 )
-
+//{
+//    "id": 1,
+//    "username": "root",
+//    "nickname": "rider_4351",
+//    "avatar": "/api/v1/public/default_avatar.jpeg",
+//    "followingCount": 1,
+//    "followerCount": 0
+//}
+data class AccountProfile (
+    val id: Int,
+    val username: String,
+    val nickname: String,
+    val avatar: String,
+    val followingCount: Int,
+    val followerCount: Int,
+    val isFollowing: Boolean
+) {
+    fun toAccountProfileEntity(): AccountProfileEntity {
+        return AccountProfileEntity(
+            id = id,
+            followerCount = followerCount,
+            followingCount = followingCount,
+            nickName = nickname,
+            avatar = ApiClient.BASE_SERVER + avatar,
+            bio = "",
+            country = "Worldwide",
+            isFollowing = isFollowing
+        )
+    }
+}
 interface AccountService {
-    suspend fun getMyAccountProfile(): AccountProfile
-    suspend fun getAccountProfileById(id: Int): AccountProfile
+    suspend fun getMyAccountProfile(): AccountProfileEntity
+    suspend fun getAccountProfileById(id: Int): AccountProfileEntity
     suspend fun getMyAccount(): UserAuth
     suspend fun loginUserWithPassword(loginName: String, password: String): UserAuth
     suspend fun logout()
     suspend fun updateAvatar(uri: String)
     suspend fun updateProfile(nickName: String, bio: String)
+    suspend fun registerUserWithPassword(loginName: String, password: String)
 }
 
 class TestAccountServiceImpl : AccountService {
-    override suspend fun getMyAccountProfile(): AccountProfile {
-        return TestDatabase.accountData.first { it.id == 1 }
+    override suspend fun getMyAccountProfile(): AccountProfileEntity {
+        val resp = ApiClient.api.getMyAccount()
+        val body = resp.body() ?: throw ServiceException("Failed to get account")
+        return body.data.toAccountProfileEntity()
     }
 
-    override suspend fun getAccountProfileById(id: Int): AccountProfile {
-        return TestDatabase.accountData.first { it.id == id }
+    override suspend fun getAccountProfileById(id: Int): AccountProfileEntity {
+        val resp = ApiClient.api.getAccountProfileById(id)
+        val body = resp.body() ?: throw ServiceException("Failed to get account")
+        return body.data.toAccountProfileEntity()
     }
 
     override suspend fun getMyAccount(): UserAuth {
-        return UserAuth(1)
+        val resp = ApiClient.api.checkToken()
+        val body = resp.body() ?: throw ServiceException("Failed to get account")
+        return UserAuth(body.id)
     }
 
     override suspend fun loginUserWithPassword(loginName: String, password: String): UserAuth {
-        return UserAuth(1, "token")
+        val resp = ApiClient.api.login(LoginUserRequestBody(loginName, password))
+        val body = resp.body() ?: throw ServiceException("Failed to login")
+        return UserAuth(0, body.token)
     }
 
     override suspend fun logout() {
@@ -52,6 +94,7 @@ class TestAccountServiceImpl : AccountService {
             }
         }
     }
+
     override suspend fun updateProfile(nickName: String, bio: String) {
         TestDatabase.accountData = TestDatabase.accountData.map {
             if (it.id == 1) {
@@ -61,4 +104,8 @@ class TestAccountServiceImpl : AccountService {
             }
         }
     }
+
+    override suspend fun registerUserWithPassword(loginName: String, password: String) {
+        ApiClient.api.register(RegisterRequestBody(loginName, password))
+    }
 }