[feat] 마이페이지 / 유저 정보 조회 서버 연결 및 기능 구현

app/src/main/AndroidManifest.xml

@@ -82,6 +82,10 @@
             android:name=".presentation.main.notification.NotificationActivity"
             android:exported="false"
             android:screenOrientation="portrait" />
+        <activity
+            android:name=".presentation.main.mypage.myfeed.MyFeedActivity"
+            android:exported="false"
+            android:screenOrientation="portrait" />
         <activity
             android:name="com.kakao.sdk.auth.AuthCodeHandlerActivity"
             android:exported="true">

app/src/main/java/org/go/sopt/winey/data/model/remote/response/ResponseGetUserDto.kt

@@ -1,61 +1,43 @@
 package org.go.sopt.winey.data.model.remote.response
 
-import org.go.sopt.winey.domain.entity.User
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
+import org.go.sopt.winey.domain.entity.UserV2
 
 @Serializable
 data class ResponseGetUserDto(
-    @SerialName("userResponseGoalDto")
-    val userResponseGoalDto: UserResponseGoalDto?,
-    @SerialName("userResponseUserDto")
-    val userResponseUserDto: UserResponseUserDto?
+    @SerialName("userData")
+    val userData: UserData
 ) {
     @Serializable
-    data class UserResponseGoalDto(
-        @SerialName("duringGoalAmount")
-        val duringGoalAmount: Long,
-        @SerialName("duringGoalCount")
-        val duringGoalCount: Long,
-        @SerialName("isAttained")
-        val isAttained: Boolean,
-        @SerialName("isOver")
-        val isOver: Boolean,
-        @SerialName("targetDay")
-        val targetDay: Int,
-        @SerialName("targetMoney")
-        val targetMoney: Int,
-        @SerialName("dday")
-        val dday: Int
-    )
-
-    @Serializable
-    data class UserResponseUserDto(
-        @SerialName("nickname")
-        val nickname: String,
+    data class UserData(
         @SerialName("userId")
         val userId: Int,
+        @SerialName("nickname")
+        val nickname: String,
         @SerialName("userLevel")
         val userLevel: String,
         @SerialName("fcmIsAllowed")
-        val fcmIsAllowed: Boolean
+        val fcmIsAllowed: Boolean,
+        @SerialName("accumulatedAmount")
+        val accumulatedAmount: Int,
+        @SerialName("amountSavedHundredDays")
+        val amountSavedHundredDays: Int,
+        @SerialName("amountSavedTwoWeeks")
+        val amountSavedTwoWeeks: Int,
+        @SerialName("amountSpentTwoWeeks")
+        val amountSpentTwoWeeks: Int
     )
 
-    fun toUser(): User {
-        val data = this
-        val userResponseUserDto = data.userResponseUserDto
-
-        return User(
-            nickname = userResponseUserDto?.nickname.orEmpty(),
-            userLevel = userResponseUserDto?.userLevel.orEmpty(),
-            fcmIsAllowed = userResponseUserDto?.fcmIsAllowed ?: false,
-            duringGoalAmount = data.userResponseGoalDto?.duringGoalAmount ?: 0,
-            duringGoalCount = data.userResponseGoalDto?.duringGoalCount ?: 0,
-            targetMoney = data.userResponseGoalDto?.targetMoney ?: 0,
-            targetDay = data.userResponseGoalDto?.targetDay ?: 0,
-            dday = data.userResponseGoalDto?.dday ?: 0,
-            isOver = data.userResponseGoalDto?.isOver ?: true,
-            isAttained = data.userResponseGoalDto?.isAttained ?: false
+    fun toUser(): UserV2 {
+        return UserV2(
+            nickname = userData.nickname,
+            userLevel = userData.userLevel,
+            fcmIsAllowed = userData.fcmIsAllowed,
+            accumulatedAmount = userData.accumulatedAmount,
+            amountSavedHundredDays = userData.amountSavedHundredDays,
+            amountSavedTwoWeeks = userData.amountSavedTwoWeeks,
+            amountSpentTwoWeeks = userData.amountSpentTwoWeeks
         )
     }
 }

app/src/main/java/org/go/sopt/winey/data/repository/AuthRepositoryImpl.kt

@@ -11,14 +11,14 @@ import org.go.sopt.winey.data.model.remote.response.ResponseLogoutDto
 import org.go.sopt.winey.data.model.remote.response.ResponseReIssueTokenDto
 import org.go.sopt.winey.data.source.AuthDataSource
 import org.go.sopt.winey.domain.entity.Goal
-import org.go.sopt.winey.domain.entity.User
+import org.go.sopt.winey.domain.entity.UserV2
 import org.go.sopt.winey.domain.repository.AuthRepository
 import javax.inject.Inject
 
 class AuthRepositoryImpl @Inject constructor(
     private val authDataSource: AuthDataSource
 ) : AuthRepository {
-    override suspend fun getUser(): Result<User?> =
+    override suspend fun getUser(): Result<UserV2?> =
         runCatching {
             authDataSource.getUser().data?.toUser()
         }

app/src/main/java/org/go/sopt/winey/data/repository/DataStoreRepositoryImpl.kt

@@ -10,7 +10,7 @@ import com.google.gson.Gson
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.catch
 import kotlinx.coroutines.flow.map
-import org.go.sopt.winey.domain.entity.User
+import org.go.sopt.winey.domain.entity.UserV2
 import org.go.sopt.winey.domain.repository.DataStoreRepository
 import java.io.IOException
 import javax.inject.Inject
@@ -91,14 +91,14 @@ class DataStoreRepositoryImpl @Inject constructor(
             }
     }
 
-    override suspend fun saveUserInfo(userInfo: User?) {
+    override suspend fun saveUserInfo(userInfo: UserV2?) {
         dataStore.edit {
             val json = Gson().toJson(userInfo)
             it[USER_INFO] = json
         }
     }
 
-    override suspend fun getUserInfo(): Flow<User> {
+    override suspend fun getUserInfo(): Flow<UserV2> {
         return dataStore.data
             .catch { exception ->
                 if (exception is IOException) {
@@ -111,9 +111,17 @@ class DataStoreRepositoryImpl @Inject constructor(
             .map {
                 val json = it[USER_INFO]
                 try {
-                    Gson().fromJson(json, User::class.java)
+                    Gson().fromJson(json, UserV2::class.java)
                 } catch (e: Exception) {
-                    User()
+                    UserV2(
+                        nickname = "",
+                        userLevel = "",
+                        accumulatedAmount = 0,
+                        amountSavedHundredDays = 0,
+                        amountSavedTwoWeeks = 0,
+                        amountSpentTwoWeeks = 0,
+                        fcmIsAllowed = true
+                    )
                 }
             }
     }

app/src/main/java/org/go/sopt/winey/domain/entity/UserV2.kt

@@ -0,0 +1,11 @@
+package org.go.sopt.winey.domain.entity
+
+data class UserV2(
+    val nickname: String,
+    val userLevel: String,
+    val fcmIsAllowed: Boolean,
+    val accumulatedAmount: Int,
+    val amountSavedHundredDays: Int,
+    val amountSavedTwoWeeks: Int,
+    val amountSpentTwoWeeks: Int
+)

app/src/main/java/org/go/sopt/winey/domain/repository/AuthRepository.kt

@@ -8,10 +8,10 @@ import org.go.sopt.winey.data.model.remote.response.ResponseLoginDto
 import org.go.sopt.winey.data.model.remote.response.ResponseLogoutDto
 import org.go.sopt.winey.data.model.remote.response.ResponseReIssueTokenDto
 import org.go.sopt.winey.domain.entity.Goal
-import org.go.sopt.winey.domain.entity.User
+import org.go.sopt.winey.domain.entity.UserV2
 
 interface AuthRepository {
-    suspend fun getUser(): Result<User?>
+    suspend fun getUser(): Result<UserV2?>
 
     suspend fun postCreateGoal(requestCreateGoalDto: RequestCreateGoalDto): Result<Goal?>
 

app/src/main/java/org/go/sopt/winey/domain/repository/DataStoreRepository.kt

@@ -2,7 +2,7 @@ package org.go.sopt.winey.domain.repository
 
 import androidx.datastore.preferences.core.Preferences
 import kotlinx.coroutines.flow.Flow
-import org.go.sopt.winey.domain.entity.User
+import org.go.sopt.winey.domain.entity.UserV2
 
 interface DataStoreRepository {
     suspend fun saveSocialToken(socialAccessToken: String, socialRefreshToken: String)
@@ -25,9 +25,9 @@ interface DataStoreRepository {
 
     suspend fun getUserId(): Flow<Int?>
 
-    suspend fun saveUserInfo(userInfo: User?)
+    suspend fun saveUserInfo(userInfo: UserV2?)
 
-    suspend fun getUserInfo(): Flow<User?>
+    suspend fun getUserInfo(): Flow<UserV2?>
 
     suspend fun clearDataStore()
 }

app/src/main/java/org/go/sopt/winey/presentation/main/MainViewModel.kt

@@ -11,7 +11,7 @@ import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.launch
 import org.go.sopt.winey.data.model.remote.response.ResponseLogoutDto
-import org.go.sopt.winey.domain.entity.User
+import org.go.sopt.winey.domain.entity.UserV2
 import org.go.sopt.winey.domain.repository.AuthRepository
 import org.go.sopt.winey.domain.repository.DataStoreRepository
 import org.go.sopt.winey.domain.repository.NotificationRepository
@@ -26,8 +26,8 @@ class MainViewModel @Inject constructor(
     private val dataStoreRepository: DataStoreRepository,
     private val notificationRepository: NotificationRepository
 ) : ViewModel() {
-    private val _getUserState = MutableStateFlow<UiState<User?>>(UiState.Loading)
-    val getUserState: StateFlow<UiState<User?>> = _getUserState.asStateFlow()
+    private val _getUserState = MutableStateFlow<UiState<UserV2?>>(UiState.Loading)
+    val getUserState: StateFlow<UiState<UserV2?>> = _getUserState.asStateFlow()
 
     private val _logoutState = MutableStateFlow<UiState<ResponseLogoutDto?>>(UiState.Empty)
     val logoutState: StateFlow<UiState<ResponseLogoutDto?>> = _logoutState.asStateFlow()
@@ -58,7 +58,7 @@ class MainViewModel @Inject constructor(
         }
     }
 
-    fun postLogout() {
+    private fun postLogout() {
         viewModelScope.launch {
             _logoutState.value = UiState.Loading
 

app/src/main/java/org/go/sopt/winey/presentation/main/feed/WineyFeedFragment.kt

@@ -17,13 +17,11 @@ import androidx.recyclerview.widget.SimpleItemAnimator
 import com.google.android.material.bottomnavigation.BottomNavigationView
 import dagger.hilt.android.AndroidEntryPoint
 import kotlinx.coroutines.flow.first
-import kotlinx.coroutines.flow.firstOrNull
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
 import kotlinx.coroutines.launch
 import org.go.sopt.winey.R
 import org.go.sopt.winey.databinding.FragmentWineyFeedBinding
-import org.go.sopt.winey.domain.entity.User
 import org.go.sopt.winey.domain.entity.WineyFeed
 import org.go.sopt.winey.domain.repository.DataStoreRepository
 import org.go.sopt.winey.presentation.main.MainViewModel
@@ -45,10 +43,10 @@ import org.go.sopt.winey.util.fragment.stringOf
 import org.go.sopt.winey.util.fragment.viewLifeCycle
 import org.go.sopt.winey.util.fragment.viewLifeCycleScope
 import org.go.sopt.winey.util.fragment.wineySnackbar
-import org.go.sopt.winey.util.view.snackbar.SnackbarType
 import org.go.sopt.winey.util.view.UiState
 import org.go.sopt.winey.util.view.WineyPopupMenu
 import org.go.sopt.winey.util.view.setOnSingleClickListener
+import org.go.sopt.winey.util.view.snackbar.SnackbarType
 import org.json.JSONException
 import org.json.JSONObject
 import timber.log.Timber
@@ -429,40 +427,6 @@ class WineyFeedFragment :
         }
     }
 
-    /** 1차 릴리즈 당시, 절약 피드 업로드 (더 이상 사용 X) */
-    private fun initGetUserStateObserver() {
-        viewLifeCycleScope.launch {
-            mainViewModel.getUserState.collect { state ->
-                when (state) {
-                    is UiState.Success -> {
-                        val data = dataStoreRepository.getUserInfo().firstOrNull() ?: return@collect
-                        checkGoalSetting(data)
-                    }
-
-                    is UiState.Failure -> {
-                        snackBar(binding.root) { state.msg }
-                    }
-
-                    else -> Timber.tag("failure").e(MSG_WINEYFEED_ERROR)
-                }
-            }
-        }
-    }
-
-    private fun checkGoalSetting(data: User) {
-        // 목표를 설정한 적 없거나, 기간 내 목표 달성에 실패한 경우
-        if (data.isOver) {
-            showDefaultGoalSettingDialog()
-        }
-        // 기간 내 목표 달성에 성공한 경우
-        else if (data.isAttained) {
-            showCongratulationDialog()
-        } else {
-            // 새 목표를 설정한 경우
-            //navigateToUpload()
-        }
-    }
-
     private fun showDefaultGoalSettingDialog() {
         amplitudeUtils.logEvent("view_goalsetting_popup")