[Feat] users 남은 api 연동

app/build.gradle.kts

@@ -68,6 +68,7 @@ dependencies {
     implementation(libs.kotlinx.serialization.json)
     implementation(libs.coil.compose)
     implementation(libs.foundation)
+    implementation(libs.androidx.datastore.preferences)
     testImplementation(libs.junit)
     androidTestImplementation(libs.androidx.junit)
     androidTestImplementation(libs.androidx.espresso.core)

app/src/main/java/com/texthip/thip/MainActivity.kt

@@ -9,13 +9,18 @@ import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.tooling.preview.Preview
+import com.texthip.thip.data.manager.TokenManager
 import com.texthip.thip.ui.theme.ThipTheme
 import com.texthip.thip.ui.theme.ThipTheme.colors
 import com.texthip.thip.ui.theme.ThipTheme.typography
 import dagger.hilt.android.AndroidEntryPoint
+import javax.inject.Inject
 
 @AndroidEntryPoint
 class MainActivity : ComponentActivity() {
+    @Inject
+    lateinit var tokenManager: TokenManager
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         enableEdgeToEdge()

app/src/main/java/com/texthip/thip/data/manager/TokenManager.kt

@@ -0,0 +1,64 @@
+package com.texthip.thip.data.manager
+
+import android.content.Context
+import androidx.datastore.core.DataStore
+import androidx.datastore.preferences.core.Preferences
+import androidx.datastore.preferences.core.edit
+import androidx.datastore.preferences.core.stringPreferencesKey
+import androidx.datastore.preferences.preferencesDataStore
+import dagger.hilt.android.qualifiers.ApplicationContext
+import kotlinx.coroutines.flow.first
+import kotlinx.coroutines.flow.map
+import javax.inject.Inject
+import javax.inject.Singleton
+
+
+private val Context.dataStore: DataStore<Preferences> by preferencesDataStore(name = "thip_tokens")
+
+@Singleton
+class TokenManager @Inject constructor(
+    @ApplicationContext private val context: Context
+) {
+    // 저장할 데이터의 Key 정의
+    companion object {
+        private val TEMP_TOKEN_KEY = stringPreferencesKey("temp_token")
+        private val ACCESS_TOKEN_KEY = stringPreferencesKey("access_token")
+        private val REFRESH_TOKEN_KEY = stringPreferencesKey("refresh_token")
+    }
+
+    // 임시 토큰 저장
+    suspend fun saveTempToken(token: String) {
+        context.dataStore.edit { prefs ->
+            prefs[TEMP_TOKEN_KEY] = token
+        }
+    }
+
+    // 임시 토큰 읽기
+    suspend fun getTempToken(): String? {
+        return context.dataStore.data.map { prefs ->
+            prefs[TEMP_TOKEN_KEY]
+        }.first() // Flow에서 첫 번째 값을 한번만 읽어옴
+    }
+
+    // 정식 토큰들(Access, Refresh) 저장
+    suspend fun saveAccessTokens(accessToken: String, refreshToken: String) {
+        context.dataStore.edit { prefs ->
+            prefs[ACCESS_TOKEN_KEY] = accessToken
+            prefs[REFRESH_TOKEN_KEY] = refreshToken
+        }
+    }
+
+    // Access Token 읽기 (Flow로 제공하여 토큰 변화를 감지할 수 있게 함)
+    fun getAccessToken(): kotlinx.coroutines.flow.Flow<String?> {
+        return context.dataStore.data.map { prefs ->
+            prefs[ACCESS_TOKEN_KEY]
+        }
+    }
+
+    // 모든 토큰 삭제 (로그아웃 시)
+    suspend fun clearTokens() {
+        context.dataStore.edit { prefs ->
+            prefs.clear()
+        }
+    }
+}

app/src/main/java/com/texthip/thip/data/model/users/request/ProfileUpdateRequest.kt

@@ -0,0 +1,9 @@
+package com.texthip.thip.data.model.users.request
+
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class ProfileUpdateRequest(
+    val nickname: String?,
+    val aliasName: String
+)

app/src/main/java/com/texthip/thip/data/model/users/request/SignupRequest.kt

@@ -0,0 +1,9 @@
+package com.texthip.thip.data.model.users.request
+
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class SignupRequest(
+    val nickname: String,
+    val aliasName: String
+)

app/src/main/java/com/texthip/thip/data/model/users/response/MyFollowingsResponse.kt

@@ -19,4 +19,16 @@ data class FollowingList(
     @SerializedName("aliasName") val aliasName: String,
     @SerializedName("aliasColor") val aliasColor: String,
     @SerializedName("isFollowing") val isFollowing: Boolean
+)
+
+@Serializable
+data class MyRecentFollowingsResponse(
+    @SerializedName("myFollowingUsers") val myFollowingUsers: List<RecentWriterList>
+)
+
+@Serializable
+data class RecentWriterList(
+    @SerializedName("userId") val userId: Long,
+    @SerializedName("nickname") val nickname: String,
+    @SerializedName("profileImageUrl") val profileImageUrl: String?
 )

app/src/main/java/com/texthip/thip/data/model/users/response/OthersFollowersResponse.kt

@@ -1,22 +1,22 @@
 package com.texthip.thip.data.model.users.response
 
+import com.google.gson.annotations.SerializedName
 import kotlinx.serialization.Serializable
 
 @Serializable
 data class OthersFollowersResponse(
-    val followers: List<FollowerList>,
-    val totalFollowerCount: Int,
-    val nextCursor: String?,
-    val isLast: Boolean
+  @SerializedName("followers") val followers: List<FollowerList>,
+  @SerializedName("totalFollowerCount") val totalFollowerCount: Int,
+  @SerializedName("nextCursor") val nextCursor: String?,
+  @SerializedName("isLast") val isLast: Boolean
 )
 
 @Serializable
 data class FollowerList(
-    val userId: Long,
-    val nickname: String,
-    val profileImageUrl: String?,
-    val aliasName: String,
-    val aliasColor: String,
-    val followerCount: Int,
-)
-
+  @SerializedName("userId") val userId: Long,
+  @SerializedName("nickname") val nickname: String,
+  @SerializedName("profileImageUrl") val profileImageUrl: String?,
+  @SerializedName("aliasName") val aliasName: String,
+  @SerializedName("aliasColor") val aliasColor: String,
+  @SerializedName("followerCount") val followerCount: Int
+)

app/src/main/java/com/texthip/thip/data/model/users/response/SignupResponse.kt

@@ -0,0 +1,10 @@
+package com.texthip.thip.data.model.users.response
+
+import com.google.gson.annotations.SerializedName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class SignupResponse(
+    @SerializedName("accessToken") val accessToken: String,
+    @SerializedName("userId") val userId: Long
+)

app/src/main/java/com/texthip/thip/data/model/users/response/UserSearchResponse.kt

@@ -0,0 +1,18 @@
+package com.texthip.thip.data.model.users.response
+
+import com.google.gson.annotations.SerializedName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class UserSearchResponse(
+    val userList: List<UserItem>
+)
+@Serializable
+data class UserItem(
+    @SerializedName("userId") val userId: Int,
+    @SerializedName("nickname") val nickname: String,
+    @SerializedName("profileImageUrl") val profileImageUrl: String?,
+    @SerializedName("aliasName") val aliasName: String,
+    @SerializedName("aliasColor") val aliasColor: String,
+    @SerializedName("followerCount") val followerCount: Int
+)

app/src/main/java/com/texthip/thip/data/repository/UserRepository.kt

@@ -1,21 +1,27 @@
 package com.texthip.thip.data.repository
 
+import com.texthip.thip.data.manager.TokenManager
 import com.texthip.thip.data.model.base.handleBaseResponse
 import com.texthip.thip.data.model.users.request.FollowRequest
 import com.texthip.thip.data.model.users.request.NicknameRequest
+import com.texthip.thip.data.model.users.request.ProfileUpdateRequest
+import com.texthip.thip.data.model.users.request.SignupRequest
 import com.texthip.thip.data.model.users.response.AliasChoiceResponse
 import com.texthip.thip.data.model.users.response.FollowResponse
 import com.texthip.thip.data.model.users.response.MyFollowingsResponse
 import com.texthip.thip.data.model.users.response.MyPageInfoResponse
 import com.texthip.thip.data.model.users.response.NicknameResponse
 import com.texthip.thip.data.model.users.response.OthersFollowersResponse
+import com.texthip.thip.data.model.users.response.SignupResponse
+import com.texthip.thip.data.model.users.response.UserSearchResponse
 import com.texthip.thip.data.service.UserService
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
 class UserRepository @Inject constructor(
-    private val userService: UserService
+    private val userService: UserService,
+    private val tokenManager: TokenManager
 ) {
     //내 팔로잉 목록 조회
     suspend fun getMyFollowings(
@@ -72,4 +78,32 @@ class UserRepository @Inject constructor(
             .handleBaseResponse()
             .getOrThrow()
     }
+
+    suspend fun updateProfile(request: ProfileUpdateRequest): Result<Unit?> = runCatching {
+        userService.updateProfile(request)
+            .handleBaseResponse()
+            .getOrThrow()
+    }
+
+    suspend fun signup(request: SignupRequest): Result<SignupResponse?> {
+        val tempToken = tokenManager.getTempToken()
+
+        if (tempToken.isNullOrBlank()) {
+            return Result.failure(Exception("임시 토큰이 없습니다. 로그인을 다시 시도해주세요."))
+        }
+        return runCatching {
+            userService.signup("Bearer $tempToken", request)
+                .handleBaseResponse()
+                .getOrThrow()
+        }
+    }
+
+    suspend fun searchUsers(
+        keyword: String,
+        isFinalized: Boolean
+    ): Result<UserSearchResponse?> = runCatching {
+        userService.searchUsers(isFinalized = isFinalized, keyword = keyword)
+            .handleBaseResponse()
+            .getOrThrow()
+    }
 }

app/src/main/java/com/texthip/thip/data/service/UserService.kt

@@ -3,15 +3,21 @@ package com.texthip.thip.data.service
 import com.texthip.thip.data.model.base.BaseResponse
 import com.texthip.thip.data.model.users.request.FollowRequest
 import com.texthip.thip.data.model.users.request.NicknameRequest
+import com.texthip.thip.data.model.users.request.ProfileUpdateRequest
+import com.texthip.thip.data.model.users.request.SignupRequest
 import com.texthip.thip.data.model.users.response.AliasChoiceResponse
 import com.texthip.thip.data.model.users.response.FollowResponse
 import com.texthip.thip.data.model.users.response.MyFollowingsResponse
 import com.texthip.thip.data.model.users.response.MyPageInfoResponse
 import com.texthip.thip.data.model.users.response.NicknameResponse
 import com.texthip.thip.data.model.users.response.OthersFollowersResponse
+import com.texthip.thip.data.model.users.response.SignupResponse
+import com.texthip.thip.data.model.users.response.UserSearchResponse
 import com.texthip.thip.data.model.users.response.UsersMyFollowingsRecentFeedsResponse
 import retrofit2.http.Body
 import retrofit2.http.GET
+import retrofit2.http.Header
+import retrofit2.http.PATCH
 import retrofit2.http.POST
 import retrofit2.http.Path
 import retrofit2.http.Query
@@ -49,4 +55,23 @@ interface UserService {
         @Path("followingUserId") followingUserId: Long,
         @Body request: FollowRequest
     ): BaseResponse<FollowResponse>
+
+    @PATCH("users")
+    suspend fun updateProfile(
+        @Body request: ProfileUpdateRequest
+    ): BaseResponse<Unit>
+
+    @POST("users/signup")
+    suspend fun signup(
+        @Header("Authorization") tempToken: String,
+        @Body request: SignupRequest
+    ): BaseResponse<SignupResponse>
+
+    @GET("users")
+    suspend fun searchUsers(
+        @Query("isFinalized") isFinalized: Boolean,
+        @Query("keyword") keyword: String,
+        @Query("size") size: Int = 30
+    ): BaseResponse<UserSearchResponse>
+
 }

app/src/main/java/com/texthip/thip/ui/feed/mock/MySubscriptionData.kt

@@ -2,6 +2,8 @@ package com.texthip.thip.ui.feed.mock
 
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.painter.Painter
+import com.texthip.thip.data.model.users.response.UserItem
+import com.texthip.thip.utils.color.hexToColor
 
 data class MySubscriptionData(
     val profileImageUrl: String? = null,
@@ -11,3 +13,14 @@ data class MySubscriptionData(
     val subscriberCount: Int = 0,
     var isSubscribed: Boolean = true
 )
+
+fun UserItem.toMySubscriptionData(): MySubscriptionData {
+    return MySubscriptionData(
+        profileImageUrl = this.profileImageUrl,
+        nickname = this.nickname,
+        role = this.aliasName,
+        roleColor = hexToColor(this.aliasColor),
+        subscriberCount = this.followerCount,
+        isSubscribed = false // API 응답에 구독 여부 정보가 없음
+    )
+}