Oppia Android Promoted Stories Domain Layer

domain/src/main/java/org/oppia/android/domain/topic/StoryProgressController.kt

@@ -13,6 +13,7 @@ import org.oppia.android.util.data.DataProvider
 import org.oppia.android.util.data.DataProviders
 import org.oppia.android.util.data.DataProviders.Companion.transformAsync
 import org.oppia.android.util.logging.ConsoleLogger
+import org.oppia.android.util.system.OppiaClock
 import javax.inject.Inject
 import javax.inject.Singleton
 
@@ -35,6 +36,7 @@ const val RATIOS_EXPLORATION_ID_0 = "2mzzFVDLuAj8"
 const val RATIOS_EXPLORATION_ID_1 = "5NWuolNcwH6e"
 const val RATIOS_EXPLORATION_ID_2 = "k2bQ7z5XHNbK"
 const val RATIOS_EXPLORATION_ID_3 = "tIoSb3HZFN6e"
+const val UPCOMING_TOPIC_ID_1 = "test_topic_id_2"
 
 private const val CACHE_NAME = "topic_progress_database"
 private const val RETRIEVE_TOPIC_PROGRESS_LIST_DATA_PROVIDER_ID =
@@ -55,6 +57,7 @@ private const val RECORD_RECENTLY_PLAYED_CHAPTER_PROVIDER_ID =
 class StoryProgressController @Inject constructor(
   private val cacheStoreFactory: PersistentCacheStore.Factory,
   private val dataProviders: DataProviders,
+  private val oppiaClock: OppiaClock,
   private val logger: ConsoleLogger
 ) {
   // TODO(#21): Determine whether chapters can have missing prerequisites in the initial prototype,
@@ -110,7 +113,9 @@ class StoryProgressController @Inject constructor(
         storyProgressBuilder.putChapterProgress(explorationId, chapterProgress)
         val storyProgress = storyProgressBuilder.build()
 
-        val topicProgressBuilder = TopicProgress.newBuilder().setTopicId(topicId)
+        val topicProgressBuilder =
+          TopicProgress.newBuilder()
+            .setTopicId(topicId).setLastPlayedTimestamp(completionTimestamp)
         if (topicProgressDatabase.topicProgressMap[topicId] != null) {
           topicProgressBuilder
             .putAllStoryProgress(topicProgressDatabase.topicProgressMap[topicId]!!.storyProgressMap)
@@ -191,7 +196,8 @@ class StoryProgressController @Inject constructor(
         storyProgressBuilder.putChapterProgress(explorationId, chapterProgressBuilder.build())
         val storyProgress = storyProgressBuilder.build()
 
-        val topicProgressBuilder = TopicProgress.newBuilder().setTopicId(topicId)
+        val topicProgressBuilder =
+          TopicProgress.newBuilder().setTopicId(topicId).setLastPlayedTimestamp(lastPlayedTimestamp)
         if (topicProgressDatabase.topicProgressMap[topicId] != null) {
           topicProgressBuilder
             .putAllStoryProgress(topicProgressDatabase.topicProgressMap[topicId]!!.storyProgressMap)

domain/src/main/java/org/oppia/android/domain/topic/StoryProgressTestHelper.kt

@@ -231,6 +231,27 @@ class StoryProgressTestHelper @Inject constructor(
     )
   }
 
+  /**
+   * Marks full topic progress on the second test topic for a particular profile.
+   *
+   * @param profileId The profile we are setting topic progress for.
+   * @param timestampOlderThanOneWeek If the timestamp for completing the topic is from more than one week ago.
+   */
+  fun markFullProgressForSecondTestTopic(profileId: ProfileId, timestampOlderThanAWeek: Boolean) {
+    val timestamp = if (!timestampOlderThanAWeek) {
+      getCurrentTimestamp()
+    } else {
+      getOldTimestamp()
+    }
+    storyProgressController.recordCompletedChapter(
+      profileId,
+      TEST_TOPIC_ID_1,
+      TEST_STORY_ID_2,
+      TEST_EXPLORATION_ID_4,
+      timestamp
+    )
+  }
+
   /**
    * Marks one story progress full in ratios exploration for a particular profile.
    *

domain/src/main/java/org/oppia/android/domain/topic/TopicController.kt

@@ -248,11 +248,6 @@ class TopicController @Inject constructor(
       )
     }
 
-    // If there is no completed chapter, it cannot be an ongoing-topic.
-    if (completedChapterProgressList.isEmpty()) {
-      return false
-    }
-
     // If there is at least 1 completed chapter and 1 not-completed chapter, it is definitely an
     // ongoing-topic.
     if (startedChapterProgressList.isNotEmpty()) {
@@ -274,6 +269,11 @@ class TopicController @Inject constructor(
         }
       }
     }
+
+    // If there is no completed chapter, it cannot be an ongoing-topic.
+    if (completedChapterProgressList.isEmpty()) {
+      return false
+    }
     return false
   }