Merge branch 'feature/jaino/#290' into develop

Author: jeongjaino

app/src/dev/kotlin/com/bff/wespot/AnalyticsModule.kt

@@ -1,7 +1,7 @@
 package com.bff.wespot
 
-import com.bff.wespot.analytic.AnalyticsHelper
-import com.bff.wespot.analytic.DebugAnalyticsHelper
+import com.bff.wespot.analytics.AnalyticsHelper
+import com.bff.wespot.analytics.DebugAnalyticsHelper
 import dagger.Module
 import dagger.Provides
 import dagger.hilt.InstallIn

app/src/main/kotlin/com/bff/wespot/main/MainActivity.kt

@@ -9,7 +9,7 @@ import androidx.activity.compose.setContent
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.activity.viewModels
 import androidx.core.content.ContextCompat
-import com.bff.wespot.analytic.AnalyticsHelper
+import com.bff.wespot.analytics.AnalyticsHelper
 import com.bff.wespot.designsystem.theme.WeSpotTheme
 import com.bff.wespot.main.state.MainAction
 import com.bff.wespot.main.viewmodel.MainViewModel

app/src/main/kotlin/com/bff/wespot/main/MainScreen.kt

@@ -21,8 +21,8 @@ import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.stringResource
 import androidx.navigation.compose.rememberNavController
 import com.bff.wespot.R
-import com.bff.wespot.analytic.AnalyticsHelper
-import com.bff.wespot.analytic.LocalAnalyticsHelper
+import com.bff.wespot.analytics.AnalyticsHelper
+import com.bff.wespot.analytics.LocalAnalyticsHelper
 import com.bff.wespot.common.checkCurrentScreen
 import com.bff.wespot.common.currentScreenAsState
 import com.bff.wespot.common.navigateToNavGraph

app/src/main/kotlin/com/bff/wespot/main/viewmodel/MainViewModel.kt

@@ -2,13 +2,14 @@ package com.bff.wespot.main.viewmodel
 
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
+import com.bff.wespot.analytics.AnalyticsHelper
 import com.bff.wespot.common.util.AppVersionUtils.VersionCompareResult
 import com.bff.wespot.common.util.AppVersionUtils.versionCompare
 import com.bff.wespot.domain.repository.CommonRepository
 import com.bff.wespot.domain.repository.DataStoreRepository
 import com.bff.wespot.domain.repository.firebase.config.RemoteConfigRepository
+import com.bff.wespot.domain.repository.user.ProfileRepository
 import com.bff.wespot.domain.repository.user.UserRepository
-import com.bff.wespot.domain.usecase.CacheProfileUseCase
 import com.bff.wespot.domain.util.DataStoreKey
 import com.bff.wespot.domain.util.RemoteConfigKey
 import com.bff.wespot.main.model.VersionUpdateType
@@ -31,12 +32,13 @@ import javax.inject.Inject
 
 @HiltViewModel
 class MainViewModel @Inject constructor(
-    private val cacheProfileUseCase: CacheProfileUseCase,
     private val dataStoreRepository: DataStoreRepository,
     private val userRepository: UserRepository,
+    private val profileRepository: ProfileRepository,
     private val coroutineDispatcher: CoroutineDispatcher,
     private val commonRepository: CommonRepository,
     private val remoteConfigRepository: RemoteConfigRepository,
+    private val analyticsHelper: AnalyticsHelper,
 ) : ViewModel(),
     ContainerHost<MainUiState, MainSideEffect> {
     override val container = container<MainUiState, MainSideEffect>(
@@ -79,7 +81,7 @@ class MainViewModel @Inject constructor(
 
     private fun handleMainScreenEntered(appVersion: String) = intent {
         viewModelScope.launch(coroutineDispatcher) {
-            cacheProfileUseCase()
+            setUserProfile()
 
             checkAppVersionWithLatestVersion(appVersion)
 
@@ -93,6 +95,15 @@ class MainViewModel @Inject constructor(
         }
     }
 
+    private fun setUserProfile() {
+        viewModelScope.launch {
+            userRepository.getProfile().mapCatching { profile ->
+                profileRepository.setProfile(profile)
+                analyticsHelper.updateUserId(profile.id.toString())
+            }
+        }
+    }
+
     /** RemoteConfig에서 최신 버전을 가져와 현재 앱 버전과 비교하고 적절한 업데이트 다이얼로그를 노출한다.*/
     private fun checkAppVersionWithLatestVersion(appVersion: String) = intent {
         val latestVersion = remoteConfigRepository.fetchFromRemoteConfig(RemoteConfigKey.LATEST_VERSION)

app/src/real/kotlin/com.bff.wespot/AnalyticsModule.kt

@@ -1,6 +1,6 @@
 package com.bff.wespot
 
-import com.bff.wespot.analytic.AnalyticsHelper
+import com.bff.wespot.analytics.AnalyticsHelper
 import com.google.firebase.analytics.FirebaseAnalytics
 import com.google.firebase.analytics.ktx.analytics
 import com.google.firebase.ktx.Firebase

app/src/real/kotlin/com.bff.wespot/FirebaseAnalyticsHelper.kt

@@ -1,7 +1,7 @@
 package com.bff.wespot
 
-import com.bff.wespot.analytic.AnalyticsEvent
-import com.bff.wespot.analytic.AnalyticsHelper
+import com.bff.wespot.analytics.AnalyticsEvent
+import com.bff.wespot.analytics.AnalyticsHelper
 import com.google.firebase.analytics.FirebaseAnalytics
 import com.google.firebase.analytics.logEvent
 import javax.inject.Inject
@@ -12,9 +12,9 @@ class FirebaseAnalyticsHelper @Inject constructor(
     private var userId: String = ""
 
     override fun logEvent(event: AnalyticsEvent) {
-        firebaseAnalytics.logEvent(event.type) {
+        firebaseAnalytics.logEvent(event.name) {
             param("userId", userId)
-            event.extras.forEach { (key, value) ->
+            event.params.forEach { (key, value) ->
                 param(
                     key = key.take(40),
                     value = value.take(100),

core/analytics/src/main/java/com/bff/wespot/analytic/AnalyticExtension.kt

@@ -0,0 +1,71 @@
+package com.bff.wespot.analytics
+
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.DisposableEffect
+import androidx.compose.runtime.staticCompositionLocalOf
+import com.bff.wespot.analytics.AnalyticsEvent.Param
+
+val LocalAnalyticsHelper = staticCompositionLocalOf<AnalyticsHelper> {
+    NoOpAnalyticsHelper()
+}
+
+fun AnalyticsHelper.logScreenView(
+    name: String,
+    extras: List<Param> = emptyList(),
+) {
+    val params = buildList {
+        addAll(extras)
+    }
+
+    logEvent(AnalyticsEvent("view_$name", params))
+}
+
+fun AnalyticsHelper.logImpression(
+    name: String,
+    extras: List<Param> = emptyList(),
+) {
+    val params = buildList {
+        addAll(extras)
+    }
+
+    logEvent(AnalyticsEvent("impression_$name", params))
+}
+
+fun AnalyticsHelper.logClick(
+    name: String,
+    area: String = "",
+    extras: List<Param> = listOf(),
+) {
+    val params = buildList {
+        add(Param("area", area))
+        addAll(extras)
+    }
+
+    logEvent(AnalyticsEvent("click_$name", params))
+}
+
+@Composable
+fun TrackScreenViewEvent(
+    name: String,
+    extras: List<Param> = emptyList(),
+    analyticsHelper: AnalyticsHelper = LocalAnalyticsHelper.current,
+) = DisposableEffect(Unit) {
+    analyticsHelper.logScreenView(
+        name = name,
+        extras = extras,
+    )
+    onDispose {}
+}
+
+@Composable
+fun TrackImpressionEvent(
+    name: String,
+    extras: List<Param> = emptyList(),
+    analyticsHelper: AnalyticsHelper = LocalAnalyticsHelper.current,
+) = DisposableEffect(Unit) {
+    analyticsHelper.logImpression(
+        name = name,
+        extras = extras,
+    )
+    onDispose {}
+}

core/analytics/src/main/java/com/bff/wespot/analytic/AnalyticsEvent.kt

@@ -0,0 +1,8 @@
+package com.bff.wespot.analytics
+
+data class AnalyticsEvent(
+    val name: String,
+    val params: List<Param> = emptyList()
+) {
+    data class Param(val key: String, val value: String)
+}