Merge branch 'dev' into feature/implement-board

Nexters · Aug 17, 2024 · a87b320 · a87b320
2 parents 56ee1c0 + e391475
commit a87b320
Show file tree

Hide file tree

Showing 14 changed files with 438 additions and 10 deletions.
diff --git a/.idea/deploymentTargetSelector.xml b/.idea/deploymentTargetSelector.xml
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
diff --git a/.idea/other.xml b/.idea/other.xml
diff --git a/...e/src/main/java/com/goalpanzi/mission_mate/core/datastore/datasource/DefaultDataSource.kt b/...e/src/main/java/com/goalpanzi/mission_mate/core/datastore/datasource/DefaultDataSource.kt
@@ -9,4 +9,6 @@ interface DefaultDataSource {
     fun getUserProfile() : Flow<UserProfile?>
     fun getViewedTooltip() : Flow<Boolean>
     fun setViewedTooltip() : Flow<Unit>
+    fun setMemberId(data: Long) : Flow<Unit>
+    fun getMemberId() : Flow<Long?>
 }
diff --git a/...c/main/java/com/goalpanzi/mission_mate/core/datastore/datasource/DefaultDataSourceImpl.kt b/...c/main/java/com/goalpanzi/mission_mate/core/datastore/datasource/DefaultDataSourceImpl.kt
@@ -4,6 +4,7 @@ import androidx.datastore.core.DataStore
 import androidx.datastore.preferences.core.Preferences
 import androidx.datastore.preferences.core.booleanPreferencesKey
 import androidx.datastore.preferences.core.edit
+import androidx.datastore.preferences.core.longPreferencesKey
 import androidx.datastore.preferences.core.stringPreferencesKey
 import com.luckyoct.core.model.CharacterType
 import com.luckyoct.core.model.UserProfile
@@ -20,6 +21,7 @@ class DefaultDataSourceImpl @Inject constructor(
         val USER_NICKNAME = stringPreferencesKey("USER_NICKNAME")
         val USER_CHARACTER = stringPreferencesKey("USER_CHARACTER")
         val VIEWED_TOOLTIP = booleanPreferencesKey("VIEWED_TOOLTIP")
+        val MEMBER_ID = longPreferencesKey("MEMBER_ID")
     }
 
     override fun clearUserData(): Flow<Unit> = flow {
@@ -58,4 +60,15 @@ class DefaultDataSourceImpl @Inject constructor(
         }
         emit(Unit)
     }
+
+    override fun setMemberId(data: Long): Flow<Unit> = flow {
+        dataStore.edit { preferences ->
+            preferences[PreferencesKey.MEMBER_ID] = data
+        }
+        emit(Unit)
+    }
+
+    override fun getMemberId(): Flow<Long?> = dataStore.data.map { preferences ->
+        preferences[PreferencesKey.MEMBER_ID]
+    }
 }
diff --git a/core/domain/src/main/java/com/goalpanzi/mission_mate/core/domain/usecase/LoginUseCase.kt b/core/domain/src/main/java/com/goalpanzi/mission_mate/core/domain/usecase/LoginUseCase.kt
@@ -22,6 +22,7 @@ class LoginUseCase @Inject constructor(
                 response.data.also {
                     authDataSource.setAccessToken(it.accessToken).first()
                     authDataSource.setRefreshToken(it.refreshToken).first()
+                    defaultDataSource.setMemberId(it.memberId).first()
                     (it.nickname to it.characterType).let { (nickname, character) ->
                         if (nickname != null && character != null) {
                             defaultDataSource.setUserProfile(

diff --git a/core/model/src/main/java/com/luckyoct/core/model/request/TokenReissueRequest.kt b/core/model/src/main/java/com/luckyoct/core/model/request/TokenReissueRequest.kt
@@ -0,0 +1,8 @@
+package com.luckyoct.core.model.request
+
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class TokenReissueRequest(
+    val refreshToken: String
+)
diff --git a/core/model/src/main/java/com/luckyoct/core/model/response/GoogleLogin.kt b/core/model/src/main/java/com/luckyoct/core/model/response/GoogleLogin.kt
@@ -9,5 +9,6 @@ data class GoogleLogin(
     val refreshToken: String,
     val nickname: String?,
     val characterType: CharacterType?,
-    val isProfileSet: Boolean
+    val isProfileSet: Boolean,
+    val memberId: Long
 )
diff --git a/core/model/src/main/java/com/luckyoct/core/model/response/TokenReissue.kt b/core/model/src/main/java/com/luckyoct/core/model/response/TokenReissue.kt
@@ -0,0 +1,9 @@
+package com.luckyoct.core.model.response
+
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class TokenReissue(
+    val accessToken: String,
+    val refreshToken: String
+)