Merge pull request #12 from taetae98coding/develop

taetae98coding · web-flow · commit a1fe384efb54 · 2026-05-16T18:00:34.000+09:00
1.8.4
diff --git a/Diary/Diary.xcodeproj/project.pbxproj b/Diary/Diary.xcodeproj/project.pbxproj
@@ -315,7 +315,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.8.3;
+				MARKETING_VERSION = 1.8.4;
 				OTHER_LDFLAGS = "";
 				PRODUCT_BUNDLE_IDENTIFIER = io.github.taetae98coding.diary.dev;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -413,7 +413,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.8.3;
+				MARKETING_VERSION = 1.8.4;
 				OTHER_LDFLAGS = "";
 				PRODUCT_BUNDLE_IDENTIFIER = io.github.taetae98coding.diary;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -518,7 +518,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.8.3;
+				MARKETING_VERSION = 1.8.4;
 				OTHER_LDFLAGS = "";
 				PRODUCT_BUNDLE_IDENTIFIER = io.github.taetae98coding.diary;
 				PRODUCT_NAME = "$(TARGET_NAME)";
diff --git a/build-logic/src/main/kotlin/BuildConfig.kt b/build-logic/src/main/kotlin/BuildConfig.kt
@@ -4,6 +4,6 @@ public data object BuildConfig {
     internal const val ANDROID_TARGET_SDK = 36
 
     public const val NAMESPACE: String = "io.github.taetae98coding.diary"
-    public const val VERSION_NAME: String = "1.8.3"
-    public const val VERSION_CODE: Int = 12
+    public const val VERSION_NAME: String = "1.8.4"
+    public const val VERSION_CODE: Int = 13
 }
diff --git a/core/datastore/api/src/commonMain/kotlin/io/github/taetae98coding/diary/core/datastore/api/entity/AccountMetaDataDataStoreEntity.kt b/core/datastore/api/src/commonMain/kotlin/io/github/taetae98coding/diary/core/datastore/api/entity/AccountMetaDataDataStoreEntity.kt
@@ -1,10 +1,13 @@
 package io.github.taetae98coding.diary.core.datastore.api.entity
 
+import kotlin.uuid.Uuid
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 
 @Serializable
 public data class AccountMetaDataDataStoreEntity(
+    @SerialName("accountId")
+    val accountId: Uuid = Uuid.NIL,
     @SerialName("profileImage")
     val profileImage: String? = null,
 )
diff --git a/data/account/src/commonMain/kotlin/io/github/taetae98coding/diary/data/account/repository/AccountInfoRepositoryImpl.kt b/data/account/src/commonMain/kotlin/io/github/taetae98coding/diary/data/account/repository/AccountInfoRepositoryImpl.kt
@@ -9,9 +9,7 @@ import io.github.taetae98coding.diary.domain.account.repository.AccountInfoRepos
 import kotlin.uuid.Uuid
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.filter
 import kotlinx.coroutines.flow.mapLatest
-import kotlinx.coroutines.flow.runningFold
 import org.koin.core.annotation.Factory
 import org.koin.core.annotation.Provided
 
@@ -21,14 +19,7 @@ internal class AccountInfoRepositoryImpl(
     private val supabaseAuth: SupabaseAuth,
 ) : AccountInfoRepository {
     override fun get(): Flow<AccountInfo?> {
-        return supabaseAuth.sessionStatus.runningFold<SupabaseSessionStatus, SupabaseSessionStatus>(SupabaseSessionStatus.Loading) { acc, value ->
-            when (value) {
-                is SupabaseSessionStatus.Authenticated, is SupabaseSessionStatus.NotAuthenticated -> value
-                else -> acc
-            }
-        }.filter { status ->
-            status is SupabaseSessionStatus.Authenticated || status is SupabaseSessionStatus.NotAuthenticated
-        }.mapLatest { status ->
+        return supabaseAuth.sessionStatus.mapLatest { status ->
             when (status) {
                 is SupabaseSessionStatus.Authenticated -> {
                     AccountInfo(
diff --git a/data/account/src/commonMain/kotlin/io/github/taetae98coding/diary/data/account/repository/AccountMetaDataRepositoryImpl.kt b/data/account/src/commonMain/kotlin/io/github/taetae98coding/diary/data/account/repository/AccountMetaDataRepositoryImpl.kt
@@ -1,11 +1,15 @@
+@file:OptIn(ExperimentalCoroutinesApi::class)
+
 package io.github.taetae98coding.diary.data.account.repository
 
 import io.github.taetae98coding.diary.core.datastore.api.datasource.AccountMetaDataDataStoreDataSource
 import io.github.taetae98coding.diary.core.mapper.toDomain
 import io.github.taetae98coding.diary.core.model.account.AccountMetaData
 import io.github.taetae98coding.diary.domain.account.repository.AccountMetaDataRepository
+import kotlin.uuid.Uuid
+import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.flow.mapLatest
 import org.koin.core.annotation.Factory
 import org.koin.core.annotation.Provided
 
@@ -14,7 +18,9 @@ internal class AccountMetaDataRepositoryImpl(
     @param:Provided
     private val accountMetaDataDataStoreDataSource: AccountMetaDataDataStoreDataSource,
 ) : AccountMetaDataRepository {
-    override fun get(): Flow<AccountMetaData?> {
-        return accountMetaDataDataStoreDataSource.get().map { it?.toDomain() }
+    override fun get(accountId: Uuid): Flow<AccountMetaData?> {
+        return accountMetaDataDataStoreDataSource.get()
+            .mapLatest { it?.takeIf { it.accountId == accountId } }
+            .mapLatest { it?.toDomain() }
     }
 }
diff --git a/data/credentials/src/commonMain/kotlin/io/github/taetae98coding/diary/data/credentials/repository/SessionRepositoryImpl.kt b/data/credentials/src/commonMain/kotlin/io/github/taetae98coding/diary/data/credentials/repository/SessionRepositoryImpl.kt
@@ -37,7 +37,12 @@ public class SessionRepositoryImpl(
     }
 
     private suspend fun updateSession(sessionRemote: SessionRemoteEntity) {
-        accountMetaDataDataStoreDataSource.upsert(AccountMetaDataDataStoreEntity(profileImage = sessionRemote.account.profileImage))
+        accountMetaDataDataStoreDataSource.upsert(
+            AccountMetaDataDataStoreEntity(
+                accountId = sessionRemote.account.id,
+                profileImage = sessionRemote.account.profileImage,
+            ),
+        )
         supabaseAuth.importAuthToken(sessionRemote.accessToken, sessionRemote.refreshToken)
     }
 }
diff --git a/data/credentials/src/jvmTest/kotlin/io/github/taetae98coding/diary/data/credentials/repository/SessionRepositoryImplTest.kt b/data/credentials/src/jvmTest/kotlin/io/github/taetae98coding/diary/data/credentials/repository/SessionRepositoryImplTest.kt
@@ -43,7 +43,10 @@ class SessionRepositoryImplTest : FunSpec() {
             coVerifyOrder {
                 sessionRemoteDataSource.getByGoogleIdToken(idToken)
                 accountMetaDataDataStoreDataSource.upsert(
-                    AccountMetaDataDataStoreEntity(profileImage = sessionRemote.account.profileImage),
+                    AccountMetaDataDataStoreEntity(
+                        accountId = sessionRemote.account.id,
+                        profileImage = sessionRemote.account.profileImage,
+                    ),
                 )
                 supabaseAuth.importAuthToken(sessionRemote.accessToken, sessionRemote.refreshToken)
             }
@@ -62,7 +65,10 @@ class SessionRepositoryImplTest : FunSpec() {
             coVerifyOrder {
                 sessionRemoteDataSource.getByGoogleAuthorizationCode(clientId, code, redirectUri)
                 accountMetaDataDataStoreDataSource.upsert(
-                    AccountMetaDataDataStoreEntity(profileImage = sessionRemote.account.profileImage),
+                    AccountMetaDataDataStoreEntity(
+                        accountId = sessionRemote.account.id,
+                        profileImage = sessionRemote.account.profileImage,
+                    ),
                 )
                 supabaseAuth.importAuthToken(sessionRemote.accessToken, sessionRemote.refreshToken)
             }
diff --git a/domain/account/src/commonMain/kotlin/io/github/taetae98coding/diary/domain/account/repository/AccountMetaDataRepository.kt b/domain/account/src/commonMain/kotlin/io/github/taetae98coding/diary/domain/account/repository/AccountMetaDataRepository.kt
@@ -1,8 +1,9 @@
 package io.github.taetae98coding.diary.domain.account.repository
 
 import io.github.taetae98coding.diary.core.model.account.AccountMetaData
+import kotlin.uuid.Uuid
 import kotlinx.coroutines.flow.Flow
 
 public interface AccountMetaDataRepository {
-    public fun get(): Flow<AccountMetaData?>
+    public fun get(accountId: Uuid): Flow<AccountMetaData?>
 }
diff --git a/domain/account/src/commonMain/kotlin/io/github/taetae98coding/diary/domain/account/usecase/GetAccountUseCase.kt b/domain/account/src/commonMain/kotlin/io/github/taetae98coding/diary/domain/account/usecase/GetAccountUseCase.kt
@@ -8,9 +8,10 @@ import io.github.taetae98coding.diary.domain.account.repository.AccountMetaDataR
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.catch
-import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.flow.emitAll
+import kotlinx.coroutines.flow.flatMapLatest
 import kotlinx.coroutines.flow.flow
+import kotlinx.coroutines.flow.flowOf
 import kotlinx.coroutines.flow.mapLatest
 import org.koin.core.annotation.Factory
 import org.koin.core.annotation.Provided
@@ -24,21 +25,21 @@ public class GetAccountUseCase(
 ) {
     public operator fun invoke(): Flow<Result<Account>> {
         return flow {
-            combine(
-                accountInfoRepository.get(),
-                accountMetaDataRepository.get(),
-            ) { accountInfo, accountMetaData ->
-                if (accountInfo == null) {
-                    Account.Guest
-                } else {
-                    Account.User(
-                        accountInfo = accountInfo,
-                        accountMetaData = accountMetaData,
-                    )
+            accountInfoRepository.get()
+                .flatMapLatest { accountInfo ->
+                    if (accountInfo == null) {
+                        flowOf(Account.Guest)
+                    } else {
+                        accountMetaDataRepository.get(accountInfo.id)
+                            .mapLatest { accountMetaData ->
+                                Account.User(
+                                    accountInfo = accountInfo,
+                                    accountMetaData = accountMetaData,
+                                )
+                            }
+                    }
                 }
-            }.also {
-                emitAll(it)
-            }
+                .also { emitAll(it) }
         }.mapLatest {
             Result.success(it)
         }.catch {
diff --git a/domain/account/src/jvmTest/kotlin/io/github/taetae98coding/diary/domain/account/usecase/GetAccountUseCaseTest.kt b/domain/account/src/jvmTest/kotlin/io/github/taetae98coding/diary/domain/account/usecase/GetAccountUseCaseTest.kt
@@ -35,7 +35,6 @@ class GetAccountUseCaseTest : BehaviorSpec() {
             clearAllMocks()
 
             every { accountInfoRepository.get() } returns flowOf(null)
-            every { accountMetaDataRepository.get() } returns flowOf(null)
 
             When("GetAccountUseCase를 호출하면") {
                 val result = useCase().first()
@@ -59,7 +58,7 @@ class GetAccountUseCaseTest : BehaviorSpec() {
                 .sample()
 
             every { accountInfoRepository.get() } returns flowOf(accountInfo)
-            every { accountMetaDataRepository.get() } returns flowOf(accountMetaData)
+            every { accountMetaDataRepository.get(accountInfo.id) } returns flowOf(accountMetaData)
 
             When("GetAccountUseCase를 호출하면") {
                 val result = useCase().first()
@@ -78,7 +77,7 @@ class GetAccountUseCaseTest : BehaviorSpec() {
                 }
 
                 Then("AccountMetaDataRepository를 호출한다") {
-                    verify(exactly = 1) { accountMetaDataRepository.get() }
+                    verify(exactly = 1) { accountMetaDataRepository.get(accountInfo.id) }
                 }
             }
         }
@@ -88,7 +87,7 @@ class GetAccountUseCaseTest : BehaviorSpec() {
             val accountInfo = fixtureMonkey.giveMeOne<AccountInfo>()
 
             every { accountInfoRepository.get() } returns flowOf(accountInfo)
-            every { accountMetaDataRepository.get() } returns flowOf(null)
+            every { accountMetaDataRepository.get(accountInfo.id) } returns flowOf(null)
 
             When("GetAccountUseCase를 호출하면") {
                 val result = useCase().first()
diff --git a/feature/memo/src/commonMain/kotlin/io/github/taetae98coding/diary/feature/memo/common/TagCard.kt b/feature/memo/src/commonMain/kotlin/io/github/taetae98coding/diary/feature/memo/common/TagCard.kt
@@ -6,6 +6,7 @@ import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.ExperimentalFlexBoxApi
 import androidx.compose.foundation.layout.FlexAlignContent
+import androidx.compose.foundation.layout.FlexAlignItems
 import androidx.compose.foundation.layout.FlexBox
 import androidx.compose.foundation.layout.FlexJustifyContent
 import androidx.compose.foundation.layout.FlexWrap
@@ -83,6 +84,7 @@ private fun TagFlowRow(
             wrap(FlexWrap.Wrap)
             gap(6.dp)
             justifyContent(FlexJustifyContent.Center)
+            alignItems(FlexAlignItems.Center)
             alignContent(FlexAlignContent.Center)
         },
     ) {
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -39,7 +39,7 @@ firebase-perf-plugin = "2.0.2"
 coil = "3.4.0"								    # https://github.com/coil-kt/coil/releases
 koin = "4.2.1"                                  # https://github.com/InsertKoinIO/koin/releases
 koin-compiler-plugin = "1.0.0-RC2"              # https://github.com/InsertKoinIO/koin-compiler-plugin/releases
-fixture-monkey = "1.1.19"						# https://github.com/naver/fixture-monkey/releases
+fixture-monkey = "1.1.20"						# https://github.com/naver/fixture-monkey/releases
 google-identity = "1.2.0"						# https://developers.google.com/identity/android-credential-manager/releases?hl=en
 google-oauth-client = "1.39.0"					# https://github.com/googleapis/google-oauth-java-client/releases
 google-play-services-location = "21.3.0"		# https://developers.google.com/android/guides/releases?hl=en

Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,6 @@ public data object BuildConfig {`
`4`	`4`	`internal const val ANDROID_TARGET_SDK = 36`
`5`	`5`
`6`	`6`	`public const val NAMESPACE: String = "io.github.taetae98coding.diary"`
`7`		`- public const val VERSION_NAME: String = "1.8.3"`
`8`		`- public const val VERSION_CODE: Int = 12`
	`7`	`+ public const val VERSION_NAME: String = "1.8.4"`
	`8`	`+ public const val VERSION_CODE: Int = 13`
`9`	`9`	`}`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,12 @@ public class SessionRepositoryImpl(`
`37`	`37`	`}`
`38`	`38`
`39`	`39`	`private suspend fun updateSession(sessionRemote: SessionRemoteEntity) {`
`40`		`- accountMetaDataDataStoreDataSource.upsert(AccountMetaDataDataStoreEntity(profileImage = sessionRemote.account.profileImage))`
	`40`	`+ accountMetaDataDataStoreDataSource.upsert(`
	`41`	`+ AccountMetaDataDataStoreEntity(`
	`42`	`+ accountId = sessionRemote.account.id,`
	`43`	`+ profileImage = sessionRemote.account.profileImage,`
	`44`	`+ ),`
	`45`	`+ )`
`41`	`46`	`supabaseAuth.importAuthToken(sessionRemote.accessToken, sessionRemote.refreshToken)`
`42`	`47`	`}`
`43`	`48`	`}`
Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,10 @@ class SessionRepositoryImplTest : FunSpec() {`
`43`	`43`	`coVerifyOrder {`
`44`	`44`	`sessionRemoteDataSource.getByGoogleIdToken(idToken)`
`45`	`45`	`accountMetaDataDataStoreDataSource.upsert(`
`46`		`- AccountMetaDataDataStoreEntity(profileImage = sessionRemote.account.profileImage),`
	`46`	`+ AccountMetaDataDataStoreEntity(`
	`47`	`+ accountId = sessionRemote.account.id,`
	`48`	`+ profileImage = sessionRemote.account.profileImage,`
	`49`	`+ ),`
`47`	`50`	`)`
`48`	`51`	`supabaseAuth.importAuthToken(sessionRemote.accessToken, sessionRemote.refreshToken)`
`49`	`52`	`}`
`@@ -62,7 +65,10 @@ class SessionRepositoryImplTest : FunSpec() {`
`62`	`65`	`coVerifyOrder {`
`63`	`66`	`sessionRemoteDataSource.getByGoogleAuthorizationCode(clientId, code, redirectUri)`
`64`	`67`	`accountMetaDataDataStoreDataSource.upsert(`
`65`		`- AccountMetaDataDataStoreEntity(profileImage = sessionRemote.account.profileImage),`
	`68`	`+ AccountMetaDataDataStoreEntity(`
	`69`	`+ accountId = sessionRemote.account.id,`
	`70`	`+ profileImage = sessionRemote.account.profileImage,`
	`71`	`+ ),`
`66`	`72`	`)`
`67`	`73`	`supabaseAuth.importAuthToken(sessionRemote.accessToken, sessionRemote.refreshToken)`
`68`	`74`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,9 @@`
`1`	`1`	`package io.github.taetae98coding.diary.domain.account.repository`
`2`	`2`
`3`	`3`	`import io.github.taetae98coding.diary.core.model.account.AccountMetaData`
	`4`	`+import kotlin.uuid.Uuid`
`4`	`5`	`import kotlinx.coroutines.flow.Flow`
`5`	`6`
`6`	`7`	`public interface AccountMetaDataRepository {`
`7`		`- public fun get(): Flow<AccountMetaData?>`
	`8`	`+ public fun get(accountId: Uuid): Flow<AccountMetaData?>`
`8`	`9`	`}`