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

jeongjaino · jeongjaino · commit f54dd8492685 · 2025-10-20T21:51:08.000+09:00
diff --git a/app/src/main/kotlin/com/bff/wespot/main/viewmodel/MainViewModel.kt b/app/src/main/kotlin/com/bff/wespot/main/viewmodel/MainViewModel.kt
@@ -2,8 +2,6 @@ package com.bff.wespot.main.viewmodel
 
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
-import com.bff.wespot.analytic.AnalyticsEvent
-import com.bff.wespot.analytic.AnalyticsHelper
 import com.bff.wespot.common.util.AppVersionUtils.VersionCompareResult
 import com.bff.wespot.common.util.AppVersionUtils.versionCompare
 import com.bff.wespot.domain.repository.CommonRepository
@@ -37,7 +35,6 @@ class MainViewModel @Inject constructor(
     private val dataStoreRepository: DataStoreRepository,
     private val userRepository: UserRepository,
     private val coroutineDispatcher: CoroutineDispatcher,
-    private val analyticsHelper: AnalyticsHelper,
     private val commonRepository: CommonRepository,
     private val remoteConfigRepository: RemoteConfigRepository,
 ) : ViewModel(),
@@ -153,21 +150,9 @@ class MainViewModel @Inject constructor(
     }
 
     private fun handleEnteredFromPushNotification(data: PushNotificationData) = intent {
-        trackPushNotificationClicked(data)
         postSideEffect(MainSideEffect.NavigateFromPushNotification(data))
     }
 
-    private fun trackPushNotificationClicked(data: PushNotificationData) {
-        analyticsHelper.logEvent(
-            event = AnalyticsEvent(
-                type = "push_notification_clicked",
-                extras = listOf(
-                    AnalyticsEvent.Param("type", data.type.name),
-                ),
-            ),
-        )
-    }
-
     private fun handleOnBoardingClose(category: OnBoardingCategory) = intent {
         when (category) {
             OnBoardingCategory.VOTE -> reduce { state.copy(showVoteOnBoarding = false) }
diff --git a/app/src/main/kotlin/com/bff/wespot/notification/PushNotificationService.kt b/app/src/main/kotlin/com/bff/wespot/notification/PushNotificationService.kt
@@ -8,8 +8,6 @@ import android.media.RingtoneManager
 import androidx.core.app.NotificationCompat
 import androidx.core.content.ContextCompat
 import com.bff.wespot.R
-import com.bff.wespot.analytic.AnalyticsEvent
-import com.bff.wespot.analytic.AnalyticsHelper
 import com.bff.wespot.common.CHANNEL_ID
 import com.bff.wespot.domain.repository.DataStoreRepository
 import com.bff.wespot.domain.util.DataStoreKey.PUSH_TOKEN
@@ -33,9 +31,6 @@ class PushNotificationService : FirebaseMessagingService() {
     lateinit var coroutineDispatcher: CoroutineDispatcher
     private val coroutineScope by lazy { CoroutineScope(coroutineDispatcher) }
 
-    @Inject
-    lateinit var analyticsHelper: AnalyticsHelper
-
     override fun onNewToken(token: String) {
         super.onNewToken(token)
         coroutineScope.launch {
@@ -47,7 +42,6 @@ class PushNotificationService : FirebaseMessagingService() {
         super.onMessageReceived(message)
         if (message.data.isNotEmpty() || message.notification != null) {
             sendNotification(message)
-            trackPushNotification(message)
         }
     }
 
@@ -92,19 +86,6 @@ class PushNotificationService : FirebaseMessagingService() {
         notificationManager.notify(notificationId, notificationBuilder.build())
     }
 
-    private fun trackPushNotification(message: RemoteMessage) {
-        val paramList = message.data.map { (key, value) ->
-            AnalyticsEvent.Param(key, value.toString())
-        }
-
-        analyticsHelper.logEvent(
-            AnalyticsEvent(
-                type = "push_notification_received",
-                extras = paramList,
-            ),
-        )
-    }
-
     override fun onDestroy() {
         super.onDestroy()
         coroutineScope.cancel()
diff --git a/feature/auth/src/main/kotlin/com/bff/wespot/auth/screen/ClassScreen.kt b/feature/auth/src/main/kotlin/com/bff/wespot/auth/screen/ClassScreen.kt
@@ -22,7 +22,6 @@ import androidx.compose.ui.platform.LocalSoftwareKeyboardController
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.input.KeyboardType
 import androidx.compose.ui.unit.dp
-import com.bff.wespot.analytic.TrackScreenViewEvent
 import com.bff.wespot.auth.R
 import com.bff.wespot.auth.state.AuthAction
 import com.bff.wespot.auth.state.NavigationAction
@@ -142,6 +141,4 @@ fun ClassScreen(
         delay(10)
         keyboard?.show()
     }
-
-    TrackScreenViewEvent(screenName = "class_screen", id = state.uuid)
 }
diff --git a/feature/auth/src/main/kotlin/com/bff/wespot/auth/screen/CompleteScreen.kt b/feature/auth/src/main/kotlin/com/bff/wespot/auth/screen/CompleteScreen.kt
@@ -22,10 +22,6 @@ import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
-import com.bff.wespot.analytic.AnalyticsEvent
-import com.bff.wespot.analytic.AnalyticsEvent.Param
-import com.bff.wespot.analytic.LocalAnalyticsHelper
-import com.bff.wespot.analytic.TrackScreenViewEvent
 import com.bff.wespot.auth.R
 import com.bff.wespot.auth.state.AuthAction
 import com.bff.wespot.auth.viewmodel.AuthViewModel
@@ -52,13 +48,8 @@ fun CompleteScreen(
 
     val activity = LocalActivity.current
     val context = LocalContext.current
-    var inviteClicked by remember {
-        mutableStateOf(false)
-    }
     val networkState by viewModel.networkState.collectAsStateWithLifecycle()
 
-    val analyticsHelper = LocalAnalyticsHelper.current
-
     val message = context.getString(com.bff.wespot.designsystem.R.string.invite_message)
 
     handleSideEffect(viewModel.sideEffect)
@@ -85,7 +76,6 @@ fun CompleteScreen(
                         context,
                         message + state.playStoreLink,
                     )
-                    inviteClicked = true
                 },
                 text = stringResource(id = R.string.invite_friend_and_start),
                 paddingValues = PaddingValues(horizontal = 20.dp, vertical = 8.dp),
@@ -95,15 +85,6 @@ fun CompleteScreen(
 
             WSOutlineButton(
                 onClick = {
-                    analyticsHelper.logEvent(
-                        AnalyticsEvent(
-                            type = "invite_friend_before_sign_up",
-                            extras = listOf(
-                                Param("screen_name", "complete_sign_up"),
-                                Param("invite_clicked", inviteClicked.toString()),
-                            ),
-                        ),
-                    )
                     viewModel.onAction(AuthAction.Signup)
                 },
                 text = stringResource(id = R.string.start),
@@ -137,6 +118,4 @@ fun CompleteScreen(
     }
 
     NetworkDialog(context = context, networkState = networkState)
-
-    TrackScreenViewEvent(screenName = "complete_screen", id = state.uuid)
 }
diff --git a/feature/auth/src/main/kotlin/com/bff/wespot/auth/screen/EditScreen.kt b/feature/auth/src/main/kotlin/com/bff/wespot/auth/screen/EditScreen.kt
@@ -37,7 +37,6 @@ import coil3.compose.AsyncImage
 import coil3.request.ImageRequest
 import coil3.request.error
 import coil3.request.placeholder
-import com.bff.wespot.analytic.TrackScreenViewEvent
 import com.bff.wespot.auth.R
 import com.bff.wespot.auth.state.AuthAction
 import com.bff.wespot.auth.state.AuthUiState
@@ -167,8 +166,6 @@ fun EditScreen(
             }
         }
     }
-
-    TrackScreenViewEvent(screenName = "edit_screen", id = state.uuid)
 }
 
 @Composable
diff --git a/feature/auth/src/main/kotlin/com/bff/wespot/auth/screen/GenderScreen.kt b/feature/auth/src/main/kotlin/com/bff/wespot/auth/screen/GenderScreen.kt
@@ -26,7 +26,6 @@ import androidx.compose.ui.graphics.painter.Painter
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
-import com.bff.wespot.analytic.TrackScreenViewEvent
 import com.bff.wespot.auth.R
 import com.bff.wespot.auth.state.AuthAction
 import com.bff.wespot.auth.state.NavigationAction
@@ -110,7 +109,6 @@ fun GenderScreen(
             }
         }
     }
-    TrackScreenViewEvent(screenName = "gender_screen", id = state.uuid)
 }
 
 @Composable
diff --git a/feature/auth/src/main/kotlin/com/bff/wespot/auth/screen/GradeScreen.kt b/feature/auth/src/main/kotlin/com/bff/wespot/auth/screen/GradeScreen.kt
@@ -24,7 +24,6 @@ import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
-import com.bff.wespot.analytic.TrackScreenViewEvent
 import com.bff.wespot.auth.R
 import com.bff.wespot.auth.state.AuthAction
 import com.bff.wespot.auth.state.NavigationAction
@@ -168,7 +167,6 @@ fun GradeScreen(
             }
         }
     }
-    TrackScreenViewEvent(screenName = "grade_screen", id = state.uuid)
 }
 
 @Composable
diff --git a/feature/auth/src/main/kotlin/com/bff/wespot/auth/screen/NameScreen.kt b/feature/auth/src/main/kotlin/com/bff/wespot/auth/screen/NameScreen.kt
@@ -25,7 +25,6 @@ import androidx.compose.ui.platform.LocalSoftwareKeyboardController
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
-import com.bff.wespot.analytic.TrackScreenViewEvent
 import com.bff.wespot.auth.R
 import com.bff.wespot.auth.state.AuthAction
 import com.bff.wespot.auth.state.NavigationAction
@@ -171,6 +170,4 @@ fun NameScreen(
     LaunchedEffect(Unit) {
         action(AuthAction.OnStartNameScreen)
     }
-
-    TrackScreenViewEvent(screenName = "name_screen", id = state.uuid)
 }
diff --git a/feature/auth/src/main/kotlin/com/bff/wespot/auth/screen/SchoolScreen.kt b/feature/auth/src/main/kotlin/com/bff/wespot/auth/screen/SchoolScreen.kt
@@ -31,7 +31,6 @@ import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import androidx.paging.LoadState
 import androidx.paging.compose.collectAsLazyPagingItems
 import androidx.paging.compose.itemKey
-import com.bff.wespot.analytic.TrackScreenViewEvent
 import com.bff.wespot.auth.R
 import com.bff.wespot.auth.state.AuthAction
 import com.bff.wespot.auth.state.NavigationAction
@@ -232,6 +231,4 @@ fun SchoolScreen(
     LaunchedEffect(Unit) {
         action(AuthAction.OnStartSchoolScreen)
     }
-
-    TrackScreenViewEvent(screenName = "school_screen", id = state.uuid)
 }
diff --git a/feature/message/src/main/kotlin/com/bff/wespot/message/viewmodel/SendViewModel.kt b/feature/message/src/main/kotlin/com/bff/wespot/message/viewmodel/SendViewModel.kt
@@ -2,8 +2,6 @@ package com.bff.wespot.message.viewmodel
 
 import androidx.lifecycle.viewModelScope
 import androidx.paging.cachedIn
-import com.bff.wespot.analytic.AnalyticsEvent
-import com.bff.wespot.analytic.AnalyticsHelper
 import com.bff.wespot.common.extension.onNetworkFailure
 import com.bff.wespot.designsystem.component.indicator.WSToastType
 import com.bff.wespot.domain.repository.BasePagingRepository
@@ -44,9 +42,6 @@ import org.orbitmvi.orbit.syntax.simple.postSideEffect
 import org.orbitmvi.orbit.syntax.simple.reduce
 import org.orbitmvi.orbit.viewmodel.container
 import timber.log.Timber
-import java.time.LocalDateTime
-import java.time.ZoneId
-import java.time.format.DateTimeFormatter
 import javax.inject.Inject
 
 @HiltViewModel
@@ -56,7 +51,6 @@ class SendViewModel @Inject constructor(
     private val commonRepository: CommonRepository,
     private val userListRepository: BasePagingRepository<User, Paging<User>>,
     private val checkProfanityUseCase: CheckProfanityUseCase,
-    private val analyticsHelper: AnalyticsHelper,
 ) : BaseViewModel(),
     ContainerHost<MessageSendUiState, MessageSendSideEffect> {
     override val container = container<MessageSendUiState, MessageSendSideEffect>(MessageSendUiState())
@@ -437,7 +431,6 @@ class SendViewModel @Inject constructor(
                         anonymousProfileName = state.senderProfile.name,
                     ),
                 ).onSuccess {
-                    trackMessageSendEvent()
                     reduce { state.copy(isLoading = false) }
                     postSideEffect(SendSideEffect.ShowToast(R.string.message_send_success))
                     postSideEffect(SendSideEffect.NavigateToMessage)
@@ -457,21 +450,6 @@ class SendViewModel @Inject constructor(
             uploadResult.getOrThrow()
         }
 
-    private fun trackMessageSendEvent() = intent {
-        val formatter = DateTimeFormatter.ISO_LOCAL_DATE_TIME
-        val sendTime = LocalDateTime.now(ZoneId.of("Asia/Seoul")).format(formatter)
-
-        analyticsHelper.logEvent(
-            event = AnalyticsEvent(
-                type = "message_send",
-                extras = listOf(
-                    AnalyticsEvent.Param("userId", state.profile.id.toString()),
-                    AnalyticsEvent.Param("time", sendTime),
-                ),
-            ),
-        )
-    }
-
     fun clearUiState() = intent {
         reduce {
             MessageSendUiState()
diff --git a/feature/vote/src/main/java/com/bff/wespot/vote/screen/IndividualVoteScreen.kt b/feature/vote/src/main/java/com/bff/wespot/vote/screen/IndividualVoteScreen.kt
@@ -30,8 +30,6 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
-import com.bff.wespot.analytic.LocalAnalyticsHelper
-import com.bff.wespot.analytic.TrackScreenViewEvent
 import com.bff.wespot.designsystem.component.button.WSButton
 import com.bff.wespot.designsystem.component.header.WSTopBar
 import com.bff.wespot.designsystem.component.indicator.WSToastType
@@ -75,8 +73,6 @@ fun IndividualVoteScreen(
     val individual by viewModel.individual.collectAsStateWithLifecycle()
     val context = LocalContext.current
 
-    val analyticsHelper = LocalAnalyticsHelper.current
-
     val networkState by viewModel.networkState.collectAsStateWithLifecycle()
 
     var showToast by remember { mutableStateOf(false) }
@@ -205,6 +201,4 @@ fun IndividualVoteScreen(
     }
 
     NetworkDialog(context = context, networkState = networkState)
-
-    TrackScreenViewEvent(screenName = "receive_vote_screen")
 }
diff --git a/feature/vote/src/main/java/com/bff/wespot/vote/screen/VotingScreen.kt b/feature/vote/src/main/java/com/bff/wespot/vote/screen/VotingScreen.kt
@@ -35,11 +35,6 @@ import androidx.compose.ui.unit.dp
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import coil3.compose.AsyncImage
 import coil3.request.ImageRequest
-import com.bff.wespot.analytic.AnalyticsEvent
-import com.bff.wespot.analytic.AnalyticsEvent.Param
-import com.bff.wespot.analytic.AnalyticsHelper
-import com.bff.wespot.analytic.LocalAnalyticsHelper
-import com.bff.wespot.analytic.TrackScreenViewEvent
 import com.bff.wespot.designsystem.component.button.WSButton
 import com.bff.wespot.designsystem.component.button.WSOutlineButton
 import com.bff.wespot.designsystem.component.button.WSOutlineButtonType
@@ -83,20 +78,10 @@ fun VotingScreen(
 ) {
     val state by viewModel.collectAsState()
     val action = viewModel::onAction
-    val analyticsHelper = LocalAnalyticsHelper.current
     val networkState by viewModel.networkState.collectAsStateWithLifecycle()
 
     val context = LocalContext.current
 
-    analyticsHelper.logEvent(
-        AnalyticsEvent(
-            type = "vote_screen_view",
-            extras = listOf(
-                Param("screen_name", "vote_screen"),
-            ),
-        ),
-    )
-
     var submitButton by remember { mutableStateOf(false) }
 
     var toast by remember {
@@ -169,7 +154,7 @@ fun VotingScreen(
         if (state.loading && showGuideScreen && !restricted.restricted) {
             return@Scaffold
         } else if (showGuideScreen) {
-            VotingGuideScreen(it, navigator, state, analyticsHelper)
+            VotingGuideScreen(it, navigator, state)
         } else {
             VotingProgressScreen(
                 state = state,
@@ -354,7 +339,6 @@ private fun VotingGuideScreen(
     paddingValues: PaddingValues,
     navigator: Navigator,
     state: VotingUiState,
-    analyticsHelper: AnalyticsHelper,
 ) {
     val context = LocalContext.current
 
@@ -385,22 +369,10 @@ private fun VotingGuideScreen(
     }
     Box(modifier = Modifier.fillMaxSize(), contentAlignment = Alignment.BottomCenter) {
         WSButton(onClick = {
-            analyticsHelper.logEvent(
-                AnalyticsEvent(
-                    type = "empty_vote_invite_friend",
-                    extras = listOf(
-                        Param("screen_name", "vote_empty_screen"),
-                        Param("invite_clicked", "true"),
-                    ),
-                ),
-            )
-
             val message = context.getString(com.bff.wespot.designsystem.R.string.invite_message)
             navigator.navigateToSharing(context, message + state.playStoreLink)
         }, text = stringResource(R.string.invite_friend_vote)) {
             it.invoke()
         }
     }
-
-    TrackScreenViewEvent(screenName = "vote_empty_screen")
 }

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,6 @@ import androidx.compose.ui.platform.LocalSoftwareKeyboardController`
`22`	`22`	`import androidx.compose.ui.res.stringResource`
`23`	`23`	`import androidx.compose.ui.text.input.KeyboardType`
`24`	`24`	`import androidx.compose.ui.unit.dp`
`25`		`-import com.bff.wespot.analytic.TrackScreenViewEvent`
`26`	`25`	`import com.bff.wespot.auth.R`
`27`	`26`	`import com.bff.wespot.auth.state.AuthAction`
`28`	`27`	`import com.bff.wespot.auth.state.NavigationAction`
`@@ -142,6 +141,4 @@ fun ClassScreen(`
`142`	`141`	`delay(10)`
`143`	`142`	`keyboard?.show()`
`144`	`143`	`}`
`145`		`-`
`146`		`- TrackScreenViewEvent(screenName = "class_screen", id = state.uuid)`
`147`	`144`	`}`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,6 @@ import coil3.compose.AsyncImage`
`37`	`37`	`import coil3.request.ImageRequest`
`38`	`38`	`import coil3.request.error`
`39`	`39`	`import coil3.request.placeholder`
`40`		`-import com.bff.wespot.analytic.TrackScreenViewEvent`
`41`	`40`	`import com.bff.wespot.auth.R`
`42`	`41`	`import com.bff.wespot.auth.state.AuthAction`
`43`	`42`	`import com.bff.wespot.auth.state.AuthUiState`
`@@ -167,8 +166,6 @@ fun EditScreen(`
`167`	`166`	`}`
`168`	`167`	`}`
`169`	`168`	`}`
`170`		`-`
`171`		`- TrackScreenViewEvent(screenName = "edit_screen", id = state.uuid)`
`172`	`169`	`}`
`173`	`170`
`174`	`171`	`@Composable`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,6 @@ import androidx.compose.ui.graphics.painter.Painter`
`26`	`26`	`import androidx.compose.ui.res.painterResource`
`27`	`27`	`import androidx.compose.ui.res.stringResource`
`28`	`28`	`import androidx.compose.ui.unit.dp`
`29`		`-import com.bff.wespot.analytic.TrackScreenViewEvent`
`30`	`29`	`import com.bff.wespot.auth.R`
`31`	`30`	`import com.bff.wespot.auth.state.AuthAction`
`32`	`31`	`import com.bff.wespot.auth.state.NavigationAction`
`@@ -110,7 +109,6 @@ fun GenderScreen(`
`110`	`109`	`}`
`111`	`110`	`}`
`112`	`111`	`}`
`113`		`- TrackScreenViewEvent(screenName = "gender_screen", id = state.uuid)`
`114`	`112`	`}`
`115`	`113`
`116`	`114`	`@Composable`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,6 @@ import androidx.compose.ui.graphics.Color`
`24`	`24`	`import androidx.compose.ui.res.painterResource`
`25`	`25`	`import androidx.compose.ui.res.stringResource`
`26`	`26`	`import androidx.compose.ui.unit.dp`
`27`		`-import com.bff.wespot.analytic.TrackScreenViewEvent`
`28`	`27`	`import com.bff.wespot.auth.R`
`29`	`28`	`import com.bff.wespot.auth.state.AuthAction`
`30`	`29`	`import com.bff.wespot.auth.state.NavigationAction`
`@@ -168,7 +167,6 @@ fun GradeScreen(`
`168`	`167`	`}`
`169`	`168`	`}`
`170`	`169`	`}`
`171`		`- TrackScreenViewEvent(screenName = "grade_screen", id = state.uuid)`
`172`	`170`	`}`
`173`	`171`
`174`	`172`	`@Composable`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,6 @@ import androidx.compose.ui.platform.LocalSoftwareKeyboardController`
`25`	`25`	`import androidx.compose.ui.res.stringResource`
`26`	`26`	`import androidx.compose.ui.unit.dp`
`27`	`27`	`import androidx.lifecycle.compose.collectAsStateWithLifecycle`
`28`		`-import com.bff.wespot.analytic.TrackScreenViewEvent`
`29`	`28`	`import com.bff.wespot.auth.R`
`30`	`29`	`import com.bff.wespot.auth.state.AuthAction`
`31`	`30`	`import com.bff.wespot.auth.state.NavigationAction`
`@@ -171,6 +170,4 @@ fun NameScreen(`
`171`	`170`	`LaunchedEffect(Unit) {`
`172`	`171`	`action(AuthAction.OnStartNameScreen)`
`173`	`172`	`}`
`174`		`-`
`175`		`- TrackScreenViewEvent(screenName = "name_screen", id = state.uuid)`
`176`	`173`	`}`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,6 @@ import androidx.lifecycle.compose.collectAsStateWithLifecycle`
`31`	`31`	`import androidx.paging.LoadState`
`32`	`32`	`import androidx.paging.compose.collectAsLazyPagingItems`
`33`	`33`	`import androidx.paging.compose.itemKey`
`34`		`-import com.bff.wespot.analytic.TrackScreenViewEvent`
`35`	`34`	`import com.bff.wespot.auth.R`
`36`	`35`	`import com.bff.wespot.auth.state.AuthAction`
`37`	`36`	`import com.bff.wespot.auth.state.NavigationAction`
`@@ -232,6 +231,4 @@ fun SchoolScreen(`
`232`	`231`	`LaunchedEffect(Unit) {`
`233`	`232`	`action(AuthAction.OnStartSchoolScreen)`
`234`	`233`	`}`
`235`		`-`
`236`		`- TrackScreenViewEvent(screenName = "school_screen", id = state.uuid)`
`237`	`234`	`}`