ALTAPPS-590: Fix topic progress doesn't change on home screen without…

… screen refreshing
hyperskill · Feb 9, 2023 · 4bbb741 · 4bbb741
1 parent 27dcaa7
commit 4bbb741
Show file tree

Hide file tree

Showing 16 changed files with 149 additions and 6 deletions.
diff --git a/...illApp/src/main/java/org/hyperskill/app/android/core/injection/AndroidAppComponentImpl.kt b/...illApp/src/main/java/org/hyperskill/app/android/core/injection/AndroidAppComponentImpl.kt
@@ -83,6 +83,8 @@ import org.hyperskill.app.profile_settings.injection.ProfileSettingsComponent
 import org.hyperskill.app.profile_settings.injection.ProfileSettingsComponentImpl
 import org.hyperskill.app.progresses.injection.ProgressesDataComponent
 import org.hyperskill.app.progresses.injection.ProgressesDataComponentImpl
+import org.hyperskill.app.progresses.injection.ProgressesFlowDataComponent
+import org.hyperskill.app.progresses.injection.ProgressesFlowDataComponentImpl
 import org.hyperskill.app.reactions.injection.ReactionsDataComponent
 import org.hyperskill.app.reactions.injection.ReactionsDataComponentImpl
 import org.hyperskill.app.sentry.injection.SentryComponent
@@ -177,6 +179,9 @@ class AndroidAppComponentImpl(
     override val stepCompletionFlowDataComponent: StepCompletionFlowDataComponent =
         StepCompletionFlowDataComponentImpl()
 
+    override val progressesFlowDataComponent: ProgressesFlowDataComponent =
+        ProgressesFlowDataComponentImpl()
+
     override val sentryComponent: SentryComponent =
         SentryComponentImpl(SentryManagerImpl(commonComponent.buildKonfig))
 

diff --git a/...erskillApp/iosHyperskillApp/Sources/Extensions/Shared/Model/TopicProgressExtensions.swift b/...erskillApp/iosHyperskillApp/Sources/Extensions/Shared/Model/TopicProgressExtensions.swift
@@ -4,6 +4,7 @@ import shared
 extension TopicProgress {
     convenience init(
         id: String = UUID().uuidString,
+        vid: String = UUID().uuidString,
         stagePosition: Int32? = nil,
         repeatedCount: Int32? = nil,
         isCompleted: Bool = false,
@@ -13,6 +14,7 @@ extension TopicProgress {
     ) {
         self.init(
             id: id,
+            vid: vid,
             stagePosition: stagePosition != nil ? KotlinInt(value: stagePosition.require()) : nil,
             repeatedCount: repeatedCount != nil ? KotlinInt(value: repeatedCount.require()) : nil,
             isCompleted: isCompleted,

diff --git a/shared/src/commonMain/kotlin/org/hyperskill/app/core/injection/AppGraph.kt b/shared/src/commonMain/kotlin/org/hyperskill/app/core/injection/AppGraph.kt
@@ -24,6 +24,7 @@ import org.hyperskill.app.profile.injection.ProfileDataComponent
 import org.hyperskill.app.profile.injection.ProfileHypercoinsDataComponent
 import org.hyperskill.app.profile_settings.injection.ProfileSettingsComponent
 import org.hyperskill.app.progresses.injection.ProgressesDataComponent
+import org.hyperskill.app.progresses.injection.ProgressesFlowDataComponent
 import org.hyperskill.app.reactions.injection.ReactionsDataComponent
 import org.hyperskill.app.sentry.injection.SentryComponent
 import org.hyperskill.app.step.domain.model.StepRoute
@@ -59,6 +60,7 @@ interface AppGraph {
     val streakFlowDataComponent: StreakFlowDataComponent
     val topicsRepetitionsFlowDataComponent: TopicsRepetitionsFlowDataComponent
     val stepCompletionFlowDataComponent: StepCompletionFlowDataComponent
+    val progressesFlowDataComponent: ProgressesFlowDataComponent
 
     fun buildAuthSocialComponent(): AuthSocialComponent
     fun buildAuthCredentialsComponent(): AuthCredentialsComponent

diff --git a/...ed/src/commonMain/kotlin/org/hyperskill/app/progresses/data/flow/TopicProgressFlowImpl.kt b/...ed/src/commonMain/kotlin/org/hyperskill/app/progresses/data/flow/TopicProgressFlowImpl.kt
@@ -0,0 +1,17 @@
+package org.hyperskill.app.progresses.data.flow
+
+import kotlinx.coroutines.flow.MutableSharedFlow
+import kotlinx.coroutines.flow.SharedFlow
+import org.hyperskill.app.progresses.domain.flow.TopicProgressFlow
+import org.hyperskill.app.topics.domain.model.TopicProgress
+
+class TopicProgressFlowImpl : TopicProgressFlow {
+    private val topicProgressMutableSharedFlow = MutableSharedFlow<TopicProgress>()
+
+    override fun observe(): SharedFlow<TopicProgress> =
+        topicProgressMutableSharedFlow
+
+    override suspend fun notifyDataChanged(data: TopicProgress) {
+        topicProgressMutableSharedFlow.emit(data)
+    }
+}
diff --git a/shared/src/commonMain/kotlin/org/hyperskill/app/progresses/domain/flow/TopicProgressFlow.kt b/shared/src/commonMain/kotlin/org/hyperskill/app/progresses/domain/flow/TopicProgressFlow.kt
@@ -0,0 +1,6 @@
+package org.hyperskill.app.progresses.domain.flow
+
+import org.hyperskill.app.core.domain.flow.SharedDataFlow
+import org.hyperskill.app.topics.domain.model.TopicProgress
+
+interface TopicProgressFlow : SharedDataFlow<TopicProgress>
diff --git a/.../commonMain/kotlin/org/hyperskill/app/progresses/injection/ProgressesFlowDataComponent.kt b/.../commonMain/kotlin/org/hyperskill/app/progresses/injection/ProgressesFlowDataComponent.kt
@@ -0,0 +1,7 @@
+package org.hyperskill.app.progresses.injection
+
+import org.hyperskill.app.progresses.domain.flow.TopicProgressFlow
+
+interface ProgressesFlowDataComponent {
+    val topicProgressFlow: TopicProgressFlow
+}
diff --git a/...monMain/kotlin/org/hyperskill/app/progresses/injection/ProgressesFlowDataComponentImpl.kt b/...monMain/kotlin/org/hyperskill/app/progresses/injection/ProgressesFlowDataComponentImpl.kt
@@ -0,0 +1,8 @@
+package org.hyperskill.app.progresses.injection
+
+import org.hyperskill.app.progresses.data.flow.TopicProgressFlowImpl
+import org.hyperskill.app.progresses.domain.flow.TopicProgressFlow
+
+class ProgressesFlowDataComponentImpl : ProgressesFlowDataComponent {
+    override val topicProgressFlow: TopicProgressFlow = TopicProgressFlowImpl()
+}
diff --git a/...onMain/kotlin/org/hyperskill/app/step_completion/injection/StepCompletionComponentImpl.kt b/...onMain/kotlin/org/hyperskill/app/step_completion/injection/StepCompletionComponentImpl.kt
@@ -23,6 +23,7 @@ class StepCompletionComponentImpl(
             appGraph.commonComponent.resourceProvider,
             appGraph.sentryComponent.sentryInteractor,
             appGraph.stepCompletionFlowDataComponent.topicCompletedFlow,
+            appGraph.progressesFlowDataComponent.topicProgressFlow,
             appGraph.buildNotificationComponent().notificationInteractor
         )
 }
diff --git a/.../kotlin/org/hyperskill/app/step_completion/presentation/StepCompletionActionDispatcher.kt b/.../kotlin/org/hyperskill/app/step_completion/presentation/StepCompletionActionDispatcher.kt
@@ -7,6 +7,7 @@ import org.hyperskill.app.analytic.domain.interactor.AnalyticInteractor
 import org.hyperskill.app.core.presentation.ActionDispatcherOptions
 import org.hyperskill.app.core.view.mapper.ResourceProvider
 import org.hyperskill.app.notification.domain.interactor.NotificationInteractor
+import org.hyperskill.app.progresses.domain.flow.TopicProgressFlow
 import org.hyperskill.app.progresses.domain.interactor.ProgressesInteractor
 import org.hyperskill.app.sentry.domain.interactor.SentryInteractor
 import org.hyperskill.app.sentry.domain.model.transaction.HyperskillSentryTransactionBuilder
@@ -28,6 +29,7 @@ class StepCompletionActionDispatcher(
     private val resourceProvider: ResourceProvider,
     private val sentryInteractor: SentryInteractor,
     private val topicCompletedFlow: TopicCompletedFlow,
+    private val topicProgressFlow: TopicProgressFlow,
     notificationInteractor: NotificationInteractor,
 ) : CoroutineActionDispatcher<Action, Message>(config.createConfig()) {
     init {
@@ -67,12 +69,11 @@ class StepCompletionActionDispatcher(
                 onNewMessage(message)
             }
             is Action.CheckTopicCompletionStatus -> {
-                val topicIsCompleted = progressesInteractor
+                val topicProgress = progressesInteractor
                     .getTopicProgress(action.topicId)
-                    .map { it.isCompleted }
                     .getOrElse { return onNewMessage(Message.CheckTopicCompletionStatus.Error) }
 
-                if (topicIsCompleted) {
+                if (topicProgress.isCompleted) {
                     topicCompletedFlow.notifyDataChanged(action.topicId)
 
                     val topicTitle = topicsInteractor
@@ -89,6 +90,7 @@ class StepCompletionActionDispatcher(
                         )
                     )
                 } else {
+                    topicProgressFlow.notifyDataChanged(topicProgress)
                     onNewMessage(Message.CheckTopicCompletionStatus.Uncompleted)
                 }
             }

diff --git a/shared/src/commonMain/kotlin/org/hyperskill/app/topics/domain/model/TopicProgress.kt b/shared/src/commonMain/kotlin/org/hyperskill/app/topics/domain/model/TopicProgress.kt
@@ -1,13 +1,15 @@
 package org.hyperskill.app.topics.domain.model
 
+import kotlin.math.round
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
-import kotlin.math.round
 
 @Serializable
 data class TopicProgress(
     @SerialName("id")
     val id: String,
+    @SerialName("vid")
+    val vid: String,
     @SerialName("stage_position")
     val stagePosition: Int? = null,
     @SerialName("repeated_count")
@@ -22,6 +24,9 @@ data class TopicProgress(
     val isInCurrentTrack: Boolean
 )
 
+val TopicProgress.topicId: Long?
+    get() = vid.substringAfter("topic-").toLongOrNull()
+
 val TopicProgress.completenessPercentage: Float
     get() = if (isCompleted || isSkipped) {
         100f

diff --git a/...org/hyperskill/app/topics_to_discover_next/injection/TopicsToDiscoverNextComponentImpl.kt b/...org/hyperskill/app/topics_to_discover_next/injection/TopicsToDiscoverNextComponentImpl.kt
@@ -19,6 +19,7 @@ class TopicsToDiscoverNextComponentImpl(
             appGraph.buildTopicsToDiscoverNextDataComponent().topicsToDiscoverNextInteractor,
             appGraph.sentryComponent.sentryInteractor,
             appGraph.analyticComponent.analyticInteractor,
-            appGraph.stepCompletionFlowDataComponent.topicCompletedFlow
+            appGraph.stepCompletionFlowDataComponent.topicCompletedFlow,
+            appGraph.progressesFlowDataComponent.topicProgressFlow
         )
 }
diff --git a/...perskill/app/topics_to_discover_next/presentation/TopicsToDiscoverNextActionDispatcher.kt b/...perskill/app/topics_to_discover_next/presentation/TopicsToDiscoverNextActionDispatcher.kt
@@ -4,6 +4,7 @@ import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
 import org.hyperskill.app.analytic.domain.interactor.AnalyticInteractor
 import org.hyperskill.app.core.presentation.ActionDispatcherOptions
+import org.hyperskill.app.progresses.domain.flow.TopicProgressFlow
 import org.hyperskill.app.sentry.domain.interactor.SentryInteractor
 import org.hyperskill.app.step_completion.domain.flow.TopicCompletedFlow
 import org.hyperskill.app.topics_to_discover_next.domain.interactor.TopicsToDiscoverNextInteractor
@@ -16,13 +17,18 @@ class TopicsToDiscoverNextActionDispatcher(
     private val topicsToDiscoverNextInteractor: TopicsToDiscoverNextInteractor,
     private val sentryInteractor: SentryInteractor,
     private val analyticInteractor: AnalyticInteractor,
-    topicCompletedFlow: TopicCompletedFlow
+    topicCompletedFlow: TopicCompletedFlow,
+    topicProgressFlow: TopicProgressFlow
 ) : CoroutineActionDispatcher<Action, Message>(config.createConfig()) {
 
     init {
         topicCompletedFlow.observe()
             .onEach { onNewMessage(Message.TopicCompleted(it)) }
             .launchIn(actionScope)
+
+        topicProgressFlow.observe()
+            .onEach { onNewMessage(Message.TopicProgressChanged(it)) }
+            .launchIn(actionScope)
     }
 
     override suspend fun doSuspendableAction(action: Action) {

diff --git a/...in/org/hyperskill/app/topics_to_discover_next/presentation/TopicsToDiscoverNextFeature.kt b/...in/org/hyperskill/app/topics_to_discover_next/presentation/TopicsToDiscoverNextFeature.kt
@@ -3,6 +3,7 @@ package org.hyperskill.app.topics_to_discover_next.presentation
 import org.hyperskill.app.analytic.domain.model.AnalyticEvent
 import org.hyperskill.app.sentry.domain.model.transaction.HyperskillSentryTransaction
 import org.hyperskill.app.topics.domain.model.Topic
+import org.hyperskill.app.topics.domain.model.TopicProgress
 
 interface TopicsToDiscoverNextFeature {
     sealed interface State {
@@ -50,7 +51,11 @@ interface TopicsToDiscoverNextFeature {
 
         object PullToRefresh : Message
 
+        /**
+         * Flow Messages
+         */
         data class TopicCompleted(val topicId: Long) : Message
+        data class TopicProgressChanged(val topicProgress: TopicProgress) : Message
 
         /**
          * A message that indicates about click on topic.

diff --git a/...in/org/hyperskill/app/topics_to_discover_next/presentation/TopicsToDiscoverNextReducer.kt b/...in/org/hyperskill/app/topics_to_discover_next/presentation/TopicsToDiscoverNextReducer.kt
@@ -1,5 +1,6 @@
 package org.hyperskill.app.topics_to_discover_next.presentation
 
+import org.hyperskill.app.topics.domain.model.topicId
 import org.hyperskill.app.topics_to_discover_next.domain.analytic.TopicsToDiscoverNextClickedHyperskillAnalyticEvent
 import org.hyperskill.app.topics_to_discover_next.domain.model.TopicsToDiscoverNextScreen
 import org.hyperskill.app.topics_to_discover_next.presentation.TopicsToDiscoverNextFeature.Action
@@ -51,6 +52,19 @@ class TopicsToDiscoverNextReducer(
                 } else {
                     null
                 }
+            is Message.TopicProgressChanged ->
+                if (state is State.Content) {
+                    val newTopicsToDiscoverNext = state.topicsToDiscoverNext.map { topic ->
+                        if (topic.id == message.topicProgress.topicId) {
+                            topic.copy(progress = message.topicProgress)
+                        } else {
+                            topic
+                        }
+                    }
+                    state.copy(topicsToDiscoverNext = newTopicsToDiscoverNext) to emptySet()
+                } else {
+                    null
+                }
             is Message.TopicToDiscoverNextClicked -> {
                 val targetTopic = (state as? State.Content)
                     ?.topicsToDiscoverNext?.firstOrNull { it.id == message.topicId }

diff --git a/shared/src/commonTest/kotlin/org/hyperskill/TopicProgressTest.kt b/shared/src/commonTest/kotlin/org/hyperskill/TopicProgressTest.kt
@@ -0,0 +1,57 @@
+package org.hyperskill
+
+import kotlin.test.Test
+import kotlin.test.assertEquals
+import org.hyperskill.app.topics.domain.model.TopicProgress
+import org.hyperskill.app.topics.domain.model.topicId
+
+class TopicProgressTest {
+    @Test
+    fun testTopicProgressGetTopicId() {
+        val topicProgress = TopicProgress(
+            id = "2-123",
+            vid = "topic-123",
+            isCompleted = false,
+            isSkipped = false,
+            isInCurrentTrack = true
+        )
+        assertEquals(123L, topicProgress.topicId)
+    }
+
+    @Test
+    fun testTopicProgressGetTopicIdNull() {
+        val topicProgresses = listOf(
+            TopicProgress(
+                id = "2-abc",
+                vid = "topic-abc",
+                isCompleted = false,
+                isSkipped = false,
+                isInCurrentTrack = true
+            ),
+            TopicProgress(
+                id = "2-abc",
+                vid = "abc-defog",
+                isCompleted = false,
+                isSkipped = false,
+                isInCurrentTrack = true
+            ),
+            TopicProgress(
+                id = "1-abc",
+                vid = "",
+                isCompleted = false,
+                isSkipped = false,
+                isInCurrentTrack = true
+            ),
+            TopicProgress(
+                id = "1-abc",
+                vid = "qwerty",
+                isCompleted = false,
+                isSkipped = false,
+                isInCurrentTrack = true
+            )
+        )
+        topicProgresses.forEach {
+            assertEquals(null, it.topicId)
+        }
+    }
+}
diff --git a/shared/src/iosMain/kotlin/org/hyperskill/app/core/injection/AppGraphImpl.kt b/shared/src/iosMain/kotlin/org/hyperskill/app/core/injection/AppGraphImpl.kt
@@ -50,6 +50,8 @@ import org.hyperskill.app.profile_settings.injection.ProfileSettingsComponent
 import org.hyperskill.app.profile_settings.injection.ProfileSettingsComponentImpl
 import org.hyperskill.app.progresses.injection.ProgressesDataComponent
 import org.hyperskill.app.progresses.injection.ProgressesDataComponentImpl
+import org.hyperskill.app.progresses.injection.ProgressesFlowDataComponent
+import org.hyperskill.app.progresses.injection.ProgressesFlowDataComponentImpl
 import org.hyperskill.app.reactions.injection.ReactionsDataComponent
 import org.hyperskill.app.reactions.injection.ReactionsDataComponentImpl
 import org.hyperskill.app.sentry.domain.model.manager.SentryManager
@@ -123,6 +125,9 @@ class AppGraphImpl(
     override val stepCompletionFlowDataComponent: StepCompletionFlowDataComponent =
         StepCompletionFlowDataComponentImpl()
 
+    override val progressesFlowDataComponent: ProgressesFlowDataComponent =
+        ProgressesFlowDataComponentImpl()
+
     override val sentryComponent: SentryComponent =
         SentryComponentImpl(sentryManager)