Return purchase flow to production flag

rostikjoystick · rostikjoystick · commit bc53c44d38d3 · 2021-12-24T19:13:30.000+03:00
diff --git a/app/src/main/java/org/stepic/droid/configuration/analytic/CoursePurchaseFlowProperty.kt b/app/src/main/java/org/stepic/droid/configuration/analytic/CoursePurchaseFlowProperty.kt
@@ -0,0 +1,12 @@
+package org.stepic.droid.configuration.analytic
+
+import org.stepic.droid.configuration.RemoteConfig
+import org.stepik.android.domain.base.analytic.UserProperty
+
+class CoursePurchaseFlowProperty(purchaseFlow: String) : UserProperty {
+    override val name: String =
+        RemoteConfig.PREFIX + RemoteConfig.PURCHASE_FLOW_ANDROID
+
+    override val value: String =
+        purchaseFlow
+}
diff --git a/app/src/main/java/org/stepic/droid/core/presenters/SplashPresenter.kt b/app/src/main/java/org/stepic/droid/core/presenters/SplashPresenter.kt
@@ -194,6 +194,7 @@ constructor(
         analytic.reportUserProperty(NewHomeScreenEnabledUserProperty(firebaseRemoteConfig[RemoteConfig.IS_NEW_HOME_SCREEN_ENABLED].asBoolean()))
         analytic.reportUserProperty(PersonalizedOnboardingCourseListsUserProperty(firebaseRemoteConfig[RemoteConfig.PERSONALIZED_ONBOARDING_COURSE_LISTS].asString()))
         analytic.reportUserProperty(CourseRevenueAvailableUserProperty(firebaseRemoteConfig[RemoteConfig.IS_COURSE_REVENUE_AVAILABLE_ANDROID].asBoolean()))
+        analytic.reportUserProperty(CoursePurchaseFlowProperty(firebaseRemoteConfig[RemoteConfig.PURCHASE_FLOW_ANDROID].asString()))
     }
 
     private fun countNumberOfLaunches() {
diff --git a/app/src/main/java/org/stepik/android/domain/course/interactor/CourseInteractor.kt b/app/src/main/java/org/stepik/android/domain/course/interactor/CourseInteractor.kt
@@ -57,7 +57,7 @@ constructor(
 
     private fun obtainCourseHeaderData(course: Course, promo: String? = null): Maybe<CourseHeaderData> {
         val currentFlow = CoursePurchaseFlow.valueOfWithFallback(
-            firebaseRemoteConfig[RemoteConfig.PURCHASE_FLOW_ANDROID_TEST]
+            firebaseRemoteConfig[RemoteConfig.PURCHASE_FLOW_ANDROID]
                 .asString()
                 .uppercase()
         )
diff --git a/app/src/main/java/org/stepik/android/domain/course/interactor/CourseStatsInteractor.kt b/app/src/main/java/org/stepik/android/domain/course/interactor/CourseStatsInteractor.kt
@@ -48,7 +48,7 @@ constructor(
 
     fun checkDeeplinkPromoCodeValidity(courseId: Long, promo: String): Single<Pair<DeeplinkPromoCode, PromoCodeSku>> {
         val currentFlow = CoursePurchaseFlow.valueOfWithFallback(
-            firebaseRemoteConfig[RemoteConfig.PURCHASE_FLOW_ANDROID_TEST]
+            firebaseRemoteConfig[RemoteConfig.PURCHASE_FLOW_ANDROID]
                 .asString()
                 .uppercase()
         )
@@ -232,7 +232,7 @@ constructor(
     private fun resolvePaidEnrollmentState(standardLightSku: LightSku?, promoLightSku: LightSku?): EnrollmentState =
         if (standardLightSku == null) {
             val currentFlow = CoursePurchaseFlow.valueOfWithFallback(
-                firebaseRemoteConfig[RemoteConfig.PURCHASE_FLOW_ANDROID_TEST]
+                firebaseRemoteConfig[RemoteConfig.PURCHASE_FLOW_ANDROID]
                     .asString()
                     .uppercase()
             )
diff --git a/app/src/main/java/org/stepik/android/domain/course_list/interactor/CourseListInteractor.kt b/app/src/main/java/org/stepik/android/domain/course_list/interactor/CourseListInteractor.kt
@@ -68,7 +68,7 @@ constructor(
         sourceTypeComposition: SourceTypeComposition
     ): Single<PagedList<CourseListItem.Data>> {
         val currentFlow = CoursePurchaseFlow.valueOfWithFallback(
-            firebaseRemoteConfig[RemoteConfig.PURCHASE_FLOW_ANDROID_TEST]
+            firebaseRemoteConfig[RemoteConfig.PURCHASE_FLOW_ANDROID]
                 .asString()
                 .uppercase()
         )
diff --git a/app/src/main/java/org/stepik/android/domain/lesson_demo/interactor/LessonDemoInteractor.kt b/app/src/main/java/org/stepik/android/domain/lesson_demo/interactor/LessonDemoInteractor.kt
@@ -28,7 +28,7 @@ constructor(
 ) {
     fun getLessonDemoData(course: Course): Single<LessonDemoData> {
         val currentFlow = CoursePurchaseFlow.valueOfWithFallback(
-            firebaseRemoteConfig[RemoteConfig.PURCHASE_FLOW_ANDROID_TEST]
+            firebaseRemoteConfig[RemoteConfig.PURCHASE_FLOW_ANDROID]
                 .asString()
                 .uppercase()
         )
diff --git a/app/src/main/java/org/stepik/android/view/lesson_demo/ui/dialog/LessonDemoCompleteBottomSheetDialogFragment.kt b/app/src/main/java/org/stepik/android/view/lesson_demo/ui/dialog/LessonDemoCompleteBottomSheetDialogFragment.kt
@@ -114,7 +114,7 @@ class LessonDemoCompleteBottomSheetDialogFragment :
     override fun onAction(action: LessonDemoFeature.Action.ViewAction) {
         if (action is LessonDemoFeature.Action.ViewAction.BuyAction) {
             val currentFlow = CoursePurchaseFlow.valueOfWithFallback(
-                firebaseRemoteConfig[RemoteConfig.PURCHASE_FLOW_ANDROID_TEST]
+                firebaseRemoteConfig[RemoteConfig.PURCHASE_FLOW_ANDROID]
                     .asString()
                     .uppercase()
             )

Original file line number	Diff line number	Diff line change
`@@ -194,6 +194,7 @@ constructor(`
`194`	`194`	`analytic.reportUserProperty(NewHomeScreenEnabledUserProperty(firebaseRemoteConfig[RemoteConfig.IS_NEW_HOME_SCREEN_ENABLED].asBoolean()))`
`195`	`195`	`analytic.reportUserProperty(PersonalizedOnboardingCourseListsUserProperty(firebaseRemoteConfig[RemoteConfig.PERSONALIZED_ONBOARDING_COURSE_LISTS].asString()))`
`196`	`196`	`analytic.reportUserProperty(CourseRevenueAvailableUserProperty(firebaseRemoteConfig[RemoteConfig.IS_COURSE_REVENUE_AVAILABLE_ANDROID].asBoolean()))`
	`197`	`+ analytic.reportUserProperty(CoursePurchaseFlowProperty(firebaseRemoteConfig[RemoteConfig.PURCHASE_FLOW_ANDROID].asString()))`
`197`	`198`	`}`
`198`	`199`
`199`	`200`	`private fun countNumberOfLaunches() {`
Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ constructor(`
`57`	`57`
`58`	`58`	`private fun obtainCourseHeaderData(course: Course, promo: String? = null): Maybe<CourseHeaderData> {`
`59`	`59`	`val currentFlow = CoursePurchaseFlow.valueOfWithFallback(`
`60`		`- firebaseRemoteConfig[RemoteConfig.PURCHASE_FLOW_ANDROID_TEST]`
	`60`	`+ firebaseRemoteConfig[RemoteConfig.PURCHASE_FLOW_ANDROID]`
`61`	`61`	`.asString()`
`62`	`62`	`.uppercase()`
`63`	`63`	`)`
Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ constructor(`
`68`	`68`	`sourceTypeComposition: SourceTypeComposition`
`69`	`69`	`): Single<PagedList<CourseListItem.Data>> {`
`70`	`70`	`val currentFlow = CoursePurchaseFlow.valueOfWithFallback(`
`71`		`- firebaseRemoteConfig[RemoteConfig.PURCHASE_FLOW_ANDROID_TEST]`
	`71`	`+ firebaseRemoteConfig[RemoteConfig.PURCHASE_FLOW_ANDROID]`
`72`	`72`	`.asString()`
`73`	`73`	`.uppercase()`
`74`	`74`	`)`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ constructor(`
`28`	`28`	`) {`
`29`	`29`	`fun getLessonDemoData(course: Course): Single<LessonDemoData> {`
`30`	`30`	`val currentFlow = CoursePurchaseFlow.valueOfWithFallback(`
`31`		`- firebaseRemoteConfig[RemoteConfig.PURCHASE_FLOW_ANDROID_TEST]`
	`31`	`+ firebaseRemoteConfig[RemoteConfig.PURCHASE_FLOW_ANDROID]`
`32`	`32`	`.asString()`
`33`	`33`	`.uppercase()`
`34`	`34`	`)`
Original file line number	Diff line number	Diff line change
`@@ -114,7 +114,7 @@ class LessonDemoCompleteBottomSheetDialogFragment :`
`114`	`114`	`override fun onAction(action: LessonDemoFeature.Action.ViewAction) {`
`115`	`115`	`if (action is LessonDemoFeature.Action.ViewAction.BuyAction) {`
`116`	`116`	`val currentFlow = CoursePurchaseFlow.valueOfWithFallback(`
`117`		`- firebaseRemoteConfig[RemoteConfig.PURCHASE_FLOW_ANDROID_TEST]`
	`117`	`+ firebaseRemoteConfig[RemoteConfig.PURCHASE_FLOW_ANDROID]`
`118`	`118`	`.asString()`
`119`	`119`	`.uppercase()`
`120`	`120`	`)`