refactor: Optimize code

Fixes: LEARNER-10041
openedx · Jul 3, 2024 · 9a835fe · 9a835fe
1 parent 7be7bc9
commit 9a835fe
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 22 deletions.
diff --git a/app/src/main/java/org/openedx/app/MainViewModel.kt b/app/src/main/java/org/openedx/app/MainViewModel.kt
@@ -58,8 +58,9 @@ class MainViewModel(
     }
 
     private fun logScreenEvent(event: AppAnalyticsEvent) {
-        analytics.logScreenEvent(event.eventName,
-            buildMap {
+        analytics.logScreenEvent(
+            screenName = event.eventName,
+            params = buildMap {
                 put(AppAnalyticsKey.NAME.key, event.biValue)
             }
         )

diff --git a/auth/src/main/java/org/openedx/auth/presentation/logistration/LogistrationViewModel.kt b/auth/src/main/java/org/openedx/auth/presentation/logistration/LogistrationViewModel.kt
@@ -19,7 +19,7 @@ class LogistrationViewModel(
     private val discoveryTypeWebView get() = config.getDiscoveryConfig().isViewTypeWebView()
 
     init {
-        logScreenEvent(AuthAnalyticsEvent.Logistration)
+        logLogistrationScreenEvent()
     }
 
     fun navigateToSignIn(parentFragmentManager: FragmentManager) {
@@ -67,15 +67,12 @@ class LogistrationViewModel(
         )
     }
 
-    private fun logScreenEvent(
-        event: AuthAnalyticsEvent,
-        params: Map<String, Any?> = emptyMap(),
-    ) {
+    private fun logLogistrationScreenEvent() {
+        val event = AuthAnalyticsEvent.Logistration
         analytics.logScreenEvent(
             screenName = event.eventName,
             params = buildMap {
                 put(AuthAnalyticsKey.NAME.key, event.biValue)
-                putAll(params)
             }
         )
     }

diff --git a/auth/src/main/java/org/openedx/auth/presentation/signin/SignInViewModel.kt b/auth/src/main/java/org/openedx/auth/presentation/signin/SignInViewModel.kt
@@ -78,7 +78,7 @@ class SignInViewModel(
 
     init {
         collectAppUpgradeEvent()
-        logScreenEvent(AuthAnalyticsEvent.SIGN_IN)
+        logSignInScreenEvent()
     }
 
     fun login(username: String, password: String) {
@@ -247,15 +247,12 @@ class SignInViewModel(
         )
     }
 
-    private fun logScreenEvent(
-        event: AuthAnalyticsEvent,
-        params: Map<String, Any?> = emptyMap(),
-    ) {
+    private fun logSignInScreenEvent() {
+        val event = AuthAnalyticsEvent.SIGN_IN
         analytics.logScreenEvent(
             screenName = event.eventName,
             params = buildMap {
                 put(AuthAnalyticsKey.NAME.key, event.biValue)
-                putAll(params)
             }
         )
     }

diff --git a/auth/src/main/java/org/openedx/auth/presentation/signup/SignUpViewModel.kt b/auth/src/main/java/org/openedx/auth/presentation/signup/SignUpViewModel.kt
@@ -73,7 +73,7 @@ class SignUpViewModel(
 
     init {
         collectAppUpgradeEvent()
-        logScreenEvent(AuthAnalyticsEvent.REGISTER)
+        logRegisterScreenEvent()
     }
 
     fun getRegistrationFields() {
@@ -326,15 +326,12 @@ class SignUpViewModel(
         )
     }
 
-    private fun logScreenEvent(
-        event: AuthAnalyticsEvent,
-        params: Map<String, Any?> = emptyMap(),
-    ) {
+    private fun logRegisterScreenEvent() {
+        val event = AuthAnalyticsEvent.REGISTER
         analytics.logScreenEvent(
             screenName = event.eventName,
             params = buildMap {
                 put(AuthAnalyticsKey.NAME.key, event.biValue)
-                putAll(params)
             }
         )
     }

diff --git a/dashboard/src/main/java/org/openedx/learn/presentation/LearnViewModel.kt b/dashboard/src/main/java/org/openedx/learn/presentation/LearnViewModel.kt
@@ -35,8 +35,9 @@ class LearnViewModel(
     }
 
     private fun logScreenEvent(event: DashboardAnalyticsEvent) {
-        analytics.logScreenEvent(event.eventName,
-            buildMap {
+        analytics.logScreenEvent(
+            screenName = event.eventName,
+            params = buildMap {
                 put(DashboardAnalyticsKey.NAME.key, event.biValue)
             }
         )