From 7abdcb36bdb6c382b1668b800748069853271987 Mon Sep 17 00:00:00 2001
From: Saptak Manna <saptakmanna100@gmail.com>
Date: Sun, 30 Jun 2024 09:43:03 +0530
Subject: [PATCH 01/21] Add existing event logs to new screen

---
 .../ClassroomListFragmentPresenter.kt         | 52 +++++++++++++++++++
 1 file changed, 52 insertions(+)

diff --git a/app/src/main/java/org/oppia/android/app/classroom/ClassroomListFragmentPresenter.kt b/app/src/main/java/org/oppia/android/app/classroom/ClassroomListFragmentPresenter.kt
index 7bc81fd5bdf..7bdebc7678b 100644
--- a/app/src/main/java/org/oppia/android/app/classroom/ClassroomListFragmentPresenter.kt
+++ b/app/src/main/java/org/oppia/android/app/classroom/ClassroomListFragmentPresenter.kt
@@ -27,6 +27,7 @@ import androidx.compose.ui.res.integerResource
 import androidx.compose.ui.unit.dp
 import androidx.databinding.ObservableList
 import androidx.fragment.app.Fragment
+import androidx.lifecycle.Observer
 import org.oppia.android.R
 import org.oppia.android.app.classroom.classroomlist.ClassroomList
 import org.oppia.android.app.classroom.promotedlist.PromotedStoryList
@@ -40,18 +41,24 @@ import org.oppia.android.app.home.classroomlist.ClassroomSummaryViewModel
 import org.oppia.android.app.home.promotedlist.PromotedStoryListViewModel
 import org.oppia.android.app.home.topiclist.AllTopicsViewModel
 import org.oppia.android.app.home.topiclist.TopicSummaryViewModel
+import org.oppia.android.app.model.AppStartupState
 import org.oppia.android.app.model.ClassroomSummary
 import org.oppia.android.app.model.LessonThumbnail
 import org.oppia.android.app.model.LessonThumbnailGraphic
+import org.oppia.android.app.model.ProfileId
 import org.oppia.android.app.model.TopicSummary
 import org.oppia.android.app.translation.AppLanguageResourceHandler
 import org.oppia.android.app.utility.datetime.DateTimeUtil
 import org.oppia.android.databinding.ClassroomListFragmentBinding
 import org.oppia.android.domain.classroom.ClassroomController
+import org.oppia.android.domain.onboarding.AppStartupStateController
 import org.oppia.android.domain.oppialogger.OppiaLogger
+import org.oppia.android.domain.oppialogger.analytics.AnalyticsController
 import org.oppia.android.domain.profile.ProfileManagementController
 import org.oppia.android.domain.topic.TopicListController
 import org.oppia.android.domain.translation.TranslationController
+import org.oppia.android.util.data.AsyncResult
+import org.oppia.android.util.data.DataProviders.Companion.toLiveData
 import org.oppia.android.util.locale.OppiaLocale
 import org.oppia.android.util.parser.html.StoryHtmlParserEntityType
 import org.oppia.android.util.parser.html.TopicHtmlParserEntityType
@@ -75,6 +82,8 @@ class ClassroomListFragmentPresenter @Inject constructor(
   private val dateTimeUtil: DateTimeUtil,
   private val translationController: TranslationController,
   private val machineLocale: OppiaLocale.MachineLocale,
+  private val appStartupStateController: AppStartupStateController,
+  private val analyticsController: AnalyticsController,
 ) {
   private val routeToTopicPlayStoryListener = activity as RouteToTopicPlayStoryListener
   private lateinit var binding: ClassroomListFragmentBinding
@@ -92,6 +101,8 @@ class ClassroomListFragmentPresenter @Inject constructor(
 
     internalProfileId = profileId.internalId
 
+    logHomeActivityEvent()
+
     classroomListViewModel = ClassroomListViewModel(
       activity,
       fragment,
@@ -144,6 +155,8 @@ class ClassroomListFragmentPresenter @Inject constructor(
       }
     )
 
+    logAppOnboardedEvent()
+
     return binding.root
   }
 
@@ -225,6 +238,45 @@ class ClassroomListFragmentPresenter @Inject constructor(
       }
     }
   }
+
+  private fun logAppOnboardedEvent() {
+    val startupStateProvider = appStartupStateController.getAppStartupState()
+    val liveData = startupStateProvider.toLiveData()
+    liveData.observe(
+      activity,
+      object : Observer<AsyncResult<AppStartupState>> {
+        override fun onChanged(startUpStateResult: AsyncResult<AppStartupState>?) {
+          when (startUpStateResult) {
+            null, is AsyncResult.Pending -> {
+              // Do nothing.
+            }
+            is AsyncResult.Success -> {
+              liveData.removeObserver(this)
+
+              if (startUpStateResult.value.startupMode ==
+                AppStartupState.StartupMode.USER_NOT_YET_ONBOARDED
+              ) {
+                analyticsController.logAppOnboardedEvent(profileId)
+              }
+            }
+            is AsyncResult.Failure -> {
+              oppiaLogger.e(
+                "ClassroomListFragment",
+                "Failed to retrieve app startup state"
+              )
+            }
+          }
+        }
+      }
+    )
+  }
+
+  private fun logHomeActivityEvent() {
+    analyticsController.logImportantEvent(
+      oppiaLogger.createOpenHomeContext(),
+      profileId
+    )
+  }
 }
 
 /** Adds a grid of items to a LazyListScope with specified arrangement and item content. */

From 53f030f6e5e1955d2b7853b69617f73f2742a676 Mon Sep 17 00:00:00 2001
From: Saptak Manna <saptakmanna100@gmail.com>
Date: Mon, 1 Jul 2024 13:01:08 +0530
Subject: [PATCH 02/21] Add classroom_id to ExplorationContext object

---
 .../app/activity/ActivityIntentFactories.kt   |  20 +-
 .../app/classroom/ClassroomListActivity.kt    |  13 +-
 .../ClassroomListFragmentPresenter.kt         |   1 +
 .../CompletedStoryItemViewModel.kt            |  14 +-
 .../oppia/android/app/home/HomeActivity.kt    |  13 +-
 .../android/app/home/HomeFragmentPresenter.kt |   1 +
 .../android/app/home/RouteToTopicListener.kt  |   2 +-
 .../app/home/RouteToTopicPlayStoryListener.kt |   7 +-
 .../promotedlist/PromotedStoryViewModel.kt    |   1 +
 .../recentlyplayed/RecentlyPlayedActivity.kt  |   2 +
 .../RecentlyPlayedFragmentPresenter.kt        |   8 +-
 .../OngoingTopicItemViewModel.kt              |   5 +-
 .../player/exploration/ExplorationActivity.kt |   1 +
 .../ExplorationActivityPresenter.kt           |  11 +-
 .../player/exploration/ExplorationFragment.kt |   2 +
 .../ExplorationFragmentPresenter.kt           |  13 +-
 .../testing/StateFragmentTestActivity.kt      |   2 +
 .../StateFragmentTestActivityPresenter.kt     |  19 +-
 .../RecentlyPlayedStorySummaryViewModel.kt    |  12 +-
 .../app/resumelesson/ResumeLessonActivity.kt  |   3 +
 .../ResumeLessonActivityPresenter.kt          |   2 +
 .../app/resumelesson/ResumeLessonFragment.kt  |   3 +
 .../ResumeLessonFragmentPresenter.kt          |  10 +-
 .../android/app/shim/IntentFactoryShim.kt     |   2 +
 .../android/app/shim/IntentFactoryShimImpl.kt |   7 +-
 .../app/story/ExplorationSelectionListener.kt |   1 +
 .../oppia/android/app/story/StoryActivity.kt  |  10 +-
 .../app/story/StoryActivityPresenter.kt       |   9 +-
 .../oppia/android/app/story/StoryFragment.kt  |  15 +-
 .../app/story/StoryFragmentPresenter.kt       |   8 +
 .../oppia/android/app/story/StoryViewModel.kt |   6 +
 .../StoryChapterSummaryViewModel.kt           |   4 +
 .../ExplorationTestActivityPresenter.kt       |   3 +
 .../app/testing/HomeFragmentTestActivity.kt   |   6 +-
 .../testing/NavigationDrawerTestActivity.kt   |  13 +-
 .../android/app/testing/TopicTestActivity.kt  |  10 +-
 .../app/testing/TopicTestActivityForStory.kt  |  12 +-
 .../app/topic/RouteToResumeLessonListener.kt  |   1 +
 .../android/app/topic/RouteToStoryListener.kt |   2 +-
 .../oppia/android/app/topic/TopicActivity.kt  |  46 ++++-
 .../app/topic/TopicActivityPresenter.kt       |  10 +-
 .../oppia/android/app/topic/TopicFragment.kt  |   3 +
 .../app/topic/TopicFragmentPresenter.kt       |  18 +-
 .../android/app/topic/ViewPagerAdapter.kt     |   3 +-
 .../app/topic/lessons/TopicLessonsFragment.kt |   6 +
 .../lessons/TopicLessonsFragmentPresenter.kt  |  16 +-
 .../classroom/ClassroomListFragmentTest.kt    |   4 +
 .../CompletedStoryListActivityTest.kt         |   3 +
 .../android/app/home/HomeActivityTest.kt      |   4 +
 .../app/home/RecentlyPlayedFragmentTest.kt    |   6 +
 .../OngoingTopicListActivityTest.kt           |  11 +-
 .../exploration/ExplorationActivityTest.kt    |  65 +++++++
 .../app/player/state/StateFragmentTest.kt     |   2 +
 .../ProfileProgressFragmentTest.kt            |   2 +
 .../resumelesson/ResumeLessonActivityTest.kt  |   2 +
 .../resumelesson/ResumeLessonFragmentTest.kt  |   3 +
 .../android/app/story/StoryActivityTest.kt    |   8 +
 .../android/app/story/StoryFragmentTest.kt    |   4 +
 .../android/app/topic/TopicActivityTest.kt    |  12 +-
 .../android/app/topic/TopicFragmentTest.kt    | 100 +++++++---
 .../app/topic/info/TopicInfoFragmentTest.kt   |  18 ++
 .../topic/lessons/TopicLessonsFragmentTest.kt | 178 ++++++++++++++----
 .../practice/TopicPracticeFragmentTest.kt     |  23 ++-
 .../revision/TopicRevisionFragmentTest.kt     |  21 ++-
 .../activity/ActivityIntentFactoriesTest.kt   |   9 +-
 .../ExplorationActivityLocalTest.kt           |  10 +
 .../player/state/StateFragmentLocalTest.kt    |   2 +
 .../app/story/StoryActivityLocalTest.kt       |   5 +-
 .../state/StateFragmentAccessibilityTest.kt   |   2 +
 .../topic/info/TopicInfoFragmentLocalTest.kt  |   5 +-
 .../lessons/TopicLessonsFragmentLocalTest.kt  |   7 +-
 .../exploration/ExplorationDataController.kt  |  10 +
 .../domain/exploration/ExplorationProgress.kt |   1 +
 .../ExplorationProgressController.kt          |   7 +
 .../android/domain/oppialogger/OppiaLogger.kt |   2 +
 .../analytics/LearnerAnalyticsLogger.kt       |   4 +
 .../android/domain/topic/TopicController.kt   | 104 ++++++++++
 model/src/main/proto/arguments.proto          |  30 +++
 model/src/main/proto/oppia_logger.proto       |   3 +
 model/src/main/proto/topic.proto              |   6 +
 .../util/logging/EventBundleCreatorTest.kt    |   3 +
 .../KenyaAlphaEventBundleCreatorTest.kt       |   3 +
 82 files changed, 901 insertions(+), 154 deletions(-)

diff --git a/app/src/main/java/org/oppia/android/app/activity/ActivityIntentFactories.kt b/app/src/main/java/org/oppia/android/app/activity/ActivityIntentFactories.kt
index ab6ab90bf77..078032aabcf 100644
--- a/app/src/main/java/org/oppia/android/app/activity/ActivityIntentFactories.kt
+++ b/app/src/main/java/org/oppia/android/app/activity/ActivityIntentFactories.kt
@@ -16,15 +16,23 @@ interface ActivityIntentFactories {
    * This must be injected within an activity context.
    */
   interface TopicActivityIntentFactory {
-    /** Returns a new [Intent] to start the topic activity for the specified profile and topic. */
-    fun createIntent(profileId: ProfileId, topicId: String): Intent
+    /**
+     * Returns a new [Intent] to start the topic activity for the specified profile, classroom
+     * and topic.
+     */
+    fun createIntent(profileId: ProfileId, classroomId: String, topicId: String): Intent
 
     /**
-     * Returns a new [Intent] to start the topic activity for the specified profile, topic, and
-     * story (where the activity will automatically navigate to & expand the specified story in the
-     * topic).
+     * Returns a new [Intent] to start the topic activity for the specified profile, classroom,
+     * topic, and story (where the activity will automatically navigate to & expand the specified
+     * story in the topic).
      */
-    fun createIntent(profileId: ProfileId, topicId: String, storyId: String): Intent
+    fun createIntent(
+      profileId: ProfileId,
+      classroomId: String,
+      topicId: String,
+      storyId: String
+    ): Intent
   }
 
   /**
diff --git a/app/src/main/java/org/oppia/android/app/classroom/ClassroomListActivity.kt b/app/src/main/java/org/oppia/android/app/classroom/ClassroomListActivity.kt
index 4ba06da7d58..764228588e7 100644
--- a/app/src/main/java/org/oppia/android/app/classroom/ClassroomListActivity.kt
+++ b/app/src/main/java/org/oppia/android/app/classroom/ClassroomListActivity.kt
@@ -98,15 +98,22 @@ class ClassroomListActivity :
     )
   }
 
-  override fun routeToTopic(internalProfileId: Int, topicId: String) {
-    startActivity(TopicActivity.createTopicActivityIntent(this, internalProfileId, topicId))
+  override fun routeToTopic(internalProfileId: Int, classroomId: String, topicId: String) {
+    startActivity(
+      TopicActivity.createTopicActivityIntent(this, internalProfileId, classroomId, topicId)
+    )
   }
 
-  override fun routeToTopicPlayStory(internalProfileId: Int, topicId: String, storyId: String) {
+  override fun routeToTopicPlayStory(
+    internalProfileId: Int,
+    classroomId: String,
+    topicId: String,
+    storyId: String) {
     startActivity(
       TopicActivity.createTopicPlayStoryActivityIntent(
         this,
         internalProfileId,
+        classroomId,
         topicId,
         storyId
       )
diff --git a/app/src/main/java/org/oppia/android/app/classroom/ClassroomListFragmentPresenter.kt b/app/src/main/java/org/oppia/android/app/classroom/ClassroomListFragmentPresenter.kt
index 7bdebc7678b..46ec5a2751d 100644
--- a/app/src/main/java/org/oppia/android/app/classroom/ClassroomListFragmentPresenter.kt
+++ b/app/src/main/java/org/oppia/android/app/classroom/ClassroomListFragmentPresenter.kt
@@ -164,6 +164,7 @@ class ClassroomListFragmentPresenter @Inject constructor(
   fun onTopicSummaryClicked(topicSummary: TopicSummary) {
     routeToTopicPlayStoryListener.routeToTopicPlayStory(
       internalProfileId,
+      topicSummary.classroomId,
       topicSummary.topicId,
       topicSummary.firstStoryId
     )
diff --git a/app/src/main/java/org/oppia/android/app/completedstorylist/CompletedStoryItemViewModel.kt b/app/src/main/java/org/oppia/android/app/completedstorylist/CompletedStoryItemViewModel.kt
index 355389d59b5..b6dd4fef3b9 100644
--- a/app/src/main/java/org/oppia/android/app/completedstorylist/CompletedStoryItemViewModel.kt
+++ b/app/src/main/java/org/oppia/android/app/completedstorylist/CompletedStoryItemViewModel.kt
@@ -31,13 +31,23 @@ class CompletedStoryItemViewModel(
 
   /** Called when user clicks on CompletedStoryItem. */
   fun onCompletedStoryItemClicked() {
-    routeToTopicPlayStory(internalProfileId, completedStory.topicId, completedStory.storyId)
+    routeToTopicPlayStory(
+      internalProfileId,
+      completedStory.classroomId,
+      completedStory.topicId,
+      completedStory.storyId
+    )
   }
 
-  override fun routeToTopicPlayStory(internalProfileId: Int, topicId: String, storyId: String) {
+  override fun routeToTopicPlayStory(
+    internalProfileId: Int,
+    classroomId: String,
+    topicId: String,
+    storyId: String) {
     val intent = intentFactoryShim.createTopicPlayStoryActivityIntent(
       activity.applicationContext,
       internalProfileId,
+      classroomId,
       topicId,
       storyId
     )
diff --git a/app/src/main/java/org/oppia/android/app/home/HomeActivity.kt b/app/src/main/java/org/oppia/android/app/home/HomeActivity.kt
index 8d6f828abd0..b1f2c655fbd 100644
--- a/app/src/main/java/org/oppia/android/app/home/HomeActivity.kt
+++ b/app/src/main/java/org/oppia/android/app/home/HomeActivity.kt
@@ -67,8 +67,10 @@ class HomeActivity :
     homeActivityPresenter.handleOnRestart()
   }
 
-  override fun routeToTopic(internalProfileId: Int, topicId: String) {
-    startActivity(TopicActivity.createTopicActivityIntent(this, internalProfileId, topicId))
+  override fun routeToTopic(internalProfileId: Int, classroomId: String, topicId: String) {
+    startActivity(
+      TopicActivity.createTopicActivityIntent(this, internalProfileId, classroomId, topicId)
+    )
   }
 
   override fun onBackPressed() {
@@ -87,11 +89,16 @@ class HomeActivity :
     dialogFragment.showNow(supportFragmentManager, TAG_SWITCH_PROFILE_DIALOG)
   }
 
-  override fun routeToTopicPlayStory(internalProfileId: Int, topicId: String, storyId: String) {
+  override fun routeToTopicPlayStory(
+    internalProfileId: Int,
+    classroomId: String,
+    topicId: String,
+    storyId: String) {
     startActivity(
       TopicActivity.createTopicPlayStoryActivityIntent(
         this,
         internalProfileId,
+        classroomId,
         topicId,
         storyId
       )
diff --git a/app/src/main/java/org/oppia/android/app/home/HomeFragmentPresenter.kt b/app/src/main/java/org/oppia/android/app/home/HomeFragmentPresenter.kt
index 64d53c68009..b3ef5d04e3f 100644
--- a/app/src/main/java/org/oppia/android/app/home/HomeFragmentPresenter.kt
+++ b/app/src/main/java/org/oppia/android/app/home/HomeFragmentPresenter.kt
@@ -197,6 +197,7 @@ class HomeFragmentPresenter @Inject constructor(
   fun onTopicSummaryClicked(topicSummary: TopicSummary) {
     routeToTopicPlayStoryListener.routeToTopicPlayStory(
       internalProfileId,
+      topicSummary.classroomId,
       topicSummary.topicId,
       topicSummary.firstStoryId
     )
diff --git a/app/src/main/java/org/oppia/android/app/home/RouteToTopicListener.kt b/app/src/main/java/org/oppia/android/app/home/RouteToTopicListener.kt
index 36c7a1a1d94..361852084f5 100755
--- a/app/src/main/java/org/oppia/android/app/home/RouteToTopicListener.kt
+++ b/app/src/main/java/org/oppia/android/app/home/RouteToTopicListener.kt
@@ -2,5 +2,5 @@ package org.oppia.android.app.home
 
 /** Listener for when an activity should route to a topic. */
 interface RouteToTopicListener {
-  fun routeToTopic(internalProfileId: Int, topicId: String)
+  fun routeToTopic(internalProfileId: Int,classroomId: String,  topicId: String)
 }
diff --git a/app/src/main/java/org/oppia/android/app/home/RouteToTopicPlayStoryListener.kt b/app/src/main/java/org/oppia/android/app/home/RouteToTopicPlayStoryListener.kt
index aa7121f1c07..4d45619ede8 100755
--- a/app/src/main/java/org/oppia/android/app/home/RouteToTopicPlayStoryListener.kt
+++ b/app/src/main/java/org/oppia/android/app/home/RouteToTopicPlayStoryListener.kt
@@ -2,5 +2,10 @@ package org.oppia.android.app.home
 
 /** Listener for when an activity should route to a story-item in TopicPlay tab. */
 interface RouteToTopicPlayStoryListener {
-  fun routeToTopicPlayStory(internalProfileId: Int, topicId: String, storyId: String)
+  fun routeToTopicPlayStory(
+    internalProfileId: Int,
+    classroomId: String,
+    topicId: String,
+    storyId: String
+  )
 }
diff --git a/app/src/main/java/org/oppia/android/app/home/promotedlist/PromotedStoryViewModel.kt b/app/src/main/java/org/oppia/android/app/home/promotedlist/PromotedStoryViewModel.kt
index 6b300f6355d..dae19f0866e 100755
--- a/app/src/main/java/org/oppia/android/app/home/promotedlist/PromotedStoryViewModel.kt
+++ b/app/src/main/java/org/oppia/android/app/home/promotedlist/PromotedStoryViewModel.kt
@@ -63,6 +63,7 @@ class PromotedStoryViewModel(
   fun clickOnStoryTile() {
     routeToTopicPlayStoryListener.routeToTopicPlayStory(
       internalProfileId,
+      promotedStory.classroomId,
       promotedStory.topicId,
       promotedStory.storyId
     )
diff --git a/app/src/main/java/org/oppia/android/app/home/recentlyplayed/RecentlyPlayedActivity.kt b/app/src/main/java/org/oppia/android/app/home/recentlyplayed/RecentlyPlayedActivity.kt
index bf852642259..9d068eaf49a 100644
--- a/app/src/main/java/org/oppia/android/app/home/recentlyplayed/RecentlyPlayedActivity.kt
+++ b/app/src/main/java/org/oppia/android/app/home/recentlyplayed/RecentlyPlayedActivity.kt
@@ -83,6 +83,7 @@ class RecentlyPlayedActivity :
 
   override fun routeToResumeLesson(
     profileId: ProfileId,
+    classroomId: String,
     topicId: String,
     storyId: String,
     explorationId: String,
@@ -93,6 +94,7 @@ class RecentlyPlayedActivity :
       ResumeLessonActivity.createResumeLessonActivityIntent(
         this,
         profileId,
+        classroomId,
         topicId,
         storyId,
         explorationId,
diff --git a/app/src/main/java/org/oppia/android/app/home/recentlyplayed/RecentlyPlayedFragmentPresenter.kt b/app/src/main/java/org/oppia/android/app/home/recentlyplayed/RecentlyPlayedFragmentPresenter.kt
index fcd8a8b3c7c..d479eb9468c 100755
--- a/app/src/main/java/org/oppia/android/app/home/recentlyplayed/RecentlyPlayedFragmentPresenter.kt
+++ b/app/src/main/java/org/oppia/android/app/home/recentlyplayed/RecentlyPlayedFragmentPresenter.kt
@@ -108,6 +108,7 @@ class RecentlyPlayedFragmentPresenter @Inject constructor(
               explorationCheckpointLiveData.removeObserver(this)
               routeToResumeLessonListener.routeToResumeLesson(
                 profileId,
+                promotedStory.classroomId,
                 promotedStory.topicId,
                 promotedStory.storyId,
                 promotedStory.explorationId,
@@ -117,6 +118,7 @@ class RecentlyPlayedFragmentPresenter @Inject constructor(
             } else if (it is AsyncResult.Failure) {
               explorationCheckpointLiveData.removeObserver(this)
               playExploration(
+                promotedStory.classroomId,
                 promotedStory.topicId,
                 promotedStory.storyId,
                 promotedStory.explorationId,
@@ -128,6 +130,7 @@ class RecentlyPlayedFragmentPresenter @Inject constructor(
       )
     } else {
       playExploration(
+        promotedStory.classroomId,
         promotedStory.topicId,
         promotedStory.storyId,
         promotedStory.explorationId,
@@ -162,6 +165,7 @@ class RecentlyPlayedFragmentPresenter @Inject constructor(
   }
 
   private fun playExploration(
+    classroomId: String,
     topicId: String,
     storyId: String,
     explorationId: String,
@@ -174,13 +178,13 @@ class RecentlyPlayedFragmentPresenter @Inject constructor(
       // cases, lessons played from this fragment are known to be in progress, and that progress
       // can't be resumed here (hence the restart).
       explorationDataController.restartExploration(
-        profileId.internalId, topicId, storyId, explorationId
+        profileId.internalId, classroomId, topicId, storyId, explorationId
       )
     } else {
       // The only lessons that can't have their progress saved are those that were already
       // completed.
       explorationDataController.replayExploration(
-        profileId.internalId, topicId, storyId, explorationId
+        profileId.internalId, classroomId, topicId, storyId, explorationId
       )
     }
     startPlayingProvider.toLiveData().observe(fragment) { result ->
diff --git a/app/src/main/java/org/oppia/android/app/ongoingtopiclist/OngoingTopicItemViewModel.kt b/app/src/main/java/org/oppia/android/app/ongoingtopiclist/OngoingTopicItemViewModel.kt
index 2f8e6f9e84d..1b074ed6f1b 100644
--- a/app/src/main/java/org/oppia/android/app/ongoingtopiclist/OngoingTopicItemViewModel.kt
+++ b/app/src/main/java/org/oppia/android/app/ongoingtopiclist/OngoingTopicItemViewModel.kt
@@ -27,7 +27,7 @@ class OngoingTopicItemViewModel(
   }
 
   fun onTopicItemClicked() {
-    routeToTopic(internalProfileId, topic.topicId)
+    routeToTopic(internalProfileId, topic.classroomId, topic.topicId)
   }
 
   fun computeStoryCountText(): String {
@@ -36,10 +36,11 @@ class OngoingTopicItemViewModel(
     )
   }
 
-  override fun routeToTopic(internalProfileId: Int, topicId: String) {
+  override fun routeToTopic(internalProfileId: Int, classroomId: String, topicId: String) {
     val intent = intentFactoryShim.createTopicActivityIntent(
       activity.applicationContext,
       internalProfileId,
+      classroomId,
       topicId
     )
     activity.startActivity(intent)
diff --git a/app/src/main/java/org/oppia/android/app/player/exploration/ExplorationActivity.kt b/app/src/main/java/org/oppia/android/app/player/exploration/ExplorationActivity.kt
index c657a4a35fb..61201523329 100755
--- a/app/src/main/java/org/oppia/android/app/player/exploration/ExplorationActivity.kt
+++ b/app/src/main/java/org/oppia/android/app/player/exploration/ExplorationActivity.kt
@@ -56,6 +56,7 @@ class ExplorationActivity :
     explorationActivityPresenter.handleOnCreate(
       this,
       params.profileId,
+      params.classroomId,
       params.topicId,
       params.storyId,
       params.explorationId,
diff --git a/app/src/main/java/org/oppia/android/app/player/exploration/ExplorationActivityPresenter.kt b/app/src/main/java/org/oppia/android/app/player/exploration/ExplorationActivityPresenter.kt
index e940dabb48c..7dde5e1fd68 100644
--- a/app/src/main/java/org/oppia/android/app/player/exploration/ExplorationActivityPresenter.kt
+++ b/app/src/main/java/org/oppia/android/app/player/exploration/ExplorationActivityPresenter.kt
@@ -70,6 +70,7 @@ class ExplorationActivityPresenter @Inject constructor(
   private lateinit var explorationToolbar: Toolbar
   private lateinit var explorationToolbarTitle: TextView
   private lateinit var profileId: ProfileId
+  private lateinit var classroomId: String
   private lateinit var topicId: String
   private lateinit var storyId: String
   private lateinit var explorationId: String
@@ -85,6 +86,7 @@ class ExplorationActivityPresenter @Inject constructor(
   fun handleOnCreate(
     context: Context,
     profileId: ProfileId,
+    classroomId: String,
     topicId: String,
     storyId: String,
     explorationId: String,
@@ -125,6 +127,7 @@ class ExplorationActivityPresenter @Inject constructor(
     }
 
     this.profileId = profileId
+    this.classroomId = classroomId
     this.topicId = topicId
     this.storyId = storyId
     this.explorationId = explorationId
@@ -187,6 +190,7 @@ class ExplorationActivityPresenter @Inject constructor(
         R.id.exploration_fragment_placeholder,
         ExplorationFragment.newInstance(
           profileId,
+          classroomId,
           topicId,
           storyId,
           explorationId,
@@ -386,7 +390,12 @@ class ExplorationActivityPresenter @Inject constructor(
       ExplorationActivityParams.ParentScreen.UNRECOGNIZED -> {
         // Default to the topic activity.
         activity.startActivity(
-          TopicActivity.createTopicActivityIntent(context, profileId.internalId, topicId)
+          TopicActivity.createTopicActivityIntent(
+            context,
+            profileId.internalId,
+            classroomId,
+            topicId
+          )
         )
         activity.finish()
       }
diff --git a/app/src/main/java/org/oppia/android/app/player/exploration/ExplorationFragment.kt b/app/src/main/java/org/oppia/android/app/player/exploration/ExplorationFragment.kt
index b72f2f0da61..93444cea525 100755
--- a/app/src/main/java/org/oppia/android/app/player/exploration/ExplorationFragment.kt
+++ b/app/src/main/java/org/oppia/android/app/player/exploration/ExplorationFragment.kt
@@ -22,6 +22,7 @@ class ExplorationFragment : InjectableFragment() {
     /** Returns a new [ExplorationFragment] with the corresponding fragment parameters. */
     fun newInstance(
       profileId: ProfileId,
+      classroomId: String,
       topicId: String,
       storyId: String,
       explorationId: String,
@@ -29,6 +30,7 @@ class ExplorationFragment : InjectableFragment() {
     ): ExplorationFragment {
       val args = ExplorationFragmentArguments.newBuilder().apply {
         this.profileId = profileId
+        this.classroomId = classroomId
         this.topicId = topicId
         this.storyId = storyId
         this.explorationId = explorationId
diff --git a/app/src/main/java/org/oppia/android/app/player/exploration/ExplorationFragmentPresenter.kt b/app/src/main/java/org/oppia/android/app/player/exploration/ExplorationFragmentPresenter.kt
index 8796b96b672..87698c6951d 100755
--- a/app/src/main/java/org/oppia/android/app/player/exploration/ExplorationFragmentPresenter.kt
+++ b/app/src/main/java/org/oppia/android/app/player/exploration/ExplorationFragmentPresenter.kt
@@ -58,7 +58,7 @@ class ExplorationFragmentPresenter @Inject constructor(
       StateFragment.newInstance(
         args.profileId.internalId, args.topicId, args.storyId, args.explorationId
       )
-    logPracticeFragmentEvent(args.topicId, args.storyId, args.explorationId)
+    logPracticeFragmentEvent(args.classroomId, args.topicId, args.storyId, args.explorationId)
     if (getStateFragment() == null) {
       fragment.childFragmentManager.beginTransaction().add(
         R.id.state_fragment_placeholder,
@@ -146,9 +146,16 @@ class ExplorationFragmentPresenter @Inject constructor(
       ) as StateFragment?
   }
 
-  private fun logPracticeFragmentEvent(topicId: String, storyId: String, explorationId: String) {
+  private fun logPracticeFragmentEvent(
+    classroomId: String,
+    topicId: String,
+    storyId: String,
+    explorationId: String
+  ) {
     analyticsController.logImportantEvent(
-      oppiaLogger.createOpenExplorationActivityContext(topicId, storyId, explorationId),
+      oppiaLogger.createOpenExplorationActivityContext(
+        classroomId, topicId, storyId, explorationId
+      ),
       ProfileId.newBuilder().apply { internalId = internalProfileId }.build()
     )
   }
diff --git a/app/src/main/java/org/oppia/android/app/player/state/testing/StateFragmentTestActivity.kt b/app/src/main/java/org/oppia/android/app/player/state/testing/StateFragmentTestActivity.kt
index e8117516284..2fc44ad11f5 100644
--- a/app/src/main/java/org/oppia/android/app/player/state/testing/StateFragmentTestActivity.kt
+++ b/app/src/main/java/org/oppia/android/app/player/state/testing/StateFragmentTestActivity.kt
@@ -71,6 +71,7 @@ class StateFragmentTestActivity :
     fun createTestActivityIntent(
       context: Context,
       profileId: Int,
+      classroomId: String,
       topicId: String,
       storyId: String,
       explorationId: String,
@@ -78,6 +79,7 @@ class StateFragmentTestActivity :
     ): Intent {
       val args = StateFragmentTestActivityParams.newBuilder().apply {
         this.internalProfileId = profileId
+        this.classroomId = classroomId
         this.topicId = topicId
         this.storyId = storyId
         this.explorationId = explorationId
diff --git a/app/src/main/java/org/oppia/android/app/player/state/testing/StateFragmentTestActivityPresenter.kt b/app/src/main/java/org/oppia/android/app/player/state/testing/StateFragmentTestActivityPresenter.kt
index 3c52bb6e777..6beed9aaf21 100644
--- a/app/src/main/java/org/oppia/android/app/player/state/testing/StateFragmentTestActivityPresenter.kt
+++ b/app/src/main/java/org/oppia/android/app/player/state/testing/StateFragmentTestActivityPresenter.kt
@@ -12,6 +12,7 @@ import org.oppia.android.app.player.exploration.TAG_HINTS_AND_SOLUTION_EXPLORATI
 import org.oppia.android.app.player.state.StateFragment
 import org.oppia.android.app.player.state.testing.StateFragmentTestActivity.Companion.STATE_FRAGMENT_TEST_ACTIVITY_PARAMS_KEY
 import org.oppia.android.databinding.StateFragmentTestActivityBinding
+import org.oppia.android.domain.classroom.TEST_CLASSROOM_ID_0
 import org.oppia.android.domain.exploration.ExplorationDataController
 import org.oppia.android.domain.oppialogger.OppiaLogger
 import org.oppia.android.domain.topic.TEST_EXPLORATION_ID_2
@@ -34,6 +35,7 @@ class StateFragmentTestActivityPresenter @Inject constructor(
 ) {
 
   private var profileId: Int = 1
+  private lateinit var classroomId: String
   private lateinit var topicId: String
   private lateinit var storyId: String
   private lateinit var explorationId: String
@@ -54,6 +56,7 @@ class StateFragmentTestActivityPresenter @Inject constructor(
       StateFragmentTestActivityParams.getDefaultInstance()
     )
     profileId = args?.internalProfileId ?: 1
+    classroomId = args?.classroomId ?: TEST_CLASSROOM_ID_0
     topicId =
       args?.topicId ?: TEST_TOPIC_ID_0
     storyId =
@@ -63,7 +66,14 @@ class StateFragmentTestActivityPresenter @Inject constructor(
       ?: TEST_EXPLORATION_ID_2
     shouldSavePartialProgress = args?.shouldSavePartialProgress ?: false
     activity.findViewById<Button>(R.id.play_test_exploration_button)?.setOnClickListener {
-      startPlayingExploration(profileId, topicId, storyId, explorationId, shouldSavePartialProgress)
+      startPlayingExploration(
+        profileId,
+        classroomId,
+        topicId,
+        storyId,
+        explorationId,
+        shouldSavePartialProgress
+      )
     }
   }
 
@@ -85,6 +95,7 @@ class StateFragmentTestActivityPresenter @Inject constructor(
 
   private fun startPlayingExploration(
     profileId: Int,
+    classroomId: String,
     topicId: String,
     storyId: String,
     explorationId: String,
@@ -95,10 +106,12 @@ class StateFragmentTestActivityPresenter @Inject constructor(
     explorationDataController.stopPlayingExploration(isCompletion = false)
     val startPlayingProvider = if (shouldSavePartialProgress) {
       explorationDataController.startPlayingNewExploration(
-        profileId, topicId, storyId, explorationId
+        profileId, classroomId, topicId, storyId, explorationId
       )
     } else {
-      explorationDataController.replayExploration(profileId, topicId, storyId, explorationId)
+      explorationDataController.replayExploration(
+        profileId, classroomId, topicId, storyId, explorationId
+      )
     }
     startPlayingProvider.toLiveData().observe(
       activity,
diff --git a/app/src/main/java/org/oppia/android/app/profileprogress/RecentlyPlayedStorySummaryViewModel.kt b/app/src/main/java/org/oppia/android/app/profileprogress/RecentlyPlayedStorySummaryViewModel.kt
index fabe3eb83dc..9980bc52c36 100644
--- a/app/src/main/java/org/oppia/android/app/profileprogress/RecentlyPlayedStorySummaryViewModel.kt
+++ b/app/src/main/java/org/oppia/android/app/profileprogress/RecentlyPlayedStorySummaryViewModel.kt
@@ -35,7 +35,9 @@ class RecentlyPlayedStorySummaryViewModel(
   }
 
   fun onStoryItemClicked() {
-    routeToTopicPlayStory(internalProfileId, promotedStory.topicId, promotedStory.storyId)
+    routeToTopicPlayStory(
+      internalProfileId, promotedStory.classroomId, promotedStory.topicId, promotedStory.storyId
+    )
   }
 
   fun computeLessonThumbnailContentDescription(): String {
@@ -44,10 +46,16 @@ class RecentlyPlayedStorySummaryViewModel(
     )
   }
 
-  override fun routeToTopicPlayStory(internalProfileId: Int, topicId: String, storyId: String) {
+  override fun routeToTopicPlayStory(
+    internalProfileId: Int,
+    classroomId: String,
+    topicId: String,
+    storyId: String
+  ) {
     val intent = intentFactoryShim.createTopicPlayStoryActivityIntent(
       activity.applicationContext,
       internalProfileId,
+      classroomId,
       topicId,
       storyId
     )
diff --git a/app/src/main/java/org/oppia/android/app/resumelesson/ResumeLessonActivity.kt b/app/src/main/java/org/oppia/android/app/resumelesson/ResumeLessonActivity.kt
index 9ffbd1969e3..26859bb4d43 100644
--- a/app/src/main/java/org/oppia/android/app/resumelesson/ResumeLessonActivity.kt
+++ b/app/src/main/java/org/oppia/android/app/resumelesson/ResumeLessonActivity.kt
@@ -31,6 +31,7 @@ class ResumeLessonActivity :
     val params = intent.getProtoExtra(PARAMS_KEY, ResumeLessonActivityParams.getDefaultInstance())
     resumeLessonActivityPresenter.handleOnCreate(
       params.profileId,
+      params.classroomId,
       params.topicId,
       params.storyId,
       params.explorationId,
@@ -50,6 +51,7 @@ class ResumeLessonActivity :
     fun createResumeLessonActivityIntent(
       context: Context,
       profileId: ProfileId,
+      classroomId: String,
       topicId: String,
       storyId: String,
       explorationId: String,
@@ -58,6 +60,7 @@ class ResumeLessonActivity :
     ): Intent {
       val params = ResumeLessonActivityParams.newBuilder().apply {
         this.profileId = profileId
+        this.classroomId = classroomId
         this.topicId = topicId
         this.storyId = storyId
         this.explorationId = explorationId
diff --git a/app/src/main/java/org/oppia/android/app/resumelesson/ResumeLessonActivityPresenter.kt b/app/src/main/java/org/oppia/android/app/resumelesson/ResumeLessonActivityPresenter.kt
index e6cbc39c507..63b89fad7d0 100644
--- a/app/src/main/java/org/oppia/android/app/resumelesson/ResumeLessonActivityPresenter.kt
+++ b/app/src/main/java/org/oppia/android/app/resumelesson/ResumeLessonActivityPresenter.kt
@@ -19,6 +19,7 @@ class ResumeLessonActivityPresenter @Inject constructor(
   /** Handles onCreate() method of the [ResumeLessonActivity]. */
   fun handleOnCreate(
     profileId: ProfileId,
+    classroomId: String,
     topicId: String,
     storyId: String,
     explorationId: String,
@@ -40,6 +41,7 @@ class ResumeLessonActivityPresenter @Inject constructor(
     if (getResumeLessonFragment() == null) {
       val resumeLessonFragment = ResumeLessonFragment.newInstance(
         profileId,
+        classroomId,
         topicId,
         storyId,
         explorationId,
diff --git a/app/src/main/java/org/oppia/android/app/resumelesson/ResumeLessonFragment.kt b/app/src/main/java/org/oppia/android/app/resumelesson/ResumeLessonFragment.kt
index 10a05914af6..d0d48da0b7a 100644
--- a/app/src/main/java/org/oppia/android/app/resumelesson/ResumeLessonFragment.kt
+++ b/app/src/main/java/org/oppia/android/app/resumelesson/ResumeLessonFragment.kt
@@ -23,6 +23,7 @@ class ResumeLessonFragment : InjectableFragment() {
     /** Creates new instance of [ResumeLessonFragment] for the provided parameters. */
     fun newInstance(
       profileId: ProfileId,
+      classroomId: String,
       topicId: String,
       storyId: String,
       explorationId: String,
@@ -31,6 +32,7 @@ class ResumeLessonFragment : InjectableFragment() {
     ): ResumeLessonFragment {
       val args = ResumeLessonFragmentArguments.newBuilder().apply {
         this.profileId = profileId
+        this.classroomId = classroomId
         this.topicId = topicId
         this.storyId = storyId
         this.explorationId = explorationId
@@ -65,6 +67,7 @@ class ResumeLessonFragment : InjectableFragment() {
       inflater,
       container,
       args.profileId,
+      args.classroomId,
       args.topicId,
       args.storyId,
       args.explorationId,
diff --git a/app/src/main/java/org/oppia/android/app/resumelesson/ResumeLessonFragmentPresenter.kt b/app/src/main/java/org/oppia/android/app/resumelesson/ResumeLessonFragmentPresenter.kt
index b3775e5607f..6613095973a 100644
--- a/app/src/main/java/org/oppia/android/app/resumelesson/ResumeLessonFragmentPresenter.kt
+++ b/app/src/main/java/org/oppia/android/app/resumelesson/ResumeLessonFragmentPresenter.kt
@@ -42,6 +42,7 @@ class ResumeLessonFragmentPresenter @Inject constructor(
 
   private lateinit var binding: ResumeLessonFragmentBinding
   private lateinit var profileId: ProfileId
+  private lateinit var classroomId: String
   private lateinit var topicId: String
   private lateinit var storyId: String
   private lateinit var explorationId: String
@@ -59,6 +60,7 @@ class ResumeLessonFragmentPresenter @Inject constructor(
     inflater: LayoutInflater,
     container: ViewGroup?,
     profileId: ProfileId,
+    classroomId: String,
     topicId: String,
     storyId: String,
     explorationId: String,
@@ -73,6 +75,7 @@ class ResumeLessonFragmentPresenter @Inject constructor(
 
     this.profileId = profileId
     this.topicId = topicId
+    this.classroomId = classroomId
     this.storyId = storyId
     this.explorationId = explorationId
 
@@ -87,6 +90,7 @@ class ResumeLessonFragmentPresenter @Inject constructor(
     binding.resumeLessonContinueButton.setOnClickListener {
       playExploration(
         profileId,
+        classroomId,
         topicId,
         storyId,
         explorationId,
@@ -98,6 +102,7 @@ class ResumeLessonFragmentPresenter @Inject constructor(
     binding.resumeLessonStartOverButton.setOnClickListener {
       playExploration(
         profileId,
+        classroomId,
         topicId,
         storyId,
         explorationId,
@@ -169,6 +174,7 @@ class ResumeLessonFragmentPresenter @Inject constructor(
 
   private fun playExploration(
     profileId: ProfileId,
+    classroomId: String,
     topicId: String,
     storyId: String,
     explorationId: String,
@@ -177,11 +183,11 @@ class ResumeLessonFragmentPresenter @Inject constructor(
   ) {
     val startPlayingProvider = if (checkpoint == ExplorationCheckpoint.getDefaultInstance()) {
       explorationDataController.restartExploration(
-        profileId.internalId, topicId, storyId, explorationId
+        profileId.internalId, classroomId, topicId, storyId, explorationId
       )
     } else {
       explorationDataController.resumeExploration(
-        profileId.internalId, topicId, storyId, explorationId, checkpoint
+        profileId.internalId, classroomId, topicId, storyId, explorationId, checkpoint
       )
     }
     startPlayingProvider.toLiveData().observe(fragment) { result ->
diff --git a/app/src/main/java/org/oppia/android/app/shim/IntentFactoryShim.kt b/app/src/main/java/org/oppia/android/app/shim/IntentFactoryShim.kt
index 6bf989b0039..0a8994ce081 100644
--- a/app/src/main/java/org/oppia/android/app/shim/IntentFactoryShim.kt
+++ b/app/src/main/java/org/oppia/android/app/shim/IntentFactoryShim.kt
@@ -20,6 +20,7 @@ interface IntentFactoryShim {
   fun createTopicPlayStoryActivityIntent(
     context: Context,
     internalProfileId: Int,
+    classroomId: String,
     topicId: String,
     storyId: String
   ): Intent
@@ -30,6 +31,7 @@ interface IntentFactoryShim {
   fun createTopicActivityIntent(
     context: Context,
     internalProfileId: Int,
+    classroomId: String,
     topicId: String
   ): Intent
 }
diff --git a/app/src/main/java/org/oppia/android/app/shim/IntentFactoryShimImpl.kt b/app/src/main/java/org/oppia/android/app/shim/IntentFactoryShimImpl.kt
index cf342ba0ee9..d07bd9c5cc6 100644
--- a/app/src/main/java/org/oppia/android/app/shim/IntentFactoryShimImpl.kt
+++ b/app/src/main/java/org/oppia/android/app/shim/IntentFactoryShimImpl.kt
@@ -28,6 +28,7 @@ class IntentFactoryShimImpl @Inject constructor(
   override fun createTopicPlayStoryActivityIntent(
     context: Context,
     internalProfileId: Int,
+    classroomId: String,
     topicId: String,
     storyId: String
   ): Intent {
@@ -35,7 +36,9 @@ class IntentFactoryShimImpl @Inject constructor(
       ProfileId.newBuilder().apply {
         internalId = internalProfileId
       }.build(),
-      topicId, storyId
+      classroomId,
+      topicId,
+      storyId
     )
   }
 
@@ -45,12 +48,14 @@ class IntentFactoryShimImpl @Inject constructor(
   override fun createTopicActivityIntent(
     context: Context,
     internalProfileId: Int,
+    classroomId: String,
     topicId: String
   ): Intent {
     return topicActivityIntentFactory.createIntent(
       ProfileId.newBuilder().apply {
         internalId = internalProfileId
       }.build(),
+      classroomId,
       topicId
     )
   }
diff --git a/app/src/main/java/org/oppia/android/app/story/ExplorationSelectionListener.kt b/app/src/main/java/org/oppia/android/app/story/ExplorationSelectionListener.kt
index 8f42436a7c0..65ec93a3aed 100644
--- a/app/src/main/java/org/oppia/android/app/story/ExplorationSelectionListener.kt
+++ b/app/src/main/java/org/oppia/android/app/story/ExplorationSelectionListener.kt
@@ -9,6 +9,7 @@ interface ExplorationSelectionListener {
   /** Called when an exploration has been selected by the user. */
   fun selectExploration(
     profileId: ProfileId,
+    classroomId: String,
     topicId: String,
     storyId: String,
     explorationId: String,
diff --git a/app/src/main/java/org/oppia/android/app/story/StoryActivity.kt b/app/src/main/java/org/oppia/android/app/story/StoryActivity.kt
index 372745559ac..79214423f26 100644
--- a/app/src/main/java/org/oppia/android/app/story/StoryActivity.kt
+++ b/app/src/main/java/org/oppia/android/app/story/StoryActivity.kt
@@ -29,6 +29,7 @@ class StoryActivity :
   @Inject
   lateinit var storyActivityPresenter: StoryActivityPresenter
   private var internalProfileId: Int = -1
+  private lateinit var classroomId: String
   private lateinit var topicId: String
   private lateinit var storyId: String
 
@@ -40,13 +41,16 @@ class StoryActivity :
       StoryActivityParams.getDefaultInstance()
     )
     internalProfileId = intent?.extractCurrentUserProfileId()?.internalId ?: -1
+    classroomId = checkNotNull(args.classroomId) {
+      "Expected extra classroom ID to be included for StoryActivity."
+    }
     topicId = checkNotNull(args.topicId) {
       "Expected extra topic ID to be included for StoryActivity."
     }
     storyId = checkNotNull(args.storyId) {
       "Expected extra story ID to be included for StoryActivity."
     }
-    storyActivityPresenter.handleOnCreate(internalProfileId, topicId, storyId)
+    storyActivityPresenter.handleOnCreate(internalProfileId, classroomId, topicId, storyId)
   }
 
   override fun routeToExploration(
@@ -72,6 +76,7 @@ class StoryActivity :
 
   override fun routeToResumeLesson(
     profileId: ProfileId,
+    classroomId: String,
     topicId: String,
     storyId: String,
     explorationId: String,
@@ -82,6 +87,7 @@ class StoryActivity :
       ResumeLessonActivity.createResumeLessonActivityIntent(
         this,
         profileId,
+        classroomId,
         topicId,
         storyId,
         explorationId,
@@ -104,11 +110,13 @@ class StoryActivity :
     fun createStoryActivityIntent(
       context: Context,
       internalProfileId: Int,
+      classroomId: String,
       topicId: String,
       storyId: String
     ): Intent {
       val profileId = ProfileId.newBuilder().setInternalId(internalProfileId).build()
       val args = StoryActivityParams.newBuilder().apply {
+        this.classroomId = classroomId
         this.topicId = topicId
         this.storyId = storyId
       }.build()
diff --git a/app/src/main/java/org/oppia/android/app/story/StoryActivityPresenter.kt b/app/src/main/java/org/oppia/android/app/story/StoryActivityPresenter.kt
index dd840745ca9..8830bd29a05 100644
--- a/app/src/main/java/org/oppia/android/app/story/StoryActivityPresenter.kt
+++ b/app/src/main/java/org/oppia/android/app/story/StoryActivityPresenter.kt
@@ -8,12 +8,17 @@ import javax.inject.Inject
 /** The presenter for [StoryActivity]. */
 @ActivityScope
 class StoryActivityPresenter @Inject constructor(private val activity: AppCompatActivity) {
-  fun handleOnCreate(internalProfileId: Int, topicId: String, storyId: String) {
+  fun handleOnCreate(
+    internalProfileId: Int,
+    classroomId: String,
+    topicId: String,
+    storyId: String
+  ) {
     activity.setContentView(R.layout.story_activity)
     if (getStoryFragment() == null) {
       activity.supportFragmentManager.beginTransaction().add(
         R.id.story_fragment_placeholder,
-        StoryFragment.newInstance(internalProfileId, topicId, storyId)
+        StoryFragment.newInstance(internalProfileId, classroomId, topicId, storyId)
       ).commitNow()
     }
   }
diff --git a/app/src/main/java/org/oppia/android/app/story/StoryFragment.kt b/app/src/main/java/org/oppia/android/app/story/StoryFragment.kt
index 963a130dace..4291059baa3 100644
--- a/app/src/main/java/org/oppia/android/app/story/StoryFragment.kt
+++ b/app/src/main/java/org/oppia/android/app/story/StoryFragment.kt
@@ -24,10 +24,16 @@ class StoryFragment : InjectableFragment(), ExplorationSelectionListener, StoryF
     const val STORY_FRAGMENT_ARGUMENTS_KEY = "StoryFragment.arguments"
 
     /** Returns a new [StoryFragment] to display the story corresponding to the specified story ID. */
-    fun newInstance(internalProfileId: Int, topicId: String, storyId: String): StoryFragment {
+    fun newInstance(
+      internalProfileId: Int,
+      classroomId: String,
+      topicId: String,
+      storyId: String
+    ): StoryFragment {
 
       val profileId = ProfileId.newBuilder().setInternalId(internalProfileId).build()
       val args = StoryFragmentArguments.newBuilder().apply {
+        this.classroomId = classroomId
         this.topicId = topicId
         this.storyId = storyId
       }.build()
@@ -60,6 +66,10 @@ class StoryFragment : InjectableFragment(), ExplorationSelectionListener, StoryF
       arguments.getProto(STORY_FRAGMENT_ARGUMENTS_KEY, StoryFragmentArguments.getDefaultInstance())
 
     val internalProfileId = arguments.extractCurrentUserProfileId().internalId
+    val classroomId =
+      checkNotNull(args.classroomId) {
+        "Expected classroomId to be passed to StoryFragment"
+      }
     val topicId =
       checkNotNull(args.topicId) {
         "Expected topicId to be passed to StoryFragment"
@@ -72,6 +82,7 @@ class StoryFragment : InjectableFragment(), ExplorationSelectionListener, StoryF
       inflater,
       container,
       internalProfileId,
+      classroomId,
       topicId,
       storyId
     )
@@ -79,6 +90,7 @@ class StoryFragment : InjectableFragment(), ExplorationSelectionListener, StoryF
 
   override fun selectExploration(
     profileId: ProfileId,
+    classroomId: String,
     topicId: String,
     storyId: String,
     explorationId: String,
@@ -89,6 +101,7 @@ class StoryFragment : InjectableFragment(), ExplorationSelectionListener, StoryF
   ) {
     storyFragmentPresenter.handleSelectExploration(
       profileId,
+      classroomId,
       topicId,
       storyId,
       explorationId,
diff --git a/app/src/main/java/org/oppia/android/app/story/StoryFragmentPresenter.kt b/app/src/main/java/org/oppia/android/app/story/StoryFragmentPresenter.kt
index 2433999b826..511e79df785 100644
--- a/app/src/main/java/org/oppia/android/app/story/StoryFragmentPresenter.kt
+++ b/app/src/main/java/org/oppia/android/app/story/StoryFragmentPresenter.kt
@@ -73,6 +73,7 @@ class StoryFragmentPresenter @Inject constructor(
     inflater: LayoutInflater,
     container: ViewGroup?,
     internalProfileId: Int,
+    classroomId: String,
     topicId: String,
     storyId: String
   ): View {
@@ -83,6 +84,7 @@ class StoryFragmentPresenter @Inject constructor(
     )
     profileId = ProfileId.newBuilder().apply { internalId = internalProfileId }.build()
     storyViewModel.setInternalProfileId(internalProfileId)
+    storyViewModel.setClassroomId(classroomId)
     storyViewModel.setTopicId(topicId)
     storyViewModel.setStoryId(storyId)
     logStoryActivityEvent(topicId, storyId)
@@ -115,6 +117,7 @@ class StoryFragmentPresenter @Inject constructor(
 
   fun handleSelectExploration(
     profileId: ProfileId,
+    classroomId: String,
     topicId: String,
     storyId: String,
     explorationId: String,
@@ -126,6 +129,7 @@ class StoryFragmentPresenter @Inject constructor(
     if (canExplorationBeResumed) {
       routeToResumeLessonListener.routeToResumeLesson(
         profileId,
+        classroomId,
         topicId,
         storyId,
         explorationId,
@@ -135,6 +139,7 @@ class StoryFragmentPresenter @Inject constructor(
     } else {
       playExploration(
         profileId,
+        classroomId,
         topicId,
         storyId,
         explorationId,
@@ -266,6 +271,7 @@ class StoryFragmentPresenter @Inject constructor(
 
   private fun playExploration(
     profileId: ProfileId,
+    classroomId: String,
     topicId: String,
     storyId: String,
     explorationId: String,
@@ -277,6 +283,7 @@ class StoryFragmentPresenter @Inject constructor(
     val startPlayingProvider = if (canHavePartialProgressSaved) {
       explorationDataController.startPlayingNewExploration(
         profileId.internalId,
+        classroomId,
         topicId,
         storyId,
         explorationId
@@ -284,6 +291,7 @@ class StoryFragmentPresenter @Inject constructor(
     } else {
       explorationDataController.replayExploration(
         profileId.internalId,
+        classroomId,
         topicId,
         storyId,
         explorationId
diff --git a/app/src/main/java/org/oppia/android/app/story/StoryViewModel.kt b/app/src/main/java/org/oppia/android/app/story/StoryViewModel.kt
index 7fee629b2e4..2acb48ce3fb 100644
--- a/app/src/main/java/org/oppia/android/app/story/StoryViewModel.kt
+++ b/app/src/main/java/org/oppia/android/app/story/StoryViewModel.kt
@@ -32,6 +32,7 @@ class StoryViewModel @Inject constructor(
   private val translationController: TranslationController
 ) {
   private var internalProfileId: Int = -1
+  private lateinit var classroomId: String
   private lateinit var topicId: String
 
   /** [storyId] needs to be set before any of the live data members can be accessed. */
@@ -62,6 +63,10 @@ class StoryViewModel @Inject constructor(
     this.internalProfileId = internalProfileId
   }
 
+  fun setClassroomId(classroomId: String) {
+    this.classroomId = classroomId
+  }
+
   fun setTopicId(topicId: String) {
     this.topicId = topicId
   }
@@ -121,6 +126,7 @@ class StoryViewModel @Inject constructor(
           explorationSelectionListener,
           explorationCheckpointController,
           internalProfileId,
+          classroomId,
           topicId,
           storyId,
           ephemeralChapterSummary,
diff --git a/app/src/main/java/org/oppia/android/app/story/storyitemviewmodel/StoryChapterSummaryViewModel.kt b/app/src/main/java/org/oppia/android/app/story/storyitemviewmodel/StoryChapterSummaryViewModel.kt
index 746af71c90b..90163342636 100644
--- a/app/src/main/java/org/oppia/android/app/story/storyitemviewmodel/StoryChapterSummaryViewModel.kt
+++ b/app/src/main/java/org/oppia/android/app/story/storyitemviewmodel/StoryChapterSummaryViewModel.kt
@@ -24,6 +24,7 @@ class StoryChapterSummaryViewModel(
   private val explorationSelectionListener: ExplorationSelectionListener,
   val explorationCheckpointController: ExplorationCheckpointController,
   val internalProfileId: Int,
+  val classroomId: String,
   val topicId: String,
   val storyId: String,
   private val ephemeralChapterSummary: EphemeralChapterSummary,
@@ -76,6 +77,7 @@ class StoryChapterSummaryViewModel(
               explorationCheckpointLiveData.removeObserver(this)
               explorationSelectionListener.selectExploration(
                 profileId,
+                classroomId,
                 topicId,
                 storyId,
                 explorationId,
@@ -88,6 +90,7 @@ class StoryChapterSummaryViewModel(
               explorationCheckpointLiveData.removeObserver(this)
               explorationSelectionListener.selectExploration(
                 profileId,
+                classroomId,
                 topicId,
                 storyId,
                 explorationId,
@@ -103,6 +106,7 @@ class StoryChapterSummaryViewModel(
     } else {
       explorationSelectionListener.selectExploration(
         profileId,
+        classroomId,
         topicId,
         storyId,
         explorationId,
diff --git a/app/src/main/java/org/oppia/android/app/testing/ExplorationTestActivityPresenter.kt b/app/src/main/java/org/oppia/android/app/testing/ExplorationTestActivityPresenter.kt
index f4a4285b28d..96e96f3173f 100644
--- a/app/src/main/java/org/oppia/android/app/testing/ExplorationTestActivityPresenter.kt
+++ b/app/src/main/java/org/oppia/android/app/testing/ExplorationTestActivityPresenter.kt
@@ -12,6 +12,7 @@ import org.oppia.android.app.home.RouteToExplorationListener
 import org.oppia.android.app.model.ExplorationActivityParams
 import org.oppia.android.app.model.ProfileId
 import org.oppia.android.app.utility.SplitScreenManager
+import org.oppia.android.domain.classroom.TEST_CLASSROOM_ID_0
 import org.oppia.android.domain.exploration.ExplorationDataController
 import org.oppia.android.domain.oppialogger.OppiaLogger
 import org.oppia.android.domain.topic.TEST_EXPLORATION_ID_2
@@ -22,6 +23,7 @@ import org.oppia.android.util.data.DataProviders.Companion.toLiveData
 import javax.inject.Inject
 
 private const val INTERNAL_PROFILE_ID = 0
+private const val CLASSROOM_ID = TEST_CLASSROOM_ID_0
 private const val TOPIC_ID = TEST_TOPIC_ID_0
 private const val STORY_ID = TEST_STORY_ID_0
 private const val EXPLORATION_ID = TEST_EXPLORATION_ID_2
@@ -52,6 +54,7 @@ class ExplorationTestActivityPresenter @Inject constructor(
     explorationDataController.stopPlayingExploration(isCompletion = false)
     explorationDataController.replayExploration(
       INTERNAL_PROFILE_ID,
+      CLASSROOM_ID,
       TOPIC_ID,
       STORY_ID,
       EXPLORATION_ID
diff --git a/app/src/main/java/org/oppia/android/app/testing/HomeFragmentTestActivity.kt b/app/src/main/java/org/oppia/android/app/testing/HomeFragmentTestActivity.kt
index 691185772cc..f4f2a699b6b 100644
--- a/app/src/main/java/org/oppia/android/app/testing/HomeFragmentTestActivity.kt
+++ b/app/src/main/java/org/oppia/android/app/testing/HomeFragmentTestActivity.kt
@@ -33,7 +33,9 @@ class HomeFragmentTestActivity :
   }
 
   // Override functions are needed to fulfill listener definitions.
-  override fun routeToTopic(internalProfileId: Int, topicId: String) {}
-  override fun routeToTopicPlayStory(internalProfileId: Int, topicId: String, storyId: String) {}
+  override fun routeToTopic(internalProfileId: Int, classroomId: String, topicId: String) {}
+  override fun routeToTopicPlayStory(
+    internalProfileId: Int, classroomId: String, topicId: String, storyId: String
+  ) {}
   override fun routeToRecentlyPlayed(recentlyPlayedActivityTitle: RecentlyPlayedActivityTitle) {}
 }
diff --git a/app/src/main/java/org/oppia/android/app/testing/NavigationDrawerTestActivity.kt b/app/src/main/java/org/oppia/android/app/testing/NavigationDrawerTestActivity.kt
index fc306b60601..50efbf13ac3 100644
--- a/app/src/main/java/org/oppia/android/app/testing/NavigationDrawerTestActivity.kt
+++ b/app/src/main/java/org/oppia/android/app/testing/NavigationDrawerTestActivity.kt
@@ -61,15 +61,22 @@ class NavigationDrawerTestActivity :
     homeActivityPresenter.handleOnRestart()
   }
 
-  override fun routeToTopic(internalProfileId: Int, topicId: String) {
-    startActivity(TopicActivity.createTopicActivityIntent(this, internalProfileId, topicId))
+  override fun routeToTopic(internalProfileId: Int, classroomId: String, topicId: String) {
+    startActivity(
+      TopicActivity.createTopicActivityIntent(this, internalProfileId, classroomId, topicId)
+    )
   }
 
-  override fun routeToTopicPlayStory(internalProfileId: Int, topicId: String, storyId: String) {
+  override fun routeToTopicPlayStory(
+    internalProfileId: Int,
+    classroomId: String,
+    topicId: String,
+    storyId: String) {
     startActivity(
       TopicActivity.createTopicPlayStoryActivityIntent(
         this,
         internalProfileId,
+        classroomId,
         topicId,
         storyId
       )
diff --git a/app/src/main/java/org/oppia/android/app/testing/TopicTestActivity.kt b/app/src/main/java/org/oppia/android/app/testing/TopicTestActivity.kt
index 7110dd21c70..1f828668d86 100644
--- a/app/src/main/java/org/oppia/android/app/testing/TopicTestActivity.kt
+++ b/app/src/main/java/org/oppia/android/app/testing/TopicTestActivity.kt
@@ -15,6 +15,7 @@ import org.oppia.android.app.topic.TopicActivityPresenter
 import org.oppia.android.app.topic.TopicFragment
 import org.oppia.android.app.topic.questionplayer.QuestionPlayerActivity
 import org.oppia.android.app.topic.revisioncard.RevisionCardActivity
+import org.oppia.android.domain.classroom.TEST_CLASSROOM_ID_0
 import org.oppia.android.domain.topic.TEST_TOPIC_ID_0
 import javax.inject.Inject
 
@@ -34,6 +35,7 @@ class TopicTestActivity :
     (activityComponent as ActivityComponentImpl).inject(this)
     topicActivityPresenter.handleOnCreate(
       internalProfileId = 0,
+      classroomId = TEST_CLASSROOM_ID_0,
       topicId = TEST_TOPIC_ID_0,
       storyId = ""
     )
@@ -47,11 +49,17 @@ class TopicTestActivity :
     )
   }
 
-  override fun routeToStory(internalProfileId: Int, topicId: String, storyId: String) {
+  override fun routeToStory(
+    internalProfileId: Int,
+    classroomId: String,
+    topicId: String,
+    storyId: String
+  ) {
     startActivity(
       StoryActivity.createStoryActivityIntent(
         this,
         internalProfileId,
+        classroomId,
         topicId,
         storyId
       )
diff --git a/app/src/main/java/org/oppia/android/app/testing/TopicTestActivityForStory.kt b/app/src/main/java/org/oppia/android/app/testing/TopicTestActivityForStory.kt
index 57d9f538dc6..7f1e7c2e4c2 100644
--- a/app/src/main/java/org/oppia/android/app/testing/TopicTestActivityForStory.kt
+++ b/app/src/main/java/org/oppia/android/app/testing/TopicTestActivityForStory.kt
@@ -18,6 +18,7 @@ import org.oppia.android.app.topic.TopicActivityPresenter
 import org.oppia.android.app.topic.TopicFragment
 import org.oppia.android.app.topic.questionplayer.QuestionPlayerActivity
 import org.oppia.android.app.topic.revisioncard.RevisionCardActivity
+import org.oppia.android.domain.classroom.TEST_CLASSROOM_ID_0
 import org.oppia.android.domain.topic.TEST_STORY_ID_0
 import org.oppia.android.domain.topic.TEST_TOPIC_ID_0
 import javax.inject.Inject
@@ -39,6 +40,7 @@ class TopicTestActivityForStory :
     (activityComponent as ActivityComponentImpl).inject(this)
     topicActivityPresenter.handleOnCreate(
       internalProfileId = 0,
+      classroomId = TEST_CLASSROOM_ID_0,
       topicId = TEST_TOPIC_ID_0,
       storyId = TEST_STORY_ID_0
     )
@@ -52,11 +54,17 @@ class TopicTestActivityForStory :
     )
   }
 
-  override fun routeToStory(internalProfileId: Int, topicId: String, storyId: String) {
+  override fun routeToStory(
+    internalProfileId: Int,
+    classroomId: String,
+    topicId: String,
+    storyId: String
+  ) {
     startActivity(
       StoryActivity.createStoryActivityIntent(
         this,
         internalProfileId,
+        classroomId,
         topicId,
         storyId
       )
@@ -65,6 +73,7 @@ class TopicTestActivityForStory :
 
   override fun routeToResumeLesson(
     profileId: ProfileId,
+    classroomId: String,
     topicId: String,
     storyId: String,
     explorationId: String,
@@ -75,6 +84,7 @@ class TopicTestActivityForStory :
       ResumeLessonActivity.createResumeLessonActivityIntent(
         this,
         profileId,
+        classroomId,
         topicId,
         storyId,
         explorationId,
diff --git a/app/src/main/java/org/oppia/android/app/topic/RouteToResumeLessonListener.kt b/app/src/main/java/org/oppia/android/app/topic/RouteToResumeLessonListener.kt
index babe6ff0d83..f33511e4591 100644
--- a/app/src/main/java/org/oppia/android/app/topic/RouteToResumeLessonListener.kt
+++ b/app/src/main/java/org/oppia/android/app/topic/RouteToResumeLessonListener.kt
@@ -9,6 +9,7 @@ interface RouteToResumeLessonListener {
   /** Called selects an exploration that can be resumed. */
   fun routeToResumeLesson(
     profileId: ProfileId,
+    classroomId: String,
     topicId: String,
     storyId: String,
     explorationId: String,
diff --git a/app/src/main/java/org/oppia/android/app/topic/RouteToStoryListener.kt b/app/src/main/java/org/oppia/android/app/topic/RouteToStoryListener.kt
index 5cee9714126..13a91ce8c48 100755
--- a/app/src/main/java/org/oppia/android/app/topic/RouteToStoryListener.kt
+++ b/app/src/main/java/org/oppia/android/app/topic/RouteToStoryListener.kt
@@ -2,5 +2,5 @@ package org.oppia.android.app.topic
 
 /** Listener for when an [TopicActivity] should route to a [StoryActivity]. */
 interface RouteToStoryListener {
-  fun routeToStory(internalProfileId: Int, topicId: String, storyId: String)
+  fun routeToStory(internalProfileId: Int, classroomId: String, topicId: String, storyId: String)
 }
diff --git a/app/src/main/java/org/oppia/android/app/topic/TopicActivity.kt b/app/src/main/java/org/oppia/android/app/topic/TopicActivity.kt
index 95595ea4385..2620d07432b 100755
--- a/app/src/main/java/org/oppia/android/app/topic/TopicActivity.kt
+++ b/app/src/main/java/org/oppia/android/app/topic/TopicActivity.kt
@@ -36,6 +36,7 @@ class TopicActivity :
 
   private var internalProfileId: Int = -1
   private lateinit var topicId: String
+  private lateinit var classroomId: String
   private var storyId: String? = null
 
   @Inject
@@ -49,13 +50,18 @@ class TopicActivity :
       TOPIC_ACTIVITY_PARAMS_KEY,
       TopicActivityParams.getDefaultInstance()
     )
+    classroomId = checkNotNull(
+      args?.classroomId
+    ) {
+      "Expected classroom ID to be included in intent for TopicActivity."
+    }
     topicId = checkNotNull(
       args?.topicId
     ) {
       "Expected topic ID to be included in intent for TopicActivity."
     }
     storyId = args?.storyId
-    topicActivityPresenter.handleOnCreate(internalProfileId, topicId, storyId)
+    topicActivityPresenter.handleOnCreate(internalProfileId, classroomId, topicId, storyId)
   }
 
   override fun routeToQuestionPlayer(skillIdList: ArrayList<String>) {
@@ -68,11 +74,17 @@ class TopicActivity :
     )
   }
 
-  override fun routeToStory(internalProfileId: Int, topicId: String, storyId: String) {
+  override fun routeToStory(
+    internalProfileId: Int,
+    classroomId: String,
+    topicId: String,
+    storyId: String
+  ) {
     startActivity(
       StoryActivity.createStoryActivityIntent(
         this,
         internalProfileId,
+        classroomId,
         topicId,
         storyId
       )
@@ -119,6 +131,7 @@ class TopicActivity :
 
   override fun routeToResumeLesson(
     profileId: ProfileId,
+    classroomId: String,
     topicId: String,
     storyId: String,
     explorationId: String,
@@ -129,6 +142,7 @@ class TopicActivity :
       ResumeLessonActivity.createResumeLessonActivityIntent(
         this,
         profileId,
+        classroomId,
         topicId,
         storyId,
         explorationId,
@@ -145,11 +159,22 @@ class TopicActivity :
   class TopicActivityIntentFactoryImpl @Inject constructor(
     private val activity: AppCompatActivity
   ) : ActivityIntentFactories.TopicActivityIntentFactory {
-    override fun createIntent(profileId: ProfileId, topicId: String): Intent =
-      createTopicActivityIntent(activity, profileId.internalId, topicId)
+    override fun createIntent(profileId: ProfileId, classroomId: String, topicId: String): Intent =
+      createTopicActivityIntent(activity, profileId.internalId, classroomId, topicId)
 
-    override fun createIntent(profileId: ProfileId, topicId: String, storyId: String): Intent =
-      createTopicPlayStoryActivityIntent(activity, profileId.internalId, topicId, storyId)
+    override fun createIntent(
+      profileId: ProfileId,
+      classroomId: String,
+      topicId: String,
+      storyId: String
+    ): Intent =
+      createTopicPlayStoryActivityIntent(
+        activity,
+        profileId.internalId,
+        classroomId,
+        topicId,
+        storyId
+      )
   }
 
   companion object {
@@ -160,9 +185,13 @@ class TopicActivity :
     fun createTopicActivityIntent(
       context: Context,
       internalProfileId: Int,
+      classroomId: String,
       topicId: String
     ): Intent {
-      val args = TopicActivityParams.newBuilder().setTopicId(topicId).build()
+      val args = TopicActivityParams.newBuilder().apply {
+        this.topicId = topicId
+        this.classroomId = classroomId
+      }.build()
       val profileId = ProfileId.newBuilder().setInternalId(internalProfileId).build()
       return Intent(context, TopicActivity::class.java).apply {
         putProtoExtra(TOPIC_ACTIVITY_PARAMS_KEY, args)
@@ -175,10 +204,11 @@ class TopicActivity :
     fun createTopicPlayStoryActivityIntent(
       context: Context,
       internalProfileId: Int,
+      classroomId: String,
       topicId: String,
       storyId: String
     ): Intent {
-      return createTopicActivityIntent(context, internalProfileId, topicId).apply {
+      return createTopicActivityIntent(context, internalProfileId, classroomId, topicId).apply {
         val args =
           getProtoExtra(TOPIC_ACTIVITY_PARAMS_KEY, TopicActivityParams.getDefaultInstance())
         val updateArg = args.toBuilder().setStoryId(storyId).build()
diff --git a/app/src/main/java/org/oppia/android/app/topic/TopicActivityPresenter.kt b/app/src/main/java/org/oppia/android/app/topic/TopicActivityPresenter.kt
index e2b2b598136..807e4d9f292 100755
--- a/app/src/main/java/org/oppia/android/app/topic/TopicActivityPresenter.kt
+++ b/app/src/main/java/org/oppia/android/app/topic/TopicActivityPresenter.kt
@@ -19,18 +19,26 @@ const val TOPIC_FRAGMENT_ARGUMENTS_KEY = "TopicFragment.arguments"
 /** The presenter for [TopicActivity]. */
 @ActivityScope
 class TopicActivityPresenter @Inject constructor(private val activity: AppCompatActivity) {
+  private lateinit var classroomId: String
   private lateinit var topicId: String
 
   private lateinit var profileId: ProfileId
 
-  fun handleOnCreate(internalProfileId: Int, topicId: String, storyId: String?) {
+  fun handleOnCreate(
+    internalProfileId: Int,
+    classroomId: String,
+    topicId: String,
+    storyId: String?
+  ) {
     this.topicId = topicId
+    this.classroomId = classroomId
     activity.setContentView(R.layout.topic_activity)
     profileId = ProfileId.newBuilder().setInternalId(internalProfileId).build()
     if (getTopicFragment() == null) {
       val topicFragment = TopicFragment()
       val arguments = Bundle().apply {
         val args = TopicFragmentArguments.newBuilder().apply {
+          this.classroomId = classroomId
           this.topicId = topicId
           if (storyId != null) {
             this.storyId = storyId
diff --git a/app/src/main/java/org/oppia/android/app/topic/TopicFragment.kt b/app/src/main/java/org/oppia/android/app/topic/TopicFragment.kt
index f9298ccac7c..83b1190f2db 100644
--- a/app/src/main/java/org/oppia/android/app/topic/TopicFragment.kt
+++ b/app/src/main/java/org/oppia/android/app/topic/TopicFragment.kt
@@ -8,6 +8,7 @@ import android.view.ViewGroup
 import org.oppia.android.app.fragment.FragmentComponentImpl
 import org.oppia.android.app.fragment.InjectableFragment
 import org.oppia.android.app.model.TopicFragmentArguments
+import org.oppia.android.domain.classroom.TEST_CLASSROOM_ID_0
 import org.oppia.android.domain.topic.TEST_TOPIC_ID_0
 import org.oppia.android.util.extensions.getProto
 import org.oppia.android.util.profile.CurrentUserProfileIdIntentDecorator.extractCurrentUserProfileId
@@ -34,6 +35,7 @@ class TopicFragment : InjectableFragment() {
       TopicFragmentArguments.getDefaultInstance()
     )
     val internalProfileId = arguments?.extractCurrentUserProfileId()?.internalId ?: -1
+    val classroomId = args?.classroomId ?: TEST_CLASSROOM_ID_0
     val topicId = args?.topicId ?: TEST_TOPIC_ID_0
     val storyId = args?.storyId ?: ""
 
@@ -41,6 +43,7 @@ class TopicFragment : InjectableFragment() {
       inflater,
       container,
       internalProfileId,
+      classroomId,
       topicId,
       storyId,
       isConfigChanged = savedInstanceState != null
diff --git a/app/src/main/java/org/oppia/android/app/topic/TopicFragmentPresenter.kt b/app/src/main/java/org/oppia/android/app/topic/TopicFragmentPresenter.kt
index 76a43e98978..4f38bb1b34b 100644
--- a/app/src/main/java/org/oppia/android/app/topic/TopicFragmentPresenter.kt
+++ b/app/src/main/java/org/oppia/android/app/topic/TopicFragmentPresenter.kt
@@ -49,6 +49,7 @@ class TopicFragmentPresenter @Inject constructor(
     inflater: LayoutInflater,
     container: ViewGroup?,
     internalProfileId: Int,
+    classroomId: String,
     topicId: String,
     storyId: String,
     isConfigChanged: Boolean
@@ -77,7 +78,7 @@ class TopicFragmentPresenter @Inject constructor(
     viewModel.setTopicId(topicId)
     binding.viewModel = viewModel
 
-    setUpViewPager(viewPager, topicId, isConfigChanged)
+    setUpViewPager(viewPager, classroomId, topicId, isConfigChanged)
     return binding.root
   }
 
@@ -124,9 +125,20 @@ class TopicFragmentPresenter @Inject constructor(
     return if (enableExtraTopicTabsUi.value) tab.positionWithFourTabs else tab.positionWithTwoTabs
   }
 
-  private fun setUpViewPager(viewPager2: ViewPager2, topicId: String, isConfigChanged: Boolean) {
+  private fun setUpViewPager(
+    viewPager2: ViewPager2,
+    classroomId: String,
+    topicId: String,
+    isConfigChanged: Boolean
+  ) {
     val adapter =
-      ViewPagerAdapter(fragment, internalProfileId, topicId, storyId, enableExtraTopicTabsUi.value)
+      ViewPagerAdapter(
+        fragment,
+        internalProfileId,
+        classroomId,
+        topicId,
+        storyId,
+        enableExtraTopicTabsUi.value)
     viewPager2.adapter = adapter
     TabLayoutMediator(tabLayout, viewPager2) { tab, position ->
       val topicTab = TopicTab.getTabForPosition(position, enableExtraTopicTabsUi.value)
diff --git a/app/src/main/java/org/oppia/android/app/topic/ViewPagerAdapter.kt b/app/src/main/java/org/oppia/android/app/topic/ViewPagerAdapter.kt
index 3b1390c6852..60badbd0dd6 100644
--- a/app/src/main/java/org/oppia/android/app/topic/ViewPagerAdapter.kt
+++ b/app/src/main/java/org/oppia/android/app/topic/ViewPagerAdapter.kt
@@ -11,6 +11,7 @@ import org.oppia.android.app.topic.revision.TopicRevisionFragment
 class ViewPagerAdapter(
   fragment: Fragment,
   private val internalProfileId: Int,
+  private val classroomId: String,
   private val topicId: String,
   private val storyId: String,
   private val enableExtraTopicTabsUi: Boolean
@@ -24,7 +25,7 @@ class ViewPagerAdapter(
         TopicInfoFragment.newInstance(internalProfileId, topicId)
       }
       TopicTab.LESSONS -> {
-        TopicLessonsFragment.newInstance(internalProfileId, topicId, storyId)
+        TopicLessonsFragment.newInstance(internalProfileId, classroomId, topicId, storyId)
       }
       TopicTab.PRACTICE -> {
         TopicPracticeFragment.newInstance(internalProfileId, topicId)
diff --git a/app/src/main/java/org/oppia/android/app/topic/lessons/TopicLessonsFragment.kt b/app/src/main/java/org/oppia/android/app/topic/lessons/TopicLessonsFragment.kt
index 51db6ebf02c..8c3258e7344 100644
--- a/app/src/main/java/org/oppia/android/app/topic/lessons/TopicLessonsFragment.kt
+++ b/app/src/main/java/org/oppia/android/app/topic/lessons/TopicLessonsFragment.kt
@@ -39,12 +39,14 @@ class TopicLessonsFragment :
     /** Returns a new [TopicLessonsFragment]. */
     fun newInstance(
       internalProfileId: Int,
+      classroomId: String,
       topicId: String,
       storyId: String
     ): TopicLessonsFragment {
 
       val profileId = ProfileId.newBuilder().setInternalId(internalProfileId).build()
       val args = TopicLessonsFragmentArguments.newBuilder().apply {
+        this.classroomId = classroomId
         this.topicId = topicId
         if (storyId.isNotBlank())
           this.storyId = storyId
@@ -91,6 +93,9 @@ class TopicLessonsFragment :
       TOPIC_LESSONS_FRAGMENT_ARGUMENTS_KEY,
       TopicLessonsFragmentArguments.getDefaultInstance()
     )
+    val classroomId = checkNotNull(args?.classroomId) {
+      "Expected classroom ID to be included in arguments for TopicLessonsFragment."
+    }
     val topicId = checkNotNull(args?.topicId) {
       "Expected topic ID to be included in arguments for TopicLessonsFragment."
     }
@@ -101,6 +106,7 @@ class TopicLessonsFragment :
       currentExpandedChapterListIndex,
       this as ExpandedChapterListIndexListener,
       internalProfileId,
+      classroomId,
       topicId,
       storyId,
       isDefaultStoryExpanded
diff --git a/app/src/main/java/org/oppia/android/app/topic/lessons/TopicLessonsFragmentPresenter.kt b/app/src/main/java/org/oppia/android/app/topic/lessons/TopicLessonsFragmentPresenter.kt
index bdb858ff1bd..9ba83983ff0 100644
--- a/app/src/main/java/org/oppia/android/app/topic/lessons/TopicLessonsFragmentPresenter.kt
+++ b/app/src/main/java/org/oppia/android/app/topic/lessons/TopicLessonsFragmentPresenter.kt
@@ -54,6 +54,7 @@ class TopicLessonsFragmentPresenter @Inject constructor(
 
   private lateinit var binding: TopicLessonsFragmentBinding
   private var internalProfileId: Int = -1
+  private lateinit var classroomId: String
   private lateinit var topicId: String
   private lateinit var storyId: String
   private var isDefaultStoryExpanded: Boolean = false
@@ -68,11 +69,13 @@ class TopicLessonsFragmentPresenter @Inject constructor(
     currentExpandedChapterListIndex: Int?,
     expandedChapterListIndexListener: ExpandedChapterListIndexListener,
     internalProfileId: Int,
+    classroomId: String,
     topicId: String,
     storyId: String,
     isDefaultStoryExpanded: Boolean
   ): View? {
     this.internalProfileId = internalProfileId
+    this.classroomId = classroomId
     this.topicId = topicId
     this.storyId = storyId
     this.isDefaultStoryExpanded = isDefaultStoryExpanded
@@ -274,7 +277,7 @@ class TopicLessonsFragmentPresenter @Inject constructor(
   }
 
   fun storySummaryClicked(storySummary: StorySummary) {
-    routeToStoryListener.routeToStory(internalProfileId, topicId, storySummary.storyId)
+    routeToStoryListener.routeToStory(internalProfileId, classroomId, topicId, storySummary.storyId)
   }
 
   fun selectChapterSummary(
@@ -308,6 +311,7 @@ class TopicLessonsFragmentPresenter @Inject constructor(
                 explorationCheckpointLiveData.removeObserver(this)
                 routeToResumeLessonListener.routeToResumeLesson(
                   profileId,
+                  classroomId,
                   topicId,
                   storyId,
                   explorationId,
@@ -318,6 +322,7 @@ class TopicLessonsFragmentPresenter @Inject constructor(
                 explorationCheckpointLiveData.removeObserver(this)
                 playExploration(
                   profileId,
+                  classroomId,
                   topicId,
                   storyId,
                   explorationId,
@@ -332,6 +337,7 @@ class TopicLessonsFragmentPresenter @Inject constructor(
       ChapterPlayState.IN_PROGRESS_NOT_SAVED -> {
         playExploration(
           profileId,
+          classroomId,
           topicId,
           storyId,
           explorationId,
@@ -342,6 +348,7 @@ class TopicLessonsFragmentPresenter @Inject constructor(
       else -> {
         playExploration(
           profileId,
+          classroomId,
           topicId,
           storyId,
           explorationId,
@@ -354,6 +361,7 @@ class TopicLessonsFragmentPresenter @Inject constructor(
 
   private fun playExploration(
     profileId: ProfileId,
+    classroomId: String,
     topicId: String,
     storyId: String,
     explorationId: String,
@@ -364,21 +372,21 @@ class TopicLessonsFragmentPresenter @Inject constructor(
       !canHavePartialProgressSaved -> {
         // Only explorations that have been completed can't be saved, so replay the lesson.
         explorationDataController.replayExploration(
-          internalProfileId, topicId, storyId, explorationId
+          internalProfileId, classroomId, topicId, storyId, explorationId
         )
       }
       hadProgress -> {
         // If there was progress, either the checkpoint was never saved, failed to save, or failed
         // to be retrieved. In all cases, this is a restart.
         explorationDataController.restartExploration(
-          internalProfileId, topicId, storyId, explorationId
+          internalProfileId, classroomId, topicId, storyId, explorationId
         )
       }
       else -> {
         // If there's no progress and it was never completed, then it's a new play through (or the
         // user is very low on device memory).
         explorationDataController.startPlayingNewExploration(
-          internalProfileId, topicId, storyId, explorationId
+          internalProfileId, classroomId, topicId, storyId, explorationId
         )
       }
     }
diff --git a/app/src/sharedTest/java/org/oppia/android/app/classroom/ClassroomListFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/classroom/ClassroomListFragmentTest.kt
index 87a5c58fd0a..eb9f0f41cc8 100644
--- a/app/src/sharedTest/java/org/oppia/android/app/classroom/ClassroomListFragmentTest.kt
+++ b/app/src/sharedTest/java/org/oppia/android/app/classroom/ClassroomListFragmentTest.kt
@@ -74,6 +74,8 @@ import org.oppia.android.domain.classify.rules.numericexpressioninput.NumericExp
 import org.oppia.android.domain.classify.rules.numericinput.NumericInputRuleModule
 import org.oppia.android.domain.classify.rules.ratioinput.RatioInputModule
 import org.oppia.android.domain.classify.rules.textinput.TextInputRuleModule
+import org.oppia.android.domain.classroom.TEST_CLASSROOM_ID_0
+import org.oppia.android.domain.classroom.TEST_CLASSROOM_ID_1
 import org.oppia.android.domain.exploration.ExplorationProgressModule
 import org.oppia.android.domain.exploration.ExplorationStorageModule
 import org.oppia.android.domain.hintsandsolution.HintsAndSolutionConfigModule
@@ -630,6 +632,7 @@ class ClassroomListFragmentTest {
     testCoroutineDispatchers.runCurrent()
 
     val args = TopicActivityParams.newBuilder().apply {
+      this.classroomId = TEST_CLASSROOM_ID_1
       this.topicId = FRACTIONS_TOPIC_ID
       this.storyId = FRACTIONS_STORY_ID_0
     }.build()
@@ -651,6 +654,7 @@ class ClassroomListFragmentTest {
     testCoroutineDispatchers.runCurrent()
 
     val args = TopicActivityParams.newBuilder().apply {
+      this.classroomId = TEST_CLASSROOM_ID_0
       this.topicId = TEST_TOPIC_ID_0
       this.storyId = TEST_STORY_ID_0
     }.build()
diff --git a/app/src/sharedTest/java/org/oppia/android/app/completedstorylist/CompletedStoryListActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/completedstorylist/CompletedStoryListActivityTest.kt
index 3f02650ac1d..8fdc33e6178 100644
--- a/app/src/sharedTest/java/org/oppia/android/app/completedstorylist/CompletedStoryListActivityTest.kt
+++ b/app/src/sharedTest/java/org/oppia/android/app/completedstorylist/CompletedStoryListActivityTest.kt
@@ -70,6 +70,7 @@ import org.oppia.android.domain.classify.rules.numericexpressioninput.NumericExp
 import org.oppia.android.domain.classify.rules.numericinput.NumericInputRuleModule
 import org.oppia.android.domain.classify.rules.ratioinput.RatioInputModule
 import org.oppia.android.domain.classify.rules.textinput.TextInputRuleModule
+import org.oppia.android.domain.classroom.TEST_CLASSROOM_ID_1
 import org.oppia.android.domain.exploration.ExplorationProgressModule
 import org.oppia.android.domain.exploration.ExplorationStorageModule
 import org.oppia.android.domain.hintsandsolution.HintsAndSolutionConfigModule
@@ -276,6 +277,7 @@ class CompletedStoryListActivityTest {
       ).perform(click())
 
       val args = TopicActivityParams.newBuilder().apply {
+        this.classroomId = TEST_CLASSROOM_ID_1
         this.topicId = FRACTIONS_TOPIC_ID
         this.storyId = FRACTIONS_STORY_ID_0
       }.build()
@@ -307,6 +309,7 @@ class CompletedStoryListActivityTest {
       ).perform(click())
 
       val args = TopicActivityParams.newBuilder().apply {
+        this.classroomId = TEST_CLASSROOM_ID_1
         this.topicId = FRACTIONS_TOPIC_ID
         this.storyId = FRACTIONS_STORY_ID_0
       }.build()
diff --git a/app/src/sharedTest/java/org/oppia/android/app/home/HomeActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/home/HomeActivityTest.kt
index e9ab96f7703..4824099e17a 100644
--- a/app/src/sharedTest/java/org/oppia/android/app/home/HomeActivityTest.kt
+++ b/app/src/sharedTest/java/org/oppia/android/app/home/HomeActivityTest.kt
@@ -102,6 +102,7 @@ import org.oppia.android.domain.classify.rules.numericexpressioninput.NumericExp
 import org.oppia.android.domain.classify.rules.numericinput.NumericInputRuleModule
 import org.oppia.android.domain.classify.rules.ratioinput.RatioInputModule
 import org.oppia.android.domain.classify.rules.textinput.TextInputRuleModule
+import org.oppia.android.domain.classroom.TEST_CLASSROOM_ID_1
 import org.oppia.android.domain.exploration.ExplorationProgressModule
 import org.oppia.android.domain.exploration.ExplorationStorageModule
 import org.oppia.android.domain.hintsandsolution.HintsAndSolutionConfigModule
@@ -960,6 +961,7 @@ class HomeActivityTest {
       ).perform(click())
 
       val args = TopicActivityParams.newBuilder().apply {
+        this.classroomId = TEST_CLASSROOM_ID_1
         this.topicId = FRACTIONS_TOPIC_ID
         this.storyId = FRACTIONS_STORY_ID_0
       }.build()
@@ -1040,6 +1042,7 @@ class HomeActivityTest {
       ).check(matches(withText(containsString("Fractions")))).perform(click())
 
       val args = TopicActivityParams.newBuilder().apply {
+        this.classroomId = TEST_CLASSROOM_ID_1
         this.topicId = FRACTIONS_TOPIC_ID
         this.storyId = FRACTIONS_STORY_ID_0
       }.build()
@@ -1208,6 +1211,7 @@ class HomeActivityTest {
       onView(atPosition(R.id.home_recycler_view, 3)).perform(click())
 
       val args = TopicActivityParams.newBuilder().apply {
+        this.classroomId = TEST_CLASSROOM_ID_1
         this.topicId = TEST_TOPIC_ID_0
         this.storyId = TEST_STORY_ID_0
       }.build()
diff --git a/app/src/sharedTest/java/org/oppia/android/app/home/RecentlyPlayedFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/home/RecentlyPlayedFragmentTest.kt
index 54dbac65f1a..d25a4e287d4 100644
--- a/app/src/sharedTest/java/org/oppia/android/app/home/RecentlyPlayedFragmentTest.kt
+++ b/app/src/sharedTest/java/org/oppia/android/app/home/RecentlyPlayedFragmentTest.kt
@@ -87,6 +87,8 @@ import org.oppia.android.domain.classify.rules.numericexpressioninput.NumericExp
 import org.oppia.android.domain.classify.rules.numericinput.NumericInputRuleModule
 import org.oppia.android.domain.classify.rules.ratioinput.RatioInputModule
 import org.oppia.android.domain.classify.rules.textinput.TextInputRuleModule
+import org.oppia.android.domain.classroom.TEST_CLASSROOM_ID_0
+import org.oppia.android.domain.classroom.TEST_CLASSROOM_ID_1
 import org.oppia.android.domain.exploration.ExplorationProgressModule
 import org.oppia.android.domain.exploration.testing.ExplorationStorageTestModule
 import org.oppia.android.domain.exploration.testing.FakeExplorationRetriever
@@ -846,6 +848,7 @@ class RecentlyPlayedFragmentTest {
         explorationId = FRACTIONS_EXPLORATION_ID_0
         storyId = FRACTIONS_STORY_ID_0
         topicId = FRACTIONS_TOPIC_ID
+        classroomId = TEST_CLASSROOM_ID_0
         profileId = ProfileId.newBuilder().apply { internalId = internalProfileId }.build()
         parentScreen = ExplorationActivityParams.ParentScreen.PARENT_SCREEN_UNSPECIFIED
         checkpoint = ExplorationCheckpoint.newBuilder().apply {
@@ -903,6 +906,7 @@ class RecentlyPlayedFragmentTest {
         explorationId = FRACTIONS_EXPLORATION_ID_0
         storyId = FRACTIONS_STORY_ID_0
         topicId = FRACTIONS_TOPIC_ID
+        classroomId = TEST_CLASSROOM_ID_1
         profileId = ProfileId.newBuilder().apply { internalId = internalProfileId }.build()
         isCheckpointingEnabled = true
         parentScreen = ExplorationActivityParams.ParentScreen.PARENT_SCREEN_UNSPECIFIED
@@ -942,6 +946,7 @@ class RecentlyPlayedFragmentTest {
         explorationId = FRACTIONS_EXPLORATION_ID_0
         storyId = FRACTIONS_STORY_ID_0
         topicId = FRACTIONS_TOPIC_ID
+        classroomId = TEST_CLASSROOM_ID_1
         profileId = ProfileId.newBuilder().apply { internalId = internalProfileId }.build()
         isCheckpointingEnabled = true
         parentScreen = ExplorationActivityParams.ParentScreen.PARENT_SCREEN_UNSPECIFIED
@@ -986,6 +991,7 @@ class RecentlyPlayedFragmentTest {
         explorationId = FRACTIONS_EXPLORATION_ID_0
         storyId = FRACTIONS_STORY_ID_0
         topicId = FRACTIONS_TOPIC_ID
+        classroomId = TEST_CLASSROOM_ID_1
         profileId = ProfileId.newBuilder().apply { internalId = internalProfileId }.build()
         isCheckpointingEnabled = true
         parentScreen = ExplorationActivityParams.ParentScreen.PARENT_SCREEN_UNSPECIFIED
diff --git a/app/src/sharedTest/java/org/oppia/android/app/ongoingtopiclist/OngoingTopicListActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/ongoingtopiclist/OngoingTopicListActivityTest.kt
index 0f349ace1ef..835f00179a1 100644
--- a/app/src/sharedTest/java/org/oppia/android/app/ongoingtopiclist/OngoingTopicListActivityTest.kt
+++ b/app/src/sharedTest/java/org/oppia/android/app/ongoingtopiclist/OngoingTopicListActivityTest.kt
@@ -69,6 +69,7 @@ import org.oppia.android.domain.classify.rules.numericexpressioninput.NumericExp
 import org.oppia.android.domain.classify.rules.numericinput.NumericInputRuleModule
 import org.oppia.android.domain.classify.rules.ratioinput.RatioInputModule
 import org.oppia.android.domain.classify.rules.textinput.TextInputRuleModule
+import org.oppia.android.domain.classroom.TEST_CLASSROOM_ID_1
 import org.oppia.android.domain.exploration.ExplorationProgressModule
 import org.oppia.android.domain.exploration.ExplorationStorageModule
 import org.oppia.android.domain.hintsandsolution.HintsAndSolutionConfigModule
@@ -251,7 +252,10 @@ class OngoingTopicListActivityTest {
         )
       ).perform(click())
 
-      val args = TopicActivityParams.newBuilder().setTopicId(RATIOS_TOPIC_ID).build()
+      val args = TopicActivityParams.newBuilder().apply {
+        classroomId = TEST_CLASSROOM_ID_1
+        topicId = RATIOS_TOPIC_ID
+      }.build()
       val profileId = ProfileId.newBuilder().setInternalId(internalProfileId).build()
       intended(hasComponent(TopicActivity::class.java.name))
       intended(hasProtoExtra(TopicActivity.TOPIC_ACTIVITY_PARAMS_KEY, args))
@@ -281,7 +285,10 @@ class OngoingTopicListActivityTest {
         )
       ).perform(click())
 
-      val args = TopicActivityParams.newBuilder().setTopicId(RATIOS_TOPIC_ID).build()
+      val args = TopicActivityParams.newBuilder().apply {
+        classroomId = TEST_CLASSROOM_ID_1
+        topicId = RATIOS_TOPIC_ID
+      }.build()
       val profileId = ProfileId.newBuilder().setInternalId(internalProfileId).build()
       intended(hasComponent(TopicActivity::class.java.name))
       intended(hasProtoExtra(TopicActivity.TOPIC_ACTIVITY_PARAMS_KEY, args))
diff --git a/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt
index e8557225acc..433926770e5 100644
--- a/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt
+++ b/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt
@@ -104,6 +104,8 @@ import org.oppia.android.domain.classify.rules.numericexpressioninput.NumericExp
 import org.oppia.android.domain.classify.rules.numericinput.NumericInputRuleModule
 import org.oppia.android.domain.classify.rules.ratioinput.RatioInputModule
 import org.oppia.android.domain.classify.rules.textinput.TextInputRuleModule
+import org.oppia.android.domain.classroom.TEST_CLASSROOM_ID_0
+import org.oppia.android.domain.classroom.TEST_CLASSROOM_ID_1
 import org.oppia.android.domain.exploration.ExplorationDataController
 import org.oppia.android.domain.exploration.ExplorationProgressModule
 import org.oppia.android.domain.exploration.testing.ExplorationStorageTestModule
@@ -254,6 +256,7 @@ class ExplorationActivityTest {
 
   private fun getApplicationDependencies(
     internalProfileId: Int,
+    classroomId: String,
     topicId: String,
     storyId: String,
     explorationId: String
@@ -263,6 +266,7 @@ class ExplorationActivityTest {
         explorationDataController = activity.explorationDataController
         explorationDataController.startPlayingNewExploration(
           internalProfileId,
+          classroomId,
           topicId,
           storyId,
           explorationId
@@ -324,6 +328,7 @@ class ExplorationActivityTest {
     ).use {
       explorationDataController.startPlayingNewExploration(
         internalProfileId,
+        TEST_CLASSROOM_ID_0,
         TEST_TOPIC_ID_0,
         TEST_STORY_ID_0,
         TEST_EXPLORATION_ID_2
@@ -440,6 +445,7 @@ class ExplorationActivityTest {
     ).use {
       explorationDataController.startPlayingNewExploration(
         internalProfileId,
+        TEST_CLASSROOM_ID_0,
         TEST_TOPIC_ID_0,
         TEST_STORY_ID_0,
         TEST_EXPLORATION_ID_2
@@ -466,6 +472,7 @@ class ExplorationActivityTest {
     ).use {
       explorationDataController.startPlayingNewExploration(
         internalProfileId,
+        TEST_CLASSROOM_ID_1,
         FRACTIONS_TOPIC_ID,
         FRACTIONS_STORY_ID_0,
         FRACTIONS_EXPLORATION_ID_0
@@ -494,6 +501,7 @@ class ExplorationActivityTest {
     ).use {
       explorationDataController.startPlayingNewExploration(
         internalProfileId,
+        TEST_CLASSROOM_ID_1,
         FRACTIONS_TOPIC_ID,
         FRACTIONS_STORY_ID_0,
         FRACTIONS_EXPLORATION_ID_0
@@ -523,6 +531,7 @@ class ExplorationActivityTest {
     ).use {
       explorationDataController.startPlayingNewExploration(
         internalProfileId,
+        TEST_CLASSROOM_ID_1,
         FRACTIONS_TOPIC_ID,
         FRACTIONS_STORY_ID_0,
         FRACTIONS_EXPLORATION_ID_0
@@ -545,6 +554,7 @@ class ExplorationActivityTest {
     ).use {
       explorationDataController.startPlayingNewExploration(
         internalProfileId,
+        TEST_CLASSROOM_ID_1,
         FRACTIONS_TOPIC_ID,
         FRACTIONS_STORY_ID_0,
         FRACTIONS_EXPLORATION_ID_0
@@ -571,6 +581,7 @@ class ExplorationActivityTest {
     ).use {
       explorationDataController.startPlayingNewExploration(
         internalProfileId,
+        TEST_CLASSROOM_ID_1,
         FRACTIONS_TOPIC_ID,
         FRACTIONS_STORY_ID_0,
         FRACTIONS_EXPLORATION_ID_0
@@ -597,6 +608,7 @@ class ExplorationActivityTest {
     ).use {
       explorationDataController.startPlayingNewExploration(
         internalProfileId,
+        TEST_CLASSROOM_ID_1,
         FRACTIONS_TOPIC_ID,
         FRACTIONS_STORY_ID_0,
         FRACTIONS_EXPLORATION_ID_0
@@ -616,6 +628,7 @@ class ExplorationActivityTest {
     ).use {
       explorationDataController.startPlayingNewExploration(
         internalProfileId,
+        TEST_CLASSROOM_ID_1,
         FRACTIONS_TOPIC_ID,
         FRACTIONS_STORY_ID_0,
         FRACTIONS_EXPLORATION_ID_0
@@ -643,6 +656,7 @@ class ExplorationActivityTest {
     ).use {
       explorationDataController.startPlayingNewExploration(
         internalProfileId,
+        TEST_CLASSROOM_ID_1,
         FRACTIONS_TOPIC_ID,
         FRACTIONS_STORY_ID_0,
         FRACTIONS_EXPLORATION_ID_0
@@ -670,6 +684,7 @@ class ExplorationActivityTest {
     ).use {
       explorationDataController.startPlayingNewExploration(
         internalProfileId,
+        TEST_CLASSROOM_ID_1,
         FRACTIONS_TOPIC_ID,
         FRACTIONS_STORY_ID_0,
         FRACTIONS_EXPLORATION_ID_0
@@ -689,6 +704,7 @@ class ExplorationActivityTest {
     ).use {
       explorationDataController.startPlayingNewExploration(
         internalProfileId,
+        TEST_CLASSROOM_ID_1,
         FRACTIONS_TOPIC_ID,
         FRACTIONS_STORY_ID_0,
         FRACTIONS_EXPLORATION_ID_0
@@ -715,6 +731,7 @@ class ExplorationActivityTest {
     ).use {
       explorationDataController.startPlayingNewExploration(
         internalProfileId,
+        TEST_CLASSROOM_ID_1,
         FRACTIONS_TOPIC_ID,
         FRACTIONS_STORY_ID_0,
         FRACTIONS_EXPLORATION_ID_0
@@ -741,6 +758,7 @@ class ExplorationActivityTest {
     ).use {
       explorationDataController.startPlayingNewExploration(
         internalProfileId,
+        TEST_CLASSROOM_ID_1,
         FRACTIONS_TOPIC_ID,
         FRACTIONS_STORY_ID_0,
         FRACTIONS_EXPLORATION_ID_0
@@ -768,6 +786,7 @@ class ExplorationActivityTest {
     ).use {
       explorationDataController.startPlayingNewExploration(
         internalProfileId,
+        TEST_CLASSROOM_ID_1,
         FRACTIONS_TOPIC_ID,
         FRACTIONS_STORY_ID_0,
         FRACTIONS_EXPLORATION_ID_0
@@ -795,6 +814,7 @@ class ExplorationActivityTest {
     ).use {
       explorationDataController.startPlayingNewExploration(
         internalProfileId,
+        TEST_CLASSROOM_ID_0,
         TEST_TOPIC_ID_0,
         TEST_STORY_ID_0,
         TEST_EXPLORATION_ID_2
@@ -817,6 +837,7 @@ class ExplorationActivityTest {
     ).use {
       explorationDataController.startPlayingNewExploration(
         internalProfileId,
+        TEST_CLASSROOM_ID_0,
         TEST_TOPIC_ID_0,
         TEST_STORY_ID_0,
         TEST_EXPLORATION_ID_2
@@ -842,6 +863,7 @@ class ExplorationActivityTest {
     ).use {
       explorationDataController.startPlayingNewExploration(
         internalProfileId,
+        TEST_CLASSROOM_ID_1,
         RATIOS_TOPIC_ID,
         RATIOS_STORY_ID_0,
         RATIOS_EXPLORATION_ID_0
@@ -871,6 +893,7 @@ class ExplorationActivityTest {
     ).use {
       explorationDataController.startPlayingNewExploration(
         internalProfileId,
+        TEST_CLASSROOM_ID_1,
         RATIOS_TOPIC_ID,
         RATIOS_STORY_ID_0,
         RATIOS_EXPLORATION_ID_0
@@ -900,6 +923,7 @@ class ExplorationActivityTest {
     ).use {
       explorationDataController.startPlayingNewExploration(
         internalProfileId,
+        TEST_CLASSROOM_ID_1,
         RATIOS_TOPIC_ID,
         RATIOS_STORY_ID_0,
         RATIOS_EXPLORATION_ID_0
@@ -930,6 +954,7 @@ class ExplorationActivityTest {
     ).use {
       explorationDataController.startPlayingNewExploration(
         internalProfileId,
+        TEST_CLASSROOM_ID_1,
         RATIOS_TOPIC_ID,
         RATIOS_STORY_ID_0,
         RATIOS_EXPLORATION_ID_0
@@ -969,6 +994,7 @@ class ExplorationActivityTest {
     ).use {
       explorationDataController.startPlayingNewExploration(
         internalProfileId,
+        TEST_CLASSROOM_ID_1,
         RATIOS_TOPIC_ID,
         RATIOS_STORY_ID_0,
         RATIOS_EXPLORATION_ID_0
@@ -1015,6 +1041,7 @@ class ExplorationActivityTest {
     ).use {
       explorationDataController.startPlayingNewExploration(
         internalProfileId,
+        TEST_CLASSROOM_ID_1,
         RATIOS_TOPIC_ID,
         RATIOS_STORY_ID_0,
         RATIOS_EXPLORATION_ID_0
@@ -1058,6 +1085,7 @@ class ExplorationActivityTest {
     ).use {
       explorationDataController.startPlayingNewExploration(
         internalProfileId,
+        TEST_CLASSROOM_ID_1,
         RATIOS_TOPIC_ID,
         RATIOS_STORY_ID_0,
         RATIOS_EXPLORATION_ID_0
@@ -1102,6 +1130,7 @@ class ExplorationActivityTest {
     ).use {
       explorationDataController.startPlayingNewExploration(
         internalProfileId,
+        TEST_CLASSROOM_ID_1,
         RATIOS_TOPIC_ID,
         RATIOS_STORY_ID_0,
         RATIOS_EXPLORATION_ID_0
@@ -1141,6 +1170,7 @@ class ExplorationActivityTest {
     ).use {
       explorationDataController.startPlayingNewExploration(
         internalProfileId,
+        TEST_CLASSROOM_ID_1,
         FRACTIONS_TOPIC_ID,
         FRACTIONS_STORY_ID_0,
         FRACTIONS_EXPLORATION_ID_0
@@ -1203,6 +1233,7 @@ class ExplorationActivityTest {
     ).use {
       explorationDataController.startPlayingNewExploration(
         internalProfileId,
+        TEST_CLASSROOM_ID_1,
         RATIOS_TOPIC_ID,
         RATIOS_STORY_ID_0,
         RATIOS_EXPLORATION_ID_0
@@ -1263,6 +1294,7 @@ class ExplorationActivityTest {
     ).use {
       explorationDataController.startPlayingNewExploration(
         internalProfileId,
+        TEST_CLASSROOM_ID_1,
         FRACTIONS_TOPIC_ID,
         FRACTIONS_STORY_ID_0,
         FRACTIONS_EXPLORATION_ID_0
@@ -1292,6 +1324,7 @@ class ExplorationActivityTest {
     ).use {
       explorationDataController.startPlayingNewExploration(
         internalProfileId,
+        TEST_CLASSROOM_ID_1,
         FRACTIONS_TOPIC_ID,
         FRACTIONS_STORY_ID_0,
         FRACTIONS_EXPLORATION_ID_0
@@ -1321,6 +1354,7 @@ class ExplorationActivityTest {
     ).use {
       explorationDataController.startPlayingNewExploration(
         internalProfileId,
+        TEST_CLASSROOM_ID_1,
         RATIOS_TOPIC_ID,
         RATIOS_STORY_ID_0,
         RATIOS_EXPLORATION_ID_0
@@ -1359,6 +1393,7 @@ class ExplorationActivityTest {
     )
     explorationDataController.startPlayingNewExploration(
       internalProfileId,
+      TEST_CLASSROOM_ID_1,
       FRACTIONS_TOPIC_ID,
       FRACTIONS_STORY_ID_0,
       FRACTIONS_EXPLORATION_ID_0
@@ -1387,6 +1422,7 @@ class ExplorationActivityTest {
     )
     explorationDataController.startPlayingNewExploration(
       internalProfileId,
+      TEST_CLASSROOM_ID_1,
       FRACTIONS_TOPIC_ID,
       FRACTIONS_STORY_ID_0,
       FRACTIONS_EXPLORATION_ID_0
@@ -1418,6 +1454,7 @@ class ExplorationActivityTest {
     )
     explorationDataController.startPlayingNewExploration(
       internalProfileId,
+      TEST_CLASSROOM_ID_1,
       FRACTIONS_TOPIC_ID,
       FRACTIONS_STORY_ID_0,
       FRACTIONS_EXPLORATION_ID_0
@@ -1458,6 +1495,7 @@ class ExplorationActivityTest {
     )
     explorationDataController.startPlayingNewExploration(
       internalProfileId,
+      TEST_CLASSROOM_ID_1,
       FRACTIONS_TOPIC_ID,
       FRACTIONS_STORY_ID_0,
       FRACTIONS_EXPLORATION_ID_0
@@ -1490,6 +1528,7 @@ class ExplorationActivityTest {
     )
     explorationDataController.startPlayingNewExploration(
       internalProfileId,
+      TEST_CLASSROOM_ID_1,
       FRACTIONS_TOPIC_ID,
       FRACTIONS_STORY_ID_0,
       FRACTIONS_EXPLORATION_ID_0
@@ -1516,6 +1555,7 @@ class ExplorationActivityTest {
     )
     explorationDataController.startPlayingNewExploration(
       internalProfileId,
+      TEST_CLASSROOM_ID_1,
       FRACTIONS_TOPIC_ID,
       FRACTIONS_STORY_ID_0,
       FRACTIONS_EXPLORATION_ID_0
@@ -1549,6 +1589,7 @@ class ExplorationActivityTest {
     )
     explorationDataController.startPlayingNewExploration(
       internalProfileId,
+      TEST_CLASSROOM_ID_1,
       FRACTIONS_TOPIC_ID,
       FRACTIONS_STORY_ID_0,
       FRACTIONS_EXPLORATION_ID_0
@@ -1589,6 +1630,7 @@ class ExplorationActivityTest {
     ).use {
       explorationDataController.startPlayingNewExploration(
         internalProfileId,
+        TEST_CLASSROOM_ID_1,
         FRACTIONS_TOPIC_ID,
         FRACTIONS_STORY_ID_0,
         FRACTIONS_EXPLORATION_ID_0
@@ -1625,6 +1667,7 @@ class ExplorationActivityTest {
     ).use {
       explorationDataController.startPlayingNewExploration(
         internalProfileId,
+        TEST_CLASSROOM_ID_1,
         FRACTIONS_TOPIC_ID,
         FRACTIONS_STORY_ID_0,
         FRACTIONS_EXPLORATION_ID_0
@@ -1662,6 +1705,7 @@ class ExplorationActivityTest {
     ).use {
       explorationDataController.startPlayingNewExploration(
         internalProfileId,
+        TEST_CLASSROOM_ID_1,
         FRACTIONS_TOPIC_ID,
         FRACTIONS_STORY_ID_0,
         FRACTIONS_EXPLORATION_ID_0
@@ -1701,6 +1745,7 @@ class ExplorationActivityTest {
     ).use {
       explorationDataController.startPlayingNewExploration(
         internalProfileId,
+        TEST_CLASSROOM_ID_1,
         FRACTIONS_TOPIC_ID,
         FRACTIONS_STORY_ID_0,
         FRACTIONS_EXPLORATION_ID_0
@@ -1741,6 +1786,7 @@ class ExplorationActivityTest {
     ).use {
       explorationDataController.startPlayingNewExploration(
         internalProfileId,
+        TEST_CLASSROOM_ID_1,
         FRACTIONS_TOPIC_ID,
         FRACTIONS_STORY_ID_0,
         FRACTIONS_EXPLORATION_ID_0
@@ -1780,6 +1826,7 @@ class ExplorationActivityTest {
     ).use {
       explorationDataController.startPlayingNewExploration(
         internalProfileId,
+        TEST_CLASSROOM_ID_1,
         FRACTIONS_TOPIC_ID,
         FRACTIONS_STORY_ID_0,
         FRACTIONS_EXPLORATION_ID_0
@@ -1831,6 +1878,7 @@ class ExplorationActivityTest {
     ).use {
       explorationDataController.startPlayingNewExploration(
         internalProfileId,
+        TEST_CLASSROOM_ID_1,
         FRACTIONS_TOPIC_ID,
         FRACTIONS_STORY_ID_0,
         FRACTIONS_EXPLORATION_ID_0
@@ -1882,6 +1930,7 @@ class ExplorationActivityTest {
     ).use {
       explorationDataController.startPlayingNewExploration(
         internalProfileId,
+        TEST_CLASSROOM_ID_1,
         FRACTIONS_TOPIC_ID,
         FRACTIONS_STORY_ID_0,
         FRACTIONS_EXPLORATION_ID_0
@@ -1923,6 +1972,7 @@ class ExplorationActivityTest {
     )
     explorationDataController.startPlayingNewExploration(
       internalProfileId,
+      TEST_CLASSROOM_ID_1,
       FRACTIONS_TOPIC_ID,
       FRACTIONS_STORY_ID_0,
       FRACTIONS_EXPLORATION_ID_0
@@ -1955,6 +2005,7 @@ class ExplorationActivityTest {
     )
     explorationDataController.startPlayingNewExploration(
       internalProfileId,
+      TEST_CLASSROOM_ID_1,
       FRACTIONS_TOPIC_ID,
       FRACTIONS_STORY_ID_0,
       FRACTIONS_EXPLORATION_ID_0
@@ -1985,6 +2036,7 @@ class ExplorationActivityTest {
     )
     explorationDataController.startPlayingNewExploration(
       internalProfileId,
+      TEST_CLASSROOM_ID_1,
       FRACTIONS_TOPIC_ID,
       FRACTIONS_STORY_ID_0,
       FRACTIONS_EXPLORATION_ID_0
@@ -2018,6 +2070,7 @@ class ExplorationActivityTest {
     )
     explorationDataController.replayExploration(
       internalProfileId,
+      TEST_CLASSROOM_ID_1,
       FRACTIONS_TOPIC_ID,
       FRACTIONS_STORY_ID_0,
       FRACTIONS_EXPLORATION_ID_0
@@ -2048,6 +2101,7 @@ class ExplorationActivityTest {
     )
     explorationDataController.replayExploration(
       internalProfileId,
+      TEST_CLASSROOM_ID_1,
       FRACTIONS_TOPIC_ID,
       FRACTIONS_STORY_ID_0,
       FRACTIONS_EXPLORATION_ID_0
@@ -2082,6 +2136,7 @@ class ExplorationActivityTest {
     ).use {
       explorationDataController.startPlayingNewExploration(
         internalProfileId,
+        TEST_CLASSROOM_ID_0,
         TEST_TOPIC_ID_0,
         TEST_STORY_ID_0,
         TEST_EXPLORATION_ID_2
@@ -2112,6 +2167,7 @@ class ExplorationActivityTest {
     ).use {
       explorationDataController.startPlayingNewExploration(
         internalProfileId,
+        TEST_CLASSROOM_ID_0,
         TEST_TOPIC_ID_0,
         TEST_STORY_ID_0,
         TEST_EXPLORATION_ID_2
@@ -2142,6 +2198,7 @@ class ExplorationActivityTest {
     ).use {
       explorationDataController.startPlayingNewExploration(
         internalProfileId,
+        TEST_CLASSROOM_ID_0,
         TEST_TOPIC_ID_0,
         TEST_STORY_ID_0,
         TEST_EXPLORATION_ID_2
@@ -2178,6 +2235,7 @@ class ExplorationActivityTest {
     ).use {
       explorationDataController.startPlayingNewExploration(
         internalProfileId,
+        TEST_CLASSROOM_ID_0,
         TEST_TOPIC_ID_0,
         TEST_STORY_ID_0,
         TEST_EXPLORATION_ID_2
@@ -2223,6 +2281,7 @@ class ExplorationActivityTest {
     ).use {
       explorationDataController.startPlayingNewExploration(
         internalProfileId,
+        TEST_CLASSROOM_ID_0,
         TEST_TOPIC_ID_0,
         TEST_STORY_ID_0,
         TEST_EXPLORATION_ID_2
@@ -2259,6 +2318,7 @@ class ExplorationActivityTest {
     ).use {
       explorationDataController.startPlayingNewExploration(
         internalProfileId,
+        TEST_CLASSROOM_ID_0,
         TEST_TOPIC_ID_0,
         TEST_STORY_ID_0,
         TEST_EXPLORATION_ID_2
@@ -2300,6 +2360,7 @@ class ExplorationActivityTest {
     ).use {
       explorationDataController.startPlayingNewExploration(
         internalProfileId,
+        TEST_CLASSROOM_ID_0,
         TEST_TOPIC_ID_0,
         TEST_STORY_ID_0,
         TEST_EXPLORATION_ID_2
@@ -2336,6 +2397,7 @@ class ExplorationActivityTest {
     ).use {
       explorationDataController.startPlayingNewExploration(
         internalProfileId,
+        TEST_CLASSROOM_ID_0,
         TEST_TOPIC_ID_0,
         TEST_STORY_ID_0,
         TEST_EXPLORATION_ID_2
@@ -2362,6 +2424,7 @@ class ExplorationActivityTest {
     ).use {
       explorationDataController.startPlayingNewExploration(
         internalProfileId,
+        TEST_CLASSROOM_ID_0,
         TEST_TOPIC_ID_0,
         TEST_STORY_ID_0,
         TEST_EXPLORATION_ID_2
@@ -2399,6 +2462,7 @@ class ExplorationActivityTest {
     ).use {
       explorationDataController.startPlayingNewExploration(
         internalProfileId,
+        TEST_CLASSROOM_ID_0,
         TEST_TOPIC_ID_0,
         TEST_STORY_ID_0,
         TEST_EXPLORATION_ID_2
@@ -2436,6 +2500,7 @@ class ExplorationActivityTest {
     ).use {
       explorationDataController.startPlayingNewExploration(
         internalProfileId,
+        TEST_CLASSROOM_ID_0,
         TEST_TOPIC_ID_0,
         TEST_STORY_ID_0,
         TEST_EXPLORATION_ID_2
diff --git a/app/src/sharedTest/java/org/oppia/android/app/player/state/StateFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/player/state/StateFragmentTest.kt
index 50c77762c0c..d7a9ae13b1e 100644
--- a/app/src/sharedTest/java/org/oppia/android/app/player/state/StateFragmentTest.kt
+++ b/app/src/sharedTest/java/org/oppia/android/app/player/state/StateFragmentTest.kt
@@ -124,6 +124,7 @@ import org.oppia.android.domain.classify.rules.numericexpressioninput.NumericExp
 import org.oppia.android.domain.classify.rules.numericinput.NumericInputRuleModule
 import org.oppia.android.domain.classify.rules.ratioinput.RatioInputModule
 import org.oppia.android.domain.classify.rules.textinput.TextInputRuleModule
+import org.oppia.android.domain.classroom.TEST_CLASSROOM_ID_0
 import org.oppia.android.domain.exploration.ExplorationProgressModule
 import org.oppia.android.domain.exploration.ExplorationStorageModule
 import org.oppia.android.domain.hintsandsolution.HintsAndSolutionConfigFastShowTestModule
@@ -4603,6 +4604,7 @@ class StateFragmentTest {
       StateFragmentTestActivity.createTestActivityIntent(
         context,
         profileId.internalId,
+        TEST_CLASSROOM_ID_0,
         TEST_TOPIC_ID_0,
         TEST_STORY_ID_0,
         explorationId,
diff --git a/app/src/sharedTest/java/org/oppia/android/app/profileprogress/ProfileProgressFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/profileprogress/ProfileProgressFragmentTest.kt
index 097e4aafb76..db196019683 100644
--- a/app/src/sharedTest/java/org/oppia/android/app/profileprogress/ProfileProgressFragmentTest.kt
+++ b/app/src/sharedTest/java/org/oppia/android/app/profileprogress/ProfileProgressFragmentTest.kt
@@ -91,6 +91,7 @@ import org.oppia.android.domain.classify.rules.numericexpressioninput.NumericExp
 import org.oppia.android.domain.classify.rules.numericinput.NumericInputRuleModule
 import org.oppia.android.domain.classify.rules.ratioinput.RatioInputModule
 import org.oppia.android.domain.classify.rules.textinput.TextInputRuleModule
+import org.oppia.android.domain.classroom.TEST_CLASSROOM_ID_1
 import org.oppia.android.domain.exploration.ExplorationProgressModule
 import org.oppia.android.domain.exploration.ExplorationStorageModule
 import org.oppia.android.domain.hintsandsolution.HintsAndSolutionConfigModule
@@ -663,6 +664,7 @@ class ProfileProgressFragmentTest {
       clickProfileProgressItem(itemPosition = 1, targetViewId = R.id.topic_name_text_view)
 
       val args = TopicActivityParams.newBuilder().apply {
+        this.classroomId = TEST_CLASSROOM_ID_1
         this.topicId = FRACTIONS_TOPIC_ID
         this.storyId = FRACTIONS_STORY_ID_0
       }.build()
diff --git a/app/src/sharedTest/java/org/oppia/android/app/resumelesson/ResumeLessonActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/resumelesson/ResumeLessonActivityTest.kt
index 3186c6a8188..40aeae59dcc 100644
--- a/app/src/sharedTest/java/org/oppia/android/app/resumelesson/ResumeLessonActivityTest.kt
+++ b/app/src/sharedTest/java/org/oppia/android/app/resumelesson/ResumeLessonActivityTest.kt
@@ -62,6 +62,7 @@ import org.oppia.android.domain.classify.rules.numericexpressioninput.NumericExp
 import org.oppia.android.domain.classify.rules.numericinput.NumericInputRuleModule
 import org.oppia.android.domain.classify.rules.ratioinput.RatioInputModule
 import org.oppia.android.domain.classify.rules.textinput.TextInputRuleModule
+import org.oppia.android.domain.classroom.TEST_CLASSROOM_ID_1
 import org.oppia.android.domain.exploration.ExplorationProgressModule
 import org.oppia.android.domain.exploration.ExplorationStorageModule
 import org.oppia.android.domain.hintsandsolution.HintsAndSolutionConfigModule
@@ -204,6 +205,7 @@ class ResumeLessonActivityTest {
     return ResumeLessonActivity.createResumeLessonActivityIntent(
       context,
       ProfileId.newBuilder().apply { internalId = 1 }.build(),
+      TEST_CLASSROOM_ID_1,
       FRACTIONS_TOPIC_ID,
       FRACTIONS_STORY_ID_0,
       FRACTIONS_EXPLORATION_ID_0,
diff --git a/app/src/sharedTest/java/org/oppia/android/app/resumelesson/ResumeLessonFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/resumelesson/ResumeLessonFragmentTest.kt
index 015955e6dde..d30099e4ee0 100644
--- a/app/src/sharedTest/java/org/oppia/android/app/resumelesson/ResumeLessonFragmentTest.kt
+++ b/app/src/sharedTest/java/org/oppia/android/app/resumelesson/ResumeLessonFragmentTest.kt
@@ -61,6 +61,7 @@ import org.oppia.android.domain.classify.rules.numericexpressioninput.NumericExp
 import org.oppia.android.domain.classify.rules.numericinput.NumericInputRuleModule
 import org.oppia.android.domain.classify.rules.ratioinput.RatioInputModule
 import org.oppia.android.domain.classify.rules.textinput.TextInputRuleModule
+import org.oppia.android.domain.classroom.TEST_CLASSROOM_ID_1
 import org.oppia.android.domain.exploration.ExplorationProgressModule
 import org.oppia.android.domain.exploration.ExplorationStorageModule
 import org.oppia.android.domain.hintsandsolution.HintsAndSolutionConfigModule
@@ -272,6 +273,7 @@ class ResumeLessonFragmentTest {
     return ResumeLessonActivity.createResumeLessonActivityIntent(
       context,
       ProfileId.newBuilder().apply { internalId = 1 }.build(),
+      TEST_CLASSROOM_ID_1,
       FRACTIONS_TOPIC_ID,
       FRACTIONS_STORY_ID_0,
       FRACTIONS_EXPLORATION_ID_0,
@@ -284,6 +286,7 @@ class ResumeLessonFragmentTest {
     return ResumeLessonActivity.createResumeLessonActivityIntent(
       context,
       ProfileId.newBuilder().apply { internalId = 1 }.build(),
+      TEST_CLASSROOM_ID_1,
       RATIOS_TOPIC_ID,
       RATIOS_STORY_ID_0,
       RATIOS_EXPLORATION_ID_0,
diff --git a/app/src/sharedTest/java/org/oppia/android/app/story/StoryActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/story/StoryActivityTest.kt
index f92c76aeee6..b6118791c2e 100644
--- a/app/src/sharedTest/java/org/oppia/android/app/story/StoryActivityTest.kt
+++ b/app/src/sharedTest/java/org/oppia/android/app/story/StoryActivityTest.kt
@@ -64,6 +64,8 @@ import org.oppia.android.domain.classify.rules.numericexpressioninput.NumericExp
 import org.oppia.android.domain.classify.rules.numericinput.NumericInputRuleModule
 import org.oppia.android.domain.classify.rules.ratioinput.RatioInputModule
 import org.oppia.android.domain.classify.rules.textinput.TextInputRuleModule
+import org.oppia.android.domain.classroom.TEST_CLASSROOM_ID_0
+import org.oppia.android.domain.classroom.TEST_CLASSROOM_ID_1
 import org.oppia.android.domain.exploration.ExplorationProgressModule
 import org.oppia.android.domain.exploration.ExplorationStorageModule
 import org.oppia.android.domain.hintsandsolution.HintsAndSolutionConfigModule
@@ -155,6 +157,7 @@ class StoryActivityTest {
   fun testActivity_createIntent_verifyScreenNameInIntent() {
     val currentScreenName = createStoryActivityIntent(
       internalProfileId = internalProfileId,
+      classroomId = TEST_CLASSROOM_ID_0,
       topicId = TEST_TOPIC_ID_0,
       storyId = TEST_STORY_ID_0
     ).extractCurrentAppScreenName()
@@ -167,6 +170,7 @@ class StoryActivityTest {
     activityTestRule.launchActivity(
       createStoryActivityIntent(
         internalProfileId = internalProfileId,
+        classroomId = TEST_CLASSROOM_ID_0,
         topicId = TEST_TOPIC_ID_0,
         storyId = TEST_STORY_ID_0
       )
@@ -184,6 +188,7 @@ class StoryActivityTest {
     launch<StoryActivity>(
       createStoryActivityIntent(
         internalProfileId = internalProfileId,
+        classroomId = TEST_CLASSROOM_ID_0,
         topicId = TEST_TOPIC_ID_0,
         storyId = TEST_STORY_ID_0
       )
@@ -207,6 +212,7 @@ class StoryActivityTest {
         explorationId = TEST_EXPLORATION_ID_2
         storyId = TEST_STORY_ID_0
         topicId = TEST_TOPIC_ID_0
+        classroomId = TEST_CLASSROOM_ID_0
         profileId = ProfileId.newBuilder().apply { internalId = internalProfileId }.build()
         parentScreen = ExplorationActivityParams.ParentScreen.STORY_SCREEN
         isCheckpointingEnabled = true
@@ -226,12 +232,14 @@ class StoryActivityTest {
 
   private fun createStoryActivityIntent(
     internalProfileId: Int,
+    classroomId: String,
     topicId: String,
     storyId: String
   ): Intent {
     return StoryActivity.createStoryActivityIntent(
       context = ApplicationProvider.getApplicationContext(),
       internalProfileId = internalProfileId,
+      classroomId = classroomId,
       topicId = topicId,
       storyId = storyId
     )
diff --git a/app/src/sharedTest/java/org/oppia/android/app/story/StoryFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/story/StoryFragmentTest.kt
index 567bbf9c3ba..c93e0f8460a 100644
--- a/app/src/sharedTest/java/org/oppia/android/app/story/StoryFragmentTest.kt
+++ b/app/src/sharedTest/java/org/oppia/android/app/story/StoryFragmentTest.kt
@@ -92,6 +92,7 @@ import org.oppia.android.domain.classify.rules.numericexpressioninput.NumericExp
 import org.oppia.android.domain.classify.rules.numericinput.NumericInputRuleModule
 import org.oppia.android.domain.classify.rules.ratioinput.RatioInputModule
 import org.oppia.android.domain.classify.rules.textinput.TextInputRuleModule
+import org.oppia.android.domain.classroom.TEST_CLASSROOM_ID_1
 import org.oppia.android.domain.exploration.ExplorationProgressModule
 import org.oppia.android.domain.exploration.ExplorationStorageModule
 import org.oppia.android.domain.hintsandsolution.HintsAndSolutionConfigModule
@@ -934,6 +935,7 @@ class StoryFragmentTest {
     return StoryActivity.createStoryActivityIntent(
       ApplicationProvider.getApplicationContext(),
       internalProfileId,
+      TEST_CLASSROOM_ID_1,
       FRACTIONS_TOPIC_ID,
       FRACTIONS_STORY_ID_0
     )
@@ -943,6 +945,7 @@ class StoryFragmentTest {
     return StoryActivity.createStoryActivityIntent(
       ApplicationProvider.getApplicationContext(),
       internalProfileId,
+      TEST_CLASSROOM_ID_1,
       TEST_TOPIC_ID_0,
       TEST_STORY_ID_0
     )
@@ -952,6 +955,7 @@ class StoryFragmentTest {
     return StoryActivity.createStoryActivityIntent(
       ApplicationProvider.getApplicationContext(),
       internalProfileId,
+      TEST_CLASSROOM_ID_1,
       RATIOS_TOPIC_ID,
       RATIOS_STORY_ID_0
     )
diff --git a/app/src/sharedTest/java/org/oppia/android/app/topic/TopicActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/topic/TopicActivityTest.kt
index fd95954b8d5..c120abeff71 100644
--- a/app/src/sharedTest/java/org/oppia/android/app/topic/TopicActivityTest.kt
+++ b/app/src/sharedTest/java/org/oppia/android/app/topic/TopicActivityTest.kt
@@ -67,6 +67,7 @@ import org.oppia.android.domain.classify.rules.numericexpressioninput.NumericExp
 import org.oppia.android.domain.classify.rules.numericinput.NumericInputRuleModule
 import org.oppia.android.domain.classify.rules.ratioinput.RatioInputModule
 import org.oppia.android.domain.classify.rules.textinput.TextInputRuleModule
+import org.oppia.android.domain.classroom.TEST_CLASSROOM_ID_1
 import org.oppia.android.domain.exploration.ExplorationProgressModule
 import org.oppia.android.domain.exploration.ExplorationStorageModule
 import org.oppia.android.domain.hintsandsolution.HintsAndSolutionConfigModule
@@ -161,11 +162,11 @@ class TopicActivityTest {
   @Test
   fun testActivity_createIntent_verifyScreenNameInIntent() {
     val currentScreenNameWithIntentOne = TopicActivity.createTopicActivityIntent(
-      context, 1, FRACTIONS_TOPIC_ID
+      context, 1, TEST_CLASSROOM_ID_1, FRACTIONS_TOPIC_ID
     ).extractCurrentAppScreenName()
 
     val currentScreenNameWithIntentTwo = TopicActivity.createTopicPlayStoryActivityIntent(
-      context, 1, FRACTIONS_TOPIC_ID, FRACTIONS_STORY_ID_0
+      context, 1, TEST_CLASSROOM_ID_1, FRACTIONS_TOPIC_ID, FRACTIONS_STORY_ID_0
     ).extractCurrentAppScreenName()
 
     assertThat(currentScreenNameWithIntentOne).isEqualTo(ScreenName.TOPIC_ACTIVITY)
@@ -175,7 +176,7 @@ class TopicActivityTest {
   @Test
   fun testTopicActivity_hasCorrectActivityLabel() {
     TestPlatformParameterModule.forceEnableExtraTopicTabsUi(true)
-    launchTopicActivity(internalProfileId, FRACTIONS_TOPIC_ID).use { scenario ->
+    launchTopicActivity(internalProfileId, TEST_CLASSROOM_ID_1, FRACTIONS_TOPIC_ID).use { scenario ->
       lateinit var title: CharSequence
       scenario.onActivity { activity -> title = activity.title }
 
@@ -189,7 +190,7 @@ class TopicActivityTest {
   @RunOn(TestPlatform.ROBOLECTRIC) // TODO(#3858): Enable for Espresso.
   fun testTopicActivity_startPracticeSession_questionActivityStartedWithProfileId() {
     TestPlatformParameterModule.forceEnableExtraTopicTabsUi(true)
-    launchTopicActivity(internalProfileId, FRACTIONS_TOPIC_ID).use {
+    launchTopicActivity(internalProfileId, TEST_CLASSROOM_ID_1, FRACTIONS_TOPIC_ID).use {
       // Open the practice tab and select a skill.
       onView(withText("Practice")).perform(click())
       testCoroutineDispatchers.runCurrent()
@@ -226,10 +227,11 @@ class TopicActivityTest {
 
   private fun launchTopicActivity(
     internalProfileId: Int,
+    classroomId: String,
     topicId: String
   ): ActivityScenario<TopicActivity> {
     val scenario = ActivityScenario.launch<TopicActivity>(
-      TopicActivity.createTopicActivityIntent(context, internalProfileId, topicId)
+      TopicActivity.createTopicActivityIntent(context, internalProfileId, classroomId, topicId)
     )
     testCoroutineDispatchers.runCurrent()
     onView(withId(R.id.topic_name_text_view)).check(matches(isDisplayed()))
diff --git a/app/src/sharedTest/java/org/oppia/android/app/topic/TopicFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/topic/TopicFragmentTest.kt
index 9f791022158..c7f6786fc61 100644
--- a/app/src/sharedTest/java/org/oppia/android/app/topic/TopicFragmentTest.kt
+++ b/app/src/sharedTest/java/org/oppia/android/app/topic/TopicFragmentTest.kt
@@ -72,6 +72,8 @@ import org.oppia.android.domain.classify.rules.numericexpressioninput.NumericExp
 import org.oppia.android.domain.classify.rules.numericinput.NumericInputRuleModule
 import org.oppia.android.domain.classify.rules.ratioinput.RatioInputModule
 import org.oppia.android.domain.classify.rules.textinput.TextInputRuleModule
+import org.oppia.android.domain.classroom.TEST_CLASSROOM_ID_0
+import org.oppia.android.domain.classroom.TEST_CLASSROOM_ID_1
 import org.oppia.android.domain.exploration.ExplorationProgressModule
 import org.oppia.android.domain.exploration.ExplorationStorageModule
 import org.oppia.android.domain.hintsandsolution.HintsAndSolutionConfigModule
@@ -195,7 +197,9 @@ class TopicFragmentTest {
   @Test
   fun testTopicFragment_toolbarTitle_isDisplayedSuccessfully() {
     initializeApplicationComponent(enableExtraTabsUi = false)
-    launchTopicActivityIntent(internalProfileId, FRACTIONS_TOPIC_ID).use {
+    launchTopicActivityIntent(
+      internalProfileId, TEST_CLASSROOM_ID_1, FRACTIONS_TOPIC_ID
+    ).use {
       testCoroutineDispatchers.runCurrent()
       onView(withId(R.id.topic_toolbar_title)).check(matches(withText("Topic: Fractions")))
     }
@@ -205,13 +209,17 @@ class TopicFragmentTest {
   fun testLessonsTabSpotlight_spotlightAlreadySeen_checkSpotlightNotShown() {
     initializeApplicationComponent(false)
     markSpotlightSeen(FIRST_CHAPTER)
-    launch<TopicActivity>(createTopicActivityIntent(internalProfileId, FRACTIONS_TOPIC_ID)).use {
+    launch<TopicActivity>(createTopicActivityIntent(
+      internalProfileId, TEST_CLASSROOM_ID_1, FRACTIONS_TOPIC_ID
+    )).use {
       // Mark lessons spotlight seen.
       testCoroutineDispatchers.runCurrent()
       onView(withId(R.id.close_spotlight_button)).perform(click())
     }
 
-    launch<TopicActivity>(createTopicActivityIntent(internalProfileId, FRACTIONS_TOPIC_ID)).use {
+    launch<TopicActivity>(createTopicActivityIntent(
+      internalProfileId,TEST_CLASSROOM_ID_1,  FRACTIONS_TOPIC_ID
+    )).use {
       testCoroutineDispatchers.runCurrent()
       onView(withText(R.string.topic_lessons_tab_spotlight_hint)).check(doesNotExist())
     }
@@ -223,6 +231,7 @@ class TopicFragmentTest {
     activityTestRule.launchActivity(
       createTopicActivityIntent(
         internalProfileId,
+        TEST_CLASSROOM_ID_1,
         FRACTIONS_TOPIC_ID
       )
     )
@@ -237,6 +246,7 @@ class TopicFragmentTest {
     activityTestRule.launchActivity(
       createTopicPlayStoryActivityIntent(
         internalProfileId,
+        TEST_CLASSROOM_ID_1,
         FRACTIONS_TOPIC_ID,
         FRACTIONS_STORY_ID_0
       )
@@ -251,6 +261,7 @@ class TopicFragmentTest {
     launch<TopicActivity>(
       createTopicPlayStoryActivityIntent(
         internalProfileId,
+        TEST_CLASSROOM_ID_1,
         FRACTIONS_TOPIC_ID,
         FRACTIONS_STORY_ID_0
       )
@@ -265,6 +276,7 @@ class TopicFragmentTest {
     launch<TopicActivity>(
       createTopicPlayStoryActivityIntent(
         internalProfileId,
+        TEST_CLASSROOM_ID_1,
         FRACTIONS_TOPIC_ID,
         FRACTIONS_STORY_ID_0
       )
@@ -285,7 +297,9 @@ class TopicFragmentTest {
     storyProgressTestHelper.markCompletedRatiosStory1Exp0(profileId, false)
     testCoroutineDispatchers.runCurrent()
     launch<TopicActivity>(
-      createTopicPlayStoryActivityIntent(internalProfileId, RATIOS_TOPIC_ID, RATIOS_STORY_ID_0)
+      createTopicPlayStoryActivityIntent(
+        internalProfileId, TEST_CLASSROOM_ID_1, RATIOS_TOPIC_ID, RATIOS_STORY_ID_0
+      )
     ).use {
       testCoroutineDispatchers.runCurrent()
 
@@ -299,7 +313,9 @@ class TopicFragmentTest {
     markSpotlightSeen(TOPIC_LESSON_TAB)
     markSpotlightSeen(FIRST_CHAPTER)
     launch<TopicActivity>(
-      createTopicPlayStoryActivityIntent(internalProfileId, RATIOS_TOPIC_ID, RATIOS_STORY_ID_0)
+      createTopicPlayStoryActivityIntent(
+        internalProfileId, TEST_CLASSROOM_ID_1, RATIOS_TOPIC_ID, RATIOS_STORY_ID_0
+      )
     ).use {
       testCoroutineDispatchers.runCurrent()
       onView(withText(R.string.topic_revision_tab_spotlight_hint)).check(doesNotExist())
@@ -317,7 +333,9 @@ class TopicFragmentTest {
     storyProgressTestHelper.markCompletedRatiosStory0Exp0(profileId, false)
     storyProgressTestHelper.markCompletedRatiosStory1Exp0(profileId, false)
     launch<TopicActivity>(
-      createTopicPlayStoryActivityIntent(internalProfileId, RATIOS_TOPIC_ID, RATIOS_STORY_ID_0)
+      createTopicPlayStoryActivityIntent(
+        internalProfileId, TEST_CLASSROOM_ID_1, RATIOS_TOPIC_ID, RATIOS_STORY_ID_0
+      )
     ).use {
       testCoroutineDispatchers.runCurrent()
       // Mark revision tab spotlight seen.
@@ -325,7 +343,9 @@ class TopicFragmentTest {
     }
 
     launch<TopicActivity>(
-      createTopicPlayStoryActivityIntent(internalProfileId, RATIOS_TOPIC_ID, RATIOS_STORY_ID_0)
+      createTopicPlayStoryActivityIntent(
+        internalProfileId, TEST_CLASSROOM_ID_1, RATIOS_TOPIC_ID, RATIOS_STORY_ID_0
+      )
     ).use {
       testCoroutineDispatchers.runCurrent()
       onView(withText(R.string.topic_revision_tab_spotlight_hint)).check(doesNotExist())
@@ -340,6 +360,7 @@ class TopicFragmentTest {
     activityTestRule.launchActivity(
       createTopicActivityIntent(
         internalProfileId,
+        TEST_CLASSROOM_ID_1,
         FRACTIONS_TOPIC_ID
       )
     )
@@ -362,6 +383,7 @@ class TopicFragmentTest {
     activityTestRule.launchActivity(
       createTopicActivityIntent(
         internalProfileId,
+        TEST_CLASSROOM_ID_1,
         FRACTIONS_TOPIC_ID
       )
     )
@@ -384,6 +406,7 @@ class TopicFragmentTest {
     activityTestRule.launchActivity(
       createTopicActivityIntent(
         internalProfileId,
+        TEST_CLASSROOM_ID_1,
         FRACTIONS_TOPIC_ID
       )
     )
@@ -405,6 +428,7 @@ class TopicFragmentTest {
     activityTestRule.launchActivity(
       createTopicActivityIntent(
         internalProfileId,
+        TEST_CLASSROOM_ID_1,
         FRACTIONS_TOPIC_ID
       )
     )
@@ -424,6 +448,7 @@ class TopicFragmentTest {
     activityTestRule.launchActivity(
       createTopicActivityIntent(
         internalProfileId,
+        TEST_CLASSROOM_ID_1,
         FRACTIONS_TOPIC_ID
       )
     )
@@ -434,7 +459,7 @@ class TopicFragmentTest {
   @Test
   fun testTopicFragment_showsTopicFragmentWithMultipleTabs() {
     initializeApplicationComponent(enableExtraTabsUi = false)
-    launchTopicActivityIntent(internalProfileId, FRACTIONS_TOPIC_ID).use {
+    launchTopicActivityIntent(internalProfileId, TEST_CLASSROOM_ID_1, FRACTIONS_TOPIC_ID).use {
       onView(withId(R.id.topic_tabs_container)).perform(click()).check(matches(isDisplayed()))
     }
   }
@@ -442,7 +467,7 @@ class TopicFragmentTest {
   @Test
   fun testTopicFragment_swipePage_hasSwipedPage() {
     initializeApplicationComponent(enableExtraTabsUi = false)
-    launchTopicActivityIntent(internalProfileId, FRACTIONS_TOPIC_ID).use {
+    launchTopicActivityIntent(internalProfileId, TEST_CLASSROOM_ID_1, FRACTIONS_TOPIC_ID).use {
       onView(withId(R.id.topic_tabs_viewpager)).check(matches(isDisplayed()))
       onView(withId(R.id.topic_tabs_viewpager)).perform(swipeLeft())
       verifyTabTitleAtPosition(position = 1)
@@ -452,7 +477,7 @@ class TopicFragmentTest {
   @Test
   fun testTopicFragment_enableExtraTabs_infoTopicTab_isDisplayedInTabLayout() {
     initializeApplicationComponent(enableExtraTabsUi = true)
-    launchTopicActivityIntent(internalProfileId, FRACTIONS_TOPIC_ID).use {
+    launchTopicActivityIntent(internalProfileId, TEST_CLASSROOM_ID_1, FRACTIONS_TOPIC_ID).use {
       onView(
         withText(
           TopicTab.getTabForPosition(
@@ -467,7 +492,7 @@ class TopicFragmentTest {
   @Test
   fun testTopicFragment_disableExtraTabs_infoTopicTab_isNotDisplayedInTabLayout() {
     initializeApplicationComponent(enableExtraTabsUi = false)
-    launchTopicActivityIntent(internalProfileId, FRACTIONS_TOPIC_ID).use {
+    launchTopicActivityIntent(internalProfileId, TEST_CLASSROOM_ID_1, FRACTIONS_TOPIC_ID).use {
       onView(withText(TopicTab.getTabForPosition(position = INFO_TAB_POSITION, true).name))
         .check(doesNotExist())
     }
@@ -478,6 +503,7 @@ class TopicFragmentTest {
     initializeApplicationComponent(enableExtraTabsUi = false)
     launchTopicPlayStoryActivityIntent(
       internalProfileId,
+      TEST_CLASSROOM_ID_1,
       FRACTIONS_TOPIC_ID,
       FRACTIONS_STORY_ID_0
     ).use {
@@ -490,6 +516,7 @@ class TopicFragmentTest {
     initializeApplicationComponent(enableExtraTabsUi = true)
     launchTopicPlayStoryActivityIntent(
       internalProfileId,
+      TEST_CLASSROOM_ID_1,
       FRACTIONS_TOPIC_ID,
       FRACTIONS_STORY_ID_0
     ).use {
@@ -500,7 +527,7 @@ class TopicFragmentTest {
   @Test
   fun testTopicFragment_disableExtraTabs_clickOnLessonsTab_showsPlayTabSelected() {
     initializeApplicationComponent(enableExtraTabsUi = false)
-    launchTopicActivityIntent(internalProfileId, FRACTIONS_TOPIC_ID).use {
+    launchTopicActivityIntent(internalProfileId, TEST_CLASSROOM_ID_1, FRACTIONS_TOPIC_ID).use {
       clickTabAtPosition(position = LESSON_TAB_POSITION_EXTRA_TABS_DISABLED)
       verifyTabTitleAtPosition(position = LESSON_TAB_POSITION_EXTRA_TABS_DISABLED)
     }
@@ -510,7 +537,7 @@ class TopicFragmentTest {
   fun testTopicFragment_clickOnLessonsTab_showsPlayTabWithContentMatched() {
     initializeApplicationComponent(enableExtraTabsUi = true)
     markAllSpotlightsSeen()
-    launchTopicActivityIntent(internalProfileId, FRACTIONS_TOPIC_ID).use {
+    launchTopicActivityIntent(internalProfileId, TEST_CLASSROOM_ID_1, FRACTIONS_TOPIC_ID).use {
       testCoroutineDispatchers.runCurrent()
       clickTabAtPosition(position = LESSON_TAB_POSITION)
       testCoroutineDispatchers.runCurrent()
@@ -526,7 +553,7 @@ class TopicFragmentTest {
   @Test
   fun testTopicFragment_practiceTabEnabled_practiceTopicTabIsDisplayedInTabLayout() {
     initializeApplicationComponent(enableExtraTabsUi = true)
-    launchTopicActivityIntent(internalProfileId, FRACTIONS_TOPIC_ID).use {
+    launchTopicActivityIntent(internalProfileId, TEST_CLASSROOM_ID_1, FRACTIONS_TOPIC_ID).use {
       val practiceTab =
         TopicTab.getTabForPosition(position = PRACTICE_TAB_POSITION, enableExtraTopicTabsUi.value)
       onView(withText(practiceTab.name)).check(
@@ -544,7 +571,7 @@ class TopicFragmentTest {
   @Test
   fun testTopicFragment_disableExtraTabs_practiceTopicTabIsNotDisplayedInTabLayout() {
     initializeApplicationComponent(enableExtraTabsUi = false)
-    launchTopicActivityIntent(internalProfileId, FRACTIONS_TOPIC_ID).use {
+    launchTopicActivityIntent(internalProfileId, TEST_CLASSROOM_ID_1, FRACTIONS_TOPIC_ID).use {
       // Unconditionally retrieve the practice tab name since this test is verifying that it's not
       // enabled.
       val practiceTab =
@@ -556,7 +583,7 @@ class TopicFragmentTest {
   @Test
   fun testTopicFragment_disableExtraTabs_configChange_practiceTopicTabIsNotDisplayed() {
     initializeApplicationComponent(enableExtraTabsUi = false)
-    launchTopicActivityIntent(internalProfileId, FRACTIONS_TOPIC_ID).use {
+    launchTopicActivityIntent(internalProfileId,TEST_CLASSROOM_ID_1,  FRACTIONS_TOPIC_ID).use {
       onView(isRoot()).perform(orientationLandscape())
       testCoroutineDispatchers.runCurrent()
 
@@ -572,7 +599,7 @@ class TopicFragmentTest {
   @Test
   fun testTopicFragment_enableExtraTabs_clickOnPracticeTab_showsPracticeTabSelected() {
     initializeApplicationComponent(enableExtraTabsUi = true)
-    launchTopicActivityIntent(internalProfileId, FRACTIONS_TOPIC_ID).use {
+    launchTopicActivityIntent(internalProfileId, TEST_CLASSROOM_ID_1, FRACTIONS_TOPIC_ID).use {
       clickTabAtPosition(position = PRACTICE_TAB_POSITION)
       verifyTabTitleAtPosition(position = PRACTICE_TAB_POSITION)
     }
@@ -582,7 +609,7 @@ class TopicFragmentTest {
   fun testTopicFragment_enableExtraTabs_clickOnPracticeTab_showsPracticeTabWithContentMatched() {
     initializeApplicationComponent(enableExtraTabsUi = true)
     markAllSpotlightsSeen()
-    launchTopicActivityIntent(internalProfileId, FRACTIONS_TOPIC_ID).use {
+    launchTopicActivityIntent(internalProfileId, TEST_CLASSROOM_ID_1, FRACTIONS_TOPIC_ID).use {
       testCoroutineDispatchers.runCurrent()
       clickTabAtPosition(position = PRACTICE_TAB_POSITION)
       testCoroutineDispatchers.runCurrent()
@@ -598,7 +625,7 @@ class TopicFragmentTest {
   @Test
   fun testTopicFragment_clickOnReviewTab_showsReviewTabSelected() {
     initializeApplicationComponent(enableExtraTabsUi = false)
-    launchTopicActivityIntent(internalProfileId, FRACTIONS_TOPIC_ID).use {
+    launchTopicActivityIntent(internalProfileId, TEST_CLASSROOM_ID_1, FRACTIONS_TOPIC_ID).use {
       clickTabAtPosition(position = REVISION_TAB_POSITION_EXTRA_TABS_DISABLED)
       verifyTabTitleAtPosition(position = REVISION_TAB_POSITION_EXTRA_TABS_DISABLED)
     }
@@ -608,7 +635,7 @@ class TopicFragmentTest {
   fun testTopicFragment_clickOnReviewTab_showsReviewTabWithContentMatched() {
     initializeApplicationComponent(enableExtraTabsUi = false)
     markAllSpotlightsSeen()
-    launchTopicActivityIntent(internalProfileId, FRACTIONS_TOPIC_ID).use {
+    launchTopicActivityIntent(internalProfileId, TEST_CLASSROOM_ID_1, FRACTIONS_TOPIC_ID).use {
       testCoroutineDispatchers.runCurrent()
       clickTabAtPosition(position = REVISION_TAB_POSITION_EXTRA_TABS_DISABLED)
       testCoroutineDispatchers.runCurrent()
@@ -624,7 +651,7 @@ class TopicFragmentTest {
   @Test
   fun testTopicFragment_enableExtraTabs_clickOnReviewTab_thenInfoTab_showsInfoTab() {
     initializeApplicationComponent(enableExtraTabsUi = true)
-    launchTopicActivityIntent(internalProfileId, FRACTIONS_TOPIC_ID).use {
+    launchTopicActivityIntent(internalProfileId, TEST_CLASSROOM_ID_1, FRACTIONS_TOPIC_ID).use {
       clickTabAtPosition(position = REVISION_TAB_POSITION)
       clickTabAtPosition(position = INFO_TAB_POSITION)
       verifyTabTitleAtPosition(position = INFO_TAB_POSITION)
@@ -634,7 +661,7 @@ class TopicFragmentTest {
   @Test
   fun enableExtraTabs_clickOnReviewTab_thenInfoTab_showsInfoTabWithContentMatched() {
     initializeApplicationComponent(enableExtraTabsUi = true)
-    launchTopicActivityIntent(internalProfileId, FRACTIONS_TOPIC_ID).use {
+    launchTopicActivityIntent(internalProfileId, TEST_CLASSROOM_ID_1, FRACTIONS_TOPIC_ID).use {
       testCoroutineDispatchers.runCurrent()
       clickTabAtPosition(position = REVISION_TAB_POSITION)
       testCoroutineDispatchers.runCurrent()
@@ -651,7 +678,7 @@ class TopicFragmentTest {
   @Test
   fun testTopicFragment_clickOnLessonsTab_configChange_showsSameTabAndItsContent() {
     initializeApplicationComponent(enableExtraTabsUi = false)
-    launchTopicActivityIntent(internalProfileId, FRACTIONS_TOPIC_ID).use {
+    launchTopicActivityIntent(internalProfileId, TEST_CLASSROOM_ID_1, FRACTIONS_TOPIC_ID).use {
       testCoroutineDispatchers.runCurrent()
       clickTabAtPosition(position = LESSON_TAB_POSITION_EXTRA_TABS_DISABLED)
       onView(isRoot()).perform(orientationLandscape())
@@ -670,7 +697,7 @@ class TopicFragmentTest {
   fun enableExtraTabs_clickOnPracticeTab_configChange_showsSameTabAndItsContent() {
     initializeApplicationComponent(enableExtraTabsUi = true)
     markAllSpotlightsSeen()
-    launchTopicActivityIntent(internalProfileId, FRACTIONS_TOPIC_ID).use {
+    launchTopicActivityIntent(internalProfileId, TEST_CLASSROOM_ID_1, FRACTIONS_TOPIC_ID).use {
       testCoroutineDispatchers.runCurrent()
       clickTabAtPosition(position = PRACTICE_TAB_POSITION)
       testCoroutineDispatchers.runCurrent()
@@ -696,7 +723,7 @@ class TopicFragmentTest {
   fun testTopicFragment_clickOnReviewTab_configChange_showsSameTabAndItsContent() {
     initializeApplicationComponent(enableExtraTabsUi = false)
     markAllSpotlightsSeen()
-    launchTopicActivityIntent(internalProfileId, FRACTIONS_TOPIC_ID).use {
+    launchTopicActivityIntent(internalProfileId, TEST_CLASSROOM_ID_1, FRACTIONS_TOPIC_ID).use {
       testCoroutineDispatchers.runCurrent()
       clickTabAtPosition(position = REVISION_TAB_POSITION_EXTRA_TABS_DISABLED)
       onView(isRoot()).perform(orientationLandscape())
@@ -716,6 +743,7 @@ class TopicFragmentTest {
     initializeApplicationComponent(enableExtraTabsUi = true)
     launchTopicPlayStoryActivityIntent(
       internalProfileId,
+      TEST_CLASSROOM_ID_1,
       FRACTIONS_TOPIC_ID,
       FRACTIONS_STORY_ID_0
     ).use {
@@ -736,6 +764,7 @@ class TopicFragmentTest {
     initializeApplicationComponent(enableExtraTabsUi = false)
     launchTopicPlayStoryActivityIntent(
       internalProfileId,
+      TEST_CLASSROOM_ID_1,
       FRACTIONS_TOPIC_ID,
       FRACTIONS_STORY_ID_0
     ).use {
@@ -757,6 +786,7 @@ class TopicFragmentTest {
     markAllSpotlightsSeen()
     launchTopicPlayStoryActivityIntent(
       internalProfileId,
+      TEST_CLASSROOM_ID_1,
       FRACTIONS_TOPIC_ID,
       FRACTIONS_STORY_ID_0
     ).use {
@@ -786,6 +816,7 @@ class TopicFragmentTest {
     markAllSpotlightsSeen()
     launchTopicPlayStoryActivityIntent(
       internalProfileId,
+      TEST_CLASSROOM_ID_1,
       FRACTIONS_TOPIC_ID,
       FRACTIONS_STORY_ID_0
     ).use {
@@ -802,6 +833,7 @@ class TopicFragmentTest {
     markAllSpotlightsSeen()
     launchTopicPlayStoryActivityIntent(
       internalProfileId,
+      TEST_CLASSROOM_ID_1,
       FRACTIONS_TOPIC_ID,
       FRACTIONS_STORY_ID_0
     ).use {
@@ -821,6 +853,7 @@ class TopicFragmentTest {
     markAllSpotlightsSeen()
     launchTopicPlayStoryActivityIntent(
       internalProfileId,
+      TEST_CLASSROOM_ID_1,
       FRACTIONS_TOPIC_ID,
       FRACTIONS_STORY_ID_0
     ).use {
@@ -842,6 +875,7 @@ class TopicFragmentTest {
     markAllSpotlightsSeen()
     launchTopicPlayStoryActivityIntent(
       internalProfileId,
+      TEST_CLASSROOM_ID_1,
       FRACTIONS_TOPIC_ID,
       FRACTIONS_STORY_ID_0
     ).use {
@@ -861,6 +895,7 @@ class TopicFragmentTest {
     markAllSpotlightsSeen()
     launchTopicPlayStoryActivityIntent(
       internalProfileId,
+      TEST_CLASSROOM_ID_1,
       FRACTIONS_TOPIC_ID,
       FRACTIONS_STORY_ID_0
     ).use {
@@ -877,10 +912,15 @@ class TopicFragmentTest {
   /**
    * Creates TopicActivity Intent without a storyId
    */
-  private fun createTopicActivityIntent(internalProfileId: Int, topicId: String): Intent {
+  private fun createTopicActivityIntent(
+    internalProfileId: Int,
+    classroomId: String,
+    topicId: String
+  ): Intent {
     return TopicActivity.createTopicActivityIntent(
       ApplicationProvider.getApplicationContext(),
       internalProfileId,
+      classroomId,
       topicId
     )
   }
@@ -892,12 +932,14 @@ class TopicFragmentTest {
    */
   private fun createTopicPlayStoryActivityIntent(
     internalProfileId: Int,
+    classroomId: String,
     topicId: String,
     storyId: String
   ): Intent {
     return TopicActivity.createTopicPlayStoryActivityIntent(
       ApplicationProvider.getApplicationContext(),
       internalProfileId,
+      classroomId,
       topicId,
       storyId
     )
@@ -909,9 +951,10 @@ class TopicFragmentTest {
    */
   private fun launchTopicActivityIntent(
     internalProfileId: Int,
+    classroomId: String,
     topicId: String
   ): ActivityScenario<TopicActivity> {
-    return launch(createTopicActivityIntent(internalProfileId, topicId))
+    return launch(createTopicActivityIntent(internalProfileId, classroomId, topicId))
   }
 
   /**
@@ -920,11 +963,12 @@ class TopicFragmentTest {
    */
   private fun launchTopicPlayStoryActivityIntent(
     internalProfileId: Int,
+    classroomId: String,
     topicId: String,
     storyId: String
   ): ActivityScenario<TopicActivity> {
     return launch<TopicActivity>(
-      createTopicPlayStoryActivityIntent(internalProfileId, topicId, storyId)
+      createTopicPlayStoryActivityIntent(internalProfileId, classroomId, topicId, storyId)
     ).also { testCoroutineDispatchers.runCurrent() }
   }
 
diff --git a/app/src/sharedTest/java/org/oppia/android/app/topic/info/TopicInfoFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/topic/info/TopicInfoFragmentTest.kt
index 8cde9282a83..cabd5945931 100644
--- a/app/src/sharedTest/java/org/oppia/android/app/topic/info/TopicInfoFragmentTest.kt
+++ b/app/src/sharedTest/java/org/oppia/android/app/topic/info/TopicInfoFragmentTest.kt
@@ -116,6 +116,7 @@ import org.robolectric.annotation.LooperMode
 import javax.inject.Inject
 import javax.inject.Singleton
 
+private const val TEST_CLASSROOM_ID = "test_classroom_id_1"
 private const val TEST_TOPIC_ID = "GJ2rLXRKD5hw"
 private const val TOPIC_NAME = "Fractions"
 
@@ -181,6 +182,7 @@ class TopicInfoFragmentTest {
   fun testTopicInfoFragment_loadFragment_checkTopicName_isCorrect() {
     launchTopicActivityIntent(
       internalProfileId = internalProfileId,
+      classroomId = TEST_CLASSROOM_ID,
       topicId = TEST_TOPIC_ID
     ).use {
       testCoroutineDispatchers.runCurrent()
@@ -192,6 +194,7 @@ class TopicInfoFragmentTest {
   fun testTopicInfoFragment_loadFragmentWithTestTopicId1_checkTopicDescription_isCorrect() {
     launchTopicActivityIntent(
       internalProfileId = internalProfileId,
+      classroomId = TEST_CLASSROOM_ID,
       topicId = TEST_TOPIC_ID
     ).use {
       testCoroutineDispatchers.runCurrent()
@@ -213,6 +216,7 @@ class TopicInfoFragmentTest {
       createTopicActivityIntent(
         context = context,
         internalProfileId = internalProfileId,
+        classroomId = TEST_CLASSROOM_ID,
         topicId = TEST_TOPIC_ID
       )
     )
@@ -232,6 +236,7 @@ class TopicInfoFragmentTest {
       createTopicActivityIntent(
         context = context,
         internalProfileId = internalProfileId,
+        classroomId = TEST_CLASSROOM_ID,
         topicId = TEST_TOPIC_ID
       )
     )
@@ -249,6 +254,7 @@ class TopicInfoFragmentTest {
   fun testTopicInfoFragment_loadFragment_configurationChange_checkTopicThumbnail_isCorrect() {
     launchTopicActivityIntent(
       internalProfileId = internalProfileId,
+      classroomId = TEST_CLASSROOM_ID,
       topicId = TEST_TOPIC_ID
     ).use {
       testCoroutineDispatchers.runCurrent()
@@ -260,6 +266,7 @@ class TopicInfoFragmentTest {
   fun testTopicInfoFragment_loadFragment_checkTopicThumbnail_hasCorrectScaleType() {
     launchTopicActivityIntent(
       internalProfileId = internalProfileId,
+      classroomId = TEST_CLASSROOM_ID,
       topicId = TEST_TOPIC_ID
     ).use {
       testCoroutineDispatchers.runCurrent()
@@ -275,6 +282,7 @@ class TopicInfoFragmentTest {
   fun testTopicInfoFragment_loadFragment_configurationChange_checkTopicName_isCorrect() {
     launchTopicActivityIntent(
       internalProfileId = internalProfileId,
+      classroomId = TEST_CLASSROOM_ID,
       topicId = TEST_TOPIC_ID
     ).use {
       testCoroutineDispatchers.runCurrent()
@@ -296,6 +304,7 @@ class TopicInfoFragmentTest {
   fun testTopicInfoFragment_loadFragment_configurationLandscape_isCorrect() {
     launchTopicActivityIntent(
       internalProfileId = internalProfileId,
+      classroomId = TEST_CLASSROOM_ID,
       topicId = TEST_TOPIC_ID
     ).use {
       testCoroutineDispatchers.runCurrent()
@@ -309,6 +318,7 @@ class TopicInfoFragmentTest {
   fun testTopicInfoFragment_loadFragment_configurationLandscape_imageViewNotDisplayed() {
     launchTopicActivityIntent(
       internalProfileId = internalProfileId,
+      classroomId = TEST_CLASSROOM_ID,
       topicId = TEST_TOPIC_ID
     ).use {
       onView(isRoot()).perform(orientationLandscape())
@@ -321,6 +331,7 @@ class TopicInfoFragmentTest {
   fun testTopicInfoFragment_loadFragment_checkDefaultTopicDescriptionLines_fiveLinesVisible() {
     launchTopicActivityIntent(
       internalProfileId = internalProfileId,
+      classroomId = TEST_CLASSROOM_ID,
       topicId = RATIOS_TOPIC_ID
     ).use {
       onView(withId(R.id.topic_description_text_view))
@@ -339,6 +350,7 @@ class TopicInfoFragmentTest {
   fun testTopicInfoFragment_loadFragment_moreThanFiveLines_seeMoreIsVisible() {
     launchTopicActivityIntent(
       internalProfileId = internalProfileId,
+      classroomId = TEST_CLASSROOM_ID,
       topicId = RATIOS_TOPIC_ID
     ).use {
       onView(withId(R.id.topic_description_text_view)).perform(
@@ -357,6 +369,7 @@ class TopicInfoFragmentTest {
   fun testTopicInfoFragment_loadFragment_seeMoreIsVisible_and_fiveLinesVisible() {
     launchTopicActivityIntent(
       internalProfileId = internalProfileId,
+      classroomId = TEST_CLASSROOM_ID,
       topicId = RATIOS_TOPIC_ID
     ).use {
       onView(withId(R.id.topic_description_text_view)).perform(
@@ -382,6 +395,7 @@ class TopicInfoFragmentTest {
   fun testTopicInfoFragment_loadFragment_clickSeeMore_seeLessVisible() {
     launchTopicActivityIntent(
       internalProfileId = internalProfileId,
+      classroomId = TEST_CLASSROOM_ID,
       topicId = RATIOS_TOPIC_ID
     ).use {
       onView(withId(R.id.topic_description_text_view)).perform(
@@ -401,6 +415,7 @@ class TopicInfoFragmentTest {
   fun testTopicInfoFragment_loadFragment_seeMoreIsVisible() {
     launchTopicActivityIntent(
       internalProfileId = internalProfileId,
+      classroomId = TEST_CLASSROOM_ID,
       topicId = RATIOS_TOPIC_ID
     ).use {
       onView(withId(R.id.see_more_text_view)).perform(scrollTo())
@@ -414,6 +429,7 @@ class TopicInfoFragmentTest {
   fun testTopicInfoFragment_loadFragment_clickSeeMore_textChangesToSeeLess() {
     launchTopicActivityIntent(
       internalProfileId = internalProfileId,
+      classroomId = TEST_CLASSROOM_ID,
       topicId = RATIOS_TOPIC_ID
     ).use {
       onView(withId(R.id.see_more_text_view)).perform(scrollTo())
@@ -425,12 +441,14 @@ class TopicInfoFragmentTest {
 
   private fun launchTopicActivityIntent(
     internalProfileId: Int,
+    classroomId: String,
     topicId: String
   ): ActivityScenario<TopicActivity> {
     val intent =
       TopicActivity.createTopicActivityIntent(
         ApplicationProvider.getApplicationContext(),
         internalProfileId,
+        classroomId,
         topicId
       )
     return ActivityScenario.launch(intent)
diff --git a/app/src/sharedTest/java/org/oppia/android/app/topic/lessons/TopicLessonsFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/topic/lessons/TopicLessonsFragmentTest.kt
index eeda1426fbf..fcbd76ab437 100644
--- a/app/src/sharedTest/java/org/oppia/android/app/topic/lessons/TopicLessonsFragmentTest.kt
+++ b/app/src/sharedTest/java/org/oppia/android/app/topic/lessons/TopicLessonsFragmentTest.kt
@@ -89,6 +89,7 @@ import org.oppia.android.domain.classify.rules.numericexpressioninput.NumericExp
 import org.oppia.android.domain.classify.rules.numericinput.NumericInputRuleModule
 import org.oppia.android.domain.classify.rules.ratioinput.RatioInputModule
 import org.oppia.android.domain.classify.rules.textinput.TextInputRuleModule
+import org.oppia.android.domain.classroom.TEST_CLASSROOM_ID_1
 import org.oppia.android.domain.exploration.ExplorationProgressModule
 import org.oppia.android.domain.exploration.testing.ExplorationStorageTestModule
 import org.oppia.android.domain.exploration.testing.FakeExplorationRetriever
@@ -210,7 +211,9 @@ class TopicLessonsFragmentTest {
 
   @Test
   fun testLessonsPlayFragment_loadRatiosTopic_storyName_isCorrect() {
-    launch<TopicActivity>(createTopicActivityIntent(internalProfileId, RATIOS_TOPIC_ID)).use {
+    launch<TopicActivity>(createTopicActivityIntent(
+      internalProfileId, TEST_CLASSROOM_ID_1, RATIOS_TOPIC_ID
+    )).use {
       clickLessonTab()
       verifyTextOnStorySummaryListItemAtPosition(itemPosition = 1, stringToMatch = "Ratios: Part 1")
     }
@@ -218,7 +221,9 @@ class TopicLessonsFragmentTest {
 
   @Test
   fun testLessonsPlayFragment_loadRatiosTopic_chapterCountTextMultiple_isCorrect() {
-    launch<TopicActivity>(createTopicActivityIntent(internalProfileId, RATIOS_TOPIC_ID)).use {
+    launch<TopicActivity>(createTopicActivityIntent(
+      internalProfileId, TEST_CLASSROOM_ID_1, RATIOS_TOPIC_ID
+    )).use {
       clickLessonTab()
       verifyTextOnStorySummaryListItemAtPosition(itemPosition = 2, stringToMatch = "2 Chapters")
     }
@@ -230,7 +235,9 @@ class TopicLessonsFragmentTest {
       profileId,
       timestampOlderThanOneWeek = false
     )
-    launch<TopicActivity>(createTopicActivityIntent(internalProfileId, RATIOS_TOPIC_ID)).use {
+    launch<TopicActivity>(createTopicActivityIntent(
+      internalProfileId, TEST_CLASSROOM_ID_1, RATIOS_TOPIC_ID
+    )).use {
       clickLessonTab()
       verifyTextOnStorySummaryListItemAtPosition(itemPosition = 1, stringToMatch = "100%")
     }
@@ -242,7 +249,9 @@ class TopicLessonsFragmentTest {
       profileId,
       timestampOlderThanOneWeek = false
     )
-    launch<TopicActivity>(createTopicActivityIntent(internalProfileId, RATIOS_TOPIC_ID)).use {
+    launch<TopicActivity>(createTopicActivityIntent(
+      internalProfileId, TEST_CLASSROOM_ID_1, RATIOS_TOPIC_ID
+    )).use {
       clickLessonTab()
       verifyProgressContentDescriptionAtPosition(itemPosition = 1, stringToMatch = "100% Completed")
     }
@@ -254,7 +263,9 @@ class TopicLessonsFragmentTest {
       profileId,
       timestampOlderThanOneWeek = false
     )
-    launch<TopicActivity>(createTopicActivityIntent(internalProfileId, RATIOS_TOPIC_ID)).use {
+    launch<TopicActivity>(createTopicActivityIntent(
+      internalProfileId, TEST_CLASSROOM_ID_1, RATIOS_TOPIC_ID
+    )).use {
       clickLessonTab()
       verifyProgressContentDescriptionAtPosition(itemPosition = 1, stringToMatch = "0% In Progress")
     }
@@ -270,7 +281,9 @@ class TopicLessonsFragmentTest {
       profileId,
       timestampOlderThanOneWeek = false
     )
-    launch<TopicActivity>(createTopicActivityIntent(internalProfileId, RATIOS_TOPIC_ID)).use {
+    launch<TopicActivity>(createTopicActivityIntent(
+      internalProfileId, TEST_CLASSROOM_ID_1, RATIOS_TOPIC_ID
+    )).use {
       clickLessonTab()
       verifyProgressContentDescriptionAtPosition(
         itemPosition = 1,
@@ -281,7 +294,9 @@ class TopicLessonsFragmentTest {
 
   @Test
   fun testLessonsPlayFragment_loadRatiosTopic_noStoryProgress_contentDescriptionIsCorrect() {
-    launch<TopicActivity>(createTopicActivityIntent(internalProfileId, RATIOS_TOPIC_ID)).use {
+    launch<TopicActivity>(createTopicActivityIntent(
+      internalProfileId, TEST_CLASSROOM_ID_1, RATIOS_TOPIC_ID
+    )).use {
       clickLessonTab()
       verifyProgressContentDescriptionAtPosition(itemPosition = 1, stringToMatch = "0% In Progress")
     }
@@ -297,7 +312,9 @@ class TopicLessonsFragmentTest {
       profileId,
       timestampOlderThanOneWeek = false
     )
-    launch<TopicActivity>(createTopicActivityIntent(internalProfileId, RATIOS_TOPIC_ID)).use {
+    launch<TopicActivity>(createTopicActivityIntent(
+      internalProfileId, TEST_CLASSROOM_ID_1, RATIOS_TOPIC_ID
+    )).use {
       clickLessonTab()
       verifyTextOnStorySummaryListItemAtPosition(itemPosition = 2, stringToMatch = "50%")
     }
@@ -305,7 +322,9 @@ class TopicLessonsFragmentTest {
 
   @Test
   fun testLessonsPlayFragment_loadRatiosTopic_configurationChange_storyName_isCorrect() {
-    launch<TopicActivity>(createTopicActivityIntent(internalProfileId, RATIOS_TOPIC_ID)).use {
+    launch<TopicActivity>(createTopicActivityIntent(
+      internalProfileId, TEST_CLASSROOM_ID_1, RATIOS_TOPIC_ID
+    )).use {
       clickLessonTab()
       onView(isRoot()).perform(orientationLandscape())
       verifyTextOnStorySummaryListItemAtPosition(itemPosition = 1, stringToMatch = "Ratios: Part 1")
@@ -315,7 +334,9 @@ class TopicLessonsFragmentTest {
   @Test
   @Config(qualifiers = "land-xxhdpi")
   fun testLessonsPlayFragment_loadRatiosTopic_configurationLandscape_storyName_isCorrect() {
-    launch<TopicActivity>(createTopicActivityIntent(internalProfileId, RATIOS_TOPIC_ID)).use {
+    launch<TopicActivity>(createTopicActivityIntent(
+      internalProfileId, TEST_CLASSROOM_ID_1, RATIOS_TOPIC_ID
+    )).use {
       clickLessonTab()
       verifyTextOnStorySummaryListItemAtPosition(itemPosition = 1, stringToMatch = "Ratios: Part 1")
     }
@@ -323,7 +344,9 @@ class TopicLessonsFragmentTest {
 
   @Test
   fun testLessonsPlayFragment_loadRatiosTopic_clickStoryItem_opensStoryActivityWithCorrectIntent() {
-    launch<TopicActivity>(createTopicActivityIntent(internalProfileId, RATIOS_TOPIC_ID)).use {
+    launch<TopicActivity>(createTopicActivityIntent(
+      internalProfileId, TEST_CLASSROOM_ID_1, RATIOS_TOPIC_ID
+    )).use {
       clickLessonTab()
       clickStoryItem(position = 1, targetViewId = R.id.story_name_text_view)
 
@@ -338,14 +361,18 @@ class TopicLessonsFragmentTest {
 
   @Test
   fun testLessonsPlayFragment_loadRatiosTopic_chapterListIsNotVisible() {
-    launch<TopicActivity>(createTopicActivityIntent(internalProfileId, RATIOS_TOPIC_ID)).use {
+    launch<TopicActivity>(createTopicActivityIntent(
+      internalProfileId, TEST_CLASSROOM_ID_1, RATIOS_TOPIC_ID
+    )).use {
       onView(withId(R.id.chapter_recycler_view)).check(doesNotExist())
     }
   }
 
   @Test
   fun testLessonsPlayFragment_loadRatiosTopic_chapterNotStartedIsCorrectlyDisplayed() {
-    launch<TopicActivity>(createTopicActivityIntent(internalProfileId, RATIOS_TOPIC_ID)).use {
+    launch<TopicActivity>(createTopicActivityIntent(
+      internalProfileId, TEST_CLASSROOM_ID_1, RATIOS_TOPIC_ID
+    )).use {
       clickLessonTab()
       clickStoryItem(position = 1, targetViewId = R.id.chapter_list_drop_down_icon)
       onView(
@@ -360,7 +387,9 @@ class TopicLessonsFragmentTest {
 
   @Test
   fun testLessonsPlayFragment_loadRatiosTopic_chapterLockedIsCorrectlyDisplayed() {
-    launch<TopicActivity>(createTopicActivityIntent(internalProfileId, RATIOS_TOPIC_ID)).use {
+    launch<TopicActivity>(createTopicActivityIntent(
+      internalProfileId, TEST_CLASSROOM_ID_1, RATIOS_TOPIC_ID
+    )).use {
       clickLessonTab()
       clickStoryItem(position = 1, targetViewId = R.id.chapter_list_drop_down_icon)
       onView(
@@ -375,7 +404,9 @@ class TopicLessonsFragmentTest {
 
   @Test
   fun testLessonsPlayFragment_loadRatiosTopic_chapterIsLocked_contentDescriptionIsCorrect() {
-    launch<TopicActivity>(createTopicActivityIntent(internalProfileId, RATIOS_TOPIC_ID)).use {
+    launch<TopicActivity>(createTopicActivityIntent(
+      internalProfileId, TEST_CLASSROOM_ID_1, RATIOS_TOPIC_ID
+    )).use {
       clickLessonTab()
       clickStoryItem(position = 1, targetViewId = R.id.chapter_list_drop_down_icon)
       onView(
@@ -403,7 +434,9 @@ class TopicLessonsFragmentTest {
       profileId,
       timestampOlderThanOneWeek = false
     )
-    launch<TopicActivity>(createTopicActivityIntent(internalProfileId, RATIOS_TOPIC_ID)).use {
+    launch<TopicActivity>(createTopicActivityIntent(
+      internalProfileId, TEST_CLASSROOM_ID_1, RATIOS_TOPIC_ID
+    )).use {
       clickLessonTab()
       clickStoryItem(position = 1, targetViewId = R.id.chapter_list_drop_down_icon)
       onView(
@@ -422,7 +455,9 @@ class TopicLessonsFragmentTest {
       profileId,
       timestampOlderThanOneWeek = false
     )
-    launch<TopicActivity>(createTopicActivityIntent(internalProfileId, RATIOS_TOPIC_ID)).use {
+    launch<TopicActivity>(createTopicActivityIntent(
+      internalProfileId, TEST_CLASSROOM_ID_1, RATIOS_TOPIC_ID
+    )).use {
       clickLessonTab()
       clickStoryItem(position = 1, targetViewId = R.id.chapter_list_drop_down_icon)
       onView(
@@ -450,7 +485,9 @@ class TopicLessonsFragmentTest {
       profileId,
       timestampOlderThanOneWeek = false
     )
-    launch<TopicActivity>(createTopicActivityIntent(internalProfileId, RATIOS_TOPIC_ID)).use {
+    launch<TopicActivity>(createTopicActivityIntent(
+      internalProfileId, TEST_CLASSROOM_ID_1, RATIOS_TOPIC_ID
+    )).use {
       clickLessonTab()
       clickStoryItem(position = 1, targetViewId = R.id.chapter_list_drop_down_icon)
       onView(
@@ -470,7 +507,9 @@ class TopicLessonsFragmentTest {
       profileId,
       timestampOlderThanOneWeek = false
     )
-    launch<TopicActivity>(createTopicActivityIntent(internalProfileId, RATIOS_TOPIC_ID)).use {
+    launch<TopicActivity>(createTopicActivityIntent(
+      internalProfileId, TEST_CLASSROOM_ID_1, RATIOS_TOPIC_ID
+    )).use {
       clickLessonTab()
       clickStoryItem(position = 1, targetViewId = R.id.chapter_list_drop_down_icon)
       onView(
@@ -493,7 +532,9 @@ class TopicLessonsFragmentTest {
 
   @Test
   fun testLessonsPlayFragment_loadRatiosTopic_configChange_chapterLockedIsCorrectlyDisplayed() {
-    launch<TopicActivity>(createTopicActivityIntent(internalProfileId, RATIOS_TOPIC_ID)).use {
+    launch<TopicActivity>(createTopicActivityIntent(
+      internalProfileId, TEST_CLASSROOM_ID_1, RATIOS_TOPIC_ID
+    )).use {
       clickLessonTab()
       clickStoryItem(position = 1, targetViewId = R.id.chapter_list_drop_down_icon)
       onView(isRoot()).perform(orientationLandscape())
@@ -513,7 +554,9 @@ class TopicLessonsFragmentTest {
       profileId,
       timestampOlderThanOneWeek = false
     )
-    launch<TopicActivity>(createTopicActivityIntent(internalProfileId, RATIOS_TOPIC_ID)).use {
+    launch<TopicActivity>(createTopicActivityIntent(
+      internalProfileId, TEST_CLASSROOM_ID_1, RATIOS_TOPIC_ID
+    )).use {
       clickLessonTab()
       clickStoryItem(position = 1, targetViewId = R.id.chapter_list_drop_down_icon)
       onView(isRoot()).perform(orientationLandscape())
@@ -534,7 +577,9 @@ class TopicLessonsFragmentTest {
       profileId,
       timestampOlderThanOneWeek = false
     )
-    launch<TopicActivity>(createTopicActivityIntent(internalProfileId, RATIOS_TOPIC_ID)).use {
+    launch<TopicActivity>(createTopicActivityIntent(
+      internalProfileId, TEST_CLASSROOM_ID_1, RATIOS_TOPIC_ID
+    )).use {
       clickLessonTab()
       clickStoryItem(position = 1, targetViewId = R.id.chapter_list_drop_down_icon)
       onView(isRoot()).perform(orientationLandscape())
@@ -550,7 +595,9 @@ class TopicLessonsFragmentTest {
 
   @Test
   fun testLessonsPlayFragment_loadRatiosTopic_configChange_chapterNotStartedIsCorrectlyDisplayed() {
-    launch<TopicActivity>(createTopicActivityIntent(internalProfileId, RATIOS_TOPIC_ID)).use {
+    launch<TopicActivity>(createTopicActivityIntent(
+      internalProfileId, TEST_CLASSROOM_ID_1, RATIOS_TOPIC_ID
+    )).use {
       clickLessonTab()
       clickStoryItem(position = 1, targetViewId = R.id.chapter_list_drop_down_icon)
       onView(isRoot()).perform(orientationLandscape())
@@ -566,7 +613,9 @@ class TopicLessonsFragmentTest {
 
   @Test
   fun testLessonsPlayFragment_loadRatiosTopic_default_arrowDown() {
-    launch<TopicActivity>(createTopicActivityIntent(internalProfileId, RATIOS_TOPIC_ID)).use {
+    launch<TopicActivity>(createTopicActivityIntent(
+      internalProfileId, TEST_CLASSROOM_ID_1, RATIOS_TOPIC_ID
+    )).use {
       clickLessonTab()
       onView(
         atPositionOnView(
@@ -587,6 +636,7 @@ class TopicLessonsFragmentTest {
     launch<TopicActivity>(
       createTopicPlayStoryActivityIntent(
         internalProfileId,
+        TEST_CLASSROOM_ID_1,
         RATIOS_TOPIC_ID,
         RATIOS_STORY_ID_0
       )
@@ -614,7 +664,9 @@ class TopicLessonsFragmentTest {
       version = FRACTIONS_STORY_0_EXPLORATION_0_CURRENT_VERSION,
     )
     testCoroutineDispatchers.runCurrent()
-    launch<TopicActivity>(createTopicActivityIntent(internalProfileId, FRACTIONS_TOPIC_ID)).use {
+    launch<TopicActivity>(createTopicActivityIntent(
+      internalProfileId, TEST_CLASSROOM_ID_1, FRACTIONS_TOPIC_ID)
+    ).use {
       clickLessonTab()
       clickStoryItem(position = 1, targetViewId = R.id.chapter_list_drop_down_icon)
       scrollToPosition(position = 1)
@@ -632,6 +684,7 @@ class TopicLessonsFragmentTest {
         explorationId = FRACTIONS_EXPLORATION_ID_0
         storyId = FRACTIONS_STORY_ID_0
         topicId = FRACTIONS_TOPIC_ID
+        classroomId = TEST_CLASSROOM_ID_1
         profileId = ProfileId.newBuilder().apply { internalId = internalProfileId }.build()
         parentScreen = ExplorationActivityParams.ParentScreen.TOPIC_SCREEN_LESSONS_TAB
         checkpoint = ExplorationCheckpoint.newBuilder().apply {
@@ -665,7 +718,9 @@ class TopicLessonsFragmentTest {
       profileId = profileId,
       version = 1 // Old version, but it doesn't matter since the new version is incompatible.
     )
-    launch<TopicActivity>(createTopicActivityIntent(internalProfileId, FRACTIONS_TOPIC_ID)).use {
+    launch<TopicActivity>(createTopicActivityIntent(
+      internalProfileId, TEST_CLASSROOM_ID_1, FRACTIONS_TOPIC_ID)
+    ).use {
       clickLessonTab()
       clickStoryItem(position = 1, targetViewId = R.id.chapter_list_drop_down_icon)
       scrollToPosition(position = 1)
@@ -683,6 +738,7 @@ class TopicLessonsFragmentTest {
         explorationId = FRACTIONS_EXPLORATION_ID_0
         storyId = FRACTIONS_STORY_ID_0
         topicId = FRACTIONS_TOPIC_ID
+        classroomId = TEST_CLASSROOM_ID_1
         profileId = ProfileId.newBuilder().apply { internalId = internalProfileId }.build()
         isCheckpointingEnabled = true
         parentScreen = ExplorationActivityParams.ParentScreen.TOPIC_SCREEN_LESSONS_TAB
@@ -698,7 +754,9 @@ class TopicLessonsFragmentTest {
 
   @Test
   fun testLessonsPlayFragment_loadFractionsTopic_clickChap_chapterMarkedAsNotStarted_opensExpAct() {
-    launch<TopicActivity>(createTopicActivityIntent(internalProfileId, FRACTIONS_TOPIC_ID)).use {
+    launch<TopicActivity>(createTopicActivityIntent(
+      internalProfileId, TEST_CLASSROOM_ID_1, FRACTIONS_TOPIC_ID)
+    ).use {
       clickLessonTab()
       clickStoryItem(position = 1, targetViewId = R.id.chapter_list_drop_down_icon)
       scrollToPosition(position = 1)
@@ -716,6 +774,7 @@ class TopicLessonsFragmentTest {
         explorationId = FRACTIONS_EXPLORATION_ID_0
         storyId = FRACTIONS_STORY_ID_0
         topicId = FRACTIONS_TOPIC_ID
+        classroomId = TEST_CLASSROOM_ID_1
         profileId = ProfileId.newBuilder().apply { internalId = internalProfileId }.build()
         isCheckpointingEnabled = true
         parentScreen = ExplorationActivityParams.ParentScreen.TOPIC_SCREEN_LESSONS_TAB
@@ -736,7 +795,9 @@ class TopicLessonsFragmentTest {
       profileId = profileId,
       timestampOlderThanOneWeek = false
     )
-    launch<TopicActivity>(createTopicActivityIntent(internalProfileId, FRACTIONS_TOPIC_ID)).use {
+    launch<TopicActivity>(createTopicActivityIntent(
+      internalProfileId, TEST_CLASSROOM_ID_1, FRACTIONS_TOPIC_ID)
+    ).use {
       clickLessonTab()
       clickStoryItem(position = 1, targetViewId = R.id.chapter_list_drop_down_icon)
       scrollToPosition(position = 1)
@@ -754,6 +815,7 @@ class TopicLessonsFragmentTest {
         explorationId = FRACTIONS_EXPLORATION_ID_0
         storyId = FRACTIONS_STORY_ID_0
         topicId = FRACTIONS_TOPIC_ID
+        classroomId = TEST_CLASSROOM_ID_1
         profileId = ProfileId.newBuilder().apply { internalId = internalProfileId }.build()
         isCheckpointingEnabled = true
         parentScreen = ExplorationActivityParams.ParentScreen.TOPIC_SCREEN_LESSONS_TAB
@@ -774,7 +836,9 @@ class TopicLessonsFragmentTest {
       profileId = profileId,
       timestampOlderThanOneWeek = false
     )
-    launch<TopicActivity>(createTopicActivityIntent(internalProfileId, FRACTIONS_TOPIC_ID)).use {
+    launch<TopicActivity>(createTopicActivityIntent(
+      internalProfileId, TEST_CLASSROOM_ID_1, FRACTIONS_TOPIC_ID)
+    ).use {
       clickLessonTab()
       clickStoryItem(position = 1, targetViewId = R.id.chapter_list_drop_down_icon)
       scrollToPosition(position = 1)
@@ -791,6 +855,7 @@ class TopicLessonsFragmentTest {
         explorationId = FRACTIONS_EXPLORATION_ID_0
         storyId = FRACTIONS_STORY_ID_0
         topicId = FRACTIONS_TOPIC_ID
+        classroomId = TEST_CLASSROOM_ID_1
         profileId = ProfileId.newBuilder().apply { internalId = internalProfileId }.build()
         isCheckpointingEnabled = false
         parentScreen = ExplorationActivityParams.ParentScreen.TOPIC_SCREEN_LESSONS_TAB
@@ -806,7 +871,9 @@ class TopicLessonsFragmentTest {
 
   @Test
   fun testLessonsPlayFragment_loadRatiosTopic_clickExpandListIconIndex1_clickExpandListIconIndex2_chapterListForIndex1IsNotDisplayed() { // ktlint-disable max-line-length
-    launch<TopicActivity>(createTopicActivityIntent(internalProfileId, RATIOS_TOPIC_ID)).use {
+    launch<TopicActivity>(createTopicActivityIntent(
+      internalProfileId, TEST_CLASSROOM_ID_1, RATIOS_TOPIC_ID
+    )).use {
       clickLessonTab()
       scrollToPosition(position = 1)
       clickStoryItem(position = 1, targetViewId = R.id.chapter_list_drop_down_icon)
@@ -827,7 +894,9 @@ class TopicLessonsFragmentTest {
 
   @Test
   fun testLessonsPlayFragment_loadRatiosTopic_clickExpandListIconIndex2_clickExpandListIconIndex1_chapterListForIndex2IsNotDisplayed() { // ktlint-disable max-line-length
-    launch<TopicActivity>(createTopicActivityIntent(internalProfileId, RATIOS_TOPIC_ID)).use {
+    launch<TopicActivity>(createTopicActivityIntent(
+      internalProfileId, TEST_CLASSROOM_ID_1, RATIOS_TOPIC_ID
+    )).use {
       clickLessonTab()
       scrollToPosition(position = 2)
       clickStoryItem(position = 2, targetViewId = R.id.chapter_list_drop_down_icon)
@@ -846,7 +915,9 @@ class TopicLessonsFragmentTest {
 
   @Test
   fun testLessonsPlayFragment_loadRatiosTopic_clickExpandListIconIndex1_configurationChange_chapterListIsVisible() { // ktlint-disable max-line-length
-    launch<TopicActivity>(createTopicActivityIntent(internalProfileId, RATIOS_TOPIC_ID)).use {
+    launch<TopicActivity>(createTopicActivityIntent(
+      internalProfileId, TEST_CLASSROOM_ID_1, RATIOS_TOPIC_ID
+    )).use {
       clickLessonTab()
       onView(isRoot()).perform(orientationLandscape())
       clickStoryItem(position = 1, targetViewId = R.id.chapter_list_drop_down_icon)
@@ -864,7 +935,9 @@ class TopicLessonsFragmentTest {
   @Test
   @Config(qualifiers = "land-xxhdpi")
   fun testLessonsPlayFragment_loadRatiosTopic_clickExpandListIconIndex1_configurationLandscape_chapterListIsVisible() { // ktlint-disable max-line-length
-    launch<TopicActivity>(createTopicActivityIntent(internalProfileId, RATIOS_TOPIC_ID)).use {
+    launch<TopicActivity>(createTopicActivityIntent(
+      internalProfileId, TEST_CLASSROOM_ID_1, RATIOS_TOPIC_ID
+    )).use {
       clickLessonTab()
       clickStoryItem(position = 1, targetViewId = R.id.chapter_list_drop_down_icon)
       scrollToPosition(position = 1)
@@ -884,7 +957,9 @@ class TopicLessonsFragmentTest {
       profileId,
       timestampOlderThanOneWeek = false
     )
-    launch<TopicActivity>(createTopicActivityIntent(internalProfileId, RATIOS_TOPIC_ID)).use {
+    launch<TopicActivity>(createTopicActivityIntent(
+      internalProfileId, TEST_CLASSROOM_ID_1, RATIOS_TOPIC_ID
+    )).use {
       clickLessonTab()
       clickStoryItem(position = 1, targetViewId = R.id.chapter_list_drop_down_icon)
       scrollToPosition(position = 1)
@@ -899,7 +974,9 @@ class TopicLessonsFragmentTest {
       profileId,
       timestampOlderThanOneWeek = false
     )
-    launch<TopicActivity>(createTopicActivityIntent(internalProfileId, RATIOS_TOPIC_ID)).use {
+    launch<TopicActivity>(createTopicActivityIntent(
+      internalProfileId, TEST_CLASSROOM_ID_1, RATIOS_TOPIC_ID
+    )).use {
       clickLessonTab()
       clickStoryItem(position = 1, targetViewId = R.id.chapter_list_drop_down_icon)
       scrollToPosition(position = 1)
@@ -914,7 +991,9 @@ class TopicLessonsFragmentTest {
     launch<TopicActivity>(
       createTopicPlayStoryActivityIntent(
         internalProfileId,
-        RATIOS_TOPIC_ID, RATIOS_STORY_ID_0
+        TEST_CLASSROOM_ID_1,
+        RATIOS_TOPIC_ID,
+        RATIOS_STORY_ID_0
       )
     ).use {
       scrollToPosition(position = 1)
@@ -933,6 +1012,7 @@ class TopicLessonsFragmentTest {
     launch<TopicActivity>(
       createTopicPlayStoryActivityIntent(
         internalProfileId,
+        TEST_CLASSROOM_ID_1,
         RATIOS_TOPIC_ID,
         RATIOS_STORY_ID_0
       )
@@ -954,6 +1034,7 @@ class TopicLessonsFragmentTest {
     launch<TopicActivity>(
       createTopicPlayStoryActivityIntent(
         internalProfileId,
+        TEST_CLASSROOM_ID_1,
         RATIOS_TOPIC_ID,
         RATIOS_STORY_ID_0
       )
@@ -974,7 +1055,9 @@ class TopicLessonsFragmentTest {
 
   @Test
   fun testLessonsPlayFragment_loadRatiosTopic_checkDropDownIconWithScreenReader_isClickable() {
-    launch<TopicActivity>(createTopicActivityIntent(internalProfileId, FRACTIONS_TOPIC_ID)).use {
+    launch<TopicActivity>(createTopicActivityIntent(
+      internalProfileId, TEST_CLASSROOM_ID_1, FRACTIONS_TOPIC_ID)
+    ).use {
       fakeAccessibilityService.setScreenReaderEnabled(true)
       clickLessonTab()
       testCoroutineDispatchers.runCurrent()
@@ -992,7 +1075,9 @@ class TopicLessonsFragmentTest {
 
   @Test
   fun testLessonPlayFragment_loadRatiosTopic_checkDropDownIconWithoutScreenReader_isNotClickable() {
-    launch<TopicActivity>(createTopicActivityIntent(internalProfileId, FRACTIONS_TOPIC_ID)).use {
+    launch<TopicActivity>(createTopicActivityIntent(
+      internalProfileId, TEST_CLASSROOM_ID_1, FRACTIONS_TOPIC_ID)
+    ).use {
       clickLessonTab()
       testCoroutineDispatchers.runCurrent()
       onView(
@@ -1009,7 +1094,9 @@ class TopicLessonsFragmentTest {
 
   @Test
   fun testLessonPlayFragment_loadRatiosTopic_checkStoryContainerWithScreenReader_isNotClickable() {
-    launch<TopicActivity>(createTopicActivityIntent(internalProfileId, FRACTIONS_TOPIC_ID)).use {
+    launch<TopicActivity>(createTopicActivityIntent(
+      internalProfileId, TEST_CLASSROOM_ID_1, FRACTIONS_TOPIC_ID)
+    ).use {
       fakeAccessibilityService.setScreenReaderEnabled(true)
       clickLessonTab()
       testCoroutineDispatchers.runCurrent()
@@ -1027,7 +1114,9 @@ class TopicLessonsFragmentTest {
 
   @Test
   fun testLessonPlayFragment_loadRatiosTopic_checkStoryContainerWithoutScreenReader_isClickable() {
-    launch<TopicActivity>(createTopicActivityIntent(internalProfileId, FRACTIONS_TOPIC_ID)).use {
+    launch<TopicActivity>(createTopicActivityIntent(
+      internalProfileId, TEST_CLASSROOM_ID_1, FRACTIONS_TOPIC_ID)
+    ).use {
       clickLessonTab()
       testCoroutineDispatchers.runCurrent()
       onView(
@@ -1051,22 +1140,29 @@ class TopicLessonsFragmentTest {
     testCoroutineDispatchers.runCurrent()
   }
 
-  private fun createTopicActivityIntent(internalProfileId: Int, topicId: String): Intent {
+  private fun createTopicActivityIntent(
+    internalProfileId: Int,
+    classroomId: String,
+    topicId: String
+  ): Intent {
     return TopicActivity.createTopicActivityIntent(
       ApplicationProvider.getApplicationContext(),
       internalProfileId,
+      classroomId,
       topicId
     )
   }
 
   private fun createTopicPlayStoryActivityIntent(
     internalProfileId: Int,
+    classroomId: String,
     topicId: String,
     storyId: String
   ): Intent {
     return TopicActivity.createTopicPlayStoryActivityIntent(
       ApplicationProvider.getApplicationContext(),
       internalProfileId,
+      classroomId,
       topicId,
       storyId
     )
diff --git a/app/src/sharedTest/java/org/oppia/android/app/topic/practice/TopicPracticeFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/topic/practice/TopicPracticeFragmentTest.kt
index 7b0f5057039..1f14282bd81 100644
--- a/app/src/sharedTest/java/org/oppia/android/app/topic/practice/TopicPracticeFragmentTest.kt
+++ b/app/src/sharedTest/java/org/oppia/android/app/topic/practice/TopicPracticeFragmentTest.kt
@@ -76,6 +76,7 @@ import org.oppia.android.domain.classify.rules.numericexpressioninput.NumericExp
 import org.oppia.android.domain.classify.rules.numericinput.NumericInputRuleModule
 import org.oppia.android.domain.classify.rules.ratioinput.RatioInputModule
 import org.oppia.android.domain.classify.rules.textinput.TextInputRuleModule
+import org.oppia.android.domain.classroom.TEST_CLASSROOM_ID_1
 import org.oppia.android.domain.exploration.ExplorationProgressModule
 import org.oppia.android.domain.exploration.ExplorationStorageModule
 import org.oppia.android.domain.hintsandsolution.HintsAndSolutionConfigModule
@@ -172,7 +173,7 @@ class TopicPracticeFragmentTest {
 
   @Test
   fun testTopicPracticeFragment_loadFragment_displaySubtopics_startButtonIsInactive() {
-    launchTopicActivityIntent(internalProfileId, FRACTIONS_TOPIC_ID).use {
+    launchTopicActivityIntent(internalProfileId, TEST_CLASSROOM_ID_1, FRACTIONS_TOPIC_ID).use {
       clickPracticeTab()
       onView(
         atPositionOnView(
@@ -208,7 +209,7 @@ class TopicPracticeFragmentTest {
 
   @Test
   fun testTopicPracticeFragment_loadFragment_selectSubtopics_isSuccessful() {
-    launchTopicActivityIntent(internalProfileId, FRACTIONS_TOPIC_ID).use {
+    launchTopicActivityIntent(internalProfileId, TEST_CLASSROOM_ID_1, FRACTIONS_TOPIC_ID).use {
       clickPracticeTab()
       clickPracticeItem(position = 1, targetViewId = R.id.subtopic_check_box)
       onView(
@@ -231,7 +232,7 @@ class TopicPracticeFragmentTest {
 
   @Test
   fun testTopicPracticeFragment_loadFragment_selectSubtopics_startButtonIsActive() {
-    launchTopicActivityIntent(internalProfileId, FRACTIONS_TOPIC_ID).use {
+    launchTopicActivityIntent(internalProfileId, TEST_CLASSROOM_ID_1, FRACTIONS_TOPIC_ID).use {
       clickPracticeTab()
       clickPracticeItem(position = 1, targetViewId = R.id.subtopic_check_box)
       testCoroutineDispatchers.runCurrent()
@@ -248,7 +249,7 @@ class TopicPracticeFragmentTest {
 
   @Test
   fun testTopicPracticeFragment_loadFragment_selectSubtopics_thenDeselect_selectsCorrectTopic() {
-    launchTopicActivityIntent(internalProfileId, FRACTIONS_TOPIC_ID).use {
+    launchTopicActivityIntent(internalProfileId, TEST_CLASSROOM_ID_1, FRACTIONS_TOPIC_ID).use {
       clickPracticeTab()
       clickPracticeItem(position = 1, targetViewId = R.id.subtopic_check_box)
       clickPracticeItem(position = 1, targetViewId = R.id.subtopic_check_box)
@@ -264,7 +265,7 @@ class TopicPracticeFragmentTest {
 
   @Test
   fun testTopicPracticeFragment_loadFragment_selectSubtopics_thenDeselect_startButtonIsInactive() {
-    launchTopicActivityIntent(internalProfileId, FRACTIONS_TOPIC_ID).use {
+    launchTopicActivityIntent(internalProfileId, TEST_CLASSROOM_ID_1, FRACTIONS_TOPIC_ID).use {
       clickPracticeTab()
       clickPracticeItem(position = 1, targetViewId = R.id.subtopic_check_box)
       clickPracticeItem(position = 1, targetViewId = R.id.subtopic_check_box)
@@ -283,7 +284,7 @@ class TopicPracticeFragmentTest {
   @Test
   fun testTopicPracticeFragment_loadFragment_selectSubtopics_clickStartButton_skillListTransferSuccessfully() { // ktlint-disable max-line-length
     testCoroutineDispatchers.unregisterIdlingResource()
-    launchTopicActivityIntent(internalProfileId, FRACTIONS_TOPIC_ID).use {
+    launchTopicActivityIntent(internalProfileId, TEST_CLASSROOM_ID_1, FRACTIONS_TOPIC_ID).use {
       clickPracticeTab()
       clickPracticeItem(position = 1, targetViewId = R.id.subtopic_check_box)
       scrollToPosition(position = 5)
@@ -296,7 +297,7 @@ class TopicPracticeFragmentTest {
 
   @Test
   fun testTopicPracticeFragment_loadFragment_selectSkills_configurationChange_skillsAreSelected() {
-    launchTopicActivityIntent(internalProfileId, FRACTIONS_TOPIC_ID).use {
+    launchTopicActivityIntent(internalProfileId, TEST_CLASSROOM_ID_1, FRACTIONS_TOPIC_ID).use {
       clickPracticeTab()
       clickPracticeItem(position = 1, targetViewId = R.id.subtopic_check_box)
       testCoroutineDispatchers.runCurrent()
@@ -313,7 +314,7 @@ class TopicPracticeFragmentTest {
 
   @Test
   fun testTopicPracticeFragment_loadFragment_configurationChange_startButtonRemainsInactive() {
-    launchTopicActivityIntent(internalProfileId, FRACTIONS_TOPIC_ID).use {
+    launchTopicActivityIntent(internalProfileId, TEST_CLASSROOM_ID_1, FRACTIONS_TOPIC_ID).use {
       clickPracticeTab()
       scrollToPosition(position = 5)
       testCoroutineDispatchers.runCurrent()
@@ -338,7 +339,7 @@ class TopicPracticeFragmentTest {
 
   @Test
   fun testTopicPracticeFragment_loadFragment_selectSkills_configChange_startButtonRemainsActive() {
-    launchTopicActivityIntent(internalProfileId, FRACTIONS_TOPIC_ID).use {
+    launchTopicActivityIntent(internalProfileId, TEST_CLASSROOM_ID_1, FRACTIONS_TOPIC_ID).use {
       clickPracticeTab()
       clickPracticeItem(position = 1, targetViewId = R.id.subtopic_check_box)
       onView(isRoot()).perform(orientationLandscape())
@@ -356,7 +357,7 @@ class TopicPracticeFragmentTest {
 
   @Test
   fun testTopicPracticeFragment_loadFragment_changeOrientation_titleIsCorrect() {
-    launchTopicActivityIntent(internalProfileId, FRACTIONS_TOPIC_ID).use {
+    launchTopicActivityIntent(internalProfileId, TEST_CLASSROOM_ID_1, FRACTIONS_TOPIC_ID).use {
       clickPracticeTab()
       onView(
         atPositionOnView(
@@ -390,12 +391,14 @@ class TopicPracticeFragmentTest {
 
   private fun launchTopicActivityIntent(
     internalProfileId: Int,
+    classroomId: String,
     topicId: String
   ): ActivityScenario<TopicActivity> {
     val intent =
       TopicActivity.createTopicActivityIntent(
         ApplicationProvider.getApplicationContext(),
         internalProfileId,
+        classroomId,
         topicId
       )
     return ActivityScenario.launch(intent)
diff --git a/app/src/sharedTest/java/org/oppia/android/app/topic/revision/TopicRevisionFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/topic/revision/TopicRevisionFragmentTest.kt
index 291281559be..dec1050be90 100644
--- a/app/src/sharedTest/java/org/oppia/android/app/topic/revision/TopicRevisionFragmentTest.kt
+++ b/app/src/sharedTest/java/org/oppia/android/app/topic/revision/TopicRevisionFragmentTest.kt
@@ -71,6 +71,7 @@ import org.oppia.android.domain.classify.rules.numericexpressioninput.NumericExp
 import org.oppia.android.domain.classify.rules.numericinput.NumericInputRuleModule
 import org.oppia.android.domain.classify.rules.ratioinput.RatioInputModule
 import org.oppia.android.domain.classify.rules.textinput.TextInputRuleModule
+import org.oppia.android.domain.classroom.TEST_CLASSROOM_ID_1
 import org.oppia.android.domain.exploration.ExplorationProgressModule
 import org.oppia.android.domain.exploration.ExplorationStorageModule
 import org.oppia.android.domain.hintsandsolution.HintsAndSolutionConfigModule
@@ -170,6 +171,7 @@ class TopicRevisionFragmentTest {
   fun testTopicRevisionFragment_loadFragment_displayRevisionTopics_isSuccessful() {
     launchTopicActivityIntent(
       internalProfileId = internalProfileId,
+      classroomId = TEST_CLASSROOM_ID_1,
       topicId = FRACTIONS_TOPIC_ID
     ).use {
       testCoroutineDispatchers.runCurrent()
@@ -183,6 +185,7 @@ class TopicRevisionFragmentTest {
   fun testTopicRevisionFragment_loadFragment_selectRevisionTopics_opensRevisionCardActivity() {
     launchTopicActivityIntent(
       internalProfileId = internalProfileId,
+      classroomId = TEST_CLASSROOM_ID_1,
       topicId = FRACTIONS_TOPIC_ID
     ).use {
       testCoroutineDispatchers.runCurrent()
@@ -202,6 +205,7 @@ class TopicRevisionFragmentTest {
   fun testTopicRevisionFragment_loadFragment_checkTopicThumbnail_isCorrect() {
     launchTopicActivityIntent(
       internalProfileId = internalProfileId,
+      classroomId = TEST_CLASSROOM_ID_1,
       topicId = FRACTIONS_TOPIC_ID
     ).use {
       testCoroutineDispatchers.runCurrent()
@@ -226,6 +230,7 @@ class TopicRevisionFragmentTest {
   fun testTopicPracticeFragment_loadFragment_configurationChange_revisionSubtopicsAreDisplayed() {
     launchTopicActivityIntent(
       internalProfileId = internalProfileId,
+      classroomId = TEST_CLASSROOM_ID_1,
       topicId = FRACTIONS_TOPIC_ID
     ).use {
       testCoroutineDispatchers.runCurrent()
@@ -240,6 +245,7 @@ class TopicRevisionFragmentTest {
   fun testTopicRevisionFragment_loadFragment_configurationChange_checkTopicThumbnail_isCorrect() {
     launchTopicActivityIntent(
       internalProfileId = internalProfileId,
+      classroomId = TEST_CLASSROOM_ID_1,
       topicId = FRACTIONS_TOPIC_ID
     ).use {
       testCoroutineDispatchers.runCurrent()
@@ -265,6 +271,7 @@ class TopicRevisionFragmentTest {
   fun testTopicRevisionFragment_loadFragment_checkTopicThumbnail_hasCorrectScaleType() {
     launchTopicActivityIntent(
       internalProfileId = internalProfileId,
+      classroomId = TEST_CLASSROOM_ID_1,
       topicId = FRACTIONS_TOPIC_ID
     ).use {
       testCoroutineDispatchers.runCurrent()
@@ -289,20 +296,30 @@ class TopicRevisionFragmentTest {
     testCoroutineDispatchers.runCurrent()
   }
 
-  private fun createTopicActivityIntent(internalProfileId: Int, topicId: String): Intent {
+  private fun createTopicActivityIntent(
+    internalProfileId: Int,
+    classroomId: String,
+    topicId: String
+  ): Intent {
     return TopicActivity.createTopicActivityIntent(
       context = ApplicationProvider.getApplicationContext(),
       internalProfileId = internalProfileId,
+      classroomId = classroomId,
       topicId = topicId
     )
   }
 
   private fun launchTopicActivityIntent(
     internalProfileId: Int,
+    classroomId: String,
     topicId: String
   ): ActivityScenario<TopicActivity> {
     return launch(
-      createTopicActivityIntent(internalProfileId = internalProfileId, topicId = topicId)
+      createTopicActivityIntent(
+        internalProfileId = internalProfileId,
+        classroomId = classroomId,
+        topicId = topicId
+      )
     )
   }
 
diff --git a/app/src/test/java/org/oppia/android/app/activity/ActivityIntentFactoriesTest.kt b/app/src/test/java/org/oppia/android/app/activity/ActivityIntentFactoriesTest.kt
index 1f47e95bbc2..4a75e8d367a 100644
--- a/app/src/test/java/org/oppia/android/app/activity/ActivityIntentFactoriesTest.kt
+++ b/app/src/test/java/org/oppia/android/app/activity/ActivityIntentFactoriesTest.kt
@@ -115,7 +115,9 @@ class ActivityIntentFactoriesTest {
   fun testTopicActivityIntentFactory_createIntent_returnsIntentToStartTopicActivity() {
     val intent =
       getTopicActivityIntentFactory().createIntent(
-        ProfileId.getDefaultInstance(), topicId = "test_topic_id"
+        ProfileId.getDefaultInstance(),
+        classroomId = "test_classroom_id",
+        topicId = "test_topic_id"
       )
     val args = intent.getProtoExtra(
       TopicActivity.TOPIC_ACTIVITY_PARAMS_KEY,
@@ -132,7 +134,10 @@ class ActivityIntentFactoriesTest {
   fun testTopicActivityIntentFactory_createIntent_withStoryId_returnsIntentToStartTopicActivity() {
     val intent =
       getTopicActivityIntentFactory().createIntent(
-        ProfileId.getDefaultInstance(), topicId = "test_topic_id", storyId = "test_story_id"
+        ProfileId.getDefaultInstance(),
+        classroomId = "test_classroom_id",
+        topicId = "test_topic_id",
+        storyId = "test_story_id"
       )
     val args = intent.getProtoExtra(
       TopicActivity.TOPIC_ACTIVITY_PARAMS_KEY,
diff --git a/app/src/test/java/org/oppia/android/app/player/exploration/ExplorationActivityLocalTest.kt b/app/src/test/java/org/oppia/android/app/player/exploration/ExplorationActivityLocalTest.kt
index 823861bc358..fde3a1be3a5 100644
--- a/app/src/test/java/org/oppia/android/app/player/exploration/ExplorationActivityLocalTest.kt
+++ b/app/src/test/java/org/oppia/android/app/player/exploration/ExplorationActivityLocalTest.kt
@@ -58,6 +58,7 @@ import org.oppia.android.domain.classify.rules.numericexpressioninput.NumericExp
 import org.oppia.android.domain.classify.rules.numericinput.NumericInputRuleModule
 import org.oppia.android.domain.classify.rules.ratioinput.RatioInputModule
 import org.oppia.android.domain.classify.rules.textinput.TextInputRuleModule
+import org.oppia.android.domain.classroom.TEST_CLASSROOM_ID_0
 import org.oppia.android.domain.exploration.ExplorationDataController
 import org.oppia.android.domain.exploration.ExplorationProgressModule
 import org.oppia.android.domain.exploration.ExplorationStorageModule
@@ -148,6 +149,7 @@ class ExplorationActivityLocalTest {
     setUpTestApplicationComponent()
     getApplicationDependencies(
       internalProfileId,
+      TEST_CLASSROOM_ID_0,
       TEST_TOPIC_ID_0,
       TEST_STORY_ID_0,
       TEST_EXPLORATION_ID_2
@@ -179,6 +181,7 @@ class ExplorationActivityLocalTest {
 
     getApplicationDependencies(
       internalProfileId,
+      TEST_CLASSROOM_ID_0,
       TEST_TOPIC_ID_0,
       TEST_STORY_ID_0,
       TEST_EXPLORATION_ID_2
@@ -195,6 +198,7 @@ class ExplorationActivityLocalTest {
     ).use {
       explorationDataController.startPlayingNewExploration(
         internalProfileId,
+        TEST_CLASSROOM_ID_0,
         TEST_TOPIC_ID_0,
         TEST_STORY_ID_0,
         TEST_EXPLORATION_ID_2
@@ -226,6 +230,7 @@ class ExplorationActivityLocalTest {
     setUpTestWithNpsEnabled()
     getApplicationDependencies(
       internalProfileId,
+      TEST_CLASSROOM_ID_0,
       TEST_TOPIC_ID_0,
       TEST_STORY_ID_0,
       TEST_EXPLORATION_ID_2
@@ -246,6 +251,7 @@ class ExplorationActivityLocalTest {
     ).use {
       explorationDataController.startPlayingNewExploration(
         internalProfileId,
+        TEST_CLASSROOM_ID_0,
         TEST_TOPIC_ID_0,
         TEST_STORY_ID_0,
         TEST_EXPLORATION_ID_2
@@ -272,6 +278,7 @@ class ExplorationActivityLocalTest {
 
     getApplicationDependencies(
       internalProfileId,
+      TEST_CLASSROOM_ID_0,
       TEST_TOPIC_ID_0,
       TEST_STORY_ID_0,
       TEST_EXPLORATION_ID_2
@@ -288,6 +295,7 @@ class ExplorationActivityLocalTest {
     ).use {
       explorationDataController.startPlayingNewExploration(
         internalProfileId,
+        TEST_CLASSROOM_ID_0,
         TEST_TOPIC_ID_0,
         TEST_STORY_ID_0,
         TEST_EXPLORATION_ID_2
@@ -345,6 +353,7 @@ class ExplorationActivityLocalTest {
 
   private fun getApplicationDependencies(
     internalProfileId: Int,
+    classroomId: String,
     topicId: String,
     storyId: String,
     explorationId: String
@@ -355,6 +364,7 @@ class ExplorationActivityLocalTest {
         explorationDataController = activity.explorationDataController
         explorationDataController.startPlayingNewExploration(
           internalProfileId,
+          classroomId,
           topicId,
           storyId,
           explorationId
diff --git a/app/src/test/java/org/oppia/android/app/player/state/StateFragmentLocalTest.kt b/app/src/test/java/org/oppia/android/app/player/state/StateFragmentLocalTest.kt
index 660b774ecbb..b40a46e7ce4 100644
--- a/app/src/test/java/org/oppia/android/app/player/state/StateFragmentLocalTest.kt
+++ b/app/src/test/java/org/oppia/android/app/player/state/StateFragmentLocalTest.kt
@@ -114,6 +114,7 @@ import org.oppia.android.domain.classify.rules.numericexpressioninput.NumericExp
 import org.oppia.android.domain.classify.rules.numericinput.NumericInputRuleModule
 import org.oppia.android.domain.classify.rules.ratioinput.RatioInputModule
 import org.oppia.android.domain.classify.rules.textinput.TextInputRuleModule
+import org.oppia.android.domain.classroom.TEST_CLASSROOM_ID_0
 import org.oppia.android.domain.exploration.ExplorationProgressModule
 import org.oppia.android.domain.exploration.ExplorationStorageModule
 import org.oppia.android.domain.hintsandsolution.HintsAndSolutionConfigModule
@@ -2231,6 +2232,7 @@ class StateFragmentLocalTest {
       StateFragmentTestActivity.createTestActivityIntent(
         context,
         profileId.internalId,
+        TEST_CLASSROOM_ID_0,
         TEST_TOPIC_ID_0,
         TEST_STORY_ID_0,
         explorationId,
diff --git a/app/src/test/java/org/oppia/android/app/story/StoryActivityLocalTest.kt b/app/src/test/java/org/oppia/android/app/story/StoryActivityLocalTest.kt
index 6489f14d675..8cee1756370 100644
--- a/app/src/test/java/org/oppia/android/app/story/StoryActivityLocalTest.kt
+++ b/app/src/test/java/org/oppia/android/app/story/StoryActivityLocalTest.kt
@@ -88,6 +88,7 @@ import org.robolectric.annotation.LooperMode
 import javax.inject.Inject
 import javax.inject.Singleton
 
+private const val TEST_CLASSROOM_ID = "test_classroom_id_1"
 private const val TEST_TOPIC_ID = "GJ2rLXRKD5hw"
 private const val TEST_STORY_ID = "GJ2rLXRKD5hw"
 
@@ -119,7 +120,7 @@ class StoryActivityLocalTest {
   @Test
   fun testStoryActivity_onLaunch_logsEvent() {
     ActivityScenario.launch<StoryActivity>(
-      createStoryActivityIntent(internalProfileId, TEST_TOPIC_ID, TEST_STORY_ID)
+      createStoryActivityIntent(internalProfileId, TEST_CLASSROOM_ID, TEST_TOPIC_ID, TEST_STORY_ID)
     ).use {
       testCoroutineDispatchers.runCurrent()
       val event = fakeAnalyticsEventLogger.getMostRecentEvent()
@@ -133,12 +134,14 @@ class StoryActivityLocalTest {
 
   private fun createStoryActivityIntent(
     internalProfileId: Int,
+    classroomId: String,
     topicId: String,
     storyId: String
   ): Intent {
     return StoryActivity.createStoryActivityIntent(
       ApplicationProvider.getApplicationContext(),
       internalProfileId,
+      classroomId,
       topicId,
       storyId
     )
diff --git a/app/src/test/java/org/oppia/android/app/testing/player/state/StateFragmentAccessibilityTest.kt b/app/src/test/java/org/oppia/android/app/testing/player/state/StateFragmentAccessibilityTest.kt
index 0323e8bb7fe..c36293a6e29 100644
--- a/app/src/test/java/org/oppia/android/app/testing/player/state/StateFragmentAccessibilityTest.kt
+++ b/app/src/test/java/org/oppia/android/app/testing/player/state/StateFragmentAccessibilityTest.kt
@@ -51,6 +51,7 @@ import org.oppia.android.domain.classify.rules.numericexpressioninput.NumericExp
 import org.oppia.android.domain.classify.rules.numericinput.NumericInputRuleModule
 import org.oppia.android.domain.classify.rules.ratioinput.RatioInputModule
 import org.oppia.android.domain.classify.rules.textinput.TextInputRuleModule
+import org.oppia.android.domain.classroom.TEST_CLASSROOM_ID_0
 import org.oppia.android.domain.exploration.ExplorationProgressModule
 import org.oppia.android.domain.exploration.ExplorationStorageModule
 import org.oppia.android.domain.hintsandsolution.HintsAndSolutionConfigModule
@@ -179,6 +180,7 @@ class StateFragmentAccessibilityTest {
       StateFragmentTestActivity.createTestActivityIntent(
         context,
         internalProfileId,
+        TEST_CLASSROOM_ID_0,
         TEST_TOPIC_ID_0,
         TEST_STORY_ID_0,
         explorationId,
diff --git a/app/src/test/java/org/oppia/android/app/topic/info/TopicInfoFragmentLocalTest.kt b/app/src/test/java/org/oppia/android/app/topic/info/TopicInfoFragmentLocalTest.kt
index cf22fc38f93..8c61974dcfe 100644
--- a/app/src/test/java/org/oppia/android/app/topic/info/TopicInfoFragmentLocalTest.kt
+++ b/app/src/test/java/org/oppia/android/app/topic/info/TopicInfoFragmentLocalTest.kt
@@ -86,6 +86,7 @@ import org.robolectric.annotation.LooperMode
 import javax.inject.Inject
 import javax.inject.Singleton
 
+private const val TEST_CLASSROOM_ID = "test_classroom_id_1"
 private const val TEST_TOPIC_ID = "GJ2rLXRKD5hw"
 
 @RunWith(AndroidJUnit4::class)
@@ -110,7 +111,7 @@ class TopicInfoFragmentLocalTest {
   @Test
   fun testTopicInfoFragment_onLaunch_logsEvent() {
     TestPlatformParameterModule.forceEnableExtraTopicTabsUi(true)
-    launchTopicActivityIntent(internalProfileId, TEST_TOPIC_ID).use {
+    launchTopicActivityIntent(internalProfileId, TEST_CLASSROOM_ID, TEST_TOPIC_ID).use {
       testCoroutineDispatchers.runCurrent()
       val event = fakeAnalyticsEventLogger.getMostRecentEvent()
 
@@ -122,12 +123,14 @@ class TopicInfoFragmentLocalTest {
 
   private fun launchTopicActivityIntent(
     internalProfileId: Int,
+    classroomId: String,
     topicId: String
   ): ActivityScenario<TopicActivity> {
     val intent =
       TopicActivity.createTopicActivityIntent(
         ApplicationProvider.getApplicationContext(),
         internalProfileId,
+        classroomId,
         topicId
       )
     return ActivityScenario.launch(intent)
diff --git a/app/src/test/java/org/oppia/android/app/topic/lessons/TopicLessonsFragmentLocalTest.kt b/app/src/test/java/org/oppia/android/app/topic/lessons/TopicLessonsFragmentLocalTest.kt
index c02f3d11f1b..080512c02fb 100644
--- a/app/src/test/java/org/oppia/android/app/topic/lessons/TopicLessonsFragmentLocalTest.kt
+++ b/app/src/test/java/org/oppia/android/app/topic/lessons/TopicLessonsFragmentLocalTest.kt
@@ -85,6 +85,7 @@ import org.robolectric.annotation.LooperMode
 import javax.inject.Inject
 import javax.inject.Singleton
 
+private const val TEST_CLASSROOM_ID = "test_classroom_id_1"
 private const val TEST_TOPIC_ID = "GJ2rLXRKD5hw"
 private const val TEST_STORY_ID = "GJ2rLXRKD5hw"
 
@@ -109,7 +110,9 @@ class TopicLessonsFragmentLocalTest {
 
   @Test
   fun testTopicLessonsFragment_onLaunch_logsEvent() {
-    launchTopicActivityIntent(internalProfileId, TEST_TOPIC_ID, TEST_STORY_ID).use {
+    launchTopicActivityIntent(
+      internalProfileId, TEST_CLASSROOM_ID, TEST_TOPIC_ID, TEST_STORY_ID
+    ).use {
       testCoroutineDispatchers.runCurrent()
       val event = fakeAnalyticsEventLogger.getMostRecentEvent()
 
@@ -122,6 +125,7 @@ class TopicLessonsFragmentLocalTest {
 
   private fun launchTopicActivityIntent(
     internalProfileId: Int,
+    classroomId: String,
     topicId: String,
     storyId: String
   ): ActivityScenario<TopicActivity> {
@@ -129,6 +133,7 @@ class TopicLessonsFragmentLocalTest {
       TopicActivity.createTopicPlayStoryActivityIntent(
         ApplicationProvider.getApplicationContext(),
         internalProfileId,
+        classroomId,
         topicId,
         storyId
       )
diff --git a/domain/src/main/java/org/oppia/android/domain/exploration/ExplorationDataController.kt b/domain/src/main/java/org/oppia/android/domain/exploration/ExplorationDataController.kt
index ed67d15d300..2cd658000a2 100644
--- a/domain/src/main/java/org/oppia/android/domain/exploration/ExplorationDataController.kt
+++ b/domain/src/main/java/org/oppia/android/domain/exploration/ExplorationDataController.kt
@@ -73,12 +73,14 @@ class ExplorationDataController @Inject constructor(
    */
   fun startPlayingNewExploration(
     internalProfileId: Int,
+    classroomId: String,
     topicId: String,
     storyId: String,
     explorationId: String
   ): DataProvider<Any?> {
     return startPlayingExploration(
       internalProfileId,
+      classroomId,
       topicId,
       storyId,
       explorationId,
@@ -102,6 +104,7 @@ class ExplorationDataController @Inject constructor(
    */
   fun resumeExploration(
     internalProfileId: Int,
+    classroomId: String,
     topicId: String,
     storyId: String,
     explorationId: String,
@@ -109,6 +112,7 @@ class ExplorationDataController @Inject constructor(
   ): DataProvider<Any?> {
     return startPlayingExploration(
       internalProfileId,
+      classroomId,
       topicId,
       storyId,
       explorationId,
@@ -131,12 +135,14 @@ class ExplorationDataController @Inject constructor(
    */
   fun restartExploration(
     internalProfileId: Int,
+    classroomId: String,
     topicId: String,
     storyId: String,
     explorationId: String
   ): DataProvider<Any?> {
     return startPlayingExploration(
       internalProfileId,
+      classroomId,
       topicId,
       storyId,
       explorationId,
@@ -162,12 +168,14 @@ class ExplorationDataController @Inject constructor(
    */
   fun replayExploration(
     internalProfileId: Int,
+    classroomId: String,
     topicId: String,
     storyId: String,
     explorationId: String
   ): DataProvider<Any?> {
     return startPlayingExploration(
       internalProfileId,
+      classroomId,
       topicId,
       storyId,
       explorationId,
@@ -206,6 +214,7 @@ class ExplorationDataController @Inject constructor(
    */
   private fun startPlayingExploration(
     internalProfileId: Int,
+    classroomId: String,
     topicId: String,
     storyId: String,
     explorationId: String,
@@ -215,6 +224,7 @@ class ExplorationDataController @Inject constructor(
   ): DataProvider<Any?> {
     return explorationProgressController.beginExplorationAsync(
       ProfileId.newBuilder().apply { internalId = internalProfileId }.build(),
+      classroomId,
       topicId,
       storyId,
       explorationId,
diff --git a/domain/src/main/java/org/oppia/android/domain/exploration/ExplorationProgress.kt b/domain/src/main/java/org/oppia/android/domain/exploration/ExplorationProgress.kt
index c897ebd7174..b71aaa4b178 100644
--- a/domain/src/main/java/org/oppia/android/domain/exploration/ExplorationProgress.kt
+++ b/domain/src/main/java/org/oppia/android/domain/exploration/ExplorationProgress.kt
@@ -19,6 +19,7 @@ private const val TERMINAL_INTERACTION_ID = "EndExploration"
  */
 internal class ExplorationProgress {
   internal lateinit var currentProfileId: ProfileId
+  internal lateinit var currentClassroomId: String
   internal lateinit var currentTopicId: String
   internal lateinit var currentStoryId: String
   internal lateinit var currentExplorationId: String
diff --git a/domain/src/main/java/org/oppia/android/domain/exploration/ExplorationProgressController.kt b/domain/src/main/java/org/oppia/android/domain/exploration/ExplorationProgressController.kt
index 22a64fdf412..de477ebfdda 100644
--- a/domain/src/main/java/org/oppia/android/domain/exploration/ExplorationProgressController.kt
+++ b/domain/src/main/java/org/oppia/android/domain/exploration/ExplorationProgressController.kt
@@ -148,6 +148,7 @@ class ExplorationProgressController @Inject constructor(
    */
   internal fun beginExplorationAsync(
     profileId: ProfileId,
+    classroomId: String,
     topicId: String,
     storyId: String,
     explorationId: String,
@@ -165,6 +166,7 @@ class ExplorationProgressController @Inject constructor(
     val message =
       ControllerMessage.InitializeController(
         profileId,
+        classroomId,
         topicId,
         storyId,
         explorationId,
@@ -468,6 +470,7 @@ class ExplorationProgressController @Inject constructor(
                   it.beginExplorationImpl(
                     message.callbackFlow,
                     message.profileId,
+                    message.classroomId,
                     message.topicId,
                     message.storyId,
                     message.explorationId,
@@ -549,6 +552,7 @@ class ExplorationProgressController @Inject constructor(
   private suspend fun ControllerState.beginExplorationImpl(
     beginExplorationResultFlow: MutableStateFlow<AsyncResult<Any?>>,
     profileId: ProfileId,
+    classroomId: String,
     topicId: String,
     storyId: String,
     explorationId: String,
@@ -562,6 +566,7 @@ class ExplorationProgressController @Inject constructor(
 
       explorationProgress.apply {
         currentProfileId = profileId
+        currentClassroomId = classroomId
         currentTopicId = topicId
         currentStoryId = storyId
         currentExplorationId = explorationId
@@ -1160,6 +1165,7 @@ class ExplorationProgressController @Inject constructor(
         profileId,
         learnerId,
         exploration,
+        explorationProgress.currentClassroomId,
         explorationProgress.currentTopicId,
         explorationProgress.currentStoryId
       )
@@ -1269,6 +1275,7 @@ class ExplorationProgressController @Inject constructor(
     /** [ControllerMessage] for initializing a new play session. */
     data class InitializeController(
       val profileId: ProfileId,
+      val classroomId: String,
       val topicId: String,
       val storyId: String,
       val explorationId: String,
diff --git a/domain/src/main/java/org/oppia/android/domain/oppialogger/OppiaLogger.kt b/domain/src/main/java/org/oppia/android/domain/oppialogger/OppiaLogger.kt
index 41cb11d6883..7a791ebc7cc 100644
--- a/domain/src/main/java/org/oppia/android/domain/oppialogger/OppiaLogger.kt
+++ b/domain/src/main/java/org/oppia/android/domain/oppialogger/OppiaLogger.kt
@@ -86,6 +86,7 @@ class OppiaLogger @Inject constructor(private val consoleLogger: ConsoleLogger)
 
   /** Returns the context of the event indicating that the user opened the exploration activity. */
   fun createOpenExplorationActivityContext(
+    classroomId: String,
     topicId: String,
     storyId: String,
     explorationId: String
@@ -93,6 +94,7 @@ class OppiaLogger @Inject constructor(private val consoleLogger: ConsoleLogger)
     return EventLog.Context.newBuilder()
       .setOpenExplorationActivity(
         EventLog.ExplorationContext.newBuilder()
+          .setClassroomId(classroomId)
           .setTopicId(topicId)
           .setStoryId(storyId)
           .setExplorationId(explorationId)
diff --git a/domain/src/main/java/org/oppia/android/domain/oppialogger/analytics/LearnerAnalyticsLogger.kt b/domain/src/main/java/org/oppia/android/domain/oppialogger/analytics/LearnerAnalyticsLogger.kt
index f0fce6b94b0..d701ba9d54d 100644
--- a/domain/src/main/java/org/oppia/android/domain/oppialogger/analytics/LearnerAnalyticsLogger.kt
+++ b/domain/src/main/java/org/oppia/android/domain/oppialogger/analytics/LearnerAnalyticsLogger.kt
@@ -75,6 +75,7 @@ class LearnerAnalyticsLogger @Inject constructor(
     profileId: ProfileId,
     learnerId: String?,
     exploration: Exploration,
+    classroomId: String,
     topicId: String,
     storyId: String
   ): ExplorationAnalyticsLogger {
@@ -82,6 +83,7 @@ class LearnerAnalyticsLogger @Inject constructor(
       installationId,
       profileId,
       learnerId,
+      classroomId,
       topicId,
       storyId,
       exploration.id,
@@ -185,6 +187,7 @@ class LearnerAnalyticsLogger @Inject constructor(
     installationId: String?,
     profileId: ProfileId,
     learnerId: String?,
+    classroomId: String,
     topicId: String,
     storyId: String,
     explorationId: String,
@@ -213,6 +216,7 @@ class LearnerAnalyticsLogger @Inject constructor(
         ExplorationContext.newBuilder().apply {
           sessionId = learnerSessionId
           this.explorationId = explorationId
+          this.classroomId = classroomId
           this.topicId = topicId
           this.storyId = storyId
           this.explorationVersion = explorationVersion
diff --git a/domain/src/main/java/org/oppia/android/domain/topic/TopicController.kt b/domain/src/main/java/org/oppia/android/domain/topic/TopicController.kt
index f893e87a4b2..f414b7ea636 100755
--- a/domain/src/main/java/org/oppia/android/domain/topic/TopicController.kt
+++ b/domain/src/main/java/org/oppia/android/domain/topic/TopicController.kt
@@ -6,6 +6,8 @@ import org.json.JSONObject
 import org.oppia.android.app.model.ChapterPlayState
 import org.oppia.android.app.model.ChapterRecord
 import org.oppia.android.app.model.ChapterSummary
+import org.oppia.android.app.model.ClassroomIdList
+import org.oppia.android.app.model.ClassroomRecord
 import org.oppia.android.app.model.CompletedStory
 import org.oppia.android.app.model.CompletedStoryList
 import org.oppia.android.app.model.EphemeralChapterSummary
@@ -30,6 +32,7 @@ import org.oppia.android.app.model.Topic
 import org.oppia.android.app.model.TopicPlayAvailability
 import org.oppia.android.app.model.TopicProgress
 import org.oppia.android.app.model.TopicRecord
+import org.oppia.android.domain.classroom.TEST_CLASSROOM_ID_0
 import org.oppia.android.domain.question.QuestionRetriever
 import org.oppia.android.domain.translation.TranslationController
 import org.oppia.android.domain.util.JsonAssetRetriever
@@ -392,6 +395,7 @@ class TopicController @Inject constructor(
           .setStoryWrittenTranslationContext(storyTranslationContext)
           .setTopicWrittenTranslationContext(topicTranslationContext)
           .setStoryTitle(storySummary.storyTitle)
+          .setClassroomId(topic.classroomId)
           .setTopicId(topic.topicId)
           .setTopicTitle(topic.title)
           .setLessonThumbnail(storySummary.storyThumbnail)
@@ -563,6 +567,7 @@ class TopicController @Inject constructor(
       .setTopicId(topicId)
       .setTitle(topicTitle)
       .setDescription(topicDescription)
+      .setClassroomId(getClassroomIdByTopicId(topicId))
       .addAllStory(storySummaryList)
       .setTopicThumbnail(createTopicThumbnailFromJson(topicData))
       .setDiskSizeBytes(computeTopicSizeBytes(getJsonAssetFileNameList(topicId)).toLong())
@@ -912,6 +917,105 @@ class TopicController @Inject constructor(
     }.build()
   }
 
+  private fun getClassroomIdByTopicId(topicId: String): String {
+    var classroomId = TEST_CLASSROOM_ID_0
+    loadClassrooms().forEach {
+      if (it.topicPrerequisitesMap.keys.contains(topicId)) {
+        classroomId = it.id
+      }
+    }
+    return classroomId
+  }
+
+  // TODO(#5344): Remove this in favor of per-classroom data handling.
+  private fun loadClassrooms(): List<ClassroomRecord> {
+    return if (loadLessonProtosFromAssets) {
+      assetRepository.loadProtoFromLocalAssets(
+        assetName = "classrooms",
+        baseMessage = ClassroomIdList.getDefaultInstance()
+      ).classroomIdsList.map { classroomId ->
+        loadClassroomById(classroomId)
+      }
+    } else loadClassroomsFromJson()
+  }
+
+  // TODO(#5344): Remove this in favor of per-classroom data handling.
+  private fun loadClassroomsFromJson(): List<ClassroomRecord> {
+    // Load the classrooms.json file.
+    val classroomIdsObj = jsonAssetRetriever.loadJsonFromAsset("classrooms.json")
+    checkNotNull(classroomIdsObj) { "Failed to load classrooms.json." }
+    val classroomIds = classroomIdsObj.optJSONArray("classroom_id_list")
+    checkNotNull(classroomIds) { "classrooms.json is missing classroom IDs." }
+
+    // Initialize a list to store the [ClassroomRecord]s.
+    val classroomRecords = mutableListOf<ClassroomRecord>()
+
+    // Iterate over all classroomIds and load each classroom's JSON.
+    for (i in 0 until classroomIds.length()) {
+      val classroomId = checkNotNull(classroomIds.optString(i)) {
+        "Expected non-null classroom ID at index $i."
+      }
+      val classroomRecord = loadClassroomById(classroomId)
+      classroomRecords.add(classroomRecord)
+    }
+
+    return classroomRecords
+  }
+
+  // TODO(#5344): Move this to classroom controller.
+  private fun loadClassroomById(classroomId: String): ClassroomRecord {
+    return if (loadLessonProtosFromAssets) {
+      assetRepository.tryLoadProtoFromLocalAssets(
+        assetName = classroomId,
+        defaultMessage = ClassroomRecord.getDefaultInstance()
+      ) ?: ClassroomRecord.getDefaultInstance()
+    } else loadClassroomByIdFromJson(classroomId)
+  }
+
+  // TODO(#5344): Remove this in favor of per-classroom data handling.
+  private fun loadClassroomByIdFromJson(classroomId: String): ClassroomRecord {
+    // Load the classroom obj.
+    val classroomObj = jsonAssetRetriever.loadJsonFromAsset("$classroomId.json")
+    checkNotNull(classroomObj) { "Failed to load $classroomId.json." }
+
+    val classroomTitle = classroomObj.getJSONObject("classroom_title")
+
+    // Load the topic prerequisite map.
+    val topicPrereqsObj = checkNotNull(classroomObj.optJSONObject("topic_prerequisites")) {
+      "Expected classroom to have non-null topic_prerequisites."
+    }
+    val topicPrereqs = topicPrereqsObj.keys().asSequence().associateWith { topicId ->
+      val topicIdArray = checkNotNull(topicPrereqsObj.optJSONArray(topicId)) {
+        "Expected topic $topicId to have a non-null string list."
+      }
+      return@associateWith List(topicIdArray.length()) { index ->
+        checkNotNull(topicIdArray.optString(index)) {
+          "Expected topic $topicId to have non-null string at index $index."
+        }
+      }
+    }
+    return ClassroomRecord.newBuilder().apply {
+      id = checkNotNull(classroomObj.optString("classroom_id")) {
+        "Expected classroom to have ID."
+      }
+      translatableTitle = SubtitledHtml.newBuilder().apply {
+        contentId = classroomTitle.getStringFromObject("content_id")
+        html = classroomTitle.getStringFromObject("html")
+      }.build()
+      putAllTopicPrerequisites(
+        topicPrereqs.mapValues { (_, topicIds) ->
+          ClassroomRecord.TopicIdList.newBuilder().apply {
+            addAllTopicIds(topicIds)
+          }.build()
+        }
+      )
+    }.build()
+  }
+
+  // TODO(#5344): Remove this in favor of per-classroom data handling.
+  private fun loadCombinedClassroomsTopicIdList(): List<String> =
+    loadClassrooms().flatMap { it.topicPrerequisitesMap.keys.toList() }
+
   private companion object {
     private fun JSONObject.getRemovableOptionalString(name: String) =
       optString(name).takeIf { it.isNotEmpty() && it != "<removed>" && it != "<unknown>" }
diff --git a/model/src/main/proto/arguments.proto b/model/src/main/proto/arguments.proto
index 2aca58d5e01..409327299ba 100644
--- a/model/src/main/proto/arguments.proto
+++ b/model/src/main/proto/arguments.proto
@@ -120,6 +120,9 @@ message ExplorationActivityParams {
   // The ID of the profile that wants to start an exploration play session.
   ProfileId profile_id = 1;
 
+  // The ID of the classroom to which the opening exploration belongs.
+  string classroom_id = 7;
+
   // The ID of the topic to which the opening exploration belongs.
   string topic_id = 2;
 
@@ -153,6 +156,9 @@ message ExplorationFragmentArguments {
   // The ID of the profile that wants to start an exploration play session.
   ProfileId profile_id = 1;
 
+  // The ID of the classroom to which the opening exploration belongs.
+  string classroom_id = 6;
+
   // The ID of the topic to which the opening exploration belongs.
   string topic_id = 2;
 
@@ -171,6 +177,9 @@ message ResumeLessonActivityParams {
   // The ID of the profile that wants to start an exploration play session.
   ProfileId profile_id = 1;
 
+  // The ID of the classroom to which the opening exploration belongs.
+  string classroom_id = 7;
+
   // The ID of the topic to which the opening exploration belongs.
   string topic_id = 2;
 
@@ -192,6 +201,9 @@ message ResumeLessonFragmentArguments {
   // The ID of the profile that wants to start an exploration play session.
   ProfileId profile_id = 1;
 
+  // The ID of the topic to which the opening exploration belongs.
+  string classroom_id = 7;
+
   // The ID of the topic to which the opening exploration belongs.
   string topic_id = 2;
 
@@ -330,6 +342,9 @@ message SurveyActivityParams {
 
 // Represents the parameters needed to create TopicActivity.
 message TopicActivityParams {
+  // The ID of the classroom to be loaded.
+  string classroom_id = 3;
+
   // The ID of the topic to be loaded.
   string topic_id = 1;
 
@@ -339,6 +354,9 @@ message TopicActivityParams {
 
 // Arguments required when creating a TopicFragment.
 message TopicFragmentArguments {
+  // The ID of the classroom to be loaded.
+  string classroom_id = 3;
+
   // The ID of the topic to be loaded.
   string topic_id = 1;
 
@@ -573,6 +591,9 @@ message StateFragmentTestActivityParams {
   // The ID of the current profile.
   int32 internal_profile_id = 1;
 
+  // The ID of the classroom to which the triggering exploration belongs.
+  string classroom_id = 6;
+
   // The ID of the topic to which the triggering exploration belongs.
   string topic_id = 2;
 
@@ -708,6 +729,9 @@ message ProfileResetPinFragmentArguments {
 
 // Represents the parameters needed to create StoryActivity.
 message StoryActivityParams {
+  // The ID of the classroom to which the opening exploration belongs.
+  string classroom_id = 3;
+
   // The ID of the topic to which the opening exploration belongs.
   string topic_id = 1;
 
@@ -717,6 +741,9 @@ message StoryActivityParams {
 
 // Arguments required when creating a StoryFragment.
 message StoryFragmentArguments {
+  // The ID of the classroom to which the opening exploration belongs.
+  string classroom_id = 3;
+
   // The ID of the topic to which the opening exploration belongs.
   string topic_id = 1;
 
@@ -738,6 +765,9 @@ message TopicInfoFragmentArguments {
 
 // Arguments required when creating a TopicLessonsFragment.
 message TopicLessonsFragmentArguments {
+  // The ID of the classroom to which the opening exploration belongs.
+  string classroom_id = 3;
+
   // The ID of the topic to which the opening exploration belongs.
   string topic_id = 1;
 
diff --git a/model/src/main/proto/oppia_logger.proto b/model/src/main/proto/oppia_logger.proto
index 07411ad365b..1d88d10ee72 100644
--- a/model/src/main/proto/oppia_logger.proto
+++ b/model/src/main/proto/oppia_logger.proto
@@ -316,6 +316,9 @@ message EventLog {
   // Represents the event context for all exploration related events containing learner-specific and
   // exploration-specific details.
   message ExplorationContext {
+    // The active classroom ID when the event is logged.
+    string classroom_id = 9;
+
     // The active topic ID when the event is logged.
     string topic_id = 1;
 
diff --git a/model/src/main/proto/topic.proto b/model/src/main/proto/topic.proto
index 6ec81bca22d..3587eb4e6ca 100755
--- a/model/src/main/proto/topic.proto
+++ b/model/src/main/proto/topic.proto
@@ -25,6 +25,9 @@ message Topic {
   // A brief description of the topic.
   SubtitledHtml description = 11;
 
+  // The ID of the classroom to which the topic belongs to.
+  string classroom_id = 12;
+
   // A list of summarized stories contained within this topic.
   repeated StorySummary story = 4;
 
@@ -236,6 +239,9 @@ message CompletedStory {
   // The title of the story being completed.
   SubtitledHtml story_title = 8;
 
+  // The ID of the classroom which contains this story.
+  string classroom_id = 10;
+
   // The ID of the topic which contains this story.
   string topic_id = 3;
 
diff --git a/utility/src/test/java/org/oppia/android/util/logging/EventBundleCreatorTest.kt b/utility/src/test/java/org/oppia/android/util/logging/EventBundleCreatorTest.kt
index 8cab8e1778d..d2d787e728b 100644
--- a/utility/src/test/java/org/oppia/android/util/logging/EventBundleCreatorTest.kt
+++ b/utility/src/test/java/org/oppia/android/util/logging/EventBundleCreatorTest.kt
@@ -121,6 +121,7 @@ class EventBundleCreatorTest {
   private companion object {
     private const val TEST_TIMESTAMP_1 = 1556094120000
     private const val TEST_TIMESTAMP_2 = 1234567898765
+    private const val TEST_CLASSROOM_ID = "test_classroom_id"
     private const val TEST_TOPIC_ID = "test_topic_id"
     private const val TEST_STORY_ID = "test_story_id"
     private const val TEST_EXPLORATION_ID = "test_exploration_id"
@@ -2185,6 +2186,7 @@ class EventBundleCreatorTest {
   ) = EventLog.Context.newBuilder().setter(value).build()
 
   private fun createExplorationContext(
+    classroomId: String = TEST_CLASSROOM_ID,
     topicId: String = TEST_TOPIC_ID,
     storyId: String = TEST_STORY_ID,
     explorationId: String = TEST_EXPLORATION_ID,
@@ -2193,6 +2195,7 @@ class EventBundleCreatorTest {
     stateName: String = TEST_STATE_NAME,
     learnerDetails: LearnerDetailsContext = createLearnerDetailsContext()
   ) = ExplorationContext.newBuilder().apply {
+    this.classroomId = classroomId
     this.topicId = topicId
     this.storyId = storyId
     this.explorationId = explorationId
diff --git a/utility/src/test/java/org/oppia/android/util/logging/KenyaAlphaEventBundleCreatorTest.kt b/utility/src/test/java/org/oppia/android/util/logging/KenyaAlphaEventBundleCreatorTest.kt
index ccc9f65bf3f..03f5ce11d3a 100644
--- a/utility/src/test/java/org/oppia/android/util/logging/KenyaAlphaEventBundleCreatorTest.kt
+++ b/utility/src/test/java/org/oppia/android/util/logging/KenyaAlphaEventBundleCreatorTest.kt
@@ -92,6 +92,7 @@ class KenyaAlphaEventBundleCreatorTest {
   private companion object {
     private const val TEST_TIMESTAMP_1 = 1556094120000
     private const val TEST_TIMESTAMP_2 = 1234567898765
+    private const val TEST_CLASSROOM_ID = "test_classroom_id"
     private const val TEST_TOPIC_ID = "test_topic_id"
     private const val TEST_STORY_ID = "test_story_id"
     private const val TEST_EXPLORATION_ID = "test_exploration_id"
@@ -1418,6 +1419,7 @@ class KenyaAlphaEventBundleCreatorTest {
   ) = EventLog.Context.newBuilder().setter(value).build()
 
   private fun createExplorationContext(
+    classroomId: String = TEST_CLASSROOM_ID,
     topicId: String = TEST_TOPIC_ID,
     storyId: String = TEST_STORY_ID,
     explorationId: String = TEST_EXPLORATION_ID,
@@ -1426,6 +1428,7 @@ class KenyaAlphaEventBundleCreatorTest {
     stateName: String = TEST_STATE_NAME,
     learnerDetails: LearnerDetailsContext = createLearnerDetailsContext()
   ) = ExplorationContext.newBuilder().apply {
+    this.classroomId = classroomId
     this.topicId = topicId
     this.storyId = storyId
     this.explorationId = explorationId

From 96e65df4e36761dee679bb682c44693903203de0 Mon Sep 17 00:00:00 2001
From: Saptak Manna <saptakmanna100@gmail.com>
Date: Mon, 1 Jul 2024 21:09:53 +0530
Subject: [PATCH 03/21] Update EventBundleCreator and its tests

---
 .../util/logging/EventBundleCreator.kt        |  1 +
 .../util/logging/EventBundleCreatorTest.kt    | 84 ++++++++++++-------
 2 files changed, 57 insertions(+), 28 deletions(-)

diff --git a/utility/src/main/java/org/oppia/android/util/logging/EventBundleCreator.kt b/utility/src/main/java/org/oppia/android/util/logging/EventBundleCreator.kt
index ab091a7bba7..fddf84da279 100644
--- a/utility/src/main/java/org/oppia/android/util/logging/EventBundleCreator.kt
+++ b/utility/src/main/java/org/oppia/android/util/logging/EventBundleCreator.kt
@@ -425,6 +425,7 @@ class EventBundleCreator @Inject constructor(
       value: ExplorationEventContext
     ) : EventActivityContext<ExplorationEventContext>(activityName, value) {
       override fun ExplorationEventContext.storeValue(store: PropertyStore) {
+        store.putNonSensitiveValue("classroom_id", classroomId)
         store.putNonSensitiveValue("topic_id", topicId)
         store.putNonSensitiveValue("story_id", storyId)
         store.putNonSensitiveValue("exploration_id", explorationId)
diff --git a/utility/src/test/java/org/oppia/android/util/logging/EventBundleCreatorTest.kt b/utility/src/test/java/org/oppia/android/util/logging/EventBundleCreatorTest.kt
index d2d787e728b..9f432ea852e 100644
--- a/utility/src/test/java/org/oppia/android/util/logging/EventBundleCreatorTest.kt
+++ b/utility/src/test/java/org/oppia/android/util/logging/EventBundleCreatorTest.kt
@@ -564,13 +564,14 @@ class EventBundleCreatorTest {
 
     val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle)
     assertThat(typeName).isEqualTo("open_exploration_player_screen")
-    assertThat(bundle).hasSize(17)
+    assertThat(bundle).hasSize(18)
     assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1)
     assertThat(bundle).string("priority").isEqualTo("essential")
     assertThat(bundle).integer("event_type").isEqualTo(OPEN_EXPLORATION_ACTIVITY.number)
     assertThat(bundle).integer("android_sdk").isEqualTo(TEST_ANDROID_SDK_VERSION)
     assertThat(bundle).string("app_version_name").isEqualTo(TEST_APP_VERSION_NAME)
     assertThat(bundle).integer("app_version_code").isEqualTo(TEST_APP_VERSION_CODE)
+    assertThat(bundle).string("classroom_id").isEqualTo(TEST_CLASSROOM_ID)
     assertThat(bundle).string("topic_id").isEqualTo(TEST_TOPIC_ID)
     assertThat(bundle).string("story_id").isEqualTo(TEST_STORY_ID)
     assertThat(bundle).string("exploration_id").isEqualTo(TEST_EXPLORATION_ID)
@@ -588,13 +589,14 @@ class EventBundleCreatorTest {
 
     val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle)
     assertThat(typeName).isEqualTo("open_exploration_player_screen")
-    assertThat(bundle).hasSize(19)
+    assertThat(bundle).hasSize(20)
     assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1)
     assertThat(bundle).string("priority").isEqualTo("essential")
     assertThat(bundle).integer("event_type").isEqualTo(OPEN_EXPLORATION_ACTIVITY.number)
     assertThat(bundle).integer("android_sdk").isEqualTo(TEST_ANDROID_SDK_VERSION)
     assertThat(bundle).string("app_version_name").isEqualTo(TEST_APP_VERSION_NAME)
     assertThat(bundle).integer("app_version_code").isEqualTo(TEST_APP_VERSION_CODE)
+    assertThat(bundle).string("classroom_id").isEqualTo(TEST_CLASSROOM_ID)
     assertThat(bundle).string("topic_id").isEqualTo(TEST_TOPIC_ID)
     assertThat(bundle).string("story_id").isEqualTo(TEST_STORY_ID)
     assertThat(bundle).string("exploration_id").isEqualTo(TEST_EXPLORATION_ID)
@@ -952,13 +954,14 @@ class EventBundleCreatorTest {
 
     val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle)
     assertThat(typeName).isEqualTo("start_exploration_card")
-    assertThat(bundle).hasSize(18)
+    assertThat(bundle).hasSize(19)
     assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1)
     assertThat(bundle).string("priority").isEqualTo("essential")
     assertThat(bundle).integer("event_type").isEqualTo(START_CARD_CONTEXT.number)
     assertThat(bundle).integer("android_sdk").isEqualTo(TEST_ANDROID_SDK_VERSION)
     assertThat(bundle).string("app_version_name").isEqualTo(TEST_APP_VERSION_NAME)
     assertThat(bundle).integer("app_version_code").isEqualTo(TEST_APP_VERSION_CODE)
+    assertThat(bundle).string("ed_classroom_id").isEqualTo(TEST_CLASSROOM_ID)
     assertThat(bundle).string("ed_topic_id").isEqualTo(TEST_TOPIC_ID)
     assertThat(bundle).string("ed_story_id").isEqualTo(TEST_STORY_ID)
     assertThat(bundle).string("ed_exploration_id").isEqualTo(TEST_EXPLORATION_ID)
@@ -977,13 +980,14 @@ class EventBundleCreatorTest {
 
     val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle)
     assertThat(typeName).isEqualTo("start_exploration_card")
-    assertThat(bundle).hasSize(20)
+    assertThat(bundle).hasSize(21)
     assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1)
     assertThat(bundle).string("priority").isEqualTo("essential")
     assertThat(bundle).integer("event_type").isEqualTo(START_CARD_CONTEXT.number)
     assertThat(bundle).integer("android_sdk").isEqualTo(TEST_ANDROID_SDK_VERSION)
     assertThat(bundle).string("app_version_name").isEqualTo(TEST_APP_VERSION_NAME)
     assertThat(bundle).integer("app_version_code").isEqualTo(TEST_APP_VERSION_CODE)
+    assertThat(bundle).string("ed_classroom_id").isEqualTo(TEST_CLASSROOM_ID)
     assertThat(bundle).string("ed_topic_id").isEqualTo(TEST_TOPIC_ID)
     assertThat(bundle).string("ed_story_id").isEqualTo(TEST_STORY_ID)
     assertThat(bundle).string("ed_exploration_id").isEqualTo(TEST_EXPLORATION_ID)
@@ -1004,13 +1008,14 @@ class EventBundleCreatorTest {
 
     val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle)
     assertThat(typeName).isEqualTo("end_exploration_card")
-    assertThat(bundle).hasSize(18)
+    assertThat(bundle).hasSize(19)
     assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1)
     assertThat(bundle).string("priority").isEqualTo("essential")
     assertThat(bundle).integer("event_type").isEqualTo(END_CARD_CONTEXT.number)
     assertThat(bundle).integer("android_sdk").isEqualTo(TEST_ANDROID_SDK_VERSION)
     assertThat(bundle).string("app_version_name").isEqualTo(TEST_APP_VERSION_NAME)
     assertThat(bundle).integer("app_version_code").isEqualTo(TEST_APP_VERSION_CODE)
+    assertThat(bundle).string("ed_classroom_id").isEqualTo(TEST_CLASSROOM_ID)
     assertThat(bundle).string("ed_topic_id").isEqualTo(TEST_TOPIC_ID)
     assertThat(bundle).string("ed_story_id").isEqualTo(TEST_STORY_ID)
     assertThat(bundle).string("ed_exploration_id").isEqualTo(TEST_EXPLORATION_ID)
@@ -1029,13 +1034,14 @@ class EventBundleCreatorTest {
 
     val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle)
     assertThat(typeName).isEqualTo("end_exploration_card")
-    assertThat(bundle).hasSize(20)
+    assertThat(bundle).hasSize(21)
     assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1)
     assertThat(bundle).string("priority").isEqualTo("essential")
     assertThat(bundle).integer("event_type").isEqualTo(END_CARD_CONTEXT.number)
     assertThat(bundle).integer("android_sdk").isEqualTo(TEST_ANDROID_SDK_VERSION)
     assertThat(bundle).string("app_version_name").isEqualTo(TEST_APP_VERSION_NAME)
     assertThat(bundle).integer("app_version_code").isEqualTo(TEST_APP_VERSION_CODE)
+    assertThat(bundle).string("ed_classroom_id").isEqualTo(TEST_CLASSROOM_ID)
     assertThat(bundle).string("ed_topic_id").isEqualTo(TEST_TOPIC_ID)
     assertThat(bundle).string("ed_story_id").isEqualTo(TEST_STORY_ID)
     assertThat(bundle).string("ed_exploration_id").isEqualTo(TEST_EXPLORATION_ID)
@@ -1056,13 +1062,14 @@ class EventBundleCreatorTest {
 
     val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle)
     assertThat(typeName).isEqualTo("unlock_hint")
-    assertThat(bundle).hasSize(18)
+    assertThat(bundle).hasSize(19)
     assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1)
     assertThat(bundle).string("priority").isEqualTo("essential")
     assertThat(bundle).integer("event_type").isEqualTo(HINT_UNLOCKED_CONTEXT.number)
     assertThat(bundle).integer("android_sdk").isEqualTo(TEST_ANDROID_SDK_VERSION)
     assertThat(bundle).string("app_version_name").isEqualTo(TEST_APP_VERSION_NAME)
     assertThat(bundle).integer("app_version_code").isEqualTo(TEST_APP_VERSION_CODE)
+    assertThat(bundle).string("ed_classroom_id").isEqualTo(TEST_CLASSROOM_ID)
     assertThat(bundle).string("ed_topic_id").isEqualTo(TEST_TOPIC_ID)
     assertThat(bundle).string("ed_story_id").isEqualTo(TEST_STORY_ID)
     assertThat(bundle).string("ed_exploration_id").isEqualTo(TEST_EXPLORATION_ID)
@@ -1081,13 +1088,14 @@ class EventBundleCreatorTest {
 
     val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle)
     assertThat(typeName).isEqualTo("unlock_hint")
-    assertThat(bundle).hasSize(20)
+    assertThat(bundle).hasSize(21)
     assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1)
     assertThat(bundle).string("priority").isEqualTo("essential")
     assertThat(bundle).integer("event_type").isEqualTo(HINT_UNLOCKED_CONTEXT.number)
     assertThat(bundle).integer("android_sdk").isEqualTo(TEST_ANDROID_SDK_VERSION)
     assertThat(bundle).string("app_version_name").isEqualTo(TEST_APP_VERSION_NAME)
     assertThat(bundle).integer("app_version_code").isEqualTo(TEST_APP_VERSION_CODE)
+    assertThat(bundle).string("ed_classroom_id").isEqualTo(TEST_CLASSROOM_ID)
     assertThat(bundle).string("ed_topic_id").isEqualTo(TEST_TOPIC_ID)
     assertThat(bundle).string("ed_story_id").isEqualTo(TEST_STORY_ID)
     assertThat(bundle).string("ed_exploration_id").isEqualTo(TEST_EXPLORATION_ID)
@@ -1108,13 +1116,14 @@ class EventBundleCreatorTest {
 
     val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle)
     assertThat(typeName).isEqualTo("reveal_hint")
-    assertThat(bundle).hasSize(18)
+    assertThat(bundle).hasSize(19)
     assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1)
     assertThat(bundle).string("priority").isEqualTo("essential")
     assertThat(bundle).integer("event_type").isEqualTo(ACCESS_HINT_CONTEXT.number)
     assertThat(bundle).integer("android_sdk").isEqualTo(TEST_ANDROID_SDK_VERSION)
     assertThat(bundle).string("app_version_name").isEqualTo(TEST_APP_VERSION_NAME)
     assertThat(bundle).integer("app_version_code").isEqualTo(TEST_APP_VERSION_CODE)
+    assertThat(bundle).string("ed_classroom_id").isEqualTo(TEST_CLASSROOM_ID)
     assertThat(bundle).string("ed_topic_id").isEqualTo(TEST_TOPIC_ID)
     assertThat(bundle).string("ed_story_id").isEqualTo(TEST_STORY_ID)
     assertThat(bundle).string("ed_exploration_id").isEqualTo(TEST_EXPLORATION_ID)
@@ -1133,13 +1142,14 @@ class EventBundleCreatorTest {
 
     val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle)
     assertThat(typeName).isEqualTo("reveal_hint")
-    assertThat(bundle).hasSize(20)
+    assertThat(bundle).hasSize(21)
     assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1)
     assertThat(bundle).string("priority").isEqualTo("essential")
     assertThat(bundle).integer("event_type").isEqualTo(ACCESS_HINT_CONTEXT.number)
     assertThat(bundle).integer("android_sdk").isEqualTo(TEST_ANDROID_SDK_VERSION)
     assertThat(bundle).string("app_version_name").isEqualTo(TEST_APP_VERSION_NAME)
     assertThat(bundle).integer("app_version_code").isEqualTo(TEST_APP_VERSION_CODE)
+    assertThat(bundle).string("ed_classroom_id").isEqualTo(TEST_CLASSROOM_ID)
     assertThat(bundle).string("ed_topic_id").isEqualTo(TEST_TOPIC_ID)
     assertThat(bundle).string("ed_story_id").isEqualTo(TEST_STORY_ID)
     assertThat(bundle).string("ed_exploration_id").isEqualTo(TEST_EXPLORATION_ID)
@@ -1160,13 +1170,14 @@ class EventBundleCreatorTest {
 
     val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle)
     assertThat(typeName).isEqualTo("unlock_solution")
-    assertThat(bundle).hasSize(17)
+    assertThat(bundle).hasSize(18)
     assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1)
     assertThat(bundle).string("priority").isEqualTo("essential")
     assertThat(bundle).integer("event_type").isEqualTo(SOLUTION_UNLOCKED_CONTEXT.number)
     assertThat(bundle).integer("android_sdk").isEqualTo(TEST_ANDROID_SDK_VERSION)
     assertThat(bundle).string("app_version_name").isEqualTo(TEST_APP_VERSION_NAME)
     assertThat(bundle).integer("app_version_code").isEqualTo(TEST_APP_VERSION_CODE)
+    assertThat(bundle).string("classroom_id").isEqualTo(TEST_CLASSROOM_ID)
     assertThat(bundle).string("topic_id").isEqualTo(TEST_TOPIC_ID)
     assertThat(bundle).string("story_id").isEqualTo(TEST_STORY_ID)
     assertThat(bundle).string("exploration_id").isEqualTo(TEST_EXPLORATION_ID)
@@ -1184,13 +1195,14 @@ class EventBundleCreatorTest {
 
     val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle)
     assertThat(typeName).isEqualTo("unlock_solution")
-    assertThat(bundle).hasSize(19)
+    assertThat(bundle).hasSize(20)
     assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1)
     assertThat(bundle).string("priority").isEqualTo("essential")
     assertThat(bundle).integer("event_type").isEqualTo(SOLUTION_UNLOCKED_CONTEXT.number)
     assertThat(bundle).integer("android_sdk").isEqualTo(TEST_ANDROID_SDK_VERSION)
     assertThat(bundle).string("app_version_name").isEqualTo(TEST_APP_VERSION_NAME)
     assertThat(bundle).integer("app_version_code").isEqualTo(TEST_APP_VERSION_CODE)
+    assertThat(bundle).string("classroom_id").isEqualTo(TEST_CLASSROOM_ID)
     assertThat(bundle).string("topic_id").isEqualTo(TEST_TOPIC_ID)
     assertThat(bundle).string("story_id").isEqualTo(TEST_STORY_ID)
     assertThat(bundle).string("exploration_id").isEqualTo(TEST_EXPLORATION_ID)
@@ -1210,13 +1222,14 @@ class EventBundleCreatorTest {
 
     val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle)
     assertThat(typeName).isEqualTo("reveal_solution")
-    assertThat(bundle).hasSize(17)
+    assertThat(bundle).hasSize(18)
     assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1)
     assertThat(bundle).string("priority").isEqualTo("essential")
     assertThat(bundle).integer("event_type").isEqualTo(ACCESS_SOLUTION_CONTEXT.number)
     assertThat(bundle).integer("android_sdk").isEqualTo(TEST_ANDROID_SDK_VERSION)
     assertThat(bundle).string("app_version_name").isEqualTo(TEST_APP_VERSION_NAME)
     assertThat(bundle).integer("app_version_code").isEqualTo(TEST_APP_VERSION_CODE)
+    assertThat(bundle).string("classroom_id").isEqualTo(TEST_CLASSROOM_ID)
     assertThat(bundle).string("topic_id").isEqualTo(TEST_TOPIC_ID)
     assertThat(bundle).string("story_id").isEqualTo(TEST_STORY_ID)
     assertThat(bundle).string("exploration_id").isEqualTo(TEST_EXPLORATION_ID)
@@ -1234,13 +1247,14 @@ class EventBundleCreatorTest {
 
     val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle)
     assertThat(typeName).isEqualTo("reveal_solution")
-    assertThat(bundle).hasSize(19)
+    assertThat(bundle).hasSize(20)
     assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1)
     assertThat(bundle).string("priority").isEqualTo("essential")
     assertThat(bundle).integer("event_type").isEqualTo(ACCESS_SOLUTION_CONTEXT.number)
     assertThat(bundle).integer("android_sdk").isEqualTo(TEST_ANDROID_SDK_VERSION)
     assertThat(bundle).string("app_version_name").isEqualTo(TEST_APP_VERSION_NAME)
     assertThat(bundle).integer("app_version_code").isEqualTo(TEST_APP_VERSION_CODE)
+    assertThat(bundle).string("classroom_id").isEqualTo(TEST_CLASSROOM_ID)
     assertThat(bundle).string("topic_id").isEqualTo(TEST_TOPIC_ID)
     assertThat(bundle).string("story_id").isEqualTo(TEST_STORY_ID)
     assertThat(bundle).string("exploration_id").isEqualTo(TEST_EXPLORATION_ID)
@@ -1260,13 +1274,14 @@ class EventBundleCreatorTest {
 
     val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle)
     assertThat(typeName).isEqualTo("submit_answer")
-    assertThat(bundle).hasSize(19)
+    assertThat(bundle).hasSize(20)
     assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1)
     assertThat(bundle).string("priority").isEqualTo("essential")
     assertThat(bundle).integer("event_type").isEqualTo(SUBMIT_ANSWER_CONTEXT.number)
     assertThat(bundle).integer("android_sdk").isEqualTo(TEST_ANDROID_SDK_VERSION)
     assertThat(bundle).string("app_version_name").isEqualTo(TEST_APP_VERSION_NAME)
     assertThat(bundle).integer("app_version_code").isEqualTo(TEST_APP_VERSION_CODE)
+    assertThat(bundle).string("ed_classroom_id").isEqualTo(TEST_CLASSROOM_ID)
     assertThat(bundle).string("ed_topic_id").isEqualTo(TEST_TOPIC_ID)
     assertThat(bundle).string("ed_story_id").isEqualTo(TEST_STORY_ID)
     assertThat(bundle).string("ed_exploration_id").isEqualTo(TEST_EXPLORATION_ID)
@@ -1286,13 +1301,14 @@ class EventBundleCreatorTest {
 
     val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle)
     assertThat(typeName).isEqualTo("submit_answer")
-    assertThat(bundle).hasSize(21)
+    assertThat(bundle).hasSize(22)
     assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1)
     assertThat(bundle).string("priority").isEqualTo("essential")
     assertThat(bundle).integer("event_type").isEqualTo(SUBMIT_ANSWER_CONTEXT.number)
     assertThat(bundle).integer("android_sdk").isEqualTo(TEST_ANDROID_SDK_VERSION)
     assertThat(bundle).string("app_version_name").isEqualTo(TEST_APP_VERSION_NAME)
     assertThat(bundle).integer("app_version_code").isEqualTo(TEST_APP_VERSION_CODE)
+    assertThat(bundle).string("ed_classroom_id").isEqualTo(TEST_CLASSROOM_ID)
     assertThat(bundle).string("ed_topic_id").isEqualTo(TEST_TOPIC_ID)
     assertThat(bundle).string("ed_story_id").isEqualTo(TEST_STORY_ID)
     assertThat(bundle).string("ed_exploration_id").isEqualTo(TEST_EXPLORATION_ID)
@@ -1314,13 +1330,14 @@ class EventBundleCreatorTest {
 
     val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle)
     assertThat(typeName).isEqualTo("click_play_voiceover_button")
-    assertThat(bundle).hasSize(19)
+    assertThat(bundle).hasSize(20)
     assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1)
     assertThat(bundle).string("priority").isEqualTo("essential")
     assertThat(bundle).integer("event_type").isEqualTo(PLAY_VOICE_OVER_CONTEXT.number)
     assertThat(bundle).integer("android_sdk").isEqualTo(TEST_ANDROID_SDK_VERSION)
     assertThat(bundle).string("app_version_name").isEqualTo(TEST_APP_VERSION_NAME)
     assertThat(bundle).integer("app_version_code").isEqualTo(TEST_APP_VERSION_CODE)
+    assertThat(bundle).string("ed_classroom_id").isEqualTo(TEST_CLASSROOM_ID)
     assertThat(bundle).string("ed_topic_id").isEqualTo(TEST_TOPIC_ID)
     assertThat(bundle).string("ed_story_id").isEqualTo(TEST_STORY_ID)
     assertThat(bundle).string("ed_exploration_id").isEqualTo(TEST_EXPLORATION_ID)
@@ -1340,13 +1357,14 @@ class EventBundleCreatorTest {
 
     val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle)
     assertThat(typeName).isEqualTo("click_play_voiceover_button")
-    assertThat(bundle).hasSize(21)
+    assertThat(bundle).hasSize(22)
     assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1)
     assertThat(bundle).string("priority").isEqualTo("essential")
     assertThat(bundle).integer("event_type").isEqualTo(PLAY_VOICE_OVER_CONTEXT.number)
     assertThat(bundle).integer("android_sdk").isEqualTo(TEST_ANDROID_SDK_VERSION)
     assertThat(bundle).string("app_version_name").isEqualTo(TEST_APP_VERSION_NAME)
     assertThat(bundle).integer("app_version_code").isEqualTo(TEST_APP_VERSION_CODE)
+    assertThat(bundle).string("ed_classroom_id").isEqualTo(TEST_CLASSROOM_ID)
     assertThat(bundle).string("ed_topic_id").isEqualTo(TEST_TOPIC_ID)
     assertThat(bundle).string("ed_story_id").isEqualTo(TEST_STORY_ID)
     assertThat(bundle).string("ed_exploration_id").isEqualTo(TEST_EXPLORATION_ID)
@@ -1368,13 +1386,14 @@ class EventBundleCreatorTest {
 
     val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle)
     assertThat(typeName).isEqualTo("click_pause_voiceover_button")
-    assertThat(bundle).hasSize(19)
+    assertThat(bundle).hasSize(20)
     assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1)
     assertThat(bundle).string("priority").isEqualTo("essential")
     assertThat(bundle).integer("event_type").isEqualTo(PAUSE_VOICE_OVER_CONTEXT.number)
     assertThat(bundle).integer("android_sdk").isEqualTo(TEST_ANDROID_SDK_VERSION)
     assertThat(bundle).string("app_version_name").isEqualTo(TEST_APP_VERSION_NAME)
     assertThat(bundle).integer("app_version_code").isEqualTo(TEST_APP_VERSION_CODE)
+    assertThat(bundle).string("ed_classroom_id").isEqualTo(TEST_CLASSROOM_ID)
     assertThat(bundle).string("ed_topic_id").isEqualTo(TEST_TOPIC_ID)
     assertThat(bundle).string("ed_story_id").isEqualTo(TEST_STORY_ID)
     assertThat(bundle).string("ed_exploration_id").isEqualTo(TEST_EXPLORATION_ID)
@@ -1394,13 +1413,14 @@ class EventBundleCreatorTest {
 
     val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle)
     assertThat(typeName).isEqualTo("click_pause_voiceover_button")
-    assertThat(bundle).hasSize(21)
+    assertThat(bundle).hasSize(22)
     assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1)
     assertThat(bundle).string("priority").isEqualTo("essential")
     assertThat(bundle).integer("event_type").isEqualTo(PAUSE_VOICE_OVER_CONTEXT.number)
     assertThat(bundle).integer("android_sdk").isEqualTo(TEST_ANDROID_SDK_VERSION)
     assertThat(bundle).string("app_version_name").isEqualTo(TEST_APP_VERSION_NAME)
     assertThat(bundle).integer("app_version_code").isEqualTo(TEST_APP_VERSION_CODE)
+    assertThat(bundle).string("ed_classroom_id").isEqualTo(TEST_CLASSROOM_ID)
     assertThat(bundle).string("ed_topic_id").isEqualTo(TEST_TOPIC_ID)
     assertThat(bundle).string("ed_story_id").isEqualTo(TEST_STORY_ID)
     assertThat(bundle).string("ed_exploration_id").isEqualTo(TEST_EXPLORATION_ID)
@@ -1498,13 +1518,14 @@ class EventBundleCreatorTest {
 
     val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle)
     assertThat(typeName).isEqualTo("leave_exploration")
-    assertThat(bundle).hasSize(17)
+    assertThat(bundle).hasSize(18)
     assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1)
     assertThat(bundle).string("priority").isEqualTo("essential")
     assertThat(bundle).integer("event_type").isEqualTo(EXIT_EXPLORATION_CONTEXT.number)
     assertThat(bundle).integer("android_sdk").isEqualTo(TEST_ANDROID_SDK_VERSION)
     assertThat(bundle).string("app_version_name").isEqualTo(TEST_APP_VERSION_NAME)
     assertThat(bundle).integer("app_version_code").isEqualTo(TEST_APP_VERSION_CODE)
+    assertThat(bundle).string("classroom_id").isEqualTo(TEST_CLASSROOM_ID)
     assertThat(bundle).string("topic_id").isEqualTo(TEST_TOPIC_ID)
     assertThat(bundle).string("story_id").isEqualTo(TEST_STORY_ID)
     assertThat(bundle).string("exploration_id").isEqualTo(TEST_EXPLORATION_ID)
@@ -1522,13 +1543,14 @@ class EventBundleCreatorTest {
 
     val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle)
     assertThat(typeName).isEqualTo("leave_exploration")
-    assertThat(bundle).hasSize(19)
+    assertThat(bundle).hasSize(20)
     assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1)
     assertThat(bundle).string("priority").isEqualTo("essential")
     assertThat(bundle).integer("event_type").isEqualTo(EXIT_EXPLORATION_CONTEXT.number)
     assertThat(bundle).integer("android_sdk").isEqualTo(TEST_ANDROID_SDK_VERSION)
     assertThat(bundle).string("app_version_name").isEqualTo(TEST_APP_VERSION_NAME)
     assertThat(bundle).integer("app_version_code").isEqualTo(TEST_APP_VERSION_CODE)
+    assertThat(bundle).string("classroom_id").isEqualTo(TEST_CLASSROOM_ID)
     assertThat(bundle).string("topic_id").isEqualTo(TEST_TOPIC_ID)
     assertThat(bundle).string("story_id").isEqualTo(TEST_STORY_ID)
     assertThat(bundle).string("exploration_id").isEqualTo(TEST_EXPLORATION_ID)
@@ -1548,13 +1570,14 @@ class EventBundleCreatorTest {
 
     val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle)
     assertThat(typeName).isEqualTo("complete_exploration")
-    assertThat(bundle).hasSize(17)
+    assertThat(bundle).hasSize(18)
     assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1)
     assertThat(bundle).string("priority").isEqualTo("essential")
     assertThat(bundle).integer("event_type").isEqualTo(FINISH_EXPLORATION_CONTEXT.number)
     assertThat(bundle).integer("android_sdk").isEqualTo(TEST_ANDROID_SDK_VERSION)
     assertThat(bundle).string("app_version_name").isEqualTo(TEST_APP_VERSION_NAME)
     assertThat(bundle).integer("app_version_code").isEqualTo(TEST_APP_VERSION_CODE)
+    assertThat(bundle).string("classroom_id").isEqualTo(TEST_CLASSROOM_ID)
     assertThat(bundle).string("topic_id").isEqualTo(TEST_TOPIC_ID)
     assertThat(bundle).string("story_id").isEqualTo(TEST_STORY_ID)
     assertThat(bundle).string("exploration_id").isEqualTo(TEST_EXPLORATION_ID)
@@ -1572,13 +1595,14 @@ class EventBundleCreatorTest {
 
     val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle)
     assertThat(typeName).isEqualTo("complete_exploration")
-    assertThat(bundle).hasSize(19)
+    assertThat(bundle).hasSize(20)
     assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1)
     assertThat(bundle).string("priority").isEqualTo("essential")
     assertThat(bundle).integer("event_type").isEqualTo(FINISH_EXPLORATION_CONTEXT.number)
     assertThat(bundle).integer("android_sdk").isEqualTo(TEST_ANDROID_SDK_VERSION)
     assertThat(bundle).string("app_version_name").isEqualTo(TEST_APP_VERSION_NAME)
     assertThat(bundle).integer("app_version_code").isEqualTo(TEST_APP_VERSION_CODE)
+    assertThat(bundle).string("classroom_id").isEqualTo(TEST_CLASSROOM_ID)
     assertThat(bundle).string("topic_id").isEqualTo(TEST_TOPIC_ID)
     assertThat(bundle).string("story_id").isEqualTo(TEST_STORY_ID)
     assertThat(bundle).string("exploration_id").isEqualTo(TEST_EXPLORATION_ID)
@@ -1748,13 +1772,14 @@ class EventBundleCreatorTest {
 
     val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle)
     assertThat(typeName).isEqualTo("reach_invested_engagement")
-    assertThat(bundle).hasSize(17)
+    assertThat(bundle).hasSize(18)
     assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1)
     assertThat(bundle).string("priority").isEqualTo("essential")
     assertThat(bundle).integer("event_type").isEqualTo(REACH_INVESTED_ENGAGEMENT.number)
     assertThat(bundle).integer("android_sdk").isEqualTo(TEST_ANDROID_SDK_VERSION)
     assertThat(bundle).string("app_version_name").isEqualTo(TEST_APP_VERSION_NAME)
     assertThat(bundle).integer("app_version_code").isEqualTo(TEST_APP_VERSION_CODE)
+    assertThat(bundle).string("classroom_id").isEqualTo(TEST_CLASSROOM_ID)
     assertThat(bundle).string("topic_id").isEqualTo(TEST_TOPIC_ID)
     assertThat(bundle).string("story_id").isEqualTo(TEST_STORY_ID)
     assertThat(bundle).string("exploration_id").isEqualTo(TEST_EXPLORATION_ID)
@@ -1772,13 +1797,14 @@ class EventBundleCreatorTest {
 
     val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle)
     assertThat(typeName).isEqualTo("reach_invested_engagement")
-    assertThat(bundle).hasSize(19)
+    assertThat(bundle).hasSize(20)
     assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1)
     assertThat(bundle).string("priority").isEqualTo("essential")
     assertThat(bundle).integer("event_type").isEqualTo(REACH_INVESTED_ENGAGEMENT.number)
     assertThat(bundle).integer("android_sdk").isEqualTo(TEST_ANDROID_SDK_VERSION)
     assertThat(bundle).string("app_version_name").isEqualTo(TEST_APP_VERSION_NAME)
     assertThat(bundle).integer("app_version_code").isEqualTo(TEST_APP_VERSION_CODE)
+    assertThat(bundle).string("classroom_id").isEqualTo(TEST_CLASSROOM_ID)
     assertThat(bundle).string("topic_id").isEqualTo(TEST_TOPIC_ID)
     assertThat(bundle).string("story_id").isEqualTo(TEST_STORY_ID)
     assertThat(bundle).string("exploration_id").isEqualTo(TEST_EXPLORATION_ID)
@@ -1798,13 +1824,14 @@ class EventBundleCreatorTest {
 
     val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle)
     assertThat(typeName).isEqualTo("click_switch_language_in_lesson")
-    assertThat(bundle).hasSize(19)
+    assertThat(bundle).hasSize(20)
     assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1)
     assertThat(bundle).string("priority").isEqualTo("essential")
     assertThat(bundle).integer("event_type").isEqualTo(SWITCH_IN_LESSON_LANGUAGE.number)
     assertThat(bundle).integer("android_sdk").isEqualTo(TEST_ANDROID_SDK_VERSION)
     assertThat(bundle).string("app_version_name").isEqualTo(TEST_APP_VERSION_NAME)
     assertThat(bundle).integer("app_version_code").isEqualTo(TEST_APP_VERSION_CODE)
+    assertThat(bundle).string("ed_classroom_id").isEqualTo(TEST_CLASSROOM_ID)
     assertThat(bundle).string("ed_topic_id").isEqualTo(TEST_TOPIC_ID)
     assertThat(bundle).string("ed_story_id").isEqualTo(TEST_STORY_ID)
     assertThat(bundle).string("ed_exploration_id").isEqualTo(TEST_EXPLORATION_ID)
@@ -1824,13 +1851,14 @@ class EventBundleCreatorTest {
 
     val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle)
     assertThat(typeName).isEqualTo("click_switch_language_in_lesson")
-    assertThat(bundle).hasSize(21)
+    assertThat(bundle).hasSize(22)
     assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1)
     assertThat(bundle).string("priority").isEqualTo("essential")
     assertThat(bundle).integer("event_type").isEqualTo(SWITCH_IN_LESSON_LANGUAGE.number)
     assertThat(bundle).integer("android_sdk").isEqualTo(TEST_ANDROID_SDK_VERSION)
     assertThat(bundle).string("app_version_name").isEqualTo(TEST_APP_VERSION_NAME)
     assertThat(bundle).integer("app_version_code").isEqualTo(TEST_APP_VERSION_CODE)
+    assertThat(bundle).string("ed_classroom_id").isEqualTo(TEST_CLASSROOM_ID)
     assertThat(bundle).string("ed_topic_id").isEqualTo(TEST_TOPIC_ID)
     assertThat(bundle).string("ed_story_id").isEqualTo(TEST_STORY_ID)
     assertThat(bundle).string("ed_exploration_id").isEqualTo(TEST_EXPLORATION_ID)

From c31c6d6087df86bcb2cab8a8448d09dbff9ad3c6 Mon Sep 17 00:00:00 2001
From: Saptak Manna <saptakmanna100@gmail.com>
Date: Wed, 3 Jul 2024 12:43:37 +0530
Subject: [PATCH 04/21] Update tests with classroomId field

---
 .../domain/audio/AudioPlayerControllerTest.kt |  72 +-
 .../ExplorationActiveTimeControllerTest.kt    |  35 +-
 .../ExplorationDataControllerTest.kt          | 125 ++-
 .../ExplorationProgressControllerTest.kt      | 750 +++++++++++++-----
 .../ExplorationCheckpointControllerTest.kt    |   1 +
 .../domain/oppialogger/OppiaLoggerTest.kt     |   2 +
 .../analytics/AnalyticsControllerTest.kt      |   3 +
 .../analytics/LearnerAnalyticsLoggerTest.kt   |  25 +-
 .../testing/logging/EventLogSubject.kt        |   8 +
 9 files changed, 801 insertions(+), 220 deletions(-)

diff --git a/domain/src/test/java/org/oppia/android/domain/audio/AudioPlayerControllerTest.kt b/domain/src/test/java/org/oppia/android/domain/audio/AudioPlayerControllerTest.kt
index 3f7a3d6b241..ee63c50d628 100644
--- a/domain/src/test/java/org/oppia/android/domain/audio/AudioPlayerControllerTest.kt
+++ b/domain/src/test/java/org/oppia/android/domain/audio/AudioPlayerControllerTest.kt
@@ -505,7 +505,12 @@ class AudioPlayerControllerTest {
     val explorationId = TEST_EXPLORATION_ID_5
     arrangeMediaPlayer(contentId = "test_content_id")
     logIntoAnalyticsReadyAdminProfile()
-    beginExploration(topicId = "test_topic_id", storyId = "test_story_id", explorationId)
+    beginExploration(
+      classroomId = "test_classroom_id",
+      topicId = "test_topic_id",
+      storyId = "test_story_id",
+      explorationId
+    )
 
     audioPlayerController.play(isPlayingFromAutoPlay = true, reloadingMainContent = false)
     testCoroutineDispatchers.runCurrent()
@@ -538,7 +543,12 @@ class AudioPlayerControllerTest {
     val explorationId = TEST_EXPLORATION_ID_5
     arrangeMediaPlayer(contentId = "test_content_id")
     logIntoAnalyticsReadyAdminProfile()
-    beginExploration(topicId = "test_topic_id", storyId = "test_story_id", explorationId)
+    beginExploration(
+      classroomId = "test_classroom_id",
+      topicId = "test_topic_id",
+      storyId = "test_story_id",
+      explorationId
+    )
 
     audioPlayerController.play(isPlayingFromAutoPlay = false, reloadingMainContent = true)
     testCoroutineDispatchers.runCurrent()
@@ -571,7 +581,12 @@ class AudioPlayerControllerTest {
     val explorationId = TEST_EXPLORATION_ID_5
     arrangeMediaPlayer(contentId = "test_content_id", languageCode = "sw")
     logIntoAnalyticsReadyAdminProfile()
-    beginExploration(topicId = "test_topic_id", storyId = "test_story_id", explorationId)
+    beginExploration(
+      classroomId = "test_classroom_id",
+      topicId = "test_topic_id",
+      storyId = "test_story_id",
+      explorationId
+    )
 
     audioPlayerController.play(isPlayingFromAutoPlay = false, reloadingMainContent = false)
     testCoroutineDispatchers.runCurrent()
@@ -604,7 +619,12 @@ class AudioPlayerControllerTest {
     val explorationId = TEST_EXPLORATION_ID_5
     arrangeMediaPlayer(contentId = null)
     logIntoAnalyticsReadyAdminProfile()
-    beginExploration(topicId = "test_topic_id", storyId = "test_story_id", explorationId)
+    beginExploration(
+      classroomId = "test_classroom_id",
+      topicId = "test_topic_id",
+      storyId = "test_story_id",
+      explorationId
+    )
 
     audioPlayerController.play(isPlayingFromAutoPlay = false, reloadingMainContent = false)
     testCoroutineDispatchers.runCurrent()
@@ -634,7 +654,12 @@ class AudioPlayerControllerTest {
     val explorationId = TEST_EXPLORATION_ID_5
     arrangeMediaPlayer(contentId = "test_content_id", languageCode = "sw")
     logIntoAnalyticsReadyAdminProfile()
-    beginExploration(topicId = "test_topic_id", storyId = "test_story_id", explorationId)
+    beginExploration(
+      classroomId = "test_classroom_id",
+      topicId = "test_topic_id",
+      storyId = "test_story_id",
+      explorationId
+    )
     audioPlayerController.play(isPlayingFromAutoPlay = false, reloadingMainContent = false)
     testCoroutineDispatchers.runCurrent()
 
@@ -669,7 +694,12 @@ class AudioPlayerControllerTest {
     val explorationId = TEST_EXPLORATION_ID_5
     arrangeMediaPlayer(contentId = null)
     logIntoAnalyticsReadyAdminProfile()
-    beginExploration(topicId = "test_topic_id", storyId = "test_story_id", explorationId)
+    beginExploration(
+      classroomId = "test_classroom_id",
+      topicId = "test_topic_id",
+      storyId = "test_story_id",
+      explorationId
+    )
     audioPlayerController.play(isPlayingFromAutoPlay = false, reloadingMainContent = false)
     testCoroutineDispatchers.runCurrent()
 
@@ -704,7 +734,12 @@ class AudioPlayerControllerTest {
     val explorationId = TEST_EXPLORATION_ID_5
     arrangeMediaPlayer(contentId = "test_content_id", languageCode = "sw")
     logIntoAnalyticsReadyAdminProfile()
-    beginExploration(topicId = "test_topic_id", storyId = "test_story_id", explorationId)
+    beginExploration(
+      classroomId = "test_classroom_id",
+      topicId = "test_topic_id",
+      storyId = "test_story_id",
+      explorationId
+    )
     audioPlayerController.play(isPlayingFromAutoPlay = false, reloadingMainContent = false)
     testCoroutineDispatchers.runCurrent()
     fakeAnalyticsEventLogger.clearAllEvents() // Remove unrelated events.
@@ -723,7 +758,12 @@ class AudioPlayerControllerTest {
     val explorationId = TEST_EXPLORATION_ID_5
     arrangeMediaPlayer(contentId = "test_content_id", languageCode = "sw")
     logIntoAnalyticsReadyAdminProfile()
-    beginExploration(topicId = "test_topic_id", storyId = "test_story_id", explorationId)
+    beginExploration(
+      classroomId = "test_classroom_id",
+      topicId = "test_topic_id",
+      storyId = "test_story_id",
+      explorationId
+    )
     testCoroutineDispatchers.runCurrent()
     fakeAnalyticsEventLogger.clearAllEvents() // Remove unrelated events.
 
@@ -740,7 +780,12 @@ class AudioPlayerControllerTest {
     val explorationId = TEST_EXPLORATION_ID_5
     arrangeMediaPlayer(contentId = "test_content_id", languageCode = "sw")
     logIntoAnalyticsReadyAdminProfile()
-    beginExploration(topicId = "test_topic_id", storyId = "test_story_id", explorationId)
+    beginExploration(
+      classroomId = "test_classroom_id",
+      topicId = "test_topic_id",
+      storyId = "test_story_id",
+      explorationId
+    )
     testCoroutineDispatchers.runCurrent()
     fakeAnalyticsEventLogger.clearAllEvents() // Remove unrelated events.
 
@@ -791,10 +836,15 @@ class AudioPlayerControllerTest {
     )
   }
 
-  private fun beginExploration(topicId: String, storyId: String, explorationId: String) {
+  private fun beginExploration(
+    classroomId: String,
+    topicId: String,
+    storyId: String,
+    explorationId: String
+  ) {
     val playingProvider =
       explorationDataController.startPlayingNewExploration(
-        internalProfileId = 0, topicId, storyId, explorationId
+        internalProfileId = 0, classroomId, topicId, storyId, explorationId
       )
     monitorFactory.waitForNextSuccessfulResult(playingProvider)
     monitorFactory.waitForNextSuccessfulResult(explorationProgressController.getCurrentState())
diff --git a/domain/src/test/java/org/oppia/android/domain/exploration/ExplorationActiveTimeControllerTest.kt b/domain/src/test/java/org/oppia/android/domain/exploration/ExplorationActiveTimeControllerTest.kt
index 7f33cbe96ab..5de6ae1179c 100644
--- a/domain/src/test/java/org/oppia/android/domain/exploration/ExplorationActiveTimeControllerTest.kt
+++ b/domain/src/test/java/org/oppia/android/domain/exploration/ExplorationActiveTimeControllerTest.kt
@@ -27,6 +27,7 @@ import org.oppia.android.domain.classify.rules.numericexpressioninput.NumericExp
 import org.oppia.android.domain.classify.rules.numericinput.NumericInputRuleModule
 import org.oppia.android.domain.classify.rules.ratioinput.RatioInputModule
 import org.oppia.android.domain.classify.rules.textinput.TextInputRuleModule
+import org.oppia.android.domain.classroom.TEST_CLASSROOM_ID_0
 import org.oppia.android.domain.exploration.testing.ExplorationStorageTestModule
 import org.oppia.android.domain.hintsandsolution.HintsAndSolutionConfigModule
 import org.oppia.android.domain.hintsandsolution.HintsAndSolutionProdModule
@@ -109,7 +110,11 @@ class ExplorationActiveTimeControllerTest {
 
     applicationLifecycleObserver.onAppInForeground()
     startPlayingNewExploration(
-      TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2, firstTestProfile
+      TEST_CLASSROOM_ID_0,
+      TEST_TOPIC_ID_0,
+      TEST_STORY_ID_0,
+      TEST_EXPLORATION_ID_2,
+      firstTestProfile
     )
 
     testCoroutineDispatchers.advanceTimeBy(SESSION_LENGTH_1)
@@ -131,7 +136,11 @@ class ExplorationActiveTimeControllerTest {
 
     applicationLifecycleObserver.onAppInForeground()
     startPlayingNewExploration(
-      TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2, firstTestProfile
+      TEST_CLASSROOM_ID_0,
+      TEST_TOPIC_ID_0,
+      TEST_STORY_ID_0,
+      TEST_EXPLORATION_ID_2,
+      firstTestProfile
     )
 
     testCoroutineDispatchers.advanceTimeBy(SESSION_LENGTH_1)
@@ -153,7 +162,11 @@ class ExplorationActiveTimeControllerTest {
 
     explorationActiveTimeController.onAppInForeground()
     startPlayingNewExploration(
-      TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2, firstTestProfile
+      TEST_CLASSROOM_ID_0,
+      TEST_TOPIC_ID_0,
+      TEST_STORY_ID_0,
+      TEST_EXPLORATION_ID_2,
+      firstTestProfile
     )
 
     testCoroutineDispatchers.advanceTimeBy(SESSION_LENGTH_1)
@@ -206,7 +219,11 @@ class ExplorationActiveTimeControllerTest {
 
     applicationLifecycleObserver.onAppInForeground()
     startPlayingNewExploration(
-      TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2, firstTestProfile
+      TEST_CLASSROOM_ID_0,
+      TEST_TOPIC_ID_0,
+      TEST_STORY_ID_0,
+      TEST_EXPLORATION_ID_2,
+      firstTestProfile
     )
 
     testCoroutineDispatchers.advanceTimeBy(SESSION_LENGTH_1)
@@ -262,6 +279,7 @@ class ExplorationActiveTimeControllerTest {
 
     explorationActiveTimeController.onAppInForeground()
     startPlayingNewExploration(
+      TEST_CLASSROOM_ID_0,
       TEST_TOPIC_ID_0,
       TEST_STORY_ID_0,
       TEST_EXPLORATION_ID_2,
@@ -308,6 +326,7 @@ class ExplorationActiveTimeControllerTest {
     testCoroutineDispatchers.advanceTimeBy(TimeUnit.DAYS.toMillis(1))
 
     startPlayingNewExploration(
+      TEST_CLASSROOM_ID_0,
       TEST_TOPIC_ID_0,
       TEST_STORY_ID_0,
       TEST_EXPLORATION_ID_2,
@@ -353,6 +372,7 @@ class ExplorationActiveTimeControllerTest {
     applicationLifecycleObserver.onAppInForeground()
 
     startPlayingNewExploration(
+      TEST_CLASSROOM_ID_0,
       TEST_TOPIC_ID_0,
       TEST_STORY_ID_0,
       TEST_EXPLORATION_ID_2,
@@ -380,6 +400,7 @@ class ExplorationActiveTimeControllerTest {
     applicationLifecycleObserver.onAppInForeground()
 
     startPlayingNewExploration(
+      TEST_CLASSROOM_ID_0,
       TEST_TOPIC_ID_0,
       TEST_STORY_ID_0,
       TEST_EXPLORATION_ID_2,
@@ -389,6 +410,7 @@ class ExplorationActiveTimeControllerTest {
     stopExploration()
 
     startPlayingNewExploration(
+      TEST_CLASSROOM_ID_0,
       TEST_TOPIC_ID_1,
       TEST_STORY_ID_0,
       TEST_EXPLORATION_ID_2,
@@ -423,6 +445,7 @@ class ExplorationActiveTimeControllerTest {
     applicationLifecycleObserver.onAppInForeground()
 
     startPlayingNewExploration(
+      TEST_CLASSROOM_ID_0,
       TEST_TOPIC_ID_0,
       TEST_STORY_ID_0,
       TEST_EXPLORATION_ID_2,
@@ -432,6 +455,7 @@ class ExplorationActiveTimeControllerTest {
     stopExploration()
 
     startPlayingNewExploration(
+      TEST_CLASSROOM_ID_0,
       TEST_TOPIC_ID_0,
       TEST_STORY_ID_0,
       TEST_EXPLORATION_ID_2,
@@ -460,6 +484,7 @@ class ExplorationActiveTimeControllerTest {
   }
 
   private fun startPlayingNewExploration(
+    classroomId: String,
     topicId: String,
     storyId: String,
     explorationId: String,
@@ -467,7 +492,7 @@ class ExplorationActiveTimeControllerTest {
   ) {
     val startPlayingProvider =
       explorationDataController.startPlayingNewExploration(
-        profileId.internalId, topicId, storyId, explorationId
+        profileId.internalId, classroomId, topicId, storyId, explorationId
       )
     monitorFactory.waitForNextSuccessfulResult(startPlayingProvider)
   }
diff --git a/domain/src/test/java/org/oppia/android/domain/exploration/ExplorationDataControllerTest.kt b/domain/src/test/java/org/oppia/android/domain/exploration/ExplorationDataControllerTest.kt
index 330ae280b21..9e6e7e78b5e 100644
--- a/domain/src/test/java/org/oppia/android/domain/exploration/ExplorationDataControllerTest.kt
+++ b/domain/src/test/java/org/oppia/android/domain/exploration/ExplorationDataControllerTest.kt
@@ -28,6 +28,7 @@ import org.oppia.android.domain.classify.rules.numericexpressioninput.NumericExp
 import org.oppia.android.domain.classify.rules.numericinput.NumericInputRuleModule
 import org.oppia.android.domain.classify.rules.ratioinput.RatioInputModule
 import org.oppia.android.domain.classify.rules.textinput.TextInputRuleModule
+import org.oppia.android.domain.classroom.TEST_CLASSROOM_ID_0
 import org.oppia.android.domain.exploration.lightweightcheckpointing.ExplorationCheckpointController
 import org.oppia.android.domain.exploration.testing.ExplorationStorageTestModule
 import org.oppia.android.domain.hintsandsolution.HintsAndSolutionConfigModule
@@ -187,7 +188,11 @@ class ExplorationDataControllerTest {
   fun testStartPlayingNewExploration_returnsSuccess() {
     val startProvider =
       explorationDataController.startPlayingNewExploration(
-        profileId.internalId, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+        profileId.internalId,
+        TEST_CLASSROOM_ID_0,
+        TEST_TOPIC_ID_0,
+        TEST_STORY_ID_0,
+        TEST_EXPLORATION_ID_2
       )
 
     monitorFactory.waitForNextSuccessfulResult(startProvider)
@@ -195,12 +200,20 @@ class ExplorationDataControllerTest {
 
   @Test
   fun testStartPlayingNewExploration_afterCompletingIt_returnsSuccess() {
-    startPlayingNewExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    startPlayingNewExploration(
+      TEST_CLASSROOM_ID_0,
+      TEST_TOPIC_ID_0,
+      TEST_STORY_ID_0,
+      TEST_EXPLORATION_ID_2
+    )
     stopExploration()
 
     val secondStartProvider =
       explorationDataController.startPlayingNewExploration(
-        profileId.internalId, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+        profileId.internalId,
+        TEST_CLASSROOM_ID_0,
+        TEST_TOPIC_ID_0, TEST_STORY_ID_0,
+        TEST_EXPLORATION_ID_2
       )
 
     monitorFactory.waitForNextSuccessfulResult(secondStartProvider)
@@ -208,13 +221,23 @@ class ExplorationDataControllerTest {
 
   @Test
   fun testResumeExploration_afterStartingIt_returnsSuccess() {
-    startPlayingNewExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    startPlayingNewExploration(
+      TEST_CLASSROOM_ID_0,
+      TEST_TOPIC_ID_0,
+      TEST_STORY_ID_0,
+      TEST_EXPLORATION_ID_2
+    )
     stopExploration(isCompletion = false)
 
     val checkpoint = retrieveExplorationCheckpoint(TEST_EXPLORATION_ID_2)
     val secondStartProvider =
       explorationDataController.resumeExploration(
-        profileId.internalId, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2, checkpoint
+        profileId.internalId,
+        TEST_CLASSROOM_ID_0,
+        TEST_TOPIC_ID_0,
+        TEST_STORY_ID_0,
+        TEST_EXPLORATION_ID_2,
+        checkpoint
       )
 
     monitorFactory.waitForNextSuccessfulResult(secondStartProvider)
@@ -224,7 +247,11 @@ class ExplorationDataControllerTest {
   fun testRestartExploration_returnsSuccess() {
     val startProvider =
       explorationDataController.restartExploration(
-        profileId.internalId, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+        profileId.internalId,
+        TEST_CLASSROOM_ID_0,
+        TEST_TOPIC_ID_0,
+        TEST_STORY_ID_0,
+        TEST_EXPLORATION_ID_2
       )
 
     monitorFactory.waitForNextSuccessfulResult(startProvider)
@@ -232,12 +259,21 @@ class ExplorationDataControllerTest {
 
   @Test
   fun testRestartExploration_afterStartingIt_returnsSuccess() {
-    restartExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    restartExploration(
+      TEST_CLASSROOM_ID_0,
+      TEST_TOPIC_ID_0,
+      TEST_STORY_ID_0,
+      TEST_EXPLORATION_ID_2
+    )
     stopExploration(isCompletion = false)
 
     val secondStartProvider =
       explorationDataController.restartExploration(
-        profileId.internalId, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+        profileId.internalId,
+        TEST_CLASSROOM_ID_0,
+        TEST_TOPIC_ID_0,
+        TEST_STORY_ID_0,
+        TEST_EXPLORATION_ID_2
       )
 
     monitorFactory.waitForNextSuccessfulResult(secondStartProvider)
@@ -247,7 +283,11 @@ class ExplorationDataControllerTest {
   fun testReplayExploration_returnsSuccess() {
     val startProvider =
       explorationDataController.replayExploration(
-        profileId.internalId, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+        profileId.internalId,
+        TEST_CLASSROOM_ID_0,
+        TEST_TOPIC_ID_0,
+        TEST_STORY_ID_0,
+        TEST_EXPLORATION_ID_2
       )
 
     monitorFactory.waitForNextSuccessfulResult(startProvider)
@@ -255,12 +295,21 @@ class ExplorationDataControllerTest {
 
   @Test
   fun testReplayExploration_afterCompletingIt_returnsSuccess() {
-    replayExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    replayExploration(
+      TEST_CLASSROOM_ID_0,
+      TEST_TOPIC_ID_0,
+      TEST_STORY_ID_0,
+      TEST_EXPLORATION_ID_2
+    )
     stopExploration()
 
     val secondStartProvider =
       explorationDataController.replayExploration(
-        profileId.internalId, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+        profileId.internalId,
+        TEST_CLASSROOM_ID_0,
+        TEST_TOPIC_ID_0,
+        TEST_STORY_ID_0,
+        TEST_EXPLORATION_ID_2
       )
 
     monitorFactory.waitForNextSuccessfulResult(secondStartProvider)
@@ -268,11 +317,20 @@ class ExplorationDataControllerTest {
 
   @Test
   fun testReplayExploration_withoutStoppingPreviousSession_returnsSuccess() {
-    replayExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    replayExploration(
+      TEST_CLASSROOM_ID_0,
+      TEST_TOPIC_ID_0,
+      TEST_STORY_ID_0,
+      TEST_EXPLORATION_ID_2
+    )
 
     val dataProvider =
       explorationDataController.replayExploration(
-        profileId.internalId, TEST_TOPIC_ID_1, TEST_STORY_ID_2, TEST_EXPLORATION_ID_4
+        profileId.internalId,
+        TEST_CLASSROOM_ID_0,
+        TEST_TOPIC_ID_1,
+        TEST_STORY_ID_2,
+        TEST_EXPLORATION_ID_4
       )
 
     // The new session overwrites the previous.
@@ -290,7 +348,12 @@ class ExplorationDataControllerTest {
 
   @Test
   fun testStopPlayingExploration_afterStarting_notCompletion_returnsSuccess() {
-    startPlayingNewExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    startPlayingNewExploration(
+      TEST_CLASSROOM_ID_0,
+      TEST_TOPIC_ID_0,
+      TEST_STORY_ID_0,
+      TEST_EXPLORATION_ID_2
+    )
 
     val resultProvider = explorationDataController.stopPlayingExploration(isCompletion = false)
 
@@ -299,7 +362,12 @@ class ExplorationDataControllerTest {
 
   @Test
   fun testStopPlayingExploration_afterStarting_completion_returnsSuccess() {
-    startPlayingNewExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    startPlayingNewExploration(
+      TEST_CLASSROOM_ID_0,
+      TEST_TOPIC_ID_0,
+      TEST_STORY_ID_0,
+      TEST_EXPLORATION_ID_2
+    )
 
     val resultProvider = explorationDataController.stopPlayingExploration(isCompletion = true)
 
@@ -310,26 +378,41 @@ class ExplorationDataControllerTest {
     ApplicationProvider.getApplicationContext<TestApplication>().inject(this)
   }
 
-  private fun startPlayingNewExploration(topicId: String, storyId: String, explorationId: String) {
+  private fun startPlayingNewExploration(
+    classroomId: String,
+    topicId: String,
+    storyId: String,
+    explorationId: String
+  ) {
     val startPlayingProvider =
       explorationDataController.startPlayingNewExploration(
-        profileId.internalId, topicId, storyId, explorationId
+        profileId.internalId, classroomId, topicId, storyId, explorationId
       )
     monitorFactory.waitForNextSuccessfulResult(startPlayingProvider)
   }
 
-  private fun restartExploration(topicId: String, storyId: String, explorationId: String) {
+  private fun restartExploration(
+    classroomId: String,
+    topicId: String,
+    storyId: String,
+    explorationId: String
+  ) {
     val startPlayingProvider =
       explorationDataController.restartExploration(
-        profileId.internalId, topicId, storyId, explorationId
+        profileId.internalId, classroomId, topicId, storyId, explorationId
       )
     monitorFactory.waitForNextSuccessfulResult(startPlayingProvider)
   }
 
-  private fun replayExploration(topicId: String, storyId: String, explorationId: String) {
+  private fun replayExploration(
+    classroomId: String,
+    topicId: String,
+    storyId: String,
+    explorationId: String
+  ) {
     val startPlayingProvider =
       explorationDataController.replayExploration(
-        profileId.internalId, topicId, storyId, explorationId
+        profileId.internalId, classroomId, topicId, storyId, explorationId
       )
     monitorFactory.waitForNextSuccessfulResult(startPlayingProvider)
   }
diff --git a/domain/src/test/java/org/oppia/android/domain/exploration/ExplorationProgressControllerTest.kt b/domain/src/test/java/org/oppia/android/domain/exploration/ExplorationProgressControllerTest.kt
index a6b797562e4..7dfceb06d2d 100644
--- a/domain/src/test/java/org/oppia/android/domain/exploration/ExplorationProgressControllerTest.kt
+++ b/domain/src/test/java/org/oppia/android/domain/exploration/ExplorationProgressControllerTest.kt
@@ -59,6 +59,8 @@ import org.oppia.android.domain.classify.rules.numericexpressioninput.NumericExp
 import org.oppia.android.domain.classify.rules.numericinput.NumericInputRuleModule
 import org.oppia.android.domain.classify.rules.ratioinput.RatioInputModule
 import org.oppia.android.domain.classify.rules.textinput.TextInputRuleModule
+import org.oppia.android.domain.classroom.TEST_CLASSROOM_ID_0
+import org.oppia.android.domain.classroom.TEST_CLASSROOM_ID_1
 import org.oppia.android.domain.exploration.lightweightcheckpointing.ExplorationCheckpointController
 import org.oppia.android.domain.exploration.testing.ExplorationStorageTestModule
 import org.oppia.android.domain.hintsandsolution.HintsAndSolutionConfigModule
@@ -124,6 +126,7 @@ import javax.inject.Singleton
 // For context:
 // https://github.com/oppia/oppia/blob/37285a/extensions/interactions/Continue/directives/oppia-interactive-continue.directive.ts.
 private const val DEFAULT_CONTINUE_INTERACTION_TEXT_ANSWER = "Please continue."
+private const val INVALID_CLASSROOM_ID = "invalid_classroom_id"
 private const val INVALID_TOPIC_ID = "invalid_topic_id"
 private const val INVALID_STORY_ID = "invalid_story_id"
 private const val INVALID_EXPLORATION_ID = "invalid_exp_id"
@@ -178,7 +181,11 @@ class ExplorationProgressControllerTest {
   fun testPlayExploration_invalid_returnsSuccess() {
     val resultDataProvider =
       explorationDataController.replayExploration(
-        profileId.internalId, INVALID_TOPIC_ID, INVALID_STORY_ID, INVALID_EXPLORATION_ID
+        profileId.internalId,
+        INVALID_CLASSROOM_ID,
+        INVALID_TOPIC_ID,
+        INVALID_STORY_ID,
+        INVALID_EXPLORATION_ID
       )
 
     // An invalid exploration is not known until it's fully loaded, and that's observed via
@@ -188,7 +195,9 @@ class ExplorationProgressControllerTest {
 
   @Test
   fun testGetCurrentState_playInvalidExploration_returnsFailure() {
-    restartExploration(INVALID_TOPIC_ID, INVALID_STORY_ID, INVALID_EXPLORATION_ID)
+    restartExploration(
+      INVALID_CLASSROOM_ID, INVALID_TOPIC_ID, INVALID_STORY_ID, INVALID_EXPLORATION_ID
+    )
 
     val error = waitForGetCurrentStateFailureLoad()
 
@@ -199,7 +208,11 @@ class ExplorationProgressControllerTest {
   fun testPlayExploration_valid_returnsSuccess() {
     val resultDataProvider =
       explorationDataController.replayExploration(
-        profileId.internalId, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+        profileId.internalId,
+        TEST_CLASSROOM_ID_0,
+        TEST_TOPIC_ID_0,
+        TEST_STORY_ID_0,
+        TEST_EXPLORATION_ID_2
       )
 
     monitorFactory.waitForNextSuccessfulResult(resultDataProvider)
@@ -207,7 +220,9 @@ class ExplorationProgressControllerTest {
 
   @Test
   fun testGetCurrentState_playExploration_loaded_returnsInitialStatePending() {
-    startPlayingNewExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    startPlayingNewExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
 
     val ephemeralState = waitForGetCurrentStateSuccessfulLoad()
 
@@ -220,7 +235,9 @@ class ExplorationProgressControllerTest {
   fun testEphemeralState_startExploration_shouldIndicateButtonAnimation() {
     oppiaClock.setFakeTimeMode(FakeOppiaClock.FakeTimeMode.MODE_FIXED_FAKE_TIME)
     val currentTime = oppiaClock.getCurrentTimeMs()
-    startPlayingNewExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    startPlayingNewExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
     val ephemeralState = waitForGetCurrentStateSuccessfulLoad()
     assertThat(ephemeralState.showContinueButtonAnimation).isTrue()
     assertThat(ephemeralState.continueButtonAnimationTimestampMs)
@@ -229,7 +246,9 @@ class ExplorationProgressControllerTest {
 
   @Test
   fun testEphemeralState_moveToNextState_shouldIndicateNoButtonAnimation() {
-    startPlayingNewExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    startPlayingNewExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
     playThroughPrototypeState1AndMoveToNextState()
     val ephemeralState = waitForGetCurrentStateSuccessfulLoad()
     assertThat(ephemeralState.showContinueButtonAnimation).isFalse()
@@ -239,11 +258,15 @@ class ExplorationProgressControllerTest {
   fun testEphemeralState_profile1ClicksContinue_switchToProfile2_shouldIndicateButtonAnimation() {
     oppiaClock.setFakeTimeMode(FakeOppiaClock.FakeTimeMode.MODE_FIXED_FAKE_TIME)
     val profileId2 = ProfileId.newBuilder().setInternalId(1).build()
-    startPlayingNewExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    startPlayingNewExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
     playThroughPrototypeState1AndMoveToNextState()
     endExploration()
     val currentTime = oppiaClock.getCurrentTimeMs()
-    startPlayingNewExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2, profileId2)
+    startPlayingNewExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2, profileId2
+    )
     val ephemeralState = waitForGetCurrentStateSuccessfulLoad()
     assertThat(ephemeralState.showContinueButtonAnimation).isTrue()
     assertThat(ephemeralState.continueButtonAnimationTimestampMs)
@@ -252,11 +275,15 @@ class ExplorationProgressControllerTest {
 
   @Test
   fun testEphemeralState_startExp_clicksContinue_reEnterExp_shouldIndicateNoButtonAnimation() {
-    startPlayingNewExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    startPlayingNewExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
     playThroughPrototypeState1AndMoveToNextState()
     val checkPoint = retrieveExplorationCheckpoint(TEST_EXPLORATION_ID_2)
     endExploration()
-    resumeExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2, checkPoint)
+    resumeExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2, checkPoint
+    )
     val ephemeralState = waitForGetCurrentStateSuccessfulLoad()
     assertThat(ephemeralState.showContinueButtonAnimation).isFalse()
   }
@@ -264,11 +291,15 @@ class ExplorationProgressControllerTest {
   @Test
   fun testEphemeralState_startExp_seesAnimation_reEnterExploration_shouldIndicateButtonAnimation() {
     oppiaClock.setFakeTimeMode(FakeOppiaClock.FakeTimeMode.MODE_FIXED_FAKE_TIME)
-    startPlayingNewExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    startPlayingNewExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
     testCoroutineDispatchers.advanceTimeBy(TimeUnit.SECONDS.toMillis(45))
     endExploration()
     val currentTime = oppiaClock.getCurrentTimeMs()
-    restartExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    restartExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
     val ephemeralState = waitForGetCurrentStateSuccessfulLoad()
     assertThat(ephemeralState.showContinueButtonAnimation).isTrue()
     assertThat(ephemeralState.continueButtonAnimationTimestampMs)
@@ -278,11 +309,15 @@ class ExplorationProgressControllerTest {
   @Test
   fun testGetCurrentState_playInvalidExploration_thenPlayValidExp_returnsInitialPendingState() {
     // Start with playing an invalid exploration.
-    restartExploration(INVALID_TOPIC_ID, INVALID_STORY_ID, INVALID_EXPLORATION_ID)
+    restartExploration(
+      INVALID_CLASSROOM_ID, INVALID_TOPIC_ID, INVALID_STORY_ID, INVALID_EXPLORATION_ID
+    )
     endExploration()
 
     // Then a valid one.
-    restartExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    restartExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
 
     // The latest result should correspond to the valid ID, and the progress controller should
     // gracefully recover.
@@ -304,13 +339,19 @@ class ExplorationProgressControllerTest {
 
   @Test
   fun testPlayExploration_withoutFinishingPrevious_succeeds() {
-    restartExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    restartExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
     waitForGetCurrentStateSuccessfulLoad()
 
     // Try playing another exploration without finishing the previous one.
     val resultDataProvider =
       explorationDataController.replayExploration(
-        profileId.internalId, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+        profileId.internalId,
+        TEST_CLASSROOM_ID_0,
+        TEST_TOPIC_ID_0,
+        TEST_STORY_ID_0,
+        TEST_EXPLORATION_ID_2
       )
 
     // The new session will overwrite the previous.
@@ -320,12 +361,16 @@ class ExplorationProgressControllerTest {
   @Test
   fun testGetCurrentState_playSecondExploration_afterFinishingPrev_loaded_returnsInitialState() {
     // Start with playing a valid exploration, then stop.
-    restartExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    restartExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
     waitForGetCurrentStateSuccessfulLoad()
     endExploration()
 
     // Then another valid one.
-    restartExploration(TEST_TOPIC_ID_1, TEST_STORY_ID_2, TEST_EXPLORATION_ID_4)
+    restartExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_1, TEST_STORY_ID_2, TEST_EXPLORATION_ID_4
+    )
 
     // The latest result should correspond to the valid ID, and the progress controller should
     // gracefully recover.
@@ -347,7 +392,9 @@ class ExplorationProgressControllerTest {
 
   @Test
   fun testSubmitAnswer_forMultipleChoice_correctAnswer_succeeds() {
-    restartExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    restartExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
     waitForGetCurrentStateSuccessfulLoad()
     navigateToPrototypeMultipleChoiceState()
 
@@ -359,7 +406,9 @@ class ExplorationProgressControllerTest {
 
   @Test
   fun testSubmitAnswer_forMultipleChoice_correctAnswer_returnsOutcomeWithTransition() {
-    restartExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    restartExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
     waitForGetCurrentStateSuccessfulLoad()
     navigateToPrototypeMultipleChoiceState()
 
@@ -373,7 +422,9 @@ class ExplorationProgressControllerTest {
 
   @Test
   fun testSubmitAnswer_forMultipleChoice_wrongAnswer_succeeds() {
-    restartExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    restartExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
     waitForGetCurrentStateSuccessfulLoad()
     navigateToPrototypeMultipleChoiceState()
 
@@ -385,7 +436,9 @@ class ExplorationProgressControllerTest {
 
   @Test
   fun testSubmitAnswer_forMultipleChoice_wrongAnswer_providesDefFeedbackAndSameStateTransition() {
-    restartExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    restartExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
     waitForGetCurrentStateSuccessfulLoad()
     navigateToPrototypeMultipleChoiceState()
 
@@ -399,7 +452,9 @@ class ExplorationProgressControllerTest {
 
   @Test
   fun testGetCurrentState_afterSubmittingCorrectMultiChoiceAnswer_becomesCompletedState() {
-    restartExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    restartExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
     waitForGetCurrentStateSuccessfulLoad()
     navigateToPrototypeMultipleChoiceState()
 
@@ -415,7 +470,9 @@ class ExplorationProgressControllerTest {
 
   @Test
   fun testGetCurrentState_afterSubmittingWrongMultiChoiceAnswer_updatesPendingState() {
-    restartExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    restartExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
     waitForGetCurrentStateSuccessfulLoad()
     navigateToPrototypeMultipleChoiceState()
 
@@ -432,7 +489,9 @@ class ExplorationProgressControllerTest {
 
   @Test
   fun testGetCurrentState_afterSubmittingWrongThenRightAnswer_updatesToStateWithBothAnswers() {
-    restartExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    restartExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
     waitForGetCurrentStateSuccessfulLoad()
     navigateToPrototypeMultipleChoiceState()
     submitMultipleChoiceAnswer(0)
@@ -463,7 +522,9 @@ class ExplorationProgressControllerTest {
 
   @Test
   fun testMoveToNext_forPendingInitialState_failsWithError() {
-    restartExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    restartExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
     waitForGetCurrentStateSuccessfulLoad()
 
     val moveToStateResult = explorationProgressController.moveToNextState()
@@ -477,7 +538,9 @@ class ExplorationProgressControllerTest {
 
   @Test
   fun testMoveToNext_forCompletedState_succeeds() {
-    restartExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    restartExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
     waitForGetCurrentStateSuccessfulLoad()
     submitPrototypeState1Answer()
 
@@ -488,7 +551,9 @@ class ExplorationProgressControllerTest {
 
   @Test
   fun testMoveToNext_forCompletedState_movesToNextState() {
-    restartExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    restartExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
     waitForGetCurrentStateSuccessfulLoad()
     submitPrototypeState1Answer()
 
@@ -500,7 +565,9 @@ class ExplorationProgressControllerTest {
 
   @Test
   fun testMoveToNext_afterMovingFromCompletedState_failsWithError() {
-    restartExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    restartExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
     waitForGetCurrentStateSuccessfulLoad()
     submitPrototypeState1Answer()
     moveToNextState()
@@ -527,7 +594,9 @@ class ExplorationProgressControllerTest {
 
   @Test
   fun testMoveToPrevious_onPendingInitialState_failsWithError() {
-    restartExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    restartExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
     waitForGetCurrentStateSuccessfulLoad()
 
     val moveToStateResult = explorationProgressController.moveToPreviousState()
@@ -541,7 +610,9 @@ class ExplorationProgressControllerTest {
 
   @Test
   fun testMoveToPrevious_onCompletedInitialState_failsWithError() {
-    restartExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    restartExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
     waitForGetCurrentStateSuccessfulLoad()
     submitPrototypeState1Answer()
 
@@ -556,7 +627,9 @@ class ExplorationProgressControllerTest {
 
   @Test
   fun testMoveToPrevious_forStateWithCompletedPreviousState_succeeds() {
-    restartExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    restartExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
     waitForGetCurrentStateSuccessfulLoad()
     playThroughPrototypeState1AndMoveToNextState()
 
@@ -569,7 +642,9 @@ class ExplorationProgressControllerTest {
 
   @Test
   fun testMoveToPrevious_forCompletedState_movesToPreviousState() {
-    restartExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    restartExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
     waitForGetCurrentStateSuccessfulLoad()
     playThroughPrototypeState1AndMoveToNextState()
 
@@ -584,7 +659,9 @@ class ExplorationProgressControllerTest {
 
   @Test
   fun testMoveToPrevious_navigatedForwardThenBackToInitial_failsWithError() {
-    restartExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    restartExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
     waitForGetCurrentStateSuccessfulLoad()
     playThroughPrototypeState1AndMoveToNextState()
     moveToPreviousState()
@@ -601,7 +678,9 @@ class ExplorationProgressControllerTest {
 
   @Test
   fun testSubmitAnswer_forTextInput_correctAnswer_returnsOutcomeWithTransition() {
-    restartExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    restartExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
     waitForGetCurrentStateSuccessfulLoad()
     navigateToPrototypeTextInputState()
 
@@ -615,7 +694,9 @@ class ExplorationProgressControllerTest {
 
   @Test
   fun testSubmitAnswer_forTextInput_wrongAnswer_returnsDefaultOutcome() {
-    restartExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    restartExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
     waitForGetCurrentStateSuccessfulLoad()
     navigateToPrototypeTextInputState()
 
@@ -630,7 +711,9 @@ class ExplorationProgressControllerTest {
 
   @Test
   fun testSubmitAnswer_forFractionInput_wrongAnswer_returnsDefaultOutcome_hasHint() {
-    restartExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    restartExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
     waitForGetCurrentStateSuccessfulLoad()
     navigateToPrototypeFractionInputState()
 
@@ -650,7 +733,9 @@ class ExplorationProgressControllerTest {
 
   @Test
   fun testRevealHint_forWrongAnswers_showHint_returnHintIsRevealed() {
-    restartExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    restartExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
     waitForGetCurrentStateSuccessfulLoad()
     navigateToPrototypeFractionInputState()
     // Submit 2 wrong answers to trigger a hint becoming available.
@@ -670,7 +755,9 @@ class ExplorationProgressControllerTest {
 
   @Test
   fun testRevealSolution_triggeredSolution_showSolution_returnSolutionIsRevealed() {
-    restartExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    restartExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
     waitForGetCurrentStateSuccessfulLoad()
     navigateToPrototypeFractionInputState()
     // Submit 2 wrong answers to trigger the hint.
@@ -697,7 +784,9 @@ class ExplorationProgressControllerTest {
 
   @Test
   fun testHintsAndSolution_noHintVisible_checkHelpIndexIsCorrect() {
-    startPlayingNewExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    startPlayingNewExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
     waitForGetCurrentStateSuccessfulLoad()
     val ephemeralState = playThroughPrototypeState1AndMoveToNextState()
 
@@ -709,7 +798,9 @@ class ExplorationProgressControllerTest {
 
   @Test
   fun testHintsAndSolution_wait60Seconds_unrevealedHintIsVisible_checkHelpIndexIsCorrect() {
-    startPlayingNewExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    startPlayingNewExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
     waitForGetCurrentStateSuccessfulLoad()
     playThroughPrototypeState1AndMoveToNextState()
     // Make the first hint visible by submitting two wrong answers.
@@ -727,7 +818,9 @@ class ExplorationProgressControllerTest {
 
   @Test
   fun testHintsAndSolution_submitTwoWrongAnswers_unrevealedHintIsVisible_checkHelpIndexIsCorrect() {
-    startPlayingNewExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    startPlayingNewExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
     waitForGetCurrentStateSuccessfulLoad()
     playThroughPrototypeState1AndMoveToNextState()
     // Make the first hint visible by submitting two wrong answers.
@@ -744,7 +837,9 @@ class ExplorationProgressControllerTest {
 
   @Test
   fun testHintsAndSolution_revealedHintIsVisible_checkHelpIndexIsCorrect() {
-    startPlayingNewExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    startPlayingNewExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
     waitForGetCurrentStateSuccessfulLoad()
     playThroughPrototypeState1AndMoveToNextState()
     submitWrongAnswerForPrototypeState2()
@@ -765,7 +860,9 @@ class ExplorationProgressControllerTest {
 
   @Test
   fun testHintsAndSolution_allHintsVisible_wait30Seconds_solutionVisible_checkHelpIndexIsCorrect() {
-    startPlayingNewExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    startPlayingNewExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
     waitForGetCurrentStateSuccessfulLoad()
     playThroughPrototypeState1AndMoveToNextState()
     submitWrongAnswerForPrototypeState2()
@@ -789,7 +886,9 @@ class ExplorationProgressControllerTest {
 
   @Test
   fun testHintAndSol_hintsVisible_submitWrongAns_wait10Second_solVisible_checkHelpIndexIsCorrect() {
-    startPlayingNewExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    startPlayingNewExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
     waitForGetCurrentStateSuccessfulLoad()
     playThroughPrototypeState1AndMoveToNextState()
     submitWrongAnswerForPrototypeState2()
@@ -814,7 +913,9 @@ class ExplorationProgressControllerTest {
 
   @Test
   fun testHintsAndSolution_revealedSolutionIsVisible_checkHelpIndexIsCorrect() {
-    startPlayingNewExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    startPlayingNewExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
     waitForGetCurrentStateSuccessfulLoad()
     playThroughPrototypeState1AndMoveToNextState()
     submitWrongAnswerForPrototypeState2()
@@ -841,7 +942,9 @@ class ExplorationProgressControllerTest {
 
   @Test
   fun testSubmitAnswer_forTextInput_wrongAnswer_afterAllHintsAreExhausted_showSolution() {
-    restartExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    restartExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
     waitForGetCurrentStateSuccessfulLoad()
     navigateToPrototypeFractionInputState()
 
@@ -862,7 +965,9 @@ class ExplorationProgressControllerTest {
 
   @Test
   fun testGetCurrentState_secondState_submitRightAnswer_pendingStateBecomesCompleted() {
-    restartExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    restartExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
     waitForGetCurrentStateSuccessfulLoad()
     navigateToPrototypeTextInputState()
 
@@ -880,7 +985,9 @@ class ExplorationProgressControllerTest {
 
   @Test
   fun testSubmitAnswer_forTextInput_withSpaces_updatesStateWithVerbatimAnswer() {
-    restartExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    restartExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
     waitForGetCurrentStateSuccessfulLoad()
     navigateToPrototypeTextInputState()
 
@@ -900,7 +1007,9 @@ class ExplorationProgressControllerTest {
 
   @Test
   fun testGetCurrentState_eighthState_submitWrongAnswer_updatePendingState() {
-    restartExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    restartExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
     waitForGetCurrentStateSuccessfulLoad()
     navigateToPrototypeTextInputState()
 
@@ -919,7 +1028,9 @@ class ExplorationProgressControllerTest {
 
   @Test
   fun testGetCurrentState_afterMovePreviousAndNext_returnsCurrentState() {
-    restartExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    restartExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
     waitForGetCurrentStateSuccessfulLoad()
     playThroughPrototypeState1AndMoveToNextState()
 
@@ -933,7 +1044,9 @@ class ExplorationProgressControllerTest {
 
   @Test
   fun testGetCurrentState_afterMoveNextAndPrevious_returnsCurrentState() {
-    restartExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    restartExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
     waitForGetCurrentStateSuccessfulLoad()
     playThroughPrototypeState1AndMoveToNextState()
     submitPrototypeState2Answer() // Submit the answer but do not proceed to the next state.
@@ -948,7 +1061,9 @@ class ExplorationProgressControllerTest {
 
   @Test
   fun testGetCurrentState_afterMoveToPrev_onThirdState_newObserver_receivesCompletedSecondState() {
-    restartExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    restartExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
     waitForGetCurrentStateSuccessfulLoad()
     playThroughPrototypeState1AndMoveToNextState()
     playThroughPrototypeState2AndMoveToNextState()
@@ -964,7 +1079,9 @@ class ExplorationProgressControllerTest {
 
   @Test
   fun testGetCurrentState_forFirstState_doesNotHaveNextState() {
-    restartExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    restartExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
     val ephemeralState = waitForGetCurrentStateSuccessfulLoad()
 
     // The initial state should not have a next state.
@@ -973,7 +1090,9 @@ class ExplorationProgressControllerTest {
 
   @Test
   fun testGetCurrentState_forFirstState_afterAnswerSubmission_doesNotHaveNextState() {
-    restartExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    restartExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
     waitForGetCurrentStateSuccessfulLoad()
 
     val ephemeralState = submitPrototypeState1Answer()
@@ -985,7 +1104,9 @@ class ExplorationProgressControllerTest {
 
   @Test
   fun testGetCurrentState_forSecondState_doesNotHaveNextState() {
-    restartExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    restartExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
     waitForGetCurrentStateSuccessfulLoad()
 
     val ephemeralState = playThroughPrototypeState1AndMoveToNextState()
@@ -996,7 +1117,9 @@ class ExplorationProgressControllerTest {
 
   @Test
   fun testGetCurrentState_forSecondState_navigateBackward_hasNextState() {
-    restartExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    restartExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
     waitForGetCurrentStateSuccessfulLoad()
     playThroughPrototypeState1AndMoveToNextState()
 
@@ -1008,7 +1131,9 @@ class ExplorationProgressControllerTest {
 
   @Test
   fun testGetCurrentState_forSecondState_navigateBackwardThenForward_doesNotHaveNextState() {
-    restartExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    restartExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
     waitForGetCurrentStateSuccessfulLoad()
     playThroughPrototypeState1AndMoveToNextState()
 
@@ -1021,7 +1146,9 @@ class ExplorationProgressControllerTest {
 
   @Test
   fun testSubmitAnswer_forNumericInput_correctAnswer_returnsOutcomeWithTransition() {
-    restartExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    restartExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
     waitForGetCurrentStateSuccessfulLoad()
     navigateToPrototypeNumericInputState()
 
@@ -1035,7 +1162,9 @@ class ExplorationProgressControllerTest {
 
   @Test
   fun testSubmitAnswer_forNumericInput_wrongAnswer_returnsOutcomeWithTransition() {
-    restartExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    restartExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
     waitForGetCurrentStateSuccessfulLoad()
     navigateToPrototypeNumericInputState()
 
@@ -1049,7 +1178,9 @@ class ExplorationProgressControllerTest {
 
   @Test
   fun testSubmitAnswer_forContinue_returnsOutcomeWithTransition() {
-    restartExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    restartExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
     waitForGetCurrentStateSuccessfulLoad()
     // The first state of the exploration is the Continue interaction.
 
@@ -1063,7 +1194,9 @@ class ExplorationProgressControllerTest {
 
   @Test
   fun testGetCurrentState_eleventhState_isTerminalState() {
-    restartExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    restartExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
     waitForGetCurrentStateSuccessfulLoad()
 
     val ephemeralState = playThroughPrototypeExploration()
@@ -1074,7 +1207,9 @@ class ExplorationProgressControllerTest {
 
   @Test
   fun testGetCurrentState_afterMoveToPrevious_onThirdState_updatesToCompletedSecondState() {
-    restartExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    restartExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
     waitForGetCurrentStateSuccessfulLoad()
     playThroughPrototypeState1AndMoveToNextState()
     playThroughPrototypeState2AndMoveToNextState()
@@ -1096,7 +1231,9 @@ class ExplorationProgressControllerTest {
 
   @Test
   fun testMoveToNext_onFinalState_failsWithError() {
-    restartExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    restartExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
     waitForGetCurrentStateSuccessfulLoad()
     playThroughPrototypeExploration()
 
@@ -1111,7 +1248,9 @@ class ExplorationProgressControllerTest {
 
   @Test
   fun testGetCurrentState_afterPlayingFullSecondExploration_returnsTerminalState() {
-    restartExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_13)
+    restartExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_13
+    )
     waitForGetCurrentStateSuccessfulLoad()
 
     submitImageRegionAnswer(clickX = 0.5f, clickY = 0.5f, clickedRegion = "Saturn")
@@ -1125,7 +1264,9 @@ class ExplorationProgressControllerTest {
   fun testGetCurrentState_afterPlayingFullSecondExploration_diffPath_returnsTerminalState() {
     // Click on Jupiter before Saturn to take a slightly different (valid) path through the
     // exploration. (Note that this does not include actual branching).
-    restartExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_13)
+    restartExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_13
+    )
     waitForGetCurrentStateSuccessfulLoad()
 
     submitImageRegionAnswer(clickX = 0.2f, clickY = 0.5f, clickedRegion = "Jupiter")
@@ -1138,12 +1279,16 @@ class ExplorationProgressControllerTest {
 
   @Test
   fun testGetCurrentState_afterPlayingThroughPreviousExplorations_returnsStateFromSecondExp() {
-    restartExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    restartExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
     waitForGetCurrentStateSuccessfulLoad()
     playThroughPrototypeExploration()
     endExploration()
 
-    restartExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_13)
+    restartExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_13
+    )
     waitForGetCurrentStateSuccessfulLoad()
     val ephemeralState =
       submitImageRegionAnswer(clickX = 0.2f, clickY = 0.5f, clickedRegion = "Jupiter")
@@ -1156,7 +1301,9 @@ class ExplorationProgressControllerTest {
 
   @Test
   fun testMoveToPrevious_navigatedForwardThenBackToInitial_failsWithError_logsException() {
-    restartExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    restartExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
     waitForGetCurrentStateSuccessfulLoad()
     playThroughPrototypeState1AndMoveToNextState()
     moveToPreviousState()
@@ -1173,7 +1320,9 @@ class ExplorationProgressControllerTest {
 
   @Test
   fun testGetCurrentState_playInvalidExploration_returnsFailure_logsException() {
-    restartExploration(INVALID_TOPIC_ID, INVALID_STORY_ID, INVALID_EXPLORATION_ID)
+    restartExploration(
+      INVALID_CLASSROOM_ID, INVALID_TOPIC_ID, INVALID_STORY_ID, INVALID_EXPLORATION_ID
+    )
 
     waitForGetCurrentStateFailureLoad()
 
@@ -1184,7 +1333,9 @@ class ExplorationProgressControllerTest {
 
   @Test
   fun testCheckpointing_loadExploration_checkCheckpointIsSaved() {
-    startPlayingNewExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    startPlayingNewExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
     waitForGetCurrentStateSuccessfulLoad()
 
     val result =
@@ -1197,7 +1348,9 @@ class ExplorationProgressControllerTest {
 
   @Test
   fun testCheckpointing_playThroughMultipleStates_verifyCheckpointHasCorrectPendingStateName() {
-    startPlayingNewExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    startPlayingNewExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
     waitForGetCurrentStateSuccessfulLoad()
 
     assertThat(retrieveCheckpointStateName(TEST_EXPLORATION_ID_2)).isEqualTo("Continue")
@@ -1214,7 +1367,9 @@ class ExplorationProgressControllerTest {
 
   @Test
   fun testCheckpointing_advToFourthState_backToPrevState_verifyCheckpointHasCorrectPendingState() {
-    startPlayingNewExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    startPlayingNewExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
     waitForGetCurrentStateSuccessfulLoad()
 
     playThroughPrototypeState1AndMoveToNextState()
@@ -1228,7 +1383,9 @@ class ExplorationProgressControllerTest {
 
   @Test
   fun testCheckpointing_backTwoStates_nextState_verifyCheckpointHasCorrectPendingState() {
-    startPlayingNewExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    startPlayingNewExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
     waitForGetCurrentStateSuccessfulLoad()
 
     playThroughPrototypeState1AndMoveToNextState()
@@ -1243,7 +1400,9 @@ class ExplorationProgressControllerTest {
 
   @Test
   fun testCheckpointing_advanceToThirdState_submitMultipleAns_checkCheckpointIsSavedAfterEachAns() {
-    startPlayingNewExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    startPlayingNewExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
     waitForGetCurrentStateSuccessfulLoad()
 
     playThroughPrototypeState1AndMoveToNextState()
@@ -1271,7 +1430,9 @@ class ExplorationProgressControllerTest {
 
   @Test
   fun testCheckpointing_advToThirdState_submitAns_prevState_checkCheckpointIsSavedAfterEachAns() {
-    startPlayingNewExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    startPlayingNewExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
     waitForGetCurrentStateSuccessfulLoad()
 
     playThroughPrototypeState1AndMoveToNextState()
@@ -1295,7 +1456,9 @@ class ExplorationProgressControllerTest {
 
   @Test
   fun testCheckpointing_advToThirdState_moveToPrevState_checkCheckpointHasStateIndexOfThirdState() {
-    startPlayingNewExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    startPlayingNewExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
     waitForGetCurrentStateSuccessfulLoad()
 
     playThroughPrototypeState1AndMoveToNextState()
@@ -1307,7 +1470,9 @@ class ExplorationProgressControllerTest {
 
   @Test
   fun testCheckpointing_advToThirdState_prevStates_nextState_checkCheckpointHasCorrectStateIndex() {
-    startPlayingNewExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    startPlayingNewExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
     waitForGetCurrentStateSuccessfulLoad()
 
     playThroughPrototypeState1AndMoveToNextState()
@@ -1321,7 +1486,9 @@ class ExplorationProgressControllerTest {
 
   @Test
   fun testCheckpointing_hintIsVisible_checkHintIsSavedInCheckpoint() {
-    startPlayingNewExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    startPlayingNewExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
     waitForGetCurrentStateSuccessfulLoad()
 
     navigateToPrototypeFractionInputState()
@@ -1336,7 +1503,9 @@ class ExplorationProgressControllerTest {
 
   @Test
   fun testCheckpointing_revealHint_checkHintIsSavedInCheckpoint() {
-    startPlayingNewExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    startPlayingNewExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
     waitForGetCurrentStateSuccessfulLoad()
 
     navigateToPrototypeFractionInputState()
@@ -1354,7 +1523,9 @@ class ExplorationProgressControllerTest {
 
   @Test
   fun testCheckpointing_solutionIsVisible_checkCheckpointIsSaved() {
-    startPlayingNewExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    startPlayingNewExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
     waitForGetCurrentStateSuccessfulLoad()
 
     navigateToPrototypeFractionInputState()
@@ -1375,7 +1546,9 @@ class ExplorationProgressControllerTest {
 
   @Test
   fun testCheckpointing_revealSolution_checkCheckpointIsSaved() {
-    startPlayingNewExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    startPlayingNewExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
     waitForGetCurrentStateSuccessfulLoad()
 
     navigateToPrototypeFractionInputState()
@@ -1399,7 +1572,9 @@ class ExplorationProgressControllerTest {
 
   @Test
   fun testCheckpointing_onStateWithContinueInteraction_pressContinue_correctCheckpointIsSaved() {
-    startPlayingNewExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    startPlayingNewExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
     waitForGetCurrentStateSuccessfulLoad()
 
     playThroughPrototypeState1AndMoveToNextState()
@@ -1412,7 +1587,9 @@ class ExplorationProgressControllerTest {
   fun testCheckpointing_noCheckpointSaved_checkCheckpointStateIsUnsaved() {
     // 'Replay' the exploration (since the only way to not have saved progress is for the lesson to
     // already be completed).
-    replayExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    replayExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
     val ephemeralState = waitForGetCurrentStateSuccessfulLoad()
 
     assertThat(ephemeralState.checkpointState).isEqualTo(CheckpointState.CHECKPOINT_UNSAVED)
@@ -1420,7 +1597,9 @@ class ExplorationProgressControllerTest {
 
   @Test
   fun testCheckpointing_saveCheckpoint_checkCheckpointStateIsSavedDatabaseNotExceededLimit() {
-    startPlayingNewExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    startPlayingNewExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
     val ephemeralState = waitForGetCurrentStateSuccessfulLoad()
 
     assertThat(ephemeralState.checkpointState)
@@ -1429,7 +1608,9 @@ class ExplorationProgressControllerTest {
 
   @Test
   fun testCheckpointing_saveCheckpoint_databaseFull_checkpointStateIsSavedDatabaseExceededLimit() {
-    startPlayingNewExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    startPlayingNewExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
     waitForGetCurrentStateSuccessfulLoad()
     // For testing, size limit of checkpoint database is set to 150 Bytes, this makes the database
     // exceed the allocated limit when checkpoint is saved on completing prototypeState 2.
@@ -1442,14 +1623,18 @@ class ExplorationProgressControllerTest {
 
   @Test
   fun testCheckpointing_onSecondState_resumeExploration_expResumedFromCorrectPendingState() {
-    startPlayingNewExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    startPlayingNewExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
     waitForGetCurrentStateSuccessfulLoad()
 
     playThroughPrototypeState1AndMoveToNextState()
     endExploration()
 
     val checkpoint = retrieveExplorationCheckpoint(TEST_EXPLORATION_ID_2)
-    resumeExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2, checkpoint)
+    resumeExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2, checkpoint
+    )
     val ephemeralState = waitForGetCurrentStateSuccessfulLoad()
 
     // Verify that we're on the second state of the second exploration.
@@ -1459,7 +1644,9 @@ class ExplorationProgressControllerTest {
 
   @Test
   fun testCheckpointing_onSecondState_navigateBack_resumeExploration_checkResumedFromSecondState() {
-    startPlayingNewExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    startPlayingNewExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
     waitForGetCurrentStateSuccessfulLoad()
 
     playThroughPrototypeState1AndMoveToNextState()
@@ -1467,7 +1654,9 @@ class ExplorationProgressControllerTest {
     endExploration()
 
     val checkpoint = retrieveExplorationCheckpoint(TEST_EXPLORATION_ID_2)
-    resumeExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2, checkpoint)
+    resumeExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2, checkpoint
+    )
     val ephemeralState = waitForGetCurrentStateSuccessfulLoad()
 
     // Verify that we're on the second state of the second exploration.
@@ -1477,7 +1666,9 @@ class ExplorationProgressControllerTest {
 
   @Test
   fun testCheckpointing_onSecondState_submitWrongAns_resumeExploration_checkWrongAnswersVisible() {
-    startPlayingNewExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    startPlayingNewExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
     waitForGetCurrentStateSuccessfulLoad()
 
     playThroughPrototypeState1AndMoveToNextState()
@@ -1487,7 +1678,9 @@ class ExplorationProgressControllerTest {
     endExploration()
 
     val checkpoint = retrieveExplorationCheckpoint(TEST_EXPLORATION_ID_2)
-    resumeExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2, checkpoint)
+    resumeExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2, checkpoint
+    )
     val ephemeralState = waitForGetCurrentStateSuccessfulLoad()
 
     // Verify that three wrong answers are visible to the user.
@@ -1497,7 +1690,9 @@ class ExplorationProgressControllerTest {
 
   @Test
   fun testCheckpointing_onSecondState_submitRightAns_resumeExploration_expResumedFromCompState() {
-    startPlayingNewExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    startPlayingNewExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
     waitForGetCurrentStateSuccessfulLoad()
 
     playThroughPrototypeState1AndMoveToNextState()
@@ -1507,7 +1702,9 @@ class ExplorationProgressControllerTest {
     endExploration()
 
     val checkpoint = retrieveExplorationCheckpoint(TEST_EXPLORATION_ID_2)
-    resumeExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2, checkpoint)
+    resumeExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2, checkpoint
+    )
     val ephemeralState = waitForGetCurrentStateSuccessfulLoad()
 
     // Verify that we're on the second state of the second exploration because the continue button
@@ -1518,7 +1715,9 @@ class ExplorationProgressControllerTest {
 
   @Test
   fun testCheckpointing_submitAns_moveToNextState_resumeExploration_answersVisibleOnPrevState() {
-    startPlayingNewExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    startPlayingNewExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
     waitForGetCurrentStateSuccessfulLoad()
 
     playThroughPrototypeState1AndMoveToNextState()
@@ -1528,7 +1727,9 @@ class ExplorationProgressControllerTest {
     endExploration()
 
     val checkpoint = retrieveExplorationCheckpoint(TEST_EXPLORATION_ID_2)
-    resumeExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2, checkpoint)
+    resumeExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2, checkpoint
+    )
     waitForGetCurrentStateSuccessfulLoad()
     val ephemeralState = moveToPreviousState()
 
@@ -1541,14 +1742,18 @@ class ExplorationProgressControllerTest {
 
   @Test
   fun testCheckpointing_onSecondState_resumeExploration_checkPendingStateDoesNotHaveANextState() {
-    startPlayingNewExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    startPlayingNewExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
     waitForGetCurrentStateSuccessfulLoad()
 
     playThroughPrototypeState1AndMoveToNextState()
     endExploration()
 
     val checkpoint = retrieveExplorationCheckpoint(TEST_EXPLORATION_ID_2)
-    resumeExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2, checkpoint)
+    resumeExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2, checkpoint
+    )
     val ephemeralState = waitForGetCurrentStateSuccessfulLoad()
 
     // Verify that we're on the second state of the second exploration because the continue button
@@ -1560,12 +1765,16 @@ class ExplorationProgressControllerTest {
 
   @Test
   fun testCheckpointing_onFirstState_resumeExploration_checkStateDoesNotHaveAPrevState() {
-    startPlayingNewExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    startPlayingNewExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
     waitForGetCurrentStateSuccessfulLoad()
     endExploration()
 
     val checkpoint = retrieveExplorationCheckpoint(TEST_EXPLORATION_ID_2)
-    resumeExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2, checkpoint)
+    resumeExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2, checkpoint
+    )
     val ephemeralState = waitForGetCurrentStateSuccessfulLoad()
 
     // Verify that we're on the second state of the second exploration because the continue button
@@ -1577,14 +1786,18 @@ class ExplorationProgressControllerTest {
 
   @Test
   fun testCheckpointing_onSecondState_resumeExploration_checkFirstStateHasANextState() {
-    startPlayingNewExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    startPlayingNewExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
     waitForGetCurrentStateSuccessfulLoad()
 
     playThroughPrototypeState1AndMoveToNextState()
     endExploration()
 
     val checkpoint = retrieveExplorationCheckpoint(TEST_EXPLORATION_ID_2)
-    resumeExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2, checkpoint)
+    resumeExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2, checkpoint
+    )
     waitForGetCurrentStateSuccessfulLoad()
     val ephemeralState = moveToPreviousState()
 
@@ -1597,14 +1810,18 @@ class ExplorationProgressControllerTest {
 
   @Test
   fun testCheckpointing_onSecondState_resumeExploration_checkFirstStateDoesNotHaveAPrevState() {
-    startPlayingNewExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    startPlayingNewExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
     waitForGetCurrentStateSuccessfulLoad()
 
     playThroughPrototypeState1AndMoveToNextState()
     endExploration()
 
     val checkpoint = retrieveExplorationCheckpoint(TEST_EXPLORATION_ID_2)
-    resumeExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2, checkpoint)
+    resumeExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2, checkpoint
+    )
     waitForGetCurrentStateSuccessfulLoad()
     val ephemeralState = moveToPreviousState()
 
@@ -1617,14 +1834,18 @@ class ExplorationProgressControllerTest {
 
   @Test
   fun testCheckpointing_onSecondState_resumeExploration_checkSecondStateHasAPrevState() {
-    startPlayingNewExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    startPlayingNewExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
     waitForGetCurrentStateSuccessfulLoad()
 
     playThroughPrototypeState1AndMoveToNextState()
     endExploration()
 
     val checkpoint = retrieveExplorationCheckpoint(TEST_EXPLORATION_ID_2)
-    resumeExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2, checkpoint)
+    resumeExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2, checkpoint
+    )
     val ephemeralState = waitForGetCurrentStateSuccessfulLoad()
 
     // Verify that we're on the second state of the second exploration because the continue button
@@ -1636,7 +1857,9 @@ class ExplorationProgressControllerTest {
 
   @Test
   fun testCheckpointing_submitAns_doNotPressContinueBtn_resumeExp_pendingStateHasNoNextState() {
-    startPlayingNewExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    startPlayingNewExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
     waitForGetCurrentStateSuccessfulLoad()
 
     playThroughPrototypeState1AndMoveToNextState()
@@ -1644,7 +1867,9 @@ class ExplorationProgressControllerTest {
     endExploration()
 
     val checkpoint = retrieveExplorationCheckpoint(TEST_EXPLORATION_ID_2)
-    resumeExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2, checkpoint)
+    resumeExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2, checkpoint
+    )
     val ephemeralState = waitForGetCurrentStateSuccessfulLoad()
 
     // Verify that the current state is a completed state but has no next state because we have
@@ -1656,14 +1881,18 @@ class ExplorationProgressControllerTest {
 
   @Test
   fun testCheckpointing_noHintVisible_resumeExp_notHintVisibleOnPendingState() {
-    startPlayingNewExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    startPlayingNewExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
     waitForGetCurrentStateSuccessfulLoad()
 
     playThroughPrototypeState1AndMoveToNextState()
     endExploration()
 
     val checkpoint = retrieveExplorationCheckpoint(TEST_EXPLORATION_ID_2)
-    resumeExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2, checkpoint)
+    resumeExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2, checkpoint
+    )
     val ephemeralState = waitForGetCurrentStateSuccessfulLoad()
 
     // Verify that the helpIndex.IndexTypeCase is equal to INDEX_TYPE_NOT_SET because no hint
@@ -1674,7 +1903,9 @@ class ExplorationProgressControllerTest {
 
   @Test
   fun testCheckpointing_unrevealedHintIsVisible_resumeExp_unrevealedHintIsVisibleOnPendingState() {
-    startPlayingNewExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    startPlayingNewExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
     waitForGetCurrentStateSuccessfulLoad()
 
     playThroughPrototypeState1AndMoveToNextState()
@@ -1684,7 +1915,9 @@ class ExplorationProgressControllerTest {
     endExploration()
 
     val checkpoint = retrieveExplorationCheckpoint(TEST_EXPLORATION_ID_2)
-    resumeExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2, checkpoint)
+    resumeExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2, checkpoint
+    )
     val ephemeralState = waitForGetCurrentStateSuccessfulLoad()
 
     // Verify that the helpIndex.IndexTypeCase is equal AVAILABLE_NEXT_HINT_HINT_INDEX because a new
@@ -1699,7 +1932,9 @@ class ExplorationProgressControllerTest {
 
   @Test
   fun testCheckpointing_revealedHintIsVisible_resumeExp_revealedHintIsVisibleOnPendingState() {
-    startPlayingNewExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    startPlayingNewExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
     waitForGetCurrentStateSuccessfulLoad()
 
     playThroughPrototypeState1AndMoveToNextState()
@@ -1711,7 +1946,9 @@ class ExplorationProgressControllerTest {
     endExploration()
 
     val checkpoint = retrieveExplorationCheckpoint(TEST_EXPLORATION_ID_2)
-    resumeExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2, checkpoint)
+    resumeExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2, checkpoint
+    )
     val ephemeralState = waitForGetCurrentStateSuccessfulLoad()
 
     // Verify that the helpIndex.IndexTypeCase is equal LATEST_REVEALED_HINT_INDEX because a new
@@ -1723,7 +1960,9 @@ class ExplorationProgressControllerTest {
 
   @Test
   fun testCheckpointing_revealedHintIsVisible_resumeExp_wait10Seconds_solutionIsNotVisible() {
-    startPlayingNewExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    startPlayingNewExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
     waitForGetCurrentStateSuccessfulLoad()
 
     playThroughPrototypeState1AndMoveToNextState()
@@ -1735,7 +1974,9 @@ class ExplorationProgressControllerTest {
     endExploration()
 
     val checkpoint = retrieveExplorationCheckpoint(TEST_EXPLORATION_ID_2)
-    resumeExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2, checkpoint)
+    resumeExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2, checkpoint
+    )
     waitForGetCurrentStateSuccessfulLoad()
     testCoroutineDispatchers.advanceTimeBy(TimeUnit.SECONDS.toMillis(10))
 
@@ -1750,7 +1991,9 @@ class ExplorationProgressControllerTest {
 
   @Test
   fun testCheckpointing_revealedHintIsVisible_resumeExp_wait30Seconds_solutionIsNotVisible() {
-    startPlayingNewExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    startPlayingNewExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
     waitForGetCurrentStateSuccessfulLoad()
 
     playThroughPrototypeState1AndMoveToNextState()
@@ -1762,7 +2005,9 @@ class ExplorationProgressControllerTest {
     endExploration()
 
     val checkpoint = retrieveExplorationCheckpoint(TEST_EXPLORATION_ID_2)
-    resumeExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2, checkpoint)
+    resumeExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2, checkpoint
+    )
     waitForGetCurrentStateSuccessfulLoad()
     testCoroutineDispatchers.advanceTimeBy(TimeUnit.SECONDS.toMillis(30))
 
@@ -1776,7 +2021,9 @@ class ExplorationProgressControllerTest {
 
   @Test
   fun testCheckpointing_solutionIsVisible_resumeExp_unrevealedSolutionIsVisibleOnPendingState() {
-    startPlayingNewExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    startPlayingNewExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
     waitForGetCurrentStateSuccessfulLoad()
 
     playThroughPrototypeState1AndMoveToNextState()
@@ -1792,7 +2039,9 @@ class ExplorationProgressControllerTest {
     endExploration()
 
     val checkpoint = retrieveExplorationCheckpoint(TEST_EXPLORATION_ID_2)
-    resumeExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2, checkpoint)
+    resumeExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2, checkpoint
+    )
     val ephemeralState = waitForGetCurrentStateSuccessfulLoad()
 
     // Verify that the helpIndex.IndexTypeCase is equal EVERYTHING_IS_REVEALED because all available
@@ -1805,7 +2054,9 @@ class ExplorationProgressControllerTest {
 
   @Test
   fun testCheckpointing_revealedSolution_resumeExp_revealedSolIsVisibleOnPendingState() {
-    startPlayingNewExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    startPlayingNewExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
     waitForGetCurrentStateSuccessfulLoad()
 
     playThroughPrototypeState1AndMoveToNextState()
@@ -1824,7 +2075,9 @@ class ExplorationProgressControllerTest {
     endExploration()
 
     val checkpoint = retrieveExplorationCheckpoint(TEST_EXPLORATION_ID_2)
-    resumeExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2, checkpoint)
+    resumeExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2, checkpoint
+    )
     val ephemeralState = waitForGetCurrentStateSuccessfulLoad()
 
     // Verify that the helpIndex.IndexTypeCase is equal EVERYTHING_IS_REVEALED because all available
@@ -1837,7 +2090,9 @@ class ExplorationProgressControllerTest {
 
   @Test
   fun testCheckpointing_playSomeStates_resumeExp_playRemainingState_verifyTerminalStateReached() {
-    startPlayingNewExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    startPlayingNewExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
     waitForGetCurrentStateSuccessfulLoad()
 
     // Play through some states in the exploration.
@@ -1849,7 +2104,9 @@ class ExplorationProgressControllerTest {
     endExploration()
 
     val checkpoint = retrieveExplorationCheckpoint(TEST_EXPLORATION_ID_2)
-    resumeExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2, checkpoint)
+    resumeExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2, checkpoint
+    )
     waitForGetCurrentStateSuccessfulLoad()
 
     // Resume exploration and play through the remaining states in the exploration.
@@ -1869,7 +2126,9 @@ class ExplorationProgressControllerTest {
   @RunOn(buildEnvironments = [BuildEnvironment.BAZEL]) // Languages unsupported in Gradle builds.
   fun testGetCurrentState_englishLocale_defaultContentLang_includesTranslationContextForEnglish() {
     forceDefaultLocale(Locale.US)
-    startPlayingNewExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    startPlayingNewExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
 
     val ephemeralState = waitForGetCurrentStateSuccessfulLoad()
 
@@ -1885,7 +2144,9 @@ class ExplorationProgressControllerTest {
   @RunOn(buildEnvironments = [BuildEnvironment.BAZEL]) // Languages unsupported in Gradle builds.
   fun testGetCurrentState_arabicLocale_defaultContentLang_includesTranslationContextForArabic() {
     forceDefaultLocale(EGYPT_ARABIC_LOCALE)
-    startPlayingNewExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    startPlayingNewExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
 
     val ephemeralState = waitForGetCurrentStateSuccessfulLoad()
 
@@ -1897,7 +2158,9 @@ class ExplorationProgressControllerTest {
   @Test
   fun testGetCurrentState_turkishLocale_defaultContentLang_includesDefaultTranslationContext() {
     forceDefaultLocale(TURKEY_TURKISH_LOCALE)
-    startPlayingNewExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    startPlayingNewExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
 
     val ephemeralState = waitForGetCurrentStateSuccessfulLoad()
 
@@ -1911,7 +2174,11 @@ class ExplorationProgressControllerTest {
     val englishProfileId = ProfileId.newBuilder().apply { internalId = 1 }.build()
     updateContentLanguage(englishProfileId, OppiaLanguage.ENGLISH)
     startPlayingNewExploration(
-      TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2, englishProfileId
+      TEST_CLASSROOM_ID_0,
+      TEST_TOPIC_ID_0,
+      TEST_STORY_ID_0,
+      TEST_EXPLORATION_ID_2,
+      englishProfileId
     )
 
     val ephemeralState = waitForGetCurrentStateSuccessfulLoad()
@@ -1929,7 +2196,11 @@ class ExplorationProgressControllerTest {
     val englishProfileId = ProfileId.newBuilder().apply { internalId = 1 }.build()
     updateContentLanguage(englishProfileId, OppiaLanguage.ENGLISH)
     startPlayingNewExploration(
-      TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2, englishProfileId
+      TEST_CLASSROOM_ID_0,
+      TEST_TOPIC_ID_0,
+      TEST_STORY_ID_0,
+      TEST_EXPLORATION_ID_2,
+      englishProfileId
     )
     val monitor = monitorFactory.createMonitor(explorationProgressController.getCurrentState())
     monitor.waitForNextSuccessResult()
@@ -1951,7 +2222,11 @@ class ExplorationProgressControllerTest {
     updateContentLanguage(englishProfileId, OppiaLanguage.ENGLISH)
     updateContentLanguage(arabicProfileId, OppiaLanguage.ARABIC)
     startPlayingNewExploration(
-      TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2, arabicProfileId
+      TEST_CLASSROOM_ID_0,
+      TEST_TOPIC_ID_0,
+      TEST_STORY_ID_0,
+      TEST_EXPLORATION_ID_2,
+      arabicProfileId
     )
 
     val ephemeralState = waitForGetCurrentStateSuccessfulLoad()
@@ -1965,7 +2240,9 @@ class ExplorationProgressControllerTest {
   fun testPlayNewExploration_logsStartCardEvent() {
     logIntoAnalyticsReadyAdminProfile()
 
-    startPlayingNewExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    startPlayingNewExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
     waitForGetCurrentStateSuccessfulLoad()
 
     val exploration = loadExploration(TEST_EXPLORATION_ID_2)
@@ -1984,7 +2261,9 @@ class ExplorationProgressControllerTest {
     val checkpoint = createTestExp2CheckpointToState6()
     fakeAnalyticsEventLogger.clearAllEvents()
 
-    resumeExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2, checkpoint)
+    resumeExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2, checkpoint
+    )
     waitForGetCurrentStateSuccessfulLoad()
 
     // Resuming shouldn't log a 'start card' event.
@@ -2002,7 +2281,9 @@ class ExplorationProgressControllerTest {
     createTestExp2CheckpointToState6()
     fakeAnalyticsEventLogger.clearAllEvents()
 
-    restartExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    restartExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
     waitForGetCurrentStateSuccessfulLoad()
 
     val (eventLog1, eventLog2) = fakeAnalyticsEventLogger.getOldestEvents(count = 2)
@@ -2025,7 +2306,9 @@ class ExplorationProgressControllerTest {
     createTestExp2CheckpointToState6()
     fakeAnalyticsEventLogger.clearAllEvents()
 
-    replayExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    replayExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
     waitForGetCurrentStateSuccessfulLoad()
 
     val eventLog = fakeAnalyticsEventLogger.getMostRecentEvent()
@@ -2042,7 +2325,9 @@ class ExplorationProgressControllerTest {
   fun testPlayNewExp_firstCard_notFinished_doesNotLogReachInvestedEngagementEvent() {
     logIntoAnalyticsReadyAdminProfile()
 
-    startPlayingNewExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    startPlayingNewExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
     waitForGetCurrentStateSuccessfulLoad()
 
     val hasEngagementEvent = fakeAnalyticsEventLogger.hasEventLogged {
@@ -2055,7 +2340,9 @@ class ExplorationProgressControllerTest {
   fun testPlayNewExp_finishFirstCard_moveToSecond_doesNotLogReachInvestedEngagementEvent() {
     logIntoAnalyticsReadyAdminProfile()
 
-    startPlayingNewExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    startPlayingNewExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
     waitForGetCurrentStateSuccessfulLoad()
     playThroughPrototypeState1AndMoveToNextState()
 
@@ -2069,7 +2356,9 @@ class ExplorationProgressControllerTest {
   fun testPlayNewExp_finishThreeCards_doNotProceed_doesNotLogReachInvestedEngagementEvent() {
     logIntoAnalyticsReadyAdminProfile()
 
-    startPlayingNewExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    startPlayingNewExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
     waitForGetCurrentStateSuccessfulLoad()
     playThroughPrototypeState1AndMoveToNextState()
     playThroughPrototypeState2AndMoveToNextState()
@@ -2085,7 +2374,9 @@ class ExplorationProgressControllerTest {
   fun testPlayNewExp_finishThreeCards_moveToFour_logsReachInvestedEngagementEvent() {
     logIntoAnalyticsReadyAdminProfile()
 
-    startPlayingNewExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    startPlayingNewExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
     waitForGetCurrentStateSuccessfulLoad()
     playThroughPrototypeState1AndMoveToNextState()
     playThroughPrototypeState2AndMoveToNextState()
@@ -2106,7 +2397,9 @@ class ExplorationProgressControllerTest {
   fun testPlayNewExp_finishFourCards_moveToFive_logsReachInvestedEngagementEventOnlyOnce() {
     logIntoAnalyticsReadyAdminProfile()
 
-    startPlayingNewExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    startPlayingNewExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
     waitForGetCurrentStateSuccessfulLoad()
     playThroughPrototypeState1AndMoveToNextState()
     playThroughPrototypeState2AndMoveToNextState()
@@ -2124,13 +2417,17 @@ class ExplorationProgressControllerTest {
   @Test
   fun testPlayNewExp_firstTwo_startOver_playFirst_doesNotLogReachInvestedEngagementEvent() {
     logIntoAnalyticsReadyAdminProfile()
-    startPlayingNewExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    startPlayingNewExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
     waitForGetCurrentStateSuccessfulLoad()
     playThroughPrototypeState1AndMoveToNextState()
     playThroughPrototypeState2AndMoveToNextState()
 
     // Restart the exploration.
-    restartExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    restartExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
     waitForGetCurrentStateSuccessfulLoad()
     playThroughPrototypeState1AndMoveToNextState()
 
@@ -2145,13 +2442,17 @@ class ExplorationProgressControllerTest {
   @Test
   fun testPlayNewExp_firstTwo_startOver_playThreeAndMove_logsReachInvestedEngagementEvent() {
     logIntoAnalyticsReadyAdminProfile()
-    startPlayingNewExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    startPlayingNewExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
     waitForGetCurrentStateSuccessfulLoad()
     playThroughPrototypeState1AndMoveToNextState()
     playThroughPrototypeState2AndMoveToNextState()
 
     // Restart the exploration.
-    restartExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    restartExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
     waitForGetCurrentStateSuccessfulLoad()
     playThroughPrototypeState1AndMoveToNextState()
     playThroughPrototypeState2AndMoveToNextState()
@@ -2172,7 +2473,9 @@ class ExplorationProgressControllerTest {
   @Test
   fun testResumeExp_stateOneTwoDone_finishThreeAndMoveForward_noLogReachInvestedEngagementEvent() {
     logIntoAnalyticsReadyAdminProfile()
-    startPlayingNewExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    startPlayingNewExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
     waitForGetCurrentStateSuccessfulLoad()
     playThroughPrototypeState1AndMoveToNextState()
     playThroughPrototypeState2AndMoveToNextState()
@@ -2180,7 +2483,9 @@ class ExplorationProgressControllerTest {
     // End, then resume the exploration and complete the third state.
     endExploration()
     val checkPoint = retrieveExplorationCheckpoint(TEST_EXPLORATION_ID_2)
-    resumeExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2, checkPoint)
+    resumeExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2, checkPoint
+    )
     playThroughPrototypeState3AndMoveToNextState()
 
     // Despite the first three states now being completed, this isn't an engagement event since the
@@ -2194,7 +2499,9 @@ class ExplorationProgressControllerTest {
   @Test
   fun testResumeExp_stateOneTwoDone_finishThreeMoreAndMove_logsReachInvestedEngagementEvent() {
     logIntoAnalyticsReadyAdminProfile()
-    startPlayingNewExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    startPlayingNewExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
     waitForGetCurrentStateSuccessfulLoad()
     playThroughPrototypeState1AndMoveToNextState()
     playThroughPrototypeState2AndMoveToNextState()
@@ -2202,7 +2509,9 @@ class ExplorationProgressControllerTest {
     // End, then resume the exploration and complete the third state.
     endExploration()
     val checkPoint = retrieveExplorationCheckpoint(TEST_EXPLORATION_ID_2)
-    resumeExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2, checkPoint)
+    resumeExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2, checkPoint
+    )
     playThroughPrototypeState3AndMoveToNextState()
     playThroughPrototypeState4AndMoveToNextState()
     playThroughPrototypeState5AndMoveToNextState()
@@ -2223,7 +2532,9 @@ class ExplorationProgressControllerTest {
   @Test
   fun testResumeExp_finishThree_thenAnotherThreeAfterResume_logsInvestedEngagementEventTwice() {
     logIntoAnalyticsReadyAdminProfile()
-    startPlayingNewExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    startPlayingNewExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
     waitForGetCurrentStateSuccessfulLoad()
     playThroughPrototypeState1AndMoveToNextState()
     playThroughPrototypeState2AndMoveToNextState()
@@ -2232,7 +2543,9 @@ class ExplorationProgressControllerTest {
     // End, then resume the exploration and complete the third state.
     endExploration()
     val checkPoint = retrieveExplorationCheckpoint(TEST_EXPLORATION_ID_2)
-    resumeExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2, checkPoint)
+    resumeExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2, checkPoint
+    )
     playThroughPrototypeState4AndMoveToNextState()
     playThroughPrototypeState5AndMoveToNextState()
     playThroughPrototypeState6AndMoveToNextState()
@@ -2264,14 +2577,18 @@ class ExplorationProgressControllerTest {
   @Test
   fun testResumeExp_submitCorrectAnswer_logsResumeLessonSubmitCorrectAnswerEvent() {
     logIntoAnalyticsReadyAdminProfile()
-    startPlayingNewExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    startPlayingNewExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
     waitForGetCurrentStateSuccessfulLoad()
     playThroughPrototypeState1AndMoveToNextState()
 
     // End, then resume the exploration and submit correct answer.
     endExploration()
     val checkPoint = retrieveExplorationCheckpoint(TEST_EXPLORATION_ID_2)
-    resumeExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2, checkPoint)
+    resumeExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2, checkPoint
+    )
     submitPrototypeState2Answer()
 
     // Event should be logged for correct answer submission after returning to the lesson.
@@ -2284,14 +2601,18 @@ class ExplorationProgressControllerTest {
   @Test
   fun testResumeExp_submitIncorrectAnswer_logsResumeLessonSubmitIncorrectAnswerEvent() {
     logIntoAnalyticsReadyAdminProfile()
-    startPlayingNewExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    startPlayingNewExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
     waitForGetCurrentStateSuccessfulLoad()
     playThroughPrototypeState1AndMoveToNextState()
 
     // End, then resume the exploration and submit incorrect answer.
     endExploration()
     val checkPoint = retrieveExplorationCheckpoint(TEST_EXPLORATION_ID_2)
-    resumeExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2, checkPoint)
+    resumeExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2, checkPoint
+    )
     submitWrongAnswerForPrototypeState2()
 
     // Event should be logged for incorrect answer submission after returning to the lesson.
@@ -2304,13 +2625,17 @@ class ExplorationProgressControllerTest {
   @Test
   fun testStartOverExp_submitCorrectAnswer_doesNotLogResumeLessonSubmitCorrectAnswerEvent() {
     logIntoAnalyticsReadyAdminProfile()
-    startPlayingNewExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    startPlayingNewExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
     waitForGetCurrentStateSuccessfulLoad()
     playThroughPrototypeState1AndMoveToNextState()
 
     // End, then start over the exploration and submit correct answer.
     endExploration()
-    restartExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    restartExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
     submitPrototypeState2Answer()
 
     // Event should not be logged for correct answer submission after returning to the lesson.
@@ -2323,13 +2648,17 @@ class ExplorationProgressControllerTest {
   @Test
   fun testStartOverExp_submitIncorrectAnswer_doesNotLogResumeLessonSubmitIncorrectAnswerEvent() {
     logIntoAnalyticsReadyAdminProfile()
-    startPlayingNewExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    startPlayingNewExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
     waitForGetCurrentStateSuccessfulLoad()
     playThroughPrototypeState1AndMoveToNextState()
 
     // End, then resume the exploration and submit incorrect answer.
     endExploration()
-    restartExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    restartExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
     submitWrongAnswerForPrototypeState2()
 
     // Event should not be logged for incorrect answer submission after returning to the lesson.
@@ -2342,7 +2671,9 @@ class ExplorationProgressControllerTest {
   @Test
   fun testReplayExp_submitCorrectAnswer_doesNotLogResumeLessonSubmitCorrectAnswerEvent() {
     logIntoAnalyticsReadyAdminProfile()
-    replayExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    replayExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
     submitPrototypeState2Answer()
 
     // Event should not be logged for correct answer submission after replaying lesson.
@@ -2355,7 +2686,9 @@ class ExplorationProgressControllerTest {
   @Test
   fun testReplayExp_submitIncorrectAnswer_doesNotLogResumeLessonSubmitIncorrectAnswerEvent() {
     logIntoAnalyticsReadyAdminProfile()
-    replayExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    replayExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
     submitWrongAnswerForPrototypeState2()
 
     // Event should not be logged for incorrect answer submission after replaying lesson.
@@ -2368,7 +2701,9 @@ class ExplorationProgressControllerTest {
   @Test
   fun testSubmitAnswer_correctAnswer_logsEndCardAndSubmitAnswerEvents() {
     logIntoAnalyticsReadyAdminProfile()
-    startPlayingNewExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    startPlayingNewExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
     waitForGetCurrentStateSuccessfulLoad()
     playThroughPrototypeState1AndMoveToNextState()
     fakeAnalyticsEventLogger.clearAllEvents()
@@ -2392,7 +2727,9 @@ class ExplorationProgressControllerTest {
   @Test
   fun testSubmitAnswer_wrongAnswer_logsSubmitAnswerEvent_logsProgressSavingSuccessEvent() {
     logIntoAnalyticsReadyAdminProfile()
-    startPlayingNewExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    startPlayingNewExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
     waitForGetCurrentStateSuccessfulLoad()
     playThroughPrototypeState1AndMoveToNextState()
     fakeAnalyticsEventLogger.clearAllEvents()
@@ -2414,7 +2751,9 @@ class ExplorationProgressControllerTest {
   @Test
   fun testMoveToNextState_logsStartCardEvent_logsProgressSavingSuccessEvent() {
     logIntoAnalyticsReadyAdminProfile()
-    startPlayingNewExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    startPlayingNewExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
     waitForGetCurrentStateSuccessfulLoad()
     submitPrototypeState1Answer()
     fakeAnalyticsEventLogger.clearAllEvents()
@@ -2436,7 +2775,9 @@ class ExplorationProgressControllerTest {
   @Test
   fun testHint_offered_logsHintOfferedEvent_logsProgressSavingSuccessEvent() {
     logIntoAnalyticsReadyAdminProfile()
-    startPlayingNewExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    startPlayingNewExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
     waitForGetCurrentStateSuccessfulLoad()
     playThroughPrototypeState1AndMoveToNextState()
 
@@ -2468,7 +2809,9 @@ class ExplorationProgressControllerTest {
   @Test
   fun testHint_offeredThenViewed_logsViewHintEvent_logsProgressSavingSuccessEvent() {
     logIntoAnalyticsReadyAdminProfile()
-    startPlayingNewExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    startPlayingNewExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
     waitForGetCurrentStateSuccessfulLoad()
     playThroughPrototypeState1AndMoveToNextState()
     // Submit 2 wrong answers to trigger a hint becoming available.
@@ -2493,7 +2836,12 @@ class ExplorationProgressControllerTest {
   @Test
   fun testHint_lastHintWithNoSolution_offered_logsHintOfferedEvent_logsProgressSavingSuccessEvt() {
     logIntoAnalyticsReadyAdminProfile()
-    startPlayingNewExploration(FRACTIONS_TOPIC_ID, FRACTIONS_STORY_ID_0, FRACTIONS_EXPLORATION_ID_0)
+    startPlayingNewExploration(
+      TEST_CLASSROOM_ID_1,
+      FRACTIONS_TOPIC_ID,
+      FRACTIONS_STORY_ID_0,
+      FRACTIONS_EXPLORATION_ID_0
+    )
     waitForGetCurrentStateSuccessfulLoad()
     submitContinueButtonAnswerAndContinue() // 'Introduction' -> 'A Problem'
     submitContinueButtonAnswerAndContinue() // 'A Problem' -> 'Mr. Baker'
@@ -2527,7 +2875,12 @@ class ExplorationProgressControllerTest {
   @Test
   fun testHint_lastHintWithNoSol_offeredThenViewed_logsViewHintEvt_logsProgressSavingSuccessEvt() {
     logIntoAnalyticsReadyAdminProfile()
-    startPlayingNewExploration(FRACTIONS_TOPIC_ID, FRACTIONS_STORY_ID_0, FRACTIONS_EXPLORATION_ID_0)
+    startPlayingNewExploration(
+      TEST_CLASSROOM_ID_1,
+      FRACTIONS_TOPIC_ID,
+      FRACTIONS_STORY_ID_0,
+      FRACTIONS_EXPLORATION_ID_0
+    )
     waitForGetCurrentStateSuccessfulLoad()
     submitContinueButtonAnswerAndContinue() // 'Introduction' -> 'A Problem'
     submitContinueButtonAnswerAndContinue() // 'A Problem' -> 'Mr. Baker'
@@ -2555,7 +2908,9 @@ class ExplorationProgressControllerTest {
   @Test
   fun testSolution_offered_logsSolutionOfferedEvent_logsProgressSavingSuccessEvent() {
     logIntoAnalyticsReadyAdminProfile()
-    startPlayingNewExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    startPlayingNewExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
     waitForGetCurrentStateSuccessfulLoad()
     playThroughPrototypeState1AndMoveToNextState()
     // Submit 2 wrong answers to trigger the hint.
@@ -2580,7 +2935,9 @@ class ExplorationProgressControllerTest {
   @Test
   fun testSolution_offeredThenViewed_logsViewSolutionEvent_logsProgressSavingSuccessEvent() {
     logIntoAnalyticsReadyAdminProfile()
-    startPlayingNewExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    startPlayingNewExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
     waitForGetCurrentStateSuccessfulLoad()
     playThroughPrototypeState1AndMoveToNextState()
     // Submit 2 wrong answers to trigger the hint.
@@ -2608,7 +2965,9 @@ class ExplorationProgressControllerTest {
   @Test
   fun testEndExploration_withoutFinishing_logsExitExplorationEvent() {
     logIntoAnalyticsReadyAdminProfile()
-    startPlayingNewExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    startPlayingNewExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
     waitForGetCurrentStateSuccessfulLoad()
 
     endExploration(isCompletion = false)
@@ -2621,7 +2980,9 @@ class ExplorationProgressControllerTest {
   @Test
   fun testEndExploration_afterFinishing_logsFinishExplorationEvent() {
     logIntoAnalyticsReadyAdminProfile()
-    startPlayingNewExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    startPlayingNewExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
     waitForGetCurrentStateSuccessfulLoad()
     playThroughPrototypeExploration()
 
@@ -2637,7 +2998,9 @@ class ExplorationProgressControllerTest {
   fun testUpdateLanguageMidLesson_englishToSwahili_updatesProfilesContentLanguage() {
     logIntoAnalyticsReadyAdminProfile()
     updateContentLanguage(profileId, OppiaLanguage.ENGLISH)
-    startPlayingNewExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    startPlayingNewExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
     waitForGetCurrentStateSuccessfulLoad()
 
     val updateProv = explorationProgressController.updateWrittenTranslationContentLanguageMidLesson(
@@ -2658,7 +3021,9 @@ class ExplorationProgressControllerTest {
   fun testUpdateLanguageMidLesson_englishToSwahili_logsLanguageSwitchEvent() {
     logIntoAnalyticsReadyAdminProfile()
     updateContentLanguage(profileId, OppiaLanguage.ENGLISH)
-    startPlayingNewExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    startPlayingNewExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
     waitForGetCurrentStateSuccessfulLoad()
 
     val updateProv = explorationProgressController.updateWrittenTranslationContentLanguageMidLesson(
@@ -2686,7 +3051,11 @@ class ExplorationProgressControllerTest {
     updateContentLanguage(englishProfileId, OppiaLanguage.ENGLISH)
     updateContentLanguage(arabicProfileId, OppiaLanguage.ARABIC)
     startPlayingNewExploration(
-      TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2, profileId = englishProfileId
+      TEST_CLASSROOM_ID_0,
+      TEST_TOPIC_ID_0,
+      TEST_STORY_ID_0,
+      TEST_EXPLORATION_ID_2,
+      englishProfileId
     )
     waitForGetCurrentStateSuccessfulLoad()
 
@@ -2710,7 +3079,9 @@ class ExplorationProgressControllerTest {
   fun testUpdateLanguageMidLesson_swahiliToEnglish_updatesProfilesContentLanguage() {
     logIntoAnalyticsReadyAdminProfile()
     updateContentLanguage(profileId, OppiaLanguage.SWAHILI)
-    startPlayingNewExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    startPlayingNewExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
     waitForGetCurrentStateSuccessfulLoad()
 
     val updateProv = explorationProgressController.updateWrittenTranslationContentLanguageMidLesson(
@@ -2731,7 +3102,9 @@ class ExplorationProgressControllerTest {
   fun testUpdateLanguageMidLesson_swahiliToEnglish_logsLanguageSwitchEvent() {
     logIntoAnalyticsReadyAdminProfile()
     updateContentLanguage(profileId, OppiaLanguage.SWAHILI)
-    startPlayingNewExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    startPlayingNewExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
     waitForGetCurrentStateSuccessfulLoad()
 
     val updateProv = explorationProgressController.updateWrittenTranslationContentLanguageMidLesson(
@@ -2756,7 +3129,12 @@ class ExplorationProgressControllerTest {
     oppiaClock.setFakeTimeMode(FakeOppiaClock.FakeTimeMode.MODE_UPTIME_MILLIS)
     explorationActiveTimeController.onAppInForeground()
 
-    startPlayingNewExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_4)
+    startPlayingNewExploration(
+      TEST_CLASSROOM_ID_0,
+      TEST_TOPIC_ID_0,
+      TEST_STORY_ID_0,
+      TEST_EXPLORATION_ID_4
+    )
 
     val sessionTime = TimeUnit.MINUTES.toMillis(5)
 
@@ -2781,6 +3159,7 @@ class ExplorationProgressControllerTest {
   }
 
   private fun startPlayingNewExploration(
+    classroomId: String,
     topicId: String,
     storyId: String,
     explorationId: String,
@@ -2788,12 +3167,13 @@ class ExplorationProgressControllerTest {
   ) {
     val startPlayingProvider =
       explorationDataController.startPlayingNewExploration(
-        profileId.internalId, topicId, storyId, explorationId
+        profileId.internalId, classroomId, topicId, storyId, explorationId
       )
     monitorFactory.waitForNextSuccessfulResult(startPlayingProvider)
   }
 
   private fun resumeExploration(
+    classroomId: String,
     topicId: String,
     storyId: String,
     explorationId: String,
@@ -2802,12 +3182,13 @@ class ExplorationProgressControllerTest {
   ) {
     val startPlayingProvider =
       explorationDataController.resumeExploration(
-        profileId.internalId, topicId, storyId, explorationId, explorationCheckpoint
+        profileId.internalId, classroomId, topicId, storyId, explorationId, explorationCheckpoint
       )
     monitorFactory.waitForNextSuccessfulResult(startPlayingProvider)
   }
 
   private fun restartExploration(
+    classroomId: String,
     topicId: String,
     storyId: String,
     explorationId: String,
@@ -2815,12 +3196,13 @@ class ExplorationProgressControllerTest {
   ) {
     val startPlayingProvider =
       explorationDataController.restartExploration(
-        profileId.internalId, topicId, storyId, explorationId
+        profileId.internalId, classroomId, topicId, storyId, explorationId
       )
     monitorFactory.waitForNextSuccessfulResult(startPlayingProvider)
   }
 
   private fun replayExploration(
+    classroomId: String,
     topicId: String,
     storyId: String,
     explorationId: String,
@@ -2828,7 +3210,7 @@ class ExplorationProgressControllerTest {
   ) {
     val startPlayingProvider =
       explorationDataController.replayExploration(
-        profileId.internalId, topicId, storyId, explorationId
+        profileId.internalId, classroomId, topicId, storyId, explorationId
       )
     monitorFactory.waitForNextSuccessfulResult(startPlayingProvider)
   }
@@ -2907,7 +3289,9 @@ class ExplorationProgressControllerTest {
   }
 
   private fun playThroughPrototypeExplorationInNewSession() {
-    startPlayingNewExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    startPlayingNewExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
     playThroughPrototypeExploration()
     endExploration()
   }
@@ -3283,7 +3667,9 @@ class ExplorationProgressControllerTest {
   }
 
   private fun createTestExp2CheckpointToState6(): ExplorationCheckpoint {
-    startPlayingNewExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    startPlayingNewExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
     waitForGetCurrentStateSuccessfulLoad()
 
     // Play through some states in the exploration.
diff --git a/domain/src/test/java/org/oppia/android/domain/exploration/lightweightcheckpointing/ExplorationCheckpointControllerTest.kt b/domain/src/test/java/org/oppia/android/domain/exploration/lightweightcheckpointing/ExplorationCheckpointControllerTest.kt
index 67f800e1c94..864af6b2745 100644
--- a/domain/src/test/java/org/oppia/android/domain/exploration/lightweightcheckpointing/ExplorationCheckpointControllerTest.kt
+++ b/domain/src/test/java/org/oppia/android/domain/exploration/lightweightcheckpointing/ExplorationCheckpointControllerTest.kt
@@ -902,6 +902,7 @@ class ExplorationCheckpointControllerTest {
     )
     explorationDataController.startPlayingNewExploration(
       internalProfileId = profileId.internalId,
+      classroomId = "<none>",
       topicId = "<none>",
       storyId = "<none>",
       explorationId = TEST_CHECKPOINTING_FAKE_EXP_ID
diff --git a/domain/src/test/java/org/oppia/android/domain/oppialogger/OppiaLoggerTest.kt b/domain/src/test/java/org/oppia/android/domain/oppialogger/OppiaLoggerTest.kt
index 75c69117bf6..73c213b9b21 100644
--- a/domain/src/test/java/org/oppia/android/domain/oppialogger/OppiaLoggerTest.kt
+++ b/domain/src/test/java/org/oppia/android/domain/oppialogger/OppiaLoggerTest.kt
@@ -62,6 +62,7 @@ import javax.inject.Singleton
 class OppiaLoggerTest {
   private companion object {
     private const val TEST_TIMESTAMP = 1234567898765
+    private const val TEST_CLASSROOM_ID = "test_classroomId"
     private const val TEST_TOPIC_ID = "test_topicId"
     private const val TEST_STORY_ID = "test_storyId"
     private const val TEST_EXPLORATION_ID = "test_explorationId"
@@ -220,6 +221,7 @@ class OppiaLoggerTest {
   @Test
   fun testController_createOpenExplorationActivityContext_returnsCorrectExplorationContext() {
     val eventContext = oppiaLogger.createOpenExplorationActivityContext(
+      TEST_CLASSROOM_ID,
       TEST_TOPIC_ID,
       TEST_STORY_ID,
       TEST_EXPLORATION_ID
diff --git a/domain/src/test/java/org/oppia/android/domain/oppialogger/analytics/AnalyticsControllerTest.kt b/domain/src/test/java/org/oppia/android/domain/oppialogger/analytics/AnalyticsControllerTest.kt
index 935cf57e88a..aadb627472f 100644
--- a/domain/src/test/java/org/oppia/android/domain/oppialogger/analytics/AnalyticsControllerTest.kt
+++ b/domain/src/test/java/org/oppia/android/domain/oppialogger/analytics/AnalyticsControllerTest.kt
@@ -77,6 +77,7 @@ import javax.inject.Provider
 import javax.inject.Singleton
 
 private const val TEST_TIMESTAMP = 1556094120000
+private const val TEST_CLASSROOM_ID = "test_classroomId"
 private const val TEST_TOPIC_ID = "test_topicId"
 private const val TEST_STORY_ID = "test_storyId"
 private const val TEST_EXPLORATION_ID = "test_explorationId"
@@ -138,6 +139,7 @@ class AnalyticsControllerTest {
     setUpTestApplicationComponent()
     analyticsController.logImportantEvent(
       oppiaLogger.createOpenExplorationActivityContext(
+        TEST_CLASSROOM_ID,
         TEST_TOPIC_ID,
         TEST_STORY_ID,
         TEST_EXPLORATION_ID
@@ -383,6 +385,7 @@ class AnalyticsControllerTest {
     setUpTestApplicationComponent()
     analyticsController.logLowPriorityEvent(
       oppiaLogger.createOpenExplorationActivityContext(
+        TEST_CLASSROOM_ID,
         TEST_TOPIC_ID,
         TEST_STORY_ID,
         TEST_EXPLORATION_ID
diff --git a/domain/src/test/java/org/oppia/android/domain/oppialogger/analytics/LearnerAnalyticsLoggerTest.kt b/domain/src/test/java/org/oppia/android/domain/oppialogger/analytics/LearnerAnalyticsLoggerTest.kt
index 2562ecbfca5..fc9ac0c1382 100644
--- a/domain/src/test/java/org/oppia/android/domain/oppialogger/analytics/LearnerAnalyticsLoggerTest.kt
+++ b/domain/src/test/java/org/oppia/android/domain/oppialogger/analytics/LearnerAnalyticsLoggerTest.kt
@@ -82,6 +82,7 @@ class LearnerAnalyticsLoggerTest {
     private const val TEST_INSTALL_ID = "test_installation_id"
     private const val TEST_LEARNER_ID = "test_learner_id"
     private const val UNKNOWN_INSTALL_ID = "unknown_installation_id"
+    private const val TEST_CLASSROOM_ID = "test_classroom_id"
     private const val TEST_TOPIC_ID = "test_topic_id"
     private const val TEST_STORY_ID = "test_story_id"
     private const val TEST_EXP_5_STATE_THREE_NAME = "NumericExpressionInput.IsEquivalentTo"
@@ -642,6 +643,7 @@ class LearnerAnalyticsLoggerTest {
     val eventLog = fakeAnalyticsEventLogger.getMostRecentEvent()
     assertThat(eventLog).isEssentialPriority()
     assertThat(eventLog).hasExitExplorationContextThat {
+      hasClassroomIdThat().isEqualTo(TEST_CLASSROOM_ID)
       hasTopicIdThat().isEqualTo(TEST_TOPIC_ID)
       hasStoryIdThat().isEqualTo(TEST_STORY_ID)
       hasExplorationIdThat().isEqualTo(TEST_EXPLORATION_ID_5)
@@ -683,6 +685,7 @@ class LearnerAnalyticsLoggerTest {
     val eventLog = fakeAnalyticsEventLogger.getMostRecentEvent()
     assertThat(eventLog).isEssentialPriority()
     assertThat(eventLog).hasFinishExplorationContextThat {
+      hasClassroomIdThat().isEqualTo(TEST_CLASSROOM_ID)
       hasTopicIdThat().isEqualTo(TEST_TOPIC_ID)
       hasStoryIdThat().isEqualTo(TEST_STORY_ID)
       hasExplorationIdThat().isEqualTo(TEST_EXPLORATION_ID_5)
@@ -710,6 +713,7 @@ class LearnerAnalyticsLoggerTest {
     assertThat(eventLog).isEssentialPriority()
     assertThat(eventLog).hasStartCardContextThat {
       hasExplorationDetailsThat {
+        hasClassroomIdThat().isEqualTo(TEST_CLASSROOM_ID)
         hasTopicIdThat().isEqualTo(TEST_TOPIC_ID)
         hasStoryIdThat().isEqualTo(TEST_STORY_ID)
         hasExplorationIdThat().isEqualTo(TEST_EXPLORATION_ID_5)
@@ -754,6 +758,7 @@ class LearnerAnalyticsLoggerTest {
     assertThat(eventLog).isEssentialPriority()
     assertThat(eventLog).hasEndCardContextThat {
       hasExplorationDetailsThat {
+        hasClassroomIdThat().isEqualTo(TEST_CLASSROOM_ID)
         hasTopicIdThat().isEqualTo(TEST_TOPIC_ID)
         hasStoryIdThat().isEqualTo(TEST_STORY_ID)
         hasExplorationIdThat().isEqualTo(TEST_EXPLORATION_ID_5)
@@ -798,6 +803,7 @@ class LearnerAnalyticsLoggerTest {
     assertThat(eventLog).isEssentialPriority()
     assertThat(eventLog).hasHintUnlockedContextThat {
       hasExplorationDetailsThat {
+        hasClassroomIdThat().isEqualTo(TEST_CLASSROOM_ID)
         hasTopicIdThat().isEqualTo(TEST_TOPIC_ID)
         hasStoryIdThat().isEqualTo(TEST_STORY_ID)
         hasExplorationIdThat().isEqualTo(TEST_EXPLORATION_ID_5)
@@ -842,6 +848,7 @@ class LearnerAnalyticsLoggerTest {
     assertThat(eventLog).isEssentialPriority()
     assertThat(eventLog).hasAccessHintContextThat {
       hasExplorationDetailsThat {
+        hasClassroomIdThat().isEqualTo(TEST_CLASSROOM_ID)
         hasTopicIdThat().isEqualTo(TEST_TOPIC_ID)
         hasStoryIdThat().isEqualTo(TEST_STORY_ID)
         hasExplorationIdThat().isEqualTo(TEST_EXPLORATION_ID_5)
@@ -885,6 +892,7 @@ class LearnerAnalyticsLoggerTest {
     val eventLog = fakeAnalyticsEventLogger.getMostRecentEvent()
     assertThat(eventLog).isEssentialPriority()
     assertThat(eventLog).hasSolutionUnlockedContextThat {
+      hasClassroomIdThat().isEqualTo(TEST_CLASSROOM_ID)
       hasTopicIdThat().isEqualTo(TEST_TOPIC_ID)
       hasStoryIdThat().isEqualTo(TEST_STORY_ID)
       hasExplorationIdThat().isEqualTo(TEST_EXPLORATION_ID_5)
@@ -911,6 +919,7 @@ class LearnerAnalyticsLoggerTest {
     val eventLog = fakeAnalyticsEventLogger.getMostRecentEvent()
     assertThat(eventLog).isEssentialPriority()
     assertThat(eventLog).hasAccessSolutionContextThat {
+      hasClassroomIdThat().isEqualTo(TEST_CLASSROOM_ID)
       hasTopicIdThat().isEqualTo(TEST_TOPIC_ID)
       hasStoryIdThat().isEqualTo(TEST_STORY_ID)
       hasExplorationIdThat().isEqualTo(TEST_EXPLORATION_ID_5)
@@ -942,6 +951,7 @@ class LearnerAnalyticsLoggerTest {
     assertThat(eventLog).isEssentialPriority()
     assertThat(eventLog).hasSubmitAnswerContextThat {
       hasExplorationDetailsThat {
+        hasClassroomIdThat().isEqualTo(TEST_CLASSROOM_ID)
         hasTopicIdThat().isEqualTo(TEST_TOPIC_ID)
         hasStoryIdThat().isEqualTo(TEST_STORY_ID)
         hasExplorationIdThat().isEqualTo(TEST_EXPLORATION_ID_5)
@@ -990,6 +1000,7 @@ class LearnerAnalyticsLoggerTest {
     assertThat(eventLog).isEssentialPriority()
     assertThat(eventLog).hasPlayVoiceOverContextThat {
       hasExplorationDetailsThat {
+        hasClassroomIdThat().isEqualTo(TEST_CLASSROOM_ID)
         hasTopicIdThat().isEqualTo(TEST_TOPIC_ID)
         hasStoryIdThat().isEqualTo(TEST_STORY_ID)
         hasExplorationIdThat().isEqualTo(TEST_EXPLORATION_ID_5)
@@ -1066,6 +1077,7 @@ class LearnerAnalyticsLoggerTest {
     assertThat(eventLog).isEssentialPriority()
     assertThat(eventLog).hasPauseVoiceOverContextThat {
       hasExplorationDetailsThat {
+        hasClassroomIdThat().isEqualTo(TEST_CLASSROOM_ID)
         hasTopicIdThat().isEqualTo(TEST_TOPIC_ID)
         hasStoryIdThat().isEqualTo(TEST_STORY_ID)
         hasExplorationIdThat().isEqualTo(TEST_EXPLORATION_ID_5)
@@ -1682,6 +1694,7 @@ class LearnerAnalyticsLoggerTest {
     val eventLog = fakeAnalyticsEventLogger.getMostRecentEvent()
     assertThat(eventLog).isEssentialPriority()
     assertThat(eventLog).hasReachedInvestedEngagementContextThat {
+      hasClassroomIdThat().isEqualTo(TEST_CLASSROOM_ID)
       hasTopicIdThat().isEqualTo(TEST_TOPIC_ID)
       hasStoryIdThat().isEqualTo(TEST_STORY_ID)
       hasExplorationIdThat().isEqualTo(TEST_EXPLORATION_ID_5)
@@ -1711,6 +1724,7 @@ class LearnerAnalyticsLoggerTest {
     assertThat(eventLog).isEssentialPriority()
     assertThat(eventLog).hasSwitchInLessonLanguageContextThat {
       hasExplorationDetailsThat {
+        hasClassroomIdThat().isEqualTo(TEST_CLASSROOM_ID)
         hasTopicIdThat().isEqualTo(TEST_TOPIC_ID)
         hasStoryIdThat().isEqualTo(TEST_STORY_ID)
         hasExplorationIdThat().isEqualTo(TEST_EXPLORATION_ID_5)
@@ -1743,6 +1757,7 @@ class LearnerAnalyticsLoggerTest {
     assertThat(eventLog).isEssentialPriority()
     assertThat(eventLog).hasSwitchInLessonLanguageContextThat {
       hasExplorationDetailsThat {
+        hasClassroomIdThat().isEqualTo(TEST_CLASSROOM_ID)
         hasTopicIdThat().isEqualTo(TEST_TOPIC_ID)
         hasStoryIdThat().isEqualTo(TEST_STORY_ID)
         hasExplorationIdThat().isEqualTo(TEST_EXPLORATION_ID_5)
@@ -1771,6 +1786,7 @@ class LearnerAnalyticsLoggerTest {
 
     val eventLog = fakeAnalyticsEventLogger.getMostRecentEvent()
     assertThat(eventLog).hasProgressSavingSuccessContextThat {
+      hasClassroomIdThat().isEqualTo(TEST_CLASSROOM_ID)
       hasTopicIdThat().isEqualTo(TEST_TOPIC_ID)
       hasStoryIdThat().isEqualTo(TEST_STORY_ID)
       hasExplorationIdThat().isEqualTo(TEST_EXPLORATION_ID_5)
@@ -1796,6 +1812,7 @@ class LearnerAnalyticsLoggerTest {
 
     val eventLog = fakeAnalyticsEventLogger.getMostRecentEvent()
     assertThat(eventLog).hasProgressSavingFailureContextThat {
+      hasClassroomIdThat().isEqualTo(TEST_CLASSROOM_ID)
       hasTopicIdThat().isEqualTo(TEST_TOPIC_ID)
       hasStoryIdThat().isEqualTo(TEST_STORY_ID)
       hasExplorationIdThat().isEqualTo(TEST_EXPLORATION_ID_5)
@@ -1821,6 +1838,7 @@ class LearnerAnalyticsLoggerTest {
 
     val eventLog = fakeAnalyticsEventLogger.getMostRecentEvent()
     assertThat(eventLog).hasLessonSavedAdvertentlyContextThat {
+      hasClassroomIdThat().isEqualTo(TEST_CLASSROOM_ID)
       hasTopicIdThat().isEqualTo(TEST_TOPIC_ID)
       hasStoryIdThat().isEqualTo(TEST_STORY_ID)
       hasExplorationIdThat().isEqualTo(TEST_EXPLORATION_ID_5)
@@ -1846,6 +1864,7 @@ class LearnerAnalyticsLoggerTest {
 
     val eventLog = fakeAnalyticsEventLogger.getMostRecentEvent()
     assertThat(eventLog).hasResumeLessonSubmitCorrectAnswerContextThat {
+      hasClassroomIdThat().isEqualTo(TEST_CLASSROOM_ID)
       hasTopicIdThat().isEqualTo(TEST_TOPIC_ID)
       hasStoryIdThat().isEqualTo(TEST_STORY_ID)
       hasExplorationIdThat().isEqualTo(TEST_EXPLORATION_ID_5)
@@ -1871,6 +1890,7 @@ class LearnerAnalyticsLoggerTest {
 
     val eventLog = fakeAnalyticsEventLogger.getMostRecentEvent()
     assertThat(eventLog).hasResumeLessonSubmitIncorrectAnswerContextThat {
+      hasClassroomIdThat().isEqualTo(TEST_CLASSROOM_ID)
       hasTopicIdThat().isEqualTo(TEST_TOPIC_ID)
       hasStoryIdThat().isEqualTo(TEST_STORY_ID)
       hasExplorationIdThat().isEqualTo(TEST_EXPLORATION_ID_5)
@@ -1897,9 +1917,12 @@ class LearnerAnalyticsLoggerTest {
     installationId: String? = TEST_INSTALL_ID,
     profileId: ProfileId = this@LearnerAnalyticsLoggerTest.profileId,
     learnerId: String? = TEST_LEARNER_ID,
+    classroomId: String = TEST_CLASSROOM_ID,
     topicId: String = TEST_TOPIC_ID,
     storyId: String = TEST_STORY_ID
-  ) = beginExploration(installationId, profileId, learnerId, exploration, topicId, storyId)
+  ) = beginExploration(
+    installationId, profileId, learnerId, exploration, classroomId, topicId, storyId
+  )
 
   private fun List<ShadowLog.LogItem>.getMostRecentWithTag(tag: String) = last { it.tag == tag }
 
diff --git a/testing/src/main/java/org/oppia/android/testing/logging/EventLogSubject.kt b/testing/src/main/java/org/oppia/android/testing/logging/EventLogSubject.kt
index 3009fe88a79..24953f669ab 100644
--- a/testing/src/main/java/org/oppia/android/testing/logging/EventLogSubject.kt
+++ b/testing/src/main/java/org/oppia/android/testing/logging/EventLogSubject.kt
@@ -1481,6 +1481,14 @@ class EventLogSubject private constructor(
     metadata: FailureMetadata,
     private val actual: EventLog.ExplorationContext
   ) : LiteProtoSubject(metadata, actual) {
+    /**
+     * Returns a [StringSubject] to test [EventLog.ExplorationContext.getClassroomId].
+     *
+     * This method never fails since the underlying property defaults to empty string if it's not
+     * defined in the context.
+     */
+    fun hasClassroomIdThat(): StringSubject = assertThat(actual.classroomId)
+
     /**
      * Returns a [StringSubject] to test [EventLog.ExplorationContext.getTopicId].
      *

From 71e5e6d235f51e808dd374a660b7f6dcff36304b Mon Sep 17 00:00:00 2001
From: Saptak Manna <saptakmanna100@gmail.com>
Date: Wed, 3 Jul 2024 13:25:45 +0530
Subject: [PATCH 05/21] Implement logging of start_exploration event

---
 .../ExplorationProgressController.kt          |  4 +++
 .../analytics/LearnerAnalyticsLogger.kt       | 10 +++++++
 model/src/main/proto/oppia_logger.proto       |  3 +++
 .../testing/logging/EventLogSubject.kt        | 27 +++++++++++++++++++
 .../util/logging/EventBundleCreator.kt        |  2 ++
 ...entTypeToHumanReadableNameConverterImpl.kt |  1 +
 ...entTypeToHumanReadableNameConverterImpl.kt |  1 +
 7 files changed, 48 insertions(+)

diff --git a/domain/src/main/java/org/oppia/android/domain/exploration/ExplorationProgressController.kt b/domain/src/main/java/org/oppia/android/domain/exploration/ExplorationProgressController.kt
index de477ebfdda..9f0d7923a47 100644
--- a/domain/src/main/java/org/oppia/android/domain/exploration/ExplorationProgressController.kt
+++ b/domain/src/main/java/org/oppia/android/domain/exploration/ExplorationProgressController.kt
@@ -905,6 +905,10 @@ class ExplorationProgressController @Inject constructor(
       val state = progress.stateDeck.getCurrentState()
       hintHandler.startWatchingForHintsInNewState(state)
       startState(logStartCard = true)
+
+      if (!isRestart) {
+        explorationAnalyticsLogger.logStartExploration()
+      }
     }
 
     // Advance the stage, but do not notify observers since the current state can be reported
diff --git a/domain/src/main/java/org/oppia/android/domain/oppialogger/analytics/LearnerAnalyticsLogger.kt b/domain/src/main/java/org/oppia/android/domain/oppialogger/analytics/LearnerAnalyticsLogger.kt
index d701ba9d54d..059a435ba50 100644
--- a/domain/src/main/java/org/oppia/android/domain/oppialogger/analytics/LearnerAnalyticsLogger.kt
+++ b/domain/src/main/java/org/oppia/android/domain/oppialogger/analytics/LearnerAnalyticsLogger.kt
@@ -239,6 +239,11 @@ class LearnerAnalyticsLogger @Inject constructor(
       }
     }
 
+    /** Logs that an exploration has been started by the learner. */
+    fun logStartExploration() {
+      getExpectedStateLogger()?.logStartExploration()
+    }
+
     /** Logs that the current exploration has been exited (i.e. not finished). */
     fun logExitExploration() {
       getExpectedStateLogger()?.logExitExploration()
@@ -325,6 +330,11 @@ class LearnerAnalyticsLogger @Inject constructor(
   ) {
     private val linkedSkillId by lazy { currentState.linkedSkillId }
 
+    /** Logs that an exploration has been started (at this state). */
+    internal fun logStartExploration() {
+      logStateEvent(EventBuilder::setStartExplorationContext)
+    }
+
     /** Logs that the current exploration has been exited (at this state). */
     internal fun logExitExploration() {
       logStateEvent(EventBuilder::setExitExplorationContext)
diff --git a/model/src/main/proto/oppia_logger.proto b/model/src/main/proto/oppia_logger.proto
index 1d88d10ee72..4b0f713768e 100644
--- a/model/src/main/proto/oppia_logger.proto
+++ b/model/src/main/proto/oppia_logger.proto
@@ -126,6 +126,9 @@ message EventLog {
       // The event being logged is related to foregrounding of the application.
       LearnerDetailsContext app_in_foreground_context = 25;
 
+      // The event being logged is related to starting an exploration.
+      ExplorationContext start_exploration_context = 54;
+
       // The event being logged is related to exiting an exploration.
       ExplorationContext exit_exploration_context = 26;
 
diff --git a/testing/src/main/java/org/oppia/android/testing/logging/EventLogSubject.kt b/testing/src/main/java/org/oppia/android/testing/logging/EventLogSubject.kt
index 24953f669ab..1a91e4c272e 100644
--- a/testing/src/main/java/org/oppia/android/testing/logging/EventLogSubject.kt
+++ b/testing/src/main/java/org/oppia/android/testing/logging/EventLogSubject.kt
@@ -53,6 +53,7 @@ import org.oppia.android.app.model.EventLog.Context.ActivityContextCase.RESUME_L
 import org.oppia.android.app.model.EventLog.Context.ActivityContextCase.SHOW_SURVEY_POPUP
 import org.oppia.android.app.model.EventLog.Context.ActivityContextCase.SOLUTION_UNLOCKED_CONTEXT
 import org.oppia.android.app.model.EventLog.Context.ActivityContextCase.START_CARD_CONTEXT
+import org.oppia.android.app.model.EventLog.Context.ActivityContextCase.START_EXPLORATION_CONTEXT
 import org.oppia.android.app.model.EventLog.Context.ActivityContextCase.START_OVER_EXPLORATION_CONTEXT
 import org.oppia.android.app.model.EventLog.Context.ActivityContextCase.SUBMIT_ANSWER_CONTEXT
 import org.oppia.android.app.model.EventLog.Context.ActivityContextCase.SWITCH_IN_LESSON_LANGUAGE
@@ -712,6 +713,32 @@ class EventLogSubject private constructor(
     hasAppInForegroundContextThat().block()
   }
 
+  /**
+   * Verifies that the [EventLog] under test has a context corresponding to
+   * [START_EXPLORATION_CONTEXT] (per [EventLog.Context.getActivityContextCase]).
+   */
+  fun hasStartExplorationContext() {
+    assertThat(actual.context.activityContextCase).isEqualTo(START_EXPLORATION_CONTEXT)
+  }
+
+  /**
+   * Verifies the [EventLog]'s context per [hasStartExplorationContext] and returns an
+   * [ExplorationContextSubject] to test the corresponding context.
+   */
+  fun hasStartExplorationContextThat(): ExplorationContextSubject {
+    hasStartExplorationContext()
+    return ExplorationContextSubject.assertThat(actual.context.startExplorationContext)
+  }
+
+  /**
+   * Verifies the [EventLog]'s context and executes [block] in the same way as
+   * [hasOpenExplorationActivityContextThat] except for the conditions of, and subject returned by,
+   * [hasStartExplorationContextThat].
+   */
+  fun hasStartExplorationContextThat(block: ExplorationContextSubject.() -> Unit) {
+    hasStartExplorationContextThat().block()
+  }
+
   /**
    * Verifies that the [EventLog] under test has a context corresponding to
    * [EXIT_EXPLORATION_CONTEXT] (per [EventLog.Context.getActivityContextCase]).
diff --git a/utility/src/main/java/org/oppia/android/util/logging/EventBundleCreator.kt b/utility/src/main/java/org/oppia/android/util/logging/EventBundleCreator.kt
index fddf84da279..9be04ca5378 100644
--- a/utility/src/main/java/org/oppia/android/util/logging/EventBundleCreator.kt
+++ b/utility/src/main/java/org/oppia/android/util/logging/EventBundleCreator.kt
@@ -111,6 +111,7 @@ import org.oppia.android.app.model.EventLog.CardContext as CardEventContext
 import org.oppia.android.app.model.EventLog.CompleteAppOnboardingContext as CompleteAppOnboardingEventContext
 import org.oppia.android.app.model.EventLog.ConceptCardContext as ConceptCardEventContext
 import org.oppia.android.app.model.EventLog.ConsoleLoggerContext as ConsoleLoggerEventContext
+import org.oppia.android.app.model.EventLog.Context.ActivityContextCase.START_EXPLORATION_CONTEXT
 import org.oppia.android.app.model.EventLog.ExplorationContext as ExplorationEventContext
 import org.oppia.android.app.model.EventLog.FeatureFlagListContext as FeatureFlagListEventContext
 import org.oppia.android.app.model.EventLog.HintContext as HintEventContext
@@ -237,6 +238,7 @@ class EventBundleCreator @Inject constructor(
       PAUSE_VOICE_OVER_CONTEXT -> VoiceoverActionContext(activityName, pauseVoiceOverContext)
       APP_IN_BACKGROUND_CONTEXT -> LearnerDetailsContext(activityName, appInBackgroundContext)
       APP_IN_FOREGROUND_CONTEXT -> LearnerDetailsContext(activityName, appInForegroundContext)
+      START_EXPLORATION_CONTEXT -> ExplorationContext(activityName, startExplorationContext)
       EXIT_EXPLORATION_CONTEXT -> ExplorationContext(activityName, exitExplorationContext)
       FINISH_EXPLORATION_CONTEXT -> ExplorationContext(activityName, finishExplorationContext)
       PROGRESS_SAVING_SUCCESS_CONTEXT ->
diff --git a/utility/src/main/java/org/oppia/android/util/logging/KenyaAlphaEventTypeToHumanReadableNameConverterImpl.kt b/utility/src/main/java/org/oppia/android/util/logging/KenyaAlphaEventTypeToHumanReadableNameConverterImpl.kt
index 342333d65eb..bf8f3d52f10 100644
--- a/utility/src/main/java/org/oppia/android/util/logging/KenyaAlphaEventTypeToHumanReadableNameConverterImpl.kt
+++ b/utility/src/main/java/org/oppia/android/util/logging/KenyaAlphaEventTypeToHumanReadableNameConverterImpl.kt
@@ -36,6 +36,7 @@ class KenyaAlphaEventTypeToHumanReadableNameConverterImpl @Inject constructor()
       ActivityContextCase.PAUSE_VOICE_OVER_CONTEXT -> "pause_voice_over_context"
       ActivityContextCase.APP_IN_BACKGROUND_CONTEXT -> "app_in_background_context"
       ActivityContextCase.APP_IN_FOREGROUND_CONTEXT -> "app_in_foreground_context"
+      ActivityContextCase.START_EXPLORATION_CONTEXT -> "start_exploration_context"
       ActivityContextCase.EXIT_EXPLORATION_CONTEXT -> "exit_exploration_context"
       ActivityContextCase.FINISH_EXPLORATION_CONTEXT -> "finish_exploration_context"
       ActivityContextCase.PROGRESS_SAVING_SUCCESS_CONTEXT -> "progress_saving_success_context"
diff --git a/utility/src/main/java/org/oppia/android/util/logging/StandardEventTypeToHumanReadableNameConverterImpl.kt b/utility/src/main/java/org/oppia/android/util/logging/StandardEventTypeToHumanReadableNameConverterImpl.kt
index 55097655e74..7cd8a253a6a 100644
--- a/utility/src/main/java/org/oppia/android/util/logging/StandardEventTypeToHumanReadableNameConverterImpl.kt
+++ b/utility/src/main/java/org/oppia/android/util/logging/StandardEventTypeToHumanReadableNameConverterImpl.kt
@@ -46,6 +46,7 @@ class StandardEventTypeToHumanReadableNameConverterImpl @Inject constructor() :
       ActivityContextCase.PAUSE_VOICE_OVER_CONTEXT -> "click_pause_voiceover_button"
       ActivityContextCase.APP_IN_BACKGROUND_CONTEXT -> "send_app_to_background"
       ActivityContextCase.APP_IN_FOREGROUND_CONTEXT -> "bring_app_to_foreground"
+      ActivityContextCase.START_EXPLORATION_CONTEXT -> "start_exploration_context"
       ActivityContextCase.EXIT_EXPLORATION_CONTEXT -> "leave_exploration"
       ActivityContextCase.FINISH_EXPLORATION_CONTEXT -> "complete_exploration"
       ActivityContextCase.PROGRESS_SAVING_SUCCESS_CONTEXT -> "progress_saving_success"

From 3530d343aabd58cb6d9ac9a0021d4fd3f8b7b6bc Mon Sep 17 00:00:00 2001
From: Saptak Manna <saptakmanna100@gmail.com>
Date: Wed, 3 Jul 2024 13:54:26 +0530
Subject: [PATCH 06/21] Fix event log proto field number

---
 model/src/main/proto/oppia_logger.proto | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/model/src/main/proto/oppia_logger.proto b/model/src/main/proto/oppia_logger.proto
index 18e7c10e407..a34f404aa07 100644
--- a/model/src/main/proto/oppia_logger.proto
+++ b/model/src/main/proto/oppia_logger.proto
@@ -127,7 +127,7 @@ message EventLog {
       LearnerDetailsContext app_in_foreground_context = 25;
 
       // The event being logged is related to starting an exploration.
-      ExplorationContext start_exploration_context = 54;
+      ExplorationContext start_exploration_context = 56;
 
       // The event being logged is related to exiting an exploration.
       ExplorationContext exit_exploration_context = 26;

From f0f1c85fd6db94e46341084b0766451e0ac62dc0 Mon Sep 17 00:00:00 2001
From: Saptak Manna <saptakmanna100@gmail.com>
Date: Wed, 3 Jul 2024 16:52:55 +0530
Subject: [PATCH 07/21] Add tests for the new event

---
 .../ExplorationProgressControllerTest.kt      | 83 +++++++++++++++--
 .../analytics/LearnerAnalyticsLoggerTest.kt   | 89 +++++++++++++++++++
 2 files changed, 167 insertions(+), 5 deletions(-)

diff --git a/domain/src/test/java/org/oppia/android/domain/exploration/ExplorationProgressControllerTest.kt b/domain/src/test/java/org/oppia/android/domain/exploration/ExplorationProgressControllerTest.kt
index 9ec59a96f2b..3026b834567 100644
--- a/domain/src/test/java/org/oppia/android/domain/exploration/ExplorationProgressControllerTest.kt
+++ b/domain/src/test/java/org/oppia/android/domain/exploration/ExplorationProgressControllerTest.kt
@@ -26,6 +26,7 @@ import org.oppia.android.app.model.EventLog.Context.ActivityContextCase.PROGRESS
 import org.oppia.android.app.model.EventLog.Context.ActivityContextCase.REACH_INVESTED_ENGAGEMENT
 import org.oppia.android.app.model.EventLog.Context.ActivityContextCase.RESUME_LESSON_SUBMIT_CORRECT_ANSWER_CONTEXT
 import org.oppia.android.app.model.EventLog.Context.ActivityContextCase.RESUME_LESSON_SUBMIT_INCORRECT_ANSWER_CONTEXT
+import org.oppia.android.app.model.EventLog.Context.ActivityContextCase.START_EXPLORATION_CONTEXT
 import org.oppia.android.app.model.Exploration
 import org.oppia.android.app.model.ExplorationCheckpoint
 import org.oppia.android.app.model.Fraction
@@ -2247,7 +2248,7 @@ class ExplorationProgressControllerTest {
 
     val exploration = loadExploration(TEST_EXPLORATION_ID_2)
     val eventLog = fakeAnalyticsEventLogger.getOldestEvent()
-    assertThat(fakeAnalyticsEventLogger.getEventListCount()).isEqualTo(4)
+    assertThat(fakeAnalyticsEventLogger.getEventListCount()).isEqualTo(5)
     assertThat(eventLog).hasStartCardContextThat {
       hasExplorationDetailsThat().containsTestExp2Details()
       hasExplorationDetailsThat().hasStateNameThat().isEqualTo(exploration.initStateName)
@@ -2311,8 +2312,8 @@ class ExplorationProgressControllerTest {
     )
     waitForGetCurrentStateSuccessfulLoad()
 
-    val eventLog = fakeAnalyticsEventLogger.getMostRecentEvent()
-    assertThat(fakeAnalyticsEventLogger.getEventListCount()).isEqualTo(1)
+    val eventLog = fakeAnalyticsEventLogger.getMostRecentEvents(2)[0]
+    assertThat(fakeAnalyticsEventLogger.getEventListCount()).isEqualTo(2)
     assertThat(eventLog).hasStartCardContextThat {
       hasExplorationDetailsThat().containsTestExp2Details()
       // The exploration should have been started over.
@@ -2470,6 +2471,23 @@ class ExplorationProgressControllerTest {
     }
   }
 
+  @Test
+  fun testPlayNewExp_logsStartExplorationEvent() {
+    logIntoAnalyticsReadyAdminProfile()
+    startPlayingNewExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
+    waitForGetCurrentStateSuccessfulLoad()
+
+    val hasStartExplorationEvent = fakeAnalyticsEventLogger.hasEventLogged {
+      it.context.activityContextCase == START_EXPLORATION_CONTEXT
+    }
+    assertThat(hasStartExplorationEvent).isTrue()
+
+    val eventLog = fakeAnalyticsEventLogger.getMostRecentEvents(4)[0]
+    assertThat(eventLog).hasStartExplorationContextThat().containsTestExp2Details()
+  }
+
   @Test
   fun testResumeExp_stateOneTwoDone_finishThreeAndMoveForward_noLogReachInvestedEngagementEvent() {
     logIntoAnalyticsReadyAdminProfile()
@@ -2622,6 +2640,28 @@ class ExplorationProgressControllerTest {
     assertThat(resumeLessonSubmitIncorrectAnswerEventCount).isEqualTo(1)
   }
 
+  @Test
+  fun testResumeExp_doesNotLogStartExplorationEvent() {
+    logIntoAnalyticsReadyAdminProfile()
+    startPlayingNewExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
+    waitForGetCurrentStateSuccessfulLoad()
+    endExploration()
+
+    fakeAnalyticsEventLogger.clearAllEvents()
+
+    val checkPoint = retrieveExplorationCheckpoint(TEST_EXPLORATION_ID_2)
+    resumeExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2, checkPoint
+    )
+
+    val hasStartExplorationEvent = fakeAnalyticsEventLogger.hasEventLogged {
+      it.context.activityContextCase == START_EXPLORATION_CONTEXT
+    }
+    assertThat(hasStartExplorationEvent).isFalse()
+  }
+
   @Test
   fun testStartOverExp_submitCorrectAnswer_doesNotLogResumeLessonSubmitCorrectAnswerEvent() {
     logIntoAnalyticsReadyAdminProfile()
@@ -2668,6 +2708,27 @@ class ExplorationProgressControllerTest {
     assertThat(resumeLessonSubmitIncorrectAnswerEventCount).isEqualTo(0)
   }
 
+  @Test
+  fun testStartOverExp_doesNotLogStartExplorationEvent() {
+    logIntoAnalyticsReadyAdminProfile()
+    startPlayingNewExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
+    waitForGetCurrentStateSuccessfulLoad()
+    endExploration()
+
+    fakeAnalyticsEventLogger.clearAllEvents()
+
+    restartExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
+
+    val hasStartExplorationEvent = fakeAnalyticsEventLogger.hasEventLogged {
+      it.context.activityContextCase == START_EXPLORATION_CONTEXT
+    }
+    assertThat(hasStartExplorationEvent).isFalse()
+  }
+
   @Test
   fun testReplayExp_submitCorrectAnswer_doesNotLogResumeLessonSubmitCorrectAnswerEvent() {
     logIntoAnalyticsReadyAdminProfile()
@@ -2843,7 +2904,12 @@ class ExplorationProgressControllerTest {
   @Test
   fun testHint_existingHintViewed_logsExistingHintViewedEvent() {
     logIntoAnalyticsReadyAdminProfile()
-    startPlayingNewExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    startPlayingNewExploration(
+      TEST_CLASSROOM_ID_0,
+      TEST_TOPIC_ID_0,
+      TEST_STORY_ID_0,
+      TEST_EXPLORATION_ID_2
+    )
     waitForGetCurrentStateSuccessfulLoad()
     playThroughPrototypeState1AndMoveToNextState()
     // Submit 2 wrong answers to trigger a hint becoming available.
@@ -3003,7 +3069,12 @@ class ExplorationProgressControllerTest {
   @Test
   fun testSolution_viewExistingSolution_logsExistingSolutionViewedEvent() {
     logIntoAnalyticsReadyAdminProfile()
-    startPlayingNewExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    startPlayingNewExploration(
+      TEST_CLASSROOM_ID_0,
+      TEST_TOPIC_ID_0,
+      TEST_STORY_ID_0,
+      TEST_EXPLORATION_ID_2
+    )
     waitForGetCurrentStateSuccessfulLoad()
     playThroughPrototypeState1AndMoveToNextState()
     // Submit 2 wrong answers to trigger the hint.
@@ -3676,6 +3747,7 @@ class ExplorationProgressControllerTest {
     pendingState.helpIndex.isSolutionRevealed()
 
   private fun EventLogSubject.ExplorationContextSubject.containsTestExp2Details() {
+    hasClassroomIdThat().isEqualTo(TEST_CLASSROOM_ID_0)
     hasTopicIdThat().isEqualTo(TEST_TOPIC_ID_0)
     hasStoryIdThat().isEqualTo(TEST_STORY_ID_0)
     hasExplorationIdThat().isEqualTo(TEST_EXPLORATION_ID_2)
@@ -3688,6 +3760,7 @@ class ExplorationProgressControllerTest {
   }
 
   private fun EventLogSubject.ExplorationContextSubject.containsFractionsExp0Details() {
+    hasClassroomIdThat().isEqualTo(TEST_CLASSROOM_ID_1)
     hasTopicIdThat().isEqualTo(FRACTIONS_TOPIC_ID)
     hasStoryIdThat().isEqualTo(FRACTIONS_STORY_ID_0)
     hasExplorationIdThat().isEqualTo(FRACTIONS_EXPLORATION_ID_0)
diff --git a/domain/src/test/java/org/oppia/android/domain/oppialogger/analytics/LearnerAnalyticsLoggerTest.kt b/domain/src/test/java/org/oppia/android/domain/oppialogger/analytics/LearnerAnalyticsLoggerTest.kt
index 3e6e4861338..30523eb52e7 100644
--- a/domain/src/test/java/org/oppia/android/domain/oppialogger/analytics/LearnerAnalyticsLoggerTest.kt
+++ b/domain/src/test/java/org/oppia/android/domain/oppialogger/analytics/LearnerAnalyticsLoggerTest.kt
@@ -615,6 +615,48 @@ class LearnerAnalyticsLoggerTest {
     }
   }
 
+  @Test
+  fun testExpLogger_logStartExploration_outsideCard_logsConsoleWarningAndNoEvents() {
+    val exploration5 = loadExploration(TEST_EXPLORATION_ID_5)
+    val expLogger = learnerAnalyticsLogger.beginExploration(exploration5)
+    testCoroutineDispatchers.runCurrent()
+
+    expLogger.logStartExploration()
+    testCoroutineDispatchers.runCurrent()
+
+    val log = ShadowLog.getLogs().getMostRecentWithTag("LearnerAnalyticsLogger")
+    assertThat(log.msg).contains("Attempting to log a state event outside state")
+    assertThat(log.type).isEqualTo(Log.WARN)
+    assertThat(fakeAnalyticsEventLogger.noEventsPresent()).isTrue()
+  }
+
+  @Test
+  fun testExpLogger_logStartExploration_insideCard_logsStateEventWithStateName() {
+    val exploration5 = loadExploration(TEST_EXPLORATION_ID_5)
+    val expLogger = learnerAnalyticsLogger.beginExploration(exploration5)
+    expLogger.startCard(exploration5.getStateByName(TEST_EXP_5_STATE_THREE_NAME))
+    testCoroutineDispatchers.runCurrent()
+
+    expLogger.logStartExploration()
+    testCoroutineDispatchers.runCurrent()
+
+    val eventLog = fakeAnalyticsEventLogger.getMostRecentEvent()
+    assertThat(eventLog).isEssentialPriority()
+    assertThat(eventLog).hasStartExplorationContextThat {
+      hasClassroomIdThat().isEqualTo(TEST_CLASSROOM_ID)
+      hasTopicIdThat().isEqualTo(TEST_TOPIC_ID)
+      hasStoryIdThat().isEqualTo(TEST_STORY_ID)
+      hasExplorationIdThat().isEqualTo(TEST_EXPLORATION_ID_5)
+      hasSessionIdThat().isEqualTo(DEFAULT_INITIAL_SESSION_ID)
+      hasVersionThat().isEqualTo(5)
+      hasStateNameThat().isEqualTo(TEST_EXP_5_STATE_THREE_NAME)
+      hasLearnerDetailsThat {
+        hasLearnerIdThat().isEqualTo(TEST_LEARNER_ID)
+        hasInstallationIdThat().isEqualTo(TEST_INSTALL_ID)
+      }
+    }
+  }
+
   @Test
   fun testExpLogger_logExitExploration_outsideCard_logsConsoleWarningAndNoEvents() {
     val exploration5 = loadExploration(TEST_EXPLORATION_ID_5)
@@ -893,6 +935,7 @@ class LearnerAnalyticsLoggerTest {
     assertThat(eventLog).isEssentialPriority()
     assertThat(eventLog).hasViewExistingHintContextThat {
       hasExplorationDetailsThat {
+        hasClassroomIdThat().isEqualTo(TEST_CLASSROOM_ID)
         hasTopicIdThat().isEqualTo(TEST_TOPIC_ID)
         hasStoryIdThat().isEqualTo(TEST_STORY_ID)
         hasExplorationIdThat().isEqualTo(TEST_EXPLORATION_ID_5)
@@ -948,6 +991,7 @@ class LearnerAnalyticsLoggerTest {
     val eventLog = fakeAnalyticsEventLogger.getMostRecentEvent()
     assertThat(eventLog).isEssentialPriority()
     assertThat(eventLog).hasRevealSolutionContextThat {
+      hasClassroomIdThat().isEqualTo(TEST_CLASSROOM_ID)
       hasTopicIdThat().isEqualTo(TEST_TOPIC_ID)
       hasStoryIdThat().isEqualTo(TEST_STORY_ID)
       hasExplorationIdThat().isEqualTo(TEST_EXPLORATION_ID_5)
@@ -1217,6 +1261,51 @@ class LearnerAnalyticsLoggerTest {
     }
   }
 
+  @Test
+  @Iteration("no_install_id", "lid=learn", "iid=null", "elid=learn", "eid=")
+  @Iteration("no_learner_id", "lid=null", "iid=install", "elid=", "eid=install")
+  fun testExpLogger_logStartExploration_missingOneId_logsEventWithMissingId() {
+    val exploration5 = loadExploration(TEST_EXPLORATION_ID_5)
+    val expLogger =
+      learnerAnalyticsLogger.beginExploration(
+        exploration5, learnerId = learnerIdParameter, installationId = installIdParameter
+      )
+    testCoroutineDispatchers.runCurrent()
+    expLogger.startCard(exploration5.getStateByName(exploration5.initStateName))
+
+    expLogger.logStartExploration()
+    testCoroutineDispatchers.runCurrent()
+
+    val eventLog = fakeAnalyticsEventLogger.getMostRecentEvent()
+    assertThat(eventLog).hasStartExplorationContextThat {
+      hasLearnerDetailsThat {
+        hasLearnerIdThat().isEqualTo(expectedLearnerIdParameter)
+        hasInstallationIdThat().isEqualTo(expectedInstallIdParameter)
+      }
+    }
+  }
+
+  @Test
+  fun testExpLogger_logStartExploration_noInstallOrLearnerIds_logsEventAndConsoleErrors() {
+    val exploration5 = loadExploration(TEST_EXPLORATION_ID_5)
+    val expLogger =
+      learnerAnalyticsLogger.beginExploration(exploration5, learnerId = null, installationId = null)
+    testCoroutineDispatchers.runCurrent()
+    expLogger.startCard(exploration5.getStateByName(exploration5.initStateName))
+
+    expLogger.logStartExploration()
+    testCoroutineDispatchers.runCurrent()
+
+    // Since both the learner & installation IDs are missing, the event logging fails since it would
+    // have no context. An unknown installation ID is used to indicate the installation ID was
+    // missing.
+    val eventLog = fakeAnalyticsEventLogger.getMostRecentEvent()
+    val log = ShadowLog.getLogs().getMostRecentWithTag("LearnerAnalyticsLogger")
+    assertThat(eventLog).hasInstallIdForAnalyticsLogFailureThat().isEqualTo(UNKNOWN_INSTALL_ID)
+    assertThat(log.msg).contains("Event is being dropped due to incomplete event")
+    assertThat(log.type).isEqualTo(Log.ERROR)
+  }
+
   @Test
   @Iteration("no_install_id", "lid=learn", "iid=null", "elid=learn", "eid=")
   @Iteration("no_learner_id", "lid=null", "iid=install", "elid=", "eid=install")

From f63eec229bad183b0535519e5b0e85bd7338b6c3 Mon Sep 17 00:00:00 2001
From: Saptak Manna <saptakmanna100@gmail.com>
Date: Wed, 3 Jul 2024 17:25:47 +0530
Subject: [PATCH 08/21] Fix ktlint checks

---
 .../app/classroom/ClassroomListActivity.kt    |   3 +-
 .../ClassroomListFragmentPresenter.kt         |   1 -
 .../CompletedStoryItemViewModel.kt            |   3 +-
 .../oppia/android/app/home/HomeActivity.kt    |   3 +-
 .../android/app/home/RouteToTopicListener.kt  |   2 +-
 .../app/testing/HomeFragmentTestActivity.kt   |   5 +-
 .../testing/NavigationDrawerTestActivity.kt   |   3 +-
 .../app/topic/TopicFragmentPresenter.kt       |   3 +-
 .../android/app/story/StoryActivityTest.kt    |   1 -
 .../android/app/topic/TopicActivityTest.kt    |   4 +-
 .../android/app/topic/TopicFragmentTest.kt    |  13 +-
 .../topic/lessons/TopicLessonsFragmentTest.kt | 224 +++++++++++-------
 .../util/logging/EventBundleCreator.kt        |   2 +-
 13 files changed, 166 insertions(+), 101 deletions(-)

diff --git a/app/src/main/java/org/oppia/android/app/classroom/ClassroomListActivity.kt b/app/src/main/java/org/oppia/android/app/classroom/ClassroomListActivity.kt
index 764228588e7..da13bd19a17 100644
--- a/app/src/main/java/org/oppia/android/app/classroom/ClassroomListActivity.kt
+++ b/app/src/main/java/org/oppia/android/app/classroom/ClassroomListActivity.kt
@@ -108,7 +108,8 @@ class ClassroomListActivity :
     internalProfileId: Int,
     classroomId: String,
     topicId: String,
-    storyId: String) {
+    storyId: String
+  ) {
     startActivity(
       TopicActivity.createTopicPlayStoryActivityIntent(
         this,
diff --git a/app/src/main/java/org/oppia/android/app/classroom/ClassroomListFragmentPresenter.kt b/app/src/main/java/org/oppia/android/app/classroom/ClassroomListFragmentPresenter.kt
index 46ec5a2751d..ba75fda470a 100644
--- a/app/src/main/java/org/oppia/android/app/classroom/ClassroomListFragmentPresenter.kt
+++ b/app/src/main/java/org/oppia/android/app/classroom/ClassroomListFragmentPresenter.kt
@@ -45,7 +45,6 @@ import org.oppia.android.app.model.AppStartupState
 import org.oppia.android.app.model.ClassroomSummary
 import org.oppia.android.app.model.LessonThumbnail
 import org.oppia.android.app.model.LessonThumbnailGraphic
-import org.oppia.android.app.model.ProfileId
 import org.oppia.android.app.model.TopicSummary
 import org.oppia.android.app.translation.AppLanguageResourceHandler
 import org.oppia.android.app.utility.datetime.DateTimeUtil
diff --git a/app/src/main/java/org/oppia/android/app/completedstorylist/CompletedStoryItemViewModel.kt b/app/src/main/java/org/oppia/android/app/completedstorylist/CompletedStoryItemViewModel.kt
index b6dd4fef3b9..6e8507554c0 100644
--- a/app/src/main/java/org/oppia/android/app/completedstorylist/CompletedStoryItemViewModel.kt
+++ b/app/src/main/java/org/oppia/android/app/completedstorylist/CompletedStoryItemViewModel.kt
@@ -43,7 +43,8 @@ class CompletedStoryItemViewModel(
     internalProfileId: Int,
     classroomId: String,
     topicId: String,
-    storyId: String) {
+    storyId: String
+  ) {
     val intent = intentFactoryShim.createTopicPlayStoryActivityIntent(
       activity.applicationContext,
       internalProfileId,
diff --git a/app/src/main/java/org/oppia/android/app/home/HomeActivity.kt b/app/src/main/java/org/oppia/android/app/home/HomeActivity.kt
index b1f2c655fbd..34885717a33 100644
--- a/app/src/main/java/org/oppia/android/app/home/HomeActivity.kt
+++ b/app/src/main/java/org/oppia/android/app/home/HomeActivity.kt
@@ -93,7 +93,8 @@ class HomeActivity :
     internalProfileId: Int,
     classroomId: String,
     topicId: String,
-    storyId: String) {
+    storyId: String
+  ) {
     startActivity(
       TopicActivity.createTopicPlayStoryActivityIntent(
         this,
diff --git a/app/src/main/java/org/oppia/android/app/home/RouteToTopicListener.kt b/app/src/main/java/org/oppia/android/app/home/RouteToTopicListener.kt
index 361852084f5..5e50031cd95 100755
--- a/app/src/main/java/org/oppia/android/app/home/RouteToTopicListener.kt
+++ b/app/src/main/java/org/oppia/android/app/home/RouteToTopicListener.kt
@@ -2,5 +2,5 @@ package org.oppia.android.app.home
 
 /** Listener for when an activity should route to a topic. */
 interface RouteToTopicListener {
-  fun routeToTopic(internalProfileId: Int,classroomId: String,  topicId: String)
+  fun routeToTopic(internalProfileId: Int, classroomId: String,  topicId: String)
 }
diff --git a/app/src/main/java/org/oppia/android/app/testing/HomeFragmentTestActivity.kt b/app/src/main/java/org/oppia/android/app/testing/HomeFragmentTestActivity.kt
index f4f2a699b6b..20731d36f2f 100644
--- a/app/src/main/java/org/oppia/android/app/testing/HomeFragmentTestActivity.kt
+++ b/app/src/main/java/org/oppia/android/app/testing/HomeFragmentTestActivity.kt
@@ -35,7 +35,10 @@ class HomeFragmentTestActivity :
   // Override functions are needed to fulfill listener definitions.
   override fun routeToTopic(internalProfileId: Int, classroomId: String, topicId: String) {}
   override fun routeToTopicPlayStory(
-    internalProfileId: Int, classroomId: String, topicId: String, storyId: String
+    internalProfileId: Int,
+    classroomId: String,
+    topicId: String,
+    storyId: String
   ) {}
   override fun routeToRecentlyPlayed(recentlyPlayedActivityTitle: RecentlyPlayedActivityTitle) {}
 }
diff --git a/app/src/main/java/org/oppia/android/app/testing/NavigationDrawerTestActivity.kt b/app/src/main/java/org/oppia/android/app/testing/NavigationDrawerTestActivity.kt
index 50efbf13ac3..6097b74d8b5 100644
--- a/app/src/main/java/org/oppia/android/app/testing/NavigationDrawerTestActivity.kt
+++ b/app/src/main/java/org/oppia/android/app/testing/NavigationDrawerTestActivity.kt
@@ -71,7 +71,8 @@ class NavigationDrawerTestActivity :
     internalProfileId: Int,
     classroomId: String,
     topicId: String,
-    storyId: String) {
+    storyId: String
+  ) {
     startActivity(
       TopicActivity.createTopicPlayStoryActivityIntent(
         this,
diff --git a/app/src/main/java/org/oppia/android/app/topic/TopicFragmentPresenter.kt b/app/src/main/java/org/oppia/android/app/topic/TopicFragmentPresenter.kt
index 4f38bb1b34b..a68bd187120 100644
--- a/app/src/main/java/org/oppia/android/app/topic/TopicFragmentPresenter.kt
+++ b/app/src/main/java/org/oppia/android/app/topic/TopicFragmentPresenter.kt
@@ -138,7 +138,8 @@ class TopicFragmentPresenter @Inject constructor(
         classroomId,
         topicId,
         storyId,
-        enableExtraTopicTabsUi.value)
+        enableExtraTopicTabsUi.value
+      )
     viewPager2.adapter = adapter
     TabLayoutMediator(tabLayout, viewPager2) { tab, position ->
       val topicTab = TopicTab.getTabForPosition(position, enableExtraTopicTabsUi.value)
diff --git a/app/src/sharedTest/java/org/oppia/android/app/story/StoryActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/story/StoryActivityTest.kt
index 7aad007eff2..733b0efc911 100644
--- a/app/src/sharedTest/java/org/oppia/android/app/story/StoryActivityTest.kt
+++ b/app/src/sharedTest/java/org/oppia/android/app/story/StoryActivityTest.kt
@@ -62,7 +62,6 @@ import org.oppia.android.domain.classify.rules.numericinput.NumericInputRuleModu
 import org.oppia.android.domain.classify.rules.ratioinput.RatioInputModule
 import org.oppia.android.domain.classify.rules.textinput.TextInputRuleModule
 import org.oppia.android.domain.classroom.TEST_CLASSROOM_ID_0
-import org.oppia.android.domain.classroom.TEST_CLASSROOM_ID_1
 import org.oppia.android.domain.exploration.ExplorationProgressModule
 import org.oppia.android.domain.exploration.ExplorationStorageModule
 import org.oppia.android.domain.hintsandsolution.HintsAndSolutionConfigModule
diff --git a/app/src/sharedTest/java/org/oppia/android/app/topic/TopicActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/topic/TopicActivityTest.kt
index 72e8cfb5207..debec65d207 100644
--- a/app/src/sharedTest/java/org/oppia/android/app/topic/TopicActivityTest.kt
+++ b/app/src/sharedTest/java/org/oppia/android/app/topic/TopicActivityTest.kt
@@ -170,7 +170,9 @@ class TopicActivityTest {
   @Test
   fun testTopicActivity_hasCorrectActivityLabel() {
     TestPlatformParameterModule.forceEnableExtraTopicTabsUi(true)
-    launchTopicActivity(internalProfileId, TEST_CLASSROOM_ID_1, FRACTIONS_TOPIC_ID).use { scenario ->
+    launchTopicActivity(
+      internalProfileId, TEST_CLASSROOM_ID_1, FRACTIONS_TOPIC_ID
+    ).use { scenario ->
       lateinit var title: CharSequence
       scenario.onActivity { activity -> title = activity.title }
 
diff --git a/app/src/sharedTest/java/org/oppia/android/app/topic/TopicFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/topic/TopicFragmentTest.kt
index c7f6786fc61..c8483d9992a 100644
--- a/app/src/sharedTest/java/org/oppia/android/app/topic/TopicFragmentTest.kt
+++ b/app/src/sharedTest/java/org/oppia/android/app/topic/TopicFragmentTest.kt
@@ -72,7 +72,6 @@ import org.oppia.android.domain.classify.rules.numericexpressioninput.NumericExp
 import org.oppia.android.domain.classify.rules.numericinput.NumericInputRuleModule
 import org.oppia.android.domain.classify.rules.ratioinput.RatioInputModule
 import org.oppia.android.domain.classify.rules.textinput.TextInputRuleModule
-import org.oppia.android.domain.classroom.TEST_CLASSROOM_ID_0
 import org.oppia.android.domain.classroom.TEST_CLASSROOM_ID_1
 import org.oppia.android.domain.exploration.ExplorationProgressModule
 import org.oppia.android.domain.exploration.ExplorationStorageModule
@@ -209,16 +208,18 @@ class TopicFragmentTest {
   fun testLessonsTabSpotlight_spotlightAlreadySeen_checkSpotlightNotShown() {
     initializeApplicationComponent(false)
     markSpotlightSeen(FIRST_CHAPTER)
-    launch<TopicActivity>(createTopicActivityIntent(
-      internalProfileId, TEST_CLASSROOM_ID_1, FRACTIONS_TOPIC_ID
-    )).use {
+    launch<TopicActivity>(
+      createTopicActivityIntent(
+        internalProfileId, TEST_CLASSROOM_ID_1, FRACTIONS_TOPIC_ID
+      )
+    ).use {
       // Mark lessons spotlight seen.
       testCoroutineDispatchers.runCurrent()
       onView(withId(R.id.close_spotlight_button)).perform(click())
     }
 
     launch<TopicActivity>(createTopicActivityIntent(
-      internalProfileId,TEST_CLASSROOM_ID_1,  FRACTIONS_TOPIC_ID
+      internalProfileId, TEST_CLASSROOM_ID_1, FRACTIONS_TOPIC_ID
     )).use {
       testCoroutineDispatchers.runCurrent()
       onView(withText(R.string.topic_lessons_tab_spotlight_hint)).check(doesNotExist())
@@ -583,7 +584,7 @@ class TopicFragmentTest {
   @Test
   fun testTopicFragment_disableExtraTabs_configChange_practiceTopicTabIsNotDisplayed() {
     initializeApplicationComponent(enableExtraTabsUi = false)
-    launchTopicActivityIntent(internalProfileId,TEST_CLASSROOM_ID_1,  FRACTIONS_TOPIC_ID).use {
+    launchTopicActivityIntent(internalProfileId, TEST_CLASSROOM_ID_1, FRACTIONS_TOPIC_ID).use {
       onView(isRoot()).perform(orientationLandscape())
       testCoroutineDispatchers.runCurrent()
 
diff --git a/app/src/sharedTest/java/org/oppia/android/app/topic/lessons/TopicLessonsFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/topic/lessons/TopicLessonsFragmentTest.kt
index 04674d4ea3a..95f9243959e 100644
--- a/app/src/sharedTest/java/org/oppia/android/app/topic/lessons/TopicLessonsFragmentTest.kt
+++ b/app/src/sharedTest/java/org/oppia/android/app/topic/lessons/TopicLessonsFragmentTest.kt
@@ -206,9 +206,11 @@ class TopicLessonsFragmentTest {
 
   @Test
   fun testLessonsPlayFragment_loadRatiosTopic_storyName_isCorrect() {
-    launch<TopicActivity>(createTopicActivityIntent(
-      internalProfileId, TEST_CLASSROOM_ID_1, RATIOS_TOPIC_ID
-    )).use {
+    launch<TopicActivity>(
+      createTopicActivityIntent(
+        internalProfileId, TEST_CLASSROOM_ID_1, RATIOS_TOPIC_ID
+      )
+    ).use {
       clickLessonTab()
       verifyTextOnStorySummaryListItemAtPosition(itemPosition = 1, stringToMatch = "Ratios: Part 1")
     }
@@ -216,9 +218,11 @@ class TopicLessonsFragmentTest {
 
   @Test
   fun testLessonsPlayFragment_loadRatiosTopic_chapterCountTextMultiple_isCorrect() {
-    launch<TopicActivity>(createTopicActivityIntent(
-      internalProfileId, TEST_CLASSROOM_ID_1, RATIOS_TOPIC_ID
-    )).use {
+    launch<TopicActivity>(
+      createTopicActivityIntent(
+        internalProfileId, TEST_CLASSROOM_ID_1, RATIOS_TOPIC_ID
+      )
+    ).use {
       clickLessonTab()
       verifyTextOnStorySummaryListItemAtPosition(itemPosition = 2, stringToMatch = "2 Chapters")
     }
@@ -244,9 +248,11 @@ class TopicLessonsFragmentTest {
       profileId,
       timestampOlderThanOneWeek = false
     )
-    launch<TopicActivity>(createTopicActivityIntent(
-      internalProfileId, TEST_CLASSROOM_ID_1, RATIOS_TOPIC_ID
-    )).use {
+    launch<TopicActivity>(
+      createTopicActivityIntent(
+        internalProfileId, TEST_CLASSROOM_ID_1, RATIOS_TOPIC_ID
+      )
+    ).use {
       clickLessonTab()
       verifyProgressContentDescriptionAtPosition(itemPosition = 1, stringToMatch = "100% Completed")
     }
@@ -258,9 +264,11 @@ class TopicLessonsFragmentTest {
       profileId,
       timestampOlderThanOneWeek = false
     )
-    launch<TopicActivity>(createTopicActivityIntent(
-      internalProfileId, TEST_CLASSROOM_ID_1, RATIOS_TOPIC_ID
-    )).use {
+    launch<TopicActivity>(
+      createTopicActivityIntent(
+        internalProfileId, TEST_CLASSROOM_ID_1, RATIOS_TOPIC_ID
+      )
+    ).use {
       clickLessonTab()
       verifyProgressContentDescriptionAtPosition(itemPosition = 1, stringToMatch = "0% In Progress")
     }
@@ -276,9 +284,11 @@ class TopicLessonsFragmentTest {
       profileId,
       timestampOlderThanOneWeek = false
     )
-    launch<TopicActivity>(createTopicActivityIntent(
-      internalProfileId, TEST_CLASSROOM_ID_1, RATIOS_TOPIC_ID
-    )).use {
+    launch<TopicActivity>(
+      createTopicActivityIntent(
+        internalProfileId, TEST_CLASSROOM_ID_1, RATIOS_TOPIC_ID
+      )
+    ).use {
       clickLessonTab()
       verifyProgressContentDescriptionAtPosition(
         itemPosition = 1,
@@ -289,9 +299,11 @@ class TopicLessonsFragmentTest {
 
   @Test
   fun testLessonsPlayFragment_loadRatiosTopic_noStoryProgress_contentDescriptionIsCorrect() {
-    launch<TopicActivity>(createTopicActivityIntent(
-      internalProfileId, TEST_CLASSROOM_ID_1, RATIOS_TOPIC_ID
-    )).use {
+    launch<TopicActivity>(
+      createTopicActivityIntent(
+        internalProfileId, TEST_CLASSROOM_ID_1, RATIOS_TOPIC_ID
+      )
+    ).use {
       clickLessonTab()
       verifyProgressContentDescriptionAtPosition(itemPosition = 1, stringToMatch = "0% In Progress")
     }
@@ -307,9 +319,11 @@ class TopicLessonsFragmentTest {
       profileId,
       timestampOlderThanOneWeek = false
     )
-    launch<TopicActivity>(createTopicActivityIntent(
-      internalProfileId, TEST_CLASSROOM_ID_1, RATIOS_TOPIC_ID
-    )).use {
+    launch<TopicActivity>(
+      createTopicActivityIntent(
+        internalProfileId, TEST_CLASSROOM_ID_1, RATIOS_TOPIC_ID
+      )
+    ).use {
       clickLessonTab()
       verifyTextOnStorySummaryListItemAtPosition(itemPosition = 2, stringToMatch = "50%")
     }
@@ -317,9 +331,11 @@ class TopicLessonsFragmentTest {
 
   @Test
   fun testLessonsPlayFragment_loadRatiosTopic_configurationChange_storyName_isCorrect() {
-    launch<TopicActivity>(createTopicActivityIntent(
-      internalProfileId, TEST_CLASSROOM_ID_1, RATIOS_TOPIC_ID
-    )).use {
+    launch<TopicActivity>(
+      createTopicActivityIntent(
+        internalProfileId, TEST_CLASSROOM_ID_1, RATIOS_TOPIC_ID
+      )
+    ).use {
       clickLessonTab()
       onView(isRoot()).perform(orientationLandscape())
       verifyTextOnStorySummaryListItemAtPosition(itemPosition = 1, stringToMatch = "Ratios: Part 1")
@@ -329,9 +345,11 @@ class TopicLessonsFragmentTest {
   @Test
   @Config(qualifiers = "land-xxhdpi")
   fun testLessonsPlayFragment_loadRatiosTopic_configurationLandscape_storyName_isCorrect() {
-    launch<TopicActivity>(createTopicActivityIntent(
-      internalProfileId, TEST_CLASSROOM_ID_1, RATIOS_TOPIC_ID
-    )).use {
+    launch<TopicActivity>(
+      createTopicActivityIntent(
+        internalProfileId, TEST_CLASSROOM_ID_1, RATIOS_TOPIC_ID
+      )
+    ).use {
       clickLessonTab()
       verifyTextOnStorySummaryListItemAtPosition(itemPosition = 1, stringToMatch = "Ratios: Part 1")
     }
@@ -339,9 +357,11 @@ class TopicLessonsFragmentTest {
 
   @Test
   fun testLessonsPlayFragment_loadRatiosTopic_clickStoryItem_opensStoryActivityWithCorrectIntent() {
-    launch<TopicActivity>(createTopicActivityIntent(
-      internalProfileId, TEST_CLASSROOM_ID_1, RATIOS_TOPIC_ID
-    )).use {
+    launch<TopicActivity>(
+      createTopicActivityIntent(
+        internalProfileId, TEST_CLASSROOM_ID_1, RATIOS_TOPIC_ID
+      )
+    ).use {
       clickLessonTab()
       clickStoryItem(position = 1, targetViewId = R.id.story_name_text_view)
 
@@ -356,18 +376,22 @@ class TopicLessonsFragmentTest {
 
   @Test
   fun testLessonsPlayFragment_loadRatiosTopic_chapterListIsNotVisible() {
-    launch<TopicActivity>(createTopicActivityIntent(
-      internalProfileId, TEST_CLASSROOM_ID_1, RATIOS_TOPIC_ID
-    )).use {
+    launch<TopicActivity>(
+      createTopicActivityIntent(
+        internalProfileId, TEST_CLASSROOM_ID_1, RATIOS_TOPIC_ID
+      )
+    ).use {
       onView(withId(R.id.chapter_recycler_view)).check(doesNotExist())
     }
   }
 
   @Test
   fun testLessonsPlayFragment_loadRatiosTopic_chapterNotStartedIsCorrectlyDisplayed() {
-    launch<TopicActivity>(createTopicActivityIntent(
-      internalProfileId, TEST_CLASSROOM_ID_1, RATIOS_TOPIC_ID
-    )).use {
+    launch<TopicActivity>(
+      createTopicActivityIntent(
+        internalProfileId, TEST_CLASSROOM_ID_1, RATIOS_TOPIC_ID
+      )
+    ).use {
       clickLessonTab()
       clickStoryItem(position = 1, targetViewId = R.id.chapter_list_drop_down_icon)
       onView(
@@ -382,9 +406,11 @@ class TopicLessonsFragmentTest {
 
   @Test
   fun testLessonsPlayFragment_loadRatiosTopic_chapterLockedIsCorrectlyDisplayed() {
-    launch<TopicActivity>(createTopicActivityIntent(
-      internalProfileId, TEST_CLASSROOM_ID_1, RATIOS_TOPIC_ID
-    )).use {
+    launch<TopicActivity>(
+      createTopicActivityIntent(
+        internalProfileId, TEST_CLASSROOM_ID_1, RATIOS_TOPIC_ID
+      )
+    ).use {
       clickLessonTab()
       clickStoryItem(position = 1, targetViewId = R.id.chapter_list_drop_down_icon)
       onView(
@@ -399,9 +425,11 @@ class TopicLessonsFragmentTest {
 
   @Test
   fun testLessonsPlayFragment_loadRatiosTopic_chapterIsLocked_contentDescriptionIsCorrect() {
-    launch<TopicActivity>(createTopicActivityIntent(
-      internalProfileId, TEST_CLASSROOM_ID_1, RATIOS_TOPIC_ID
-    )).use {
+    launch<TopicActivity>(
+      createTopicActivityIntent(
+        internalProfileId, TEST_CLASSROOM_ID_1, RATIOS_TOPIC_ID
+      )
+    ).use {
       clickLessonTab()
       clickStoryItem(position = 1, targetViewId = R.id.chapter_list_drop_down_icon)
       onView(
@@ -429,9 +457,11 @@ class TopicLessonsFragmentTest {
       profileId,
       timestampOlderThanOneWeek = false
     )
-    launch<TopicActivity>(createTopicActivityIntent(
-      internalProfileId, TEST_CLASSROOM_ID_1, RATIOS_TOPIC_ID
-    )).use {
+    launch<TopicActivity>(
+      createTopicActivityIntent(
+        internalProfileId, TEST_CLASSROOM_ID_1, RATIOS_TOPIC_ID
+      )
+    ).use {
       clickLessonTab()
       clickStoryItem(position = 1, targetViewId = R.id.chapter_list_drop_down_icon)
       onView(
@@ -450,9 +480,11 @@ class TopicLessonsFragmentTest {
       profileId,
       timestampOlderThanOneWeek = false
     )
-    launch<TopicActivity>(createTopicActivityIntent(
-      internalProfileId, TEST_CLASSROOM_ID_1, RATIOS_TOPIC_ID
-    )).use {
+    launch<TopicActivity>(
+      createTopicActivityIntent(
+        internalProfileId, TEST_CLASSROOM_ID_1, RATIOS_TOPIC_ID
+      )
+    ).use {
       clickLessonTab()
       clickStoryItem(position = 1, targetViewId = R.id.chapter_list_drop_down_icon)
       onView(
@@ -480,9 +512,11 @@ class TopicLessonsFragmentTest {
       profileId,
       timestampOlderThanOneWeek = false
     )
-    launch<TopicActivity>(createTopicActivityIntent(
-      internalProfileId, TEST_CLASSROOM_ID_1, RATIOS_TOPIC_ID
-    )).use {
+    launch<TopicActivity>(
+      createTopicActivityIntent(
+        internalProfileId, TEST_CLASSROOM_ID_1, RATIOS_TOPIC_ID
+      )
+    ).use {
       clickLessonTab()
       clickStoryItem(position = 1, targetViewId = R.id.chapter_list_drop_down_icon)
       onView(
@@ -502,9 +536,11 @@ class TopicLessonsFragmentTest {
       profileId,
       timestampOlderThanOneWeek = false
     )
-    launch<TopicActivity>(createTopicActivityIntent(
-      internalProfileId, TEST_CLASSROOM_ID_1, RATIOS_TOPIC_ID
-    )).use {
+    launch<TopicActivity>(
+      createTopicActivityIntent(
+        internalProfileId, TEST_CLASSROOM_ID_1, RATIOS_TOPIC_ID
+      )
+    ).use {
       clickLessonTab()
       clickStoryItem(position = 1, targetViewId = R.id.chapter_list_drop_down_icon)
       onView(
@@ -527,9 +563,11 @@ class TopicLessonsFragmentTest {
 
   @Test
   fun testLessonsPlayFragment_loadRatiosTopic_configChange_chapterLockedIsCorrectlyDisplayed() {
-    launch<TopicActivity>(createTopicActivityIntent(
-      internalProfileId, TEST_CLASSROOM_ID_1, RATIOS_TOPIC_ID
-    )).use {
+    launch<TopicActivity>(
+      createTopicActivityIntent(
+        internalProfileId, TEST_CLASSROOM_ID_1, RATIOS_TOPIC_ID
+      )
+    ).use {
       clickLessonTab()
       clickStoryItem(position = 1, targetViewId = R.id.chapter_list_drop_down_icon)
       onView(isRoot()).perform(orientationLandscape())
@@ -549,9 +587,11 @@ class TopicLessonsFragmentTest {
       profileId,
       timestampOlderThanOneWeek = false
     )
-    launch<TopicActivity>(createTopicActivityIntent(
-      internalProfileId, TEST_CLASSROOM_ID_1, RATIOS_TOPIC_ID
-    )).use {
+    launch<TopicActivity>(
+      createTopicActivityIntent(
+        internalProfileId, TEST_CLASSROOM_ID_1, RATIOS_TOPIC_ID
+      )
+    ).use {
       clickLessonTab()
       clickStoryItem(position = 1, targetViewId = R.id.chapter_list_drop_down_icon)
       onView(isRoot()).perform(orientationLandscape())
@@ -572,9 +612,11 @@ class TopicLessonsFragmentTest {
       profileId,
       timestampOlderThanOneWeek = false
     )
-    launch<TopicActivity>(createTopicActivityIntent(
-      internalProfileId, TEST_CLASSROOM_ID_1, RATIOS_TOPIC_ID
-    )).use {
+    launch<TopicActivity>(
+      createTopicActivityIntent(
+        internalProfileId, TEST_CLASSROOM_ID_1, RATIOS_TOPIC_ID
+      )
+    ).use {
       clickLessonTab()
       clickStoryItem(position = 1, targetViewId = R.id.chapter_list_drop_down_icon)
       onView(isRoot()).perform(orientationLandscape())
@@ -590,9 +632,11 @@ class TopicLessonsFragmentTest {
 
   @Test
   fun testLessonsPlayFragment_loadRatiosTopic_configChange_chapterNotStartedIsCorrectlyDisplayed() {
-    launch<TopicActivity>(createTopicActivityIntent(
-      internalProfileId, TEST_CLASSROOM_ID_1, RATIOS_TOPIC_ID
-    )).use {
+    launch<TopicActivity>(
+      createTopicActivityIntent(
+        internalProfileId, TEST_CLASSROOM_ID_1, RATIOS_TOPIC_ID
+      )
+    ).use {
       clickLessonTab()
       clickStoryItem(position = 1, targetViewId = R.id.chapter_list_drop_down_icon)
       onView(isRoot()).perform(orientationLandscape())
@@ -608,9 +652,11 @@ class TopicLessonsFragmentTest {
 
   @Test
   fun testLessonsPlayFragment_loadRatiosTopic_default_arrowDown() {
-    launch<TopicActivity>(createTopicActivityIntent(
-      internalProfileId, TEST_CLASSROOM_ID_1, RATIOS_TOPIC_ID
-    )).use {
+    launch<TopicActivity>(
+      createTopicActivityIntent(
+        internalProfileId, TEST_CLASSROOM_ID_1, RATIOS_TOPIC_ID
+      )
+    ).use {
       clickLessonTab()
       onView(
         atPositionOnView(
@@ -866,9 +912,11 @@ class TopicLessonsFragmentTest {
 
   @Test
   fun testLessonsPlayFragment_loadRatiosTopic_clickExpandListIconIndex1_clickExpandListIconIndex2_chapterListForIndex1IsNotDisplayed() { // ktlint-disable max-line-length
-    launch<TopicActivity>(createTopicActivityIntent(
-      internalProfileId, TEST_CLASSROOM_ID_1, RATIOS_TOPIC_ID
-    )).use {
+    launch<TopicActivity>(
+      createTopicActivityIntent(
+        internalProfileId, TEST_CLASSROOM_ID_1, RATIOS_TOPIC_ID
+      )
+    ).use {
       clickLessonTab()
       scrollToPosition(position = 1)
       clickStoryItem(position = 1, targetViewId = R.id.chapter_list_drop_down_icon)
@@ -889,9 +937,11 @@ class TopicLessonsFragmentTest {
 
   @Test
   fun testLessonsPlayFragment_loadRatiosTopic_clickExpandListIconIndex2_clickExpandListIconIndex1_chapterListForIndex2IsNotDisplayed() { // ktlint-disable max-line-length
-    launch<TopicActivity>(createTopicActivityIntent(
-      internalProfileId, TEST_CLASSROOM_ID_1, RATIOS_TOPIC_ID
-    )).use {
+    launch<TopicActivity>(
+      createTopicActivityIntent(
+        internalProfileId, TEST_CLASSROOM_ID_1, RATIOS_TOPIC_ID
+      )
+    ).use {
       clickLessonTab()
       scrollToPosition(position = 2)
       clickStoryItem(position = 2, targetViewId = R.id.chapter_list_drop_down_icon)
@@ -910,9 +960,11 @@ class TopicLessonsFragmentTest {
 
   @Test
   fun testLessonsPlayFragment_loadRatiosTopic_clickExpandListIconIndex1_configurationChange_chapterListIsVisible() { // ktlint-disable max-line-length
-    launch<TopicActivity>(createTopicActivityIntent(
-      internalProfileId, TEST_CLASSROOM_ID_1, RATIOS_TOPIC_ID
-    )).use {
+    launch<TopicActivity>(
+      createTopicActivityIntent(
+        internalProfileId, TEST_CLASSROOM_ID_1, RATIOS_TOPIC_ID
+      )
+    ).use {
       clickLessonTab()
       onView(isRoot()).perform(orientationLandscape())
       clickStoryItem(position = 1, targetViewId = R.id.chapter_list_drop_down_icon)
@@ -930,9 +982,11 @@ class TopicLessonsFragmentTest {
   @Test
   @Config(qualifiers = "land-xxhdpi")
   fun testLessonsPlayFragment_loadRatiosTopic_clickExpandListIconIndex1_configurationLandscape_chapterListIsVisible() { // ktlint-disable max-line-length
-    launch<TopicActivity>(createTopicActivityIntent(
-      internalProfileId, TEST_CLASSROOM_ID_1, RATIOS_TOPIC_ID
-    )).use {
+    launch<TopicActivity>(
+      createTopicActivityIntent(
+        internalProfileId, TEST_CLASSROOM_ID_1, RATIOS_TOPIC_ID
+      )
+    ).use {
       clickLessonTab()
       clickStoryItem(position = 1, targetViewId = R.id.chapter_list_drop_down_icon)
       scrollToPosition(position = 1)
@@ -952,9 +1006,11 @@ class TopicLessonsFragmentTest {
       profileId,
       timestampOlderThanOneWeek = false
     )
-    launch<TopicActivity>(createTopicActivityIntent(
-      internalProfileId, TEST_CLASSROOM_ID_1, RATIOS_TOPIC_ID
-    )).use {
+    launch<TopicActivity>(
+      createTopicActivityIntent(
+        internalProfileId, TEST_CLASSROOM_ID_1, RATIOS_TOPIC_ID
+      )
+    ).use {
       clickLessonTab()
       clickStoryItem(position = 1, targetViewId = R.id.chapter_list_drop_down_icon)
       scrollToPosition(position = 1)
diff --git a/utility/src/main/java/org/oppia/android/util/logging/EventBundleCreator.kt b/utility/src/main/java/org/oppia/android/util/logging/EventBundleCreator.kt
index 8c3318cecfd..dde89bc818b 100644
--- a/utility/src/main/java/org/oppia/android/util/logging/EventBundleCreator.kt
+++ b/utility/src/main/java/org/oppia/android/util/logging/EventBundleCreator.kt
@@ -52,6 +52,7 @@ import org.oppia.android.app.model.EventLog.Context.ActivityContextCase.REVEAL_S
 import org.oppia.android.app.model.EventLog.Context.ActivityContextCase.SHOW_SURVEY_POPUP
 import org.oppia.android.app.model.EventLog.Context.ActivityContextCase.SOLUTION_UNLOCKED_CONTEXT
 import org.oppia.android.app.model.EventLog.Context.ActivityContextCase.START_CARD_CONTEXT
+import org.oppia.android.app.model.EventLog.Context.ActivityContextCase.START_EXPLORATION_CONTEXT
 import org.oppia.android.app.model.EventLog.Context.ActivityContextCase.START_OVER_EXPLORATION_CONTEXT
 import org.oppia.android.app.model.EventLog.Context.ActivityContextCase.SUBMIT_ANSWER_CONTEXT
 import org.oppia.android.app.model.EventLog.Context.ActivityContextCase.SWITCH_IN_LESSON_LANGUAGE
@@ -113,7 +114,6 @@ import org.oppia.android.app.model.EventLog.CardContext as CardEventContext
 import org.oppia.android.app.model.EventLog.CompleteAppOnboardingContext as CompleteAppOnboardingEventContext
 import org.oppia.android.app.model.EventLog.ConceptCardContext as ConceptCardEventContext
 import org.oppia.android.app.model.EventLog.ConsoleLoggerContext as ConsoleLoggerEventContext
-import org.oppia.android.app.model.EventLog.Context.ActivityContextCase.START_EXPLORATION_CONTEXT
 import org.oppia.android.app.model.EventLog.ExplorationContext as ExplorationEventContext
 import org.oppia.android.app.model.EventLog.FeatureFlagListContext as FeatureFlagListEventContext
 import org.oppia.android.app.model.EventLog.HintContext as HintEventContext

From 10c2e8f2dda2902eee8dd197bde14a5e9d048eb1 Mon Sep 17 00:00:00 2001
From: Saptak Manna <saptakmanna100@gmail.com>
Date: Wed, 3 Jul 2024 17:44:43 +0530
Subject: [PATCH 09/21] Fix ktlint checks

---
 .../android/app/home/RouteToTopicListener.kt  |  2 +-
 .../android/app/topic/TopicFragmentTest.kt    |  8 ++-
 .../topic/lessons/TopicLessonsFragmentTest.kt | 70 ++++++++++++-------
 3 files changed, 52 insertions(+), 28 deletions(-)

diff --git a/app/src/main/java/org/oppia/android/app/home/RouteToTopicListener.kt b/app/src/main/java/org/oppia/android/app/home/RouteToTopicListener.kt
index 5e50031cd95..c00a7dc8389 100755
--- a/app/src/main/java/org/oppia/android/app/home/RouteToTopicListener.kt
+++ b/app/src/main/java/org/oppia/android/app/home/RouteToTopicListener.kt
@@ -2,5 +2,5 @@ package org.oppia.android.app.home
 
 /** Listener for when an activity should route to a topic. */
 interface RouteToTopicListener {
-  fun routeToTopic(internalProfileId: Int, classroomId: String,  topicId: String)
+  fun routeToTopic(internalProfileId: Int, classroomId: String, topicId: String)
 }
diff --git a/app/src/sharedTest/java/org/oppia/android/app/topic/TopicFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/topic/TopicFragmentTest.kt
index c8483d9992a..dc00a9ca748 100644
--- a/app/src/sharedTest/java/org/oppia/android/app/topic/TopicFragmentTest.kt
+++ b/app/src/sharedTest/java/org/oppia/android/app/topic/TopicFragmentTest.kt
@@ -218,9 +218,11 @@ class TopicFragmentTest {
       onView(withId(R.id.close_spotlight_button)).perform(click())
     }
 
-    launch<TopicActivity>(createTopicActivityIntent(
-      internalProfileId, TEST_CLASSROOM_ID_1, FRACTIONS_TOPIC_ID
-    )).use {
+    launch<TopicActivity>(
+      createTopicActivityIntent(
+        internalProfileId, TEST_CLASSROOM_ID_1, FRACTIONS_TOPIC_ID
+      )
+    ).use {
       testCoroutineDispatchers.runCurrent()
       onView(withText(R.string.topic_lessons_tab_spotlight_hint)).check(doesNotExist())
     }
diff --git a/app/src/sharedTest/java/org/oppia/android/app/topic/lessons/TopicLessonsFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/topic/lessons/TopicLessonsFragmentTest.kt
index 95f9243959e..39f9fff33c4 100644
--- a/app/src/sharedTest/java/org/oppia/android/app/topic/lessons/TopicLessonsFragmentTest.kt
+++ b/app/src/sharedTest/java/org/oppia/android/app/topic/lessons/TopicLessonsFragmentTest.kt
@@ -234,9 +234,11 @@ class TopicLessonsFragmentTest {
       profileId,
       timestampOlderThanOneWeek = false
     )
-    launch<TopicActivity>(createTopicActivityIntent(
-      internalProfileId, TEST_CLASSROOM_ID_1, RATIOS_TOPIC_ID
-    )).use {
+    launch<TopicActivity>(
+      createTopicActivityIntent(
+        internalProfileId, TEST_CLASSROOM_ID_1, RATIOS_TOPIC_ID
+      )
+    ).use {
       clickLessonTab()
       verifyTextOnStorySummaryListItemAtPosition(itemPosition = 1, stringToMatch = "100%")
     }
@@ -705,8 +707,10 @@ class TopicLessonsFragmentTest {
       version = FRACTIONS_STORY_0_EXPLORATION_0_CURRENT_VERSION,
     )
     testCoroutineDispatchers.runCurrent()
-    launch<TopicActivity>(createTopicActivityIntent(
-      internalProfileId, TEST_CLASSROOM_ID_1, FRACTIONS_TOPIC_ID)
+    launch<TopicActivity>(
+      createTopicActivityIntent(
+        internalProfileId, TEST_CLASSROOM_ID_1, FRACTIONS_TOPIC_ID
+      )
     ).use {
       clickLessonTab()
       clickStoryItem(position = 1, targetViewId = R.id.chapter_list_drop_down_icon)
@@ -759,8 +763,10 @@ class TopicLessonsFragmentTest {
       profileId = profileId,
       version = 1 // Old version, but it doesn't matter since the new version is incompatible.
     )
-    launch<TopicActivity>(createTopicActivityIntent(
-      internalProfileId, TEST_CLASSROOM_ID_1, FRACTIONS_TOPIC_ID)
+    launch<TopicActivity>(
+      createTopicActivityIntent(
+        internalProfileId, TEST_CLASSROOM_ID_1, FRACTIONS_TOPIC_ID
+      )
     ).use {
       clickLessonTab()
       clickStoryItem(position = 1, targetViewId = R.id.chapter_list_drop_down_icon)
@@ -795,8 +801,10 @@ class TopicLessonsFragmentTest {
 
   @Test
   fun testLessonsPlayFragment_loadFractionsTopic_clickChap_chapterMarkedAsNotStarted_opensExpAct() {
-    launch<TopicActivity>(createTopicActivityIntent(
-      internalProfileId, TEST_CLASSROOM_ID_1, FRACTIONS_TOPIC_ID)
+    launch<TopicActivity>(
+      createTopicActivityIntent(
+        internalProfileId, TEST_CLASSROOM_ID_1, FRACTIONS_TOPIC_ID
+      )
     ).use {
       clickLessonTab()
       clickStoryItem(position = 1, targetViewId = R.id.chapter_list_drop_down_icon)
@@ -836,8 +844,10 @@ class TopicLessonsFragmentTest {
       profileId = profileId,
       timestampOlderThanOneWeek = false
     )
-    launch<TopicActivity>(createTopicActivityIntent(
-      internalProfileId, TEST_CLASSROOM_ID_1, FRACTIONS_TOPIC_ID)
+    launch<TopicActivity>(
+      createTopicActivityIntent(
+        internalProfileId, TEST_CLASSROOM_ID_1, FRACTIONS_TOPIC_ID
+      )
     ).use {
       clickLessonTab()
       clickStoryItem(position = 1, targetViewId = R.id.chapter_list_drop_down_icon)
@@ -877,8 +887,10 @@ class TopicLessonsFragmentTest {
       profileId = profileId,
       timestampOlderThanOneWeek = false
     )
-    launch<TopicActivity>(createTopicActivityIntent(
-      internalProfileId, TEST_CLASSROOM_ID_1, FRACTIONS_TOPIC_ID)
+    launch<TopicActivity>(
+      createTopicActivityIntent(
+        internalProfileId, TEST_CLASSROOM_ID_1, FRACTIONS_TOPIC_ID
+      )
     ).use {
       clickLessonTab()
       clickStoryItem(position = 1, targetViewId = R.id.chapter_list_drop_down_icon)
@@ -1025,9 +1037,11 @@ class TopicLessonsFragmentTest {
       profileId,
       timestampOlderThanOneWeek = false
     )
-    launch<TopicActivity>(createTopicActivityIntent(
-      internalProfileId, TEST_CLASSROOM_ID_1, RATIOS_TOPIC_ID
-    )).use {
+    launch<TopicActivity>(
+      createTopicActivityIntent(
+        internalProfileId, TEST_CLASSROOM_ID_1, RATIOS_TOPIC_ID
+      )
+    ).use {
       clickLessonTab()
       clickStoryItem(position = 1, targetViewId = R.id.chapter_list_drop_down_icon)
       scrollToPosition(position = 1)
@@ -1106,8 +1120,10 @@ class TopicLessonsFragmentTest {
 
   @Test
   fun testLessonsPlayFragment_loadRatiosTopic_checkDropDownIconWithScreenReader_isClickable() {
-    launch<TopicActivity>(createTopicActivityIntent(
-      internalProfileId, TEST_CLASSROOM_ID_1, FRACTIONS_TOPIC_ID)
+    launch<TopicActivity>(
+      createTopicActivityIntent(
+        internalProfileId, TEST_CLASSROOM_ID_1, FRACTIONS_TOPIC_ID
+      )
     ).use {
       fakeAccessibilityService.setScreenReaderEnabled(true)
       clickLessonTab()
@@ -1126,8 +1142,10 @@ class TopicLessonsFragmentTest {
 
   @Test
   fun testLessonPlayFragment_loadRatiosTopic_checkDropDownIconWithoutScreenReader_isNotClickable() {
-    launch<TopicActivity>(createTopicActivityIntent(
-      internalProfileId, TEST_CLASSROOM_ID_1, FRACTIONS_TOPIC_ID)
+    launch<TopicActivity>(
+      createTopicActivityIntent(
+        internalProfileId, TEST_CLASSROOM_ID_1, FRACTIONS_TOPIC_ID
+      )
     ).use {
       clickLessonTab()
       testCoroutineDispatchers.runCurrent()
@@ -1145,8 +1163,10 @@ class TopicLessonsFragmentTest {
 
   @Test
   fun testLessonPlayFragment_loadRatiosTopic_checkStoryContainerWithScreenReader_isNotClickable() {
-    launch<TopicActivity>(createTopicActivityIntent(
-      internalProfileId, TEST_CLASSROOM_ID_1, FRACTIONS_TOPIC_ID)
+    launch<TopicActivity>(
+      createTopicActivityIntent(
+        internalProfileId, TEST_CLASSROOM_ID_1, FRACTIONS_TOPIC_ID
+      )
     ).use {
       fakeAccessibilityService.setScreenReaderEnabled(true)
       clickLessonTab()
@@ -1165,8 +1185,10 @@ class TopicLessonsFragmentTest {
 
   @Test
   fun testLessonPlayFragment_loadRatiosTopic_checkStoryContainerWithoutScreenReader_isClickable() {
-    launch<TopicActivity>(createTopicActivityIntent(
-      internalProfileId, TEST_CLASSROOM_ID_1, FRACTIONS_TOPIC_ID)
+    launch<TopicActivity>(
+      createTopicActivityIntent(
+        internalProfileId, TEST_CLASSROOM_ID_1, FRACTIONS_TOPIC_ID
+      )
     ).use {
       clickLessonTab()
       testCoroutineDispatchers.runCurrent()

From 8fce57a33b423102a2c091777dc06a4325be0c70 Mon Sep 17 00:00:00 2001
From: Saptak Manna <saptakmanna100@gmail.com>
Date: Wed, 3 Jul 2024 18:19:22 +0530
Subject: [PATCH 10/21] Fix utility module tests

---
 .../util/logging/EventBundleCreatorTest.kt    | 10 ++-
 .../KenyaAlphaEventBundleCreatorTest.kt       | 90 ++++++++++++-------
 2 files changed, 66 insertions(+), 34 deletions(-)

diff --git a/utility/src/test/java/org/oppia/android/util/logging/EventBundleCreatorTest.kt b/utility/src/test/java/org/oppia/android/util/logging/EventBundleCreatorTest.kt
index e589c0a760d..7a285e8626c 100644
--- a/utility/src/test/java/org/oppia/android/util/logging/EventBundleCreatorTest.kt
+++ b/utility/src/test/java/org/oppia/android/util/logging/EventBundleCreatorTest.kt
@@ -1171,13 +1171,14 @@ class EventBundleCreatorTest {
 
     val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle)
     assertThat(typeName).isEqualTo("view_existing_hint")
-    assertThat(bundle).hasSize(18)
+    assertThat(bundle).hasSize(19)
     assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1)
     assertThat(bundle).string("priority").isEqualTo("essential")
     assertThat(bundle).integer("event_type").isEqualTo(VIEW_EXISTING_HINT_CONTEXT.number)
     assertThat(bundle).integer("android_sdk").isEqualTo(TEST_ANDROID_SDK_VERSION)
     assertThat(bundle).string("app_version_name").isEqualTo(TEST_APP_VERSION_NAME)
     assertThat(bundle).integer("app_version_code").isEqualTo(TEST_APP_VERSION_CODE)
+    assertThat(bundle).string("ed_classroom_id").isEqualTo(TEST_CLASSROOM_ID)
     assertThat(bundle).string("ed_topic_id").isEqualTo(TEST_TOPIC_ID)
     assertThat(bundle).string("ed_story_id").isEqualTo(TEST_STORY_ID)
     assertThat(bundle).string("ed_exploration_id").isEqualTo(TEST_EXPLORATION_ID)
@@ -1196,7 +1197,7 @@ class EventBundleCreatorTest {
 
     val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle)
     assertThat(typeName).isEqualTo("view_existing_hint")
-    assertThat(bundle).hasSize(20)
+    assertThat(bundle).hasSize(21)
     assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1)
     assertThat(bundle).string("priority").isEqualTo("essential")
     assertThat(bundle).integer("event_type").isEqualTo(VIEW_EXISTING_HINT_CONTEXT.number)
@@ -1327,13 +1328,14 @@ class EventBundleCreatorTest {
 
     val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle)
     assertThat(typeName).isEqualTo("view_existing_solution")
-    assertThat(bundle).hasSize(17)
+    assertThat(bundle).hasSize(18)
     assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1)
     assertThat(bundle).string("priority").isEqualTo("essential")
     assertThat(bundle).integer("event_type").isEqualTo(VIEW_EXISTING_SOLUTION_CONTEXT.number)
     assertThat(bundle).integer("android_sdk").isEqualTo(TEST_ANDROID_SDK_VERSION)
     assertThat(bundle).string("app_version_name").isEqualTo(TEST_APP_VERSION_NAME)
     assertThat(bundle).integer("app_version_code").isEqualTo(TEST_APP_VERSION_CODE)
+    assertThat(bundle).string("classroom_id").isEqualTo(TEST_CLASSROOM_ID)
     assertThat(bundle).string("topic_id").isEqualTo(TEST_TOPIC_ID)
     assertThat(bundle).string("story_id").isEqualTo(TEST_STORY_ID)
     assertThat(bundle).string("exploration_id").isEqualTo(TEST_EXPLORATION_ID)
@@ -1351,7 +1353,7 @@ class EventBundleCreatorTest {
 
     val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle)
     assertThat(typeName).isEqualTo("view_existing_solution")
-    assertThat(bundle).hasSize(19)
+    assertThat(bundle).hasSize(20)
     assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1)
     assertThat(bundle).string("priority").isEqualTo("essential")
     assertThat(bundle).integer("event_type").isEqualTo(VIEW_EXISTING_SOLUTION_CONTEXT.number)
diff --git a/utility/src/test/java/org/oppia/android/util/logging/KenyaAlphaEventBundleCreatorTest.kt b/utility/src/test/java/org/oppia/android/util/logging/KenyaAlphaEventBundleCreatorTest.kt
index 66e87537afd..517e4e1ffc1 100644
--- a/utility/src/test/java/org/oppia/android/util/logging/KenyaAlphaEventBundleCreatorTest.kt
+++ b/utility/src/test/java/org/oppia/android/util/logging/KenyaAlphaEventBundleCreatorTest.kt
@@ -193,13 +193,14 @@ class KenyaAlphaEventBundleCreatorTest {
 
     val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle)
     assertThat(typeName).isEqualTo("open_exploration_activity")
-    assertThat(bundle).hasSize(17)
+    assertThat(bundle).hasSize(18)
     assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1)
     assertThat(bundle).string("priority").isEqualTo("essential")
     assertThat(bundle).integer("event_type").isEqualTo(OPEN_EXPLORATION_ACTIVITY.number)
     assertThat(bundle).integer("android_sdk").isEqualTo(TEST_ANDROID_SDK_VERSION)
     assertThat(bundle).string("app_version_name").isEqualTo(TEST_APP_VERSION_NAME)
     assertThat(bundle).integer("app_version_code").isEqualTo(TEST_APP_VERSION_CODE)
+    assertThat(bundle).string("classroom_id").isEqualTo(TEST_CLASSROOM_ID)
     assertThat(bundle).string("topic_id").isEqualTo(TEST_TOPIC_ID)
     assertThat(bundle).string("story_id").isEqualTo(TEST_STORY_ID)
     assertThat(bundle).string("exploration_id").isEqualTo(TEST_EXPLORATION_ID)
@@ -217,13 +218,14 @@ class KenyaAlphaEventBundleCreatorTest {
 
     val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle)
     assertThat(typeName).isEqualTo("open_exploration_activity")
-    assertThat(bundle).hasSize(19)
+    assertThat(bundle).hasSize(20)
     assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1)
     assertThat(bundle).string("priority").isEqualTo("essential")
     assertThat(bundle).integer("event_type").isEqualTo(OPEN_EXPLORATION_ACTIVITY.number)
     assertThat(bundle).integer("android_sdk").isEqualTo(TEST_ANDROID_SDK_VERSION)
     assertThat(bundle).string("app_version_name").isEqualTo(TEST_APP_VERSION_NAME)
     assertThat(bundle).integer("app_version_code").isEqualTo(TEST_APP_VERSION_CODE)
+    assertThat(bundle).string("classroom_id").isEqualTo(TEST_CLASSROOM_ID)
     assertThat(bundle).string("topic_id").isEqualTo(TEST_TOPIC_ID)
     assertThat(bundle).string("story_id").isEqualTo(TEST_STORY_ID)
     assertThat(bundle).string("exploration_id").isEqualTo(TEST_EXPLORATION_ID)
@@ -418,13 +420,14 @@ class KenyaAlphaEventBundleCreatorTest {
 
     val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle)
     assertThat(typeName).isEqualTo("start_card_context")
-    assertThat(bundle).hasSize(18)
+    assertThat(bundle).hasSize(19)
     assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1)
     assertThat(bundle).string("priority").isEqualTo("essential")
     assertThat(bundle).integer("event_type").isEqualTo(START_CARD_CONTEXT.number)
     assertThat(bundle).integer("android_sdk").isEqualTo(TEST_ANDROID_SDK_VERSION)
     assertThat(bundle).string("app_version_name").isEqualTo(TEST_APP_VERSION_NAME)
     assertThat(bundle).integer("app_version_code").isEqualTo(TEST_APP_VERSION_CODE)
+    assertThat(bundle).string("ed_classroom_id").isEqualTo(TEST_CLASSROOM_ID)
     assertThat(bundle).string("ed_topic_id").isEqualTo(TEST_TOPIC_ID)
     assertThat(bundle).string("ed_story_id").isEqualTo(TEST_STORY_ID)
     assertThat(bundle).string("ed_exploration_id").isEqualTo(TEST_EXPLORATION_ID)
@@ -443,13 +446,14 @@ class KenyaAlphaEventBundleCreatorTest {
 
     val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle)
     assertThat(typeName).isEqualTo("start_card_context")
-    assertThat(bundle).hasSize(20)
+    assertThat(bundle).hasSize(21)
     assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1)
     assertThat(bundle).string("priority").isEqualTo("essential")
     assertThat(bundle).integer("event_type").isEqualTo(START_CARD_CONTEXT.number)
     assertThat(bundle).integer("android_sdk").isEqualTo(TEST_ANDROID_SDK_VERSION)
     assertThat(bundle).string("app_version_name").isEqualTo(TEST_APP_VERSION_NAME)
     assertThat(bundle).integer("app_version_code").isEqualTo(TEST_APP_VERSION_CODE)
+    assertThat(bundle).string("ed_classroom_id").isEqualTo(TEST_CLASSROOM_ID)
     assertThat(bundle).string("ed_topic_id").isEqualTo(TEST_TOPIC_ID)
     assertThat(bundle).string("ed_story_id").isEqualTo(TEST_STORY_ID)
     assertThat(bundle).string("ed_exploration_id").isEqualTo(TEST_EXPLORATION_ID)
@@ -470,13 +474,14 @@ class KenyaAlphaEventBundleCreatorTest {
 
     val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle)
     assertThat(typeName).isEqualTo("end_card_context")
-    assertThat(bundle).hasSize(18)
+    assertThat(bundle).hasSize(19)
     assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1)
     assertThat(bundle).string("priority").isEqualTo("essential")
     assertThat(bundle).integer("event_type").isEqualTo(END_CARD_CONTEXT.number)
     assertThat(bundle).integer("android_sdk").isEqualTo(TEST_ANDROID_SDK_VERSION)
     assertThat(bundle).string("app_version_name").isEqualTo(TEST_APP_VERSION_NAME)
     assertThat(bundle).integer("app_version_code").isEqualTo(TEST_APP_VERSION_CODE)
+    assertThat(bundle).string("ed_classroom_id").isEqualTo(TEST_CLASSROOM_ID)
     assertThat(bundle).string("ed_topic_id").isEqualTo(TEST_TOPIC_ID)
     assertThat(bundle).string("ed_story_id").isEqualTo(TEST_STORY_ID)
     assertThat(bundle).string("ed_exploration_id").isEqualTo(TEST_EXPLORATION_ID)
@@ -495,13 +500,14 @@ class KenyaAlphaEventBundleCreatorTest {
 
     val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle)
     assertThat(typeName).isEqualTo("end_card_context")
-    assertThat(bundle).hasSize(20)
+    assertThat(bundle).hasSize(21)
     assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1)
     assertThat(bundle).string("priority").isEqualTo("essential")
     assertThat(bundle).integer("event_type").isEqualTo(END_CARD_CONTEXT.number)
     assertThat(bundle).integer("android_sdk").isEqualTo(TEST_ANDROID_SDK_VERSION)
     assertThat(bundle).string("app_version_name").isEqualTo(TEST_APP_VERSION_NAME)
     assertThat(bundle).integer("app_version_code").isEqualTo(TEST_APP_VERSION_CODE)
+    assertThat(bundle).string("ed_classroom_id").isEqualTo(TEST_CLASSROOM_ID)
     assertThat(bundle).string("ed_topic_id").isEqualTo(TEST_TOPIC_ID)
     assertThat(bundle).string("ed_story_id").isEqualTo(TEST_STORY_ID)
     assertThat(bundle).string("ed_exploration_id").isEqualTo(TEST_EXPLORATION_ID)
@@ -522,13 +528,14 @@ class KenyaAlphaEventBundleCreatorTest {
 
     val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle)
     assertThat(typeName).isEqualTo("hint_offered_context")
-    assertThat(bundle).hasSize(18)
+    assertThat(bundle).hasSize(19)
     assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1)
     assertThat(bundle).string("priority").isEqualTo("essential")
     assertThat(bundle).integer("event_type").isEqualTo(HINT_UNLOCKED_CONTEXT.number)
     assertThat(bundle).integer("android_sdk").isEqualTo(TEST_ANDROID_SDK_VERSION)
     assertThat(bundle).string("app_version_name").isEqualTo(TEST_APP_VERSION_NAME)
     assertThat(bundle).integer("app_version_code").isEqualTo(TEST_APP_VERSION_CODE)
+    assertThat(bundle).string("ed_classroom_id").isEqualTo(TEST_CLASSROOM_ID)
     assertThat(bundle).string("ed_topic_id").isEqualTo(TEST_TOPIC_ID)
     assertThat(bundle).string("ed_story_id").isEqualTo(TEST_STORY_ID)
     assertThat(bundle).string("ed_exploration_id").isEqualTo(TEST_EXPLORATION_ID)
@@ -547,13 +554,14 @@ class KenyaAlphaEventBundleCreatorTest {
 
     val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle)
     assertThat(typeName).isEqualTo("hint_offered_context")
-    assertThat(bundle).hasSize(20)
+    assertThat(bundle).hasSize(21)
     assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1)
     assertThat(bundle).string("priority").isEqualTo("essential")
     assertThat(bundle).integer("event_type").isEqualTo(HINT_UNLOCKED_CONTEXT.number)
     assertThat(bundle).integer("android_sdk").isEqualTo(TEST_ANDROID_SDK_VERSION)
     assertThat(bundle).string("app_version_name").isEqualTo(TEST_APP_VERSION_NAME)
     assertThat(bundle).integer("app_version_code").isEqualTo(TEST_APP_VERSION_CODE)
+    assertThat(bundle).string("ed_classroom_id").isEqualTo(TEST_CLASSROOM_ID)
     assertThat(bundle).string("ed_topic_id").isEqualTo(TEST_TOPIC_ID)
     assertThat(bundle).string("ed_story_id").isEqualTo(TEST_STORY_ID)
     assertThat(bundle).string("ed_exploration_id").isEqualTo(TEST_EXPLORATION_ID)
@@ -574,13 +582,14 @@ class KenyaAlphaEventBundleCreatorTest {
 
     val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle)
     assertThat(typeName).isEqualTo("reveal_hint_context")
-    assertThat(bundle).hasSize(18)
+    assertThat(bundle).hasSize(19)
     assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1)
     assertThat(bundle).string("priority").isEqualTo("essential")
     assertThat(bundle).integer("event_type").isEqualTo(REVEAL_HINT_CONTEXT.number)
     assertThat(bundle).integer("android_sdk").isEqualTo(TEST_ANDROID_SDK_VERSION)
     assertThat(bundle).string("app_version_name").isEqualTo(TEST_APP_VERSION_NAME)
     assertThat(bundle).integer("app_version_code").isEqualTo(TEST_APP_VERSION_CODE)
+    assertThat(bundle).string("ed_classroom_id").isEqualTo(TEST_CLASSROOM_ID)
     assertThat(bundle).string("ed_topic_id").isEqualTo(TEST_TOPIC_ID)
     assertThat(bundle).string("ed_story_id").isEqualTo(TEST_STORY_ID)
     assertThat(bundle).string("ed_exploration_id").isEqualTo(TEST_EXPLORATION_ID)
@@ -599,13 +608,14 @@ class KenyaAlphaEventBundleCreatorTest {
 
     val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle)
     assertThat(typeName).isEqualTo("reveal_hint_context")
-    assertThat(bundle).hasSize(20)
+    assertThat(bundle).hasSize(21)
     assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1)
     assertThat(bundle).string("priority").isEqualTo("essential")
     assertThat(bundle).integer("event_type").isEqualTo(REVEAL_HINT_CONTEXT.number)
     assertThat(bundle).integer("android_sdk").isEqualTo(TEST_ANDROID_SDK_VERSION)
     assertThat(bundle).string("app_version_name").isEqualTo(TEST_APP_VERSION_NAME)
     assertThat(bundle).integer("app_version_code").isEqualTo(TEST_APP_VERSION_CODE)
+    assertThat(bundle).string("ed_classroom_id").isEqualTo(TEST_CLASSROOM_ID)
     assertThat(bundle).string("ed_topic_id").isEqualTo(TEST_TOPIC_ID)
     assertThat(bundle).string("ed_story_id").isEqualTo(TEST_STORY_ID)
     assertThat(bundle).string("ed_exploration_id").isEqualTo(TEST_EXPLORATION_ID)
@@ -626,13 +636,14 @@ class KenyaAlphaEventBundleCreatorTest {
 
     val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle)
     assertThat(typeName).isEqualTo("view_existing_hint_context")
-    assertThat(bundle).hasSize(18)
+    assertThat(bundle).hasSize(19)
     assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1)
     assertThat(bundle).string("priority").isEqualTo("essential")
     assertThat(bundle).integer("event_type").isEqualTo(VIEW_EXISTING_HINT_CONTEXT.number)
     assertThat(bundle).integer("android_sdk").isEqualTo(TEST_ANDROID_SDK_VERSION)
     assertThat(bundle).string("app_version_name").isEqualTo(TEST_APP_VERSION_NAME)
     assertThat(bundle).integer("app_version_code").isEqualTo(TEST_APP_VERSION_CODE)
+    assertThat(bundle).string("ed_classroom_id").isEqualTo(TEST_CLASSROOM_ID)
     assertThat(bundle).string("ed_topic_id").isEqualTo(TEST_TOPIC_ID)
     assertThat(bundle).string("ed_story_id").isEqualTo(TEST_STORY_ID)
     assertThat(bundle).string("ed_exploration_id").isEqualTo(TEST_EXPLORATION_ID)
@@ -651,13 +662,14 @@ class KenyaAlphaEventBundleCreatorTest {
 
     val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle)
     assertThat(typeName).isEqualTo("view_existing_hint_context")
-    assertThat(bundle).hasSize(20)
+    assertThat(bundle).hasSize(21)
     assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1)
     assertThat(bundle).string("priority").isEqualTo("essential")
     assertThat(bundle).integer("event_type").isEqualTo(VIEW_EXISTING_HINT_CONTEXT.number)
     assertThat(bundle).integer("android_sdk").isEqualTo(TEST_ANDROID_SDK_VERSION)
     assertThat(bundle).string("app_version_name").isEqualTo(TEST_APP_VERSION_NAME)
     assertThat(bundle).integer("app_version_code").isEqualTo(TEST_APP_VERSION_CODE)
+    assertThat(bundle).string("ed_classroom_id").isEqualTo(TEST_CLASSROOM_ID)
     assertThat(bundle).string("ed_topic_id").isEqualTo(TEST_TOPIC_ID)
     assertThat(bundle).string("ed_story_id").isEqualTo(TEST_STORY_ID)
     assertThat(bundle).string("ed_exploration_id").isEqualTo(TEST_EXPLORATION_ID)
@@ -678,13 +690,14 @@ class KenyaAlphaEventBundleCreatorTest {
 
     val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle)
     assertThat(typeName).isEqualTo("solution_offered_context")
-    assertThat(bundle).hasSize(17)
+    assertThat(bundle).hasSize(18)
     assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1)
     assertThat(bundle).string("priority").isEqualTo("essential")
     assertThat(bundle).integer("event_type").isEqualTo(SOLUTION_UNLOCKED_CONTEXT.number)
     assertThat(bundle).integer("android_sdk").isEqualTo(TEST_ANDROID_SDK_VERSION)
     assertThat(bundle).string("app_version_name").isEqualTo(TEST_APP_VERSION_NAME)
     assertThat(bundle).integer("app_version_code").isEqualTo(TEST_APP_VERSION_CODE)
+    assertThat(bundle).string("classroom_id").isEqualTo(TEST_CLASSROOM_ID)
     assertThat(bundle).string("topic_id").isEqualTo(TEST_TOPIC_ID)
     assertThat(bundle).string("story_id").isEqualTo(TEST_STORY_ID)
     assertThat(bundle).string("exploration_id").isEqualTo(TEST_EXPLORATION_ID)
@@ -702,13 +715,14 @@ class KenyaAlphaEventBundleCreatorTest {
 
     val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle)
     assertThat(typeName).isEqualTo("solution_offered_context")
-    assertThat(bundle).hasSize(19)
+    assertThat(bundle).hasSize(20)
     assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1)
     assertThat(bundle).string("priority").isEqualTo("essential")
     assertThat(bundle).integer("event_type").isEqualTo(SOLUTION_UNLOCKED_CONTEXT.number)
     assertThat(bundle).integer("android_sdk").isEqualTo(TEST_ANDROID_SDK_VERSION)
     assertThat(bundle).string("app_version_name").isEqualTo(TEST_APP_VERSION_NAME)
     assertThat(bundle).integer("app_version_code").isEqualTo(TEST_APP_VERSION_CODE)
+    assertThat(bundle).string("classroom_id").isEqualTo(TEST_CLASSROOM_ID)
     assertThat(bundle).string("topic_id").isEqualTo(TEST_TOPIC_ID)
     assertThat(bundle).string("story_id").isEqualTo(TEST_STORY_ID)
     assertThat(bundle).string("exploration_id").isEqualTo(TEST_EXPLORATION_ID)
@@ -728,13 +742,14 @@ class KenyaAlphaEventBundleCreatorTest {
 
     val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle)
     assertThat(typeName).isEqualTo("reveal_solution_context")
-    assertThat(bundle).hasSize(17)
+    assertThat(bundle).hasSize(18)
     assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1)
     assertThat(bundle).string("priority").isEqualTo("essential")
     assertThat(bundle).integer("event_type").isEqualTo(REVEAL_SOLUTION_CONTEXT.number)
     assertThat(bundle).integer("android_sdk").isEqualTo(TEST_ANDROID_SDK_VERSION)
     assertThat(bundle).string("app_version_name").isEqualTo(TEST_APP_VERSION_NAME)
     assertThat(bundle).integer("app_version_code").isEqualTo(TEST_APP_VERSION_CODE)
+    assertThat(bundle).string("classroom_id").isEqualTo(TEST_CLASSROOM_ID)
     assertThat(bundle).string("topic_id").isEqualTo(TEST_TOPIC_ID)
     assertThat(bundle).string("story_id").isEqualTo(TEST_STORY_ID)
     assertThat(bundle).string("exploration_id").isEqualTo(TEST_EXPLORATION_ID)
@@ -752,13 +767,14 @@ class KenyaAlphaEventBundleCreatorTest {
 
     val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle)
     assertThat(typeName).isEqualTo("reveal_solution_context")
-    assertThat(bundle).hasSize(19)
+    assertThat(bundle).hasSize(20)
     assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1)
     assertThat(bundle).string("priority").isEqualTo("essential")
     assertThat(bundle).integer("event_type").isEqualTo(REVEAL_SOLUTION_CONTEXT.number)
     assertThat(bundle).integer("android_sdk").isEqualTo(TEST_ANDROID_SDK_VERSION)
     assertThat(bundle).string("app_version_name").isEqualTo(TEST_APP_VERSION_NAME)
     assertThat(bundle).integer("app_version_code").isEqualTo(TEST_APP_VERSION_CODE)
+    assertThat(bundle).string("classroom_id").isEqualTo(TEST_CLASSROOM_ID)
     assertThat(bundle).string("topic_id").isEqualTo(TEST_TOPIC_ID)
     assertThat(bundle).string("story_id").isEqualTo(TEST_STORY_ID)
     assertThat(bundle).string("exploration_id").isEqualTo(TEST_EXPLORATION_ID)
@@ -778,13 +794,14 @@ class KenyaAlphaEventBundleCreatorTest {
 
     val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle)
     assertThat(typeName).isEqualTo("view_existing_solution_context")
-    assertThat(bundle).hasSize(17)
+    assertThat(bundle).hasSize(18)
     assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1)
     assertThat(bundle).string("priority").isEqualTo("essential")
     assertThat(bundle).integer("event_type").isEqualTo(VIEW_EXISTING_SOLUTION_CONTEXT.number)
     assertThat(bundle).integer("android_sdk").isEqualTo(TEST_ANDROID_SDK_VERSION)
     assertThat(bundle).string("app_version_name").isEqualTo(TEST_APP_VERSION_NAME)
     assertThat(bundle).integer("app_version_code").isEqualTo(TEST_APP_VERSION_CODE)
+    assertThat(bundle).string("classroom_id").isEqualTo(TEST_CLASSROOM_ID)
     assertThat(bundle).string("topic_id").isEqualTo(TEST_TOPIC_ID)
     assertThat(bundle).string("story_id").isEqualTo(TEST_STORY_ID)
     assertThat(bundle).string("exploration_id").isEqualTo(TEST_EXPLORATION_ID)
@@ -802,13 +819,14 @@ class KenyaAlphaEventBundleCreatorTest {
 
     val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle)
     assertThat(typeName).isEqualTo("view_existing_solution_context")
-    assertThat(bundle).hasSize(19)
+    assertThat(bundle).hasSize(20)
     assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1)
     assertThat(bundle).string("priority").isEqualTo("essential")
     assertThat(bundle).integer("event_type").isEqualTo(VIEW_EXISTING_SOLUTION_CONTEXT.number)
     assertThat(bundle).integer("android_sdk").isEqualTo(TEST_ANDROID_SDK_VERSION)
     assertThat(bundle).string("app_version_name").isEqualTo(TEST_APP_VERSION_NAME)
     assertThat(bundle).integer("app_version_code").isEqualTo(TEST_APP_VERSION_CODE)
+    assertThat(bundle).string("classroom_id").isEqualTo(TEST_CLASSROOM_ID)
     assertThat(bundle).string("topic_id").isEqualTo(TEST_TOPIC_ID)
     assertThat(bundle).string("story_id").isEqualTo(TEST_STORY_ID)
     assertThat(bundle).string("exploration_id").isEqualTo(TEST_EXPLORATION_ID)
@@ -828,13 +846,14 @@ class KenyaAlphaEventBundleCreatorTest {
 
     val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle)
     assertThat(typeName).isEqualTo("submit_answer_context")
-    assertThat(bundle).hasSize(19)
+    assertThat(bundle).hasSize(20)
     assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1)
     assertThat(bundle).string("priority").isEqualTo("essential")
     assertThat(bundle).integer("event_type").isEqualTo(SUBMIT_ANSWER_CONTEXT.number)
     assertThat(bundle).integer("android_sdk").isEqualTo(TEST_ANDROID_SDK_VERSION)
     assertThat(bundle).string("app_version_name").isEqualTo(TEST_APP_VERSION_NAME)
     assertThat(bundle).integer("app_version_code").isEqualTo(TEST_APP_VERSION_CODE)
+    assertThat(bundle).string("ed_classroom_id").isEqualTo(TEST_CLASSROOM_ID)
     assertThat(bundle).string("ed_topic_id").isEqualTo(TEST_TOPIC_ID)
     assertThat(bundle).string("ed_story_id").isEqualTo(TEST_STORY_ID)
     assertThat(bundle).string("ed_exploration_id").isEqualTo(TEST_EXPLORATION_ID)
@@ -854,13 +873,14 @@ class KenyaAlphaEventBundleCreatorTest {
 
     val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle)
     assertThat(typeName).isEqualTo("submit_answer_context")
-    assertThat(bundle).hasSize(21)
+    assertThat(bundle).hasSize(22)
     assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1)
     assertThat(bundle).string("priority").isEqualTo("essential")
     assertThat(bundle).integer("event_type").isEqualTo(SUBMIT_ANSWER_CONTEXT.number)
     assertThat(bundle).integer("android_sdk").isEqualTo(TEST_ANDROID_SDK_VERSION)
     assertThat(bundle).string("app_version_name").isEqualTo(TEST_APP_VERSION_NAME)
     assertThat(bundle).integer("app_version_code").isEqualTo(TEST_APP_VERSION_CODE)
+    assertThat(bundle).string("ed_classroom_id").isEqualTo(TEST_CLASSROOM_ID)
     assertThat(bundle).string("ed_topic_id").isEqualTo(TEST_TOPIC_ID)
     assertThat(bundle).string("ed_story_id").isEqualTo(TEST_STORY_ID)
     assertThat(bundle).string("ed_exploration_id").isEqualTo(TEST_EXPLORATION_ID)
@@ -882,13 +902,14 @@ class KenyaAlphaEventBundleCreatorTest {
 
     val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle)
     assertThat(typeName).isEqualTo("play_voice_over_context")
-    assertThat(bundle).hasSize(19)
+    assertThat(bundle).hasSize(20)
     assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1)
     assertThat(bundle).string("priority").isEqualTo("essential")
     assertThat(bundle).integer("event_type").isEqualTo(PLAY_VOICE_OVER_CONTEXT.number)
     assertThat(bundle).integer("android_sdk").isEqualTo(TEST_ANDROID_SDK_VERSION)
     assertThat(bundle).string("app_version_name").isEqualTo(TEST_APP_VERSION_NAME)
     assertThat(bundle).integer("app_version_code").isEqualTo(TEST_APP_VERSION_CODE)
+    assertThat(bundle).string("ed_classroom_id").isEqualTo(TEST_CLASSROOM_ID)
     assertThat(bundle).string("ed_topic_id").isEqualTo(TEST_TOPIC_ID)
     assertThat(bundle).string("ed_story_id").isEqualTo(TEST_STORY_ID)
     assertThat(bundle).string("ed_exploration_id").isEqualTo(TEST_EXPLORATION_ID)
@@ -908,13 +929,14 @@ class KenyaAlphaEventBundleCreatorTest {
 
     val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle)
     assertThat(typeName).isEqualTo("play_voice_over_context")
-    assertThat(bundle).hasSize(21)
+    assertThat(bundle).hasSize(22)
     assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1)
     assertThat(bundle).string("priority").isEqualTo("essential")
     assertThat(bundle).integer("event_type").isEqualTo(PLAY_VOICE_OVER_CONTEXT.number)
     assertThat(bundle).integer("android_sdk").isEqualTo(TEST_ANDROID_SDK_VERSION)
     assertThat(bundle).string("app_version_name").isEqualTo(TEST_APP_VERSION_NAME)
     assertThat(bundle).integer("app_version_code").isEqualTo(TEST_APP_VERSION_CODE)
+    assertThat(bundle).string("ed_classroom_id").isEqualTo(TEST_CLASSROOM_ID)
     assertThat(bundle).string("ed_topic_id").isEqualTo(TEST_TOPIC_ID)
     assertThat(bundle).string("ed_story_id").isEqualTo(TEST_STORY_ID)
     assertThat(bundle).string("ed_exploration_id").isEqualTo(TEST_EXPLORATION_ID)
@@ -936,13 +958,14 @@ class KenyaAlphaEventBundleCreatorTest {
 
     val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle)
     assertThat(typeName).isEqualTo("pause_voice_over_context")
-    assertThat(bundle).hasSize(19)
+    assertThat(bundle).hasSize(20)
     assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1)
     assertThat(bundle).string("priority").isEqualTo("essential")
     assertThat(bundle).integer("event_type").isEqualTo(PAUSE_VOICE_OVER_CONTEXT.number)
     assertThat(bundle).integer("android_sdk").isEqualTo(TEST_ANDROID_SDK_VERSION)
     assertThat(bundle).string("app_version_name").isEqualTo(TEST_APP_VERSION_NAME)
     assertThat(bundle).integer("app_version_code").isEqualTo(TEST_APP_VERSION_CODE)
+    assertThat(bundle).string("ed_classroom_id").isEqualTo(TEST_CLASSROOM_ID)
     assertThat(bundle).string("ed_topic_id").isEqualTo(TEST_TOPIC_ID)
     assertThat(bundle).string("ed_story_id").isEqualTo(TEST_STORY_ID)
     assertThat(bundle).string("ed_exploration_id").isEqualTo(TEST_EXPLORATION_ID)
@@ -962,13 +985,14 @@ class KenyaAlphaEventBundleCreatorTest {
 
     val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle)
     assertThat(typeName).isEqualTo("pause_voice_over_context")
-    assertThat(bundle).hasSize(21)
+    assertThat(bundle).hasSize(22)
     assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1)
     assertThat(bundle).string("priority").isEqualTo("essential")
     assertThat(bundle).integer("event_type").isEqualTo(PAUSE_VOICE_OVER_CONTEXT.number)
     assertThat(bundle).integer("android_sdk").isEqualTo(TEST_ANDROID_SDK_VERSION)
     assertThat(bundle).string("app_version_name").isEqualTo(TEST_APP_VERSION_NAME)
     assertThat(bundle).integer("app_version_code").isEqualTo(TEST_APP_VERSION_CODE)
+    assertThat(bundle).string("ed_classroom_id").isEqualTo(TEST_CLASSROOM_ID)
     assertThat(bundle).string("ed_topic_id").isEqualTo(TEST_TOPIC_ID)
     assertThat(bundle).string("ed_story_id").isEqualTo(TEST_STORY_ID)
     assertThat(bundle).string("ed_exploration_id").isEqualTo(TEST_EXPLORATION_ID)
@@ -1066,13 +1090,14 @@ class KenyaAlphaEventBundleCreatorTest {
 
     val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle)
     assertThat(typeName).isEqualTo("exit_exploration_context")
-    assertThat(bundle).hasSize(17)
+    assertThat(bundle).hasSize(18)
     assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1)
     assertThat(bundle).string("priority").isEqualTo("essential")
     assertThat(bundle).integer("event_type").isEqualTo(EXIT_EXPLORATION_CONTEXT.number)
     assertThat(bundle).integer("android_sdk").isEqualTo(TEST_ANDROID_SDK_VERSION)
     assertThat(bundle).string("app_version_name").isEqualTo(TEST_APP_VERSION_NAME)
     assertThat(bundle).integer("app_version_code").isEqualTo(TEST_APP_VERSION_CODE)
+    assertThat(bundle).string("classroom_id").isEqualTo(TEST_CLASSROOM_ID)
     assertThat(bundle).string("topic_id").isEqualTo(TEST_TOPIC_ID)
     assertThat(bundle).string("story_id").isEqualTo(TEST_STORY_ID)
     assertThat(bundle).string("exploration_id").isEqualTo(TEST_EXPLORATION_ID)
@@ -1090,13 +1115,14 @@ class KenyaAlphaEventBundleCreatorTest {
 
     val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle)
     assertThat(typeName).isEqualTo("exit_exploration_context")
-    assertThat(bundle).hasSize(19)
+    assertThat(bundle).hasSize(20)
     assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1)
     assertThat(bundle).string("priority").isEqualTo("essential")
     assertThat(bundle).integer("event_type").isEqualTo(EXIT_EXPLORATION_CONTEXT.number)
     assertThat(bundle).integer("android_sdk").isEqualTo(TEST_ANDROID_SDK_VERSION)
     assertThat(bundle).string("app_version_name").isEqualTo(TEST_APP_VERSION_NAME)
     assertThat(bundle).integer("app_version_code").isEqualTo(TEST_APP_VERSION_CODE)
+    assertThat(bundle).string("classroom_id").isEqualTo(TEST_CLASSROOM_ID)
     assertThat(bundle).string("topic_id").isEqualTo(TEST_TOPIC_ID)
     assertThat(bundle).string("story_id").isEqualTo(TEST_STORY_ID)
     assertThat(bundle).string("exploration_id").isEqualTo(TEST_EXPLORATION_ID)
@@ -1116,13 +1142,14 @@ class KenyaAlphaEventBundleCreatorTest {
 
     val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle)
     assertThat(typeName).isEqualTo("finish_exploration_context")
-    assertThat(bundle).hasSize(17)
+    assertThat(bundle).hasSize(18)
     assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1)
     assertThat(bundle).string("priority").isEqualTo("essential")
     assertThat(bundle).integer("event_type").isEqualTo(FINISH_EXPLORATION_CONTEXT.number)
     assertThat(bundle).integer("android_sdk").isEqualTo(TEST_ANDROID_SDK_VERSION)
     assertThat(bundle).string("app_version_name").isEqualTo(TEST_APP_VERSION_NAME)
     assertThat(bundle).integer("app_version_code").isEqualTo(TEST_APP_VERSION_CODE)
+    assertThat(bundle).string("classroom_id").isEqualTo(TEST_CLASSROOM_ID)
     assertThat(bundle).string("topic_id").isEqualTo(TEST_TOPIC_ID)
     assertThat(bundle).string("story_id").isEqualTo(TEST_STORY_ID)
     assertThat(bundle).string("exploration_id").isEqualTo(TEST_EXPLORATION_ID)
@@ -1140,13 +1167,14 @@ class KenyaAlphaEventBundleCreatorTest {
 
     val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle)
     assertThat(typeName).isEqualTo("finish_exploration_context")
-    assertThat(bundle).hasSize(19)
+    assertThat(bundle).hasSize(20)
     assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1)
     assertThat(bundle).string("priority").isEqualTo("essential")
     assertThat(bundle).integer("event_type").isEqualTo(FINISH_EXPLORATION_CONTEXT.number)
     assertThat(bundle).integer("android_sdk").isEqualTo(TEST_ANDROID_SDK_VERSION)
     assertThat(bundle).string("app_version_name").isEqualTo(TEST_APP_VERSION_NAME)
     assertThat(bundle).integer("app_version_code").isEqualTo(TEST_APP_VERSION_CODE)
+    assertThat(bundle).string("classroom_id").isEqualTo(TEST_CLASSROOM_ID)
     assertThat(bundle).string("topic_id").isEqualTo(TEST_TOPIC_ID)
     assertThat(bundle).string("story_id").isEqualTo(TEST_STORY_ID)
     assertThat(bundle).string("exploration_id").isEqualTo(TEST_EXPLORATION_ID)
@@ -1316,13 +1344,14 @@ class KenyaAlphaEventBundleCreatorTest {
 
     val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle)
     assertThat(typeName).isEqualTo("switch_in_lesson_language")
-    assertThat(bundle).hasSize(19)
+    assertThat(bundle).hasSize(20)
     assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1)
     assertThat(bundle).string("priority").isEqualTo("essential")
     assertThat(bundle).integer("event_type").isEqualTo(SWITCH_IN_LESSON_LANGUAGE.number)
     assertThat(bundle).integer("android_sdk").isEqualTo(TEST_ANDROID_SDK_VERSION)
     assertThat(bundle).string("app_version_name").isEqualTo(TEST_APP_VERSION_NAME)
     assertThat(bundle).integer("app_version_code").isEqualTo(TEST_APP_VERSION_CODE)
+    assertThat(bundle).string("ed_classroom_id").isEqualTo(TEST_CLASSROOM_ID)
     assertThat(bundle).string("ed_topic_id").isEqualTo(TEST_TOPIC_ID)
     assertThat(bundle).string("ed_story_id").isEqualTo(TEST_STORY_ID)
     assertThat(bundle).string("ed_exploration_id").isEqualTo(TEST_EXPLORATION_ID)
@@ -1342,13 +1371,14 @@ class KenyaAlphaEventBundleCreatorTest {
 
     val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle)
     assertThat(typeName).isEqualTo("switch_in_lesson_language")
-    assertThat(bundle).hasSize(21)
+    assertThat(bundle).hasSize(22)
     assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1)
     assertThat(bundle).string("priority").isEqualTo("essential")
     assertThat(bundle).integer("event_type").isEqualTo(SWITCH_IN_LESSON_LANGUAGE.number)
     assertThat(bundle).integer("android_sdk").isEqualTo(TEST_ANDROID_SDK_VERSION)
     assertThat(bundle).string("app_version_name").isEqualTo(TEST_APP_VERSION_NAME)
     assertThat(bundle).integer("app_version_code").isEqualTo(TEST_APP_VERSION_CODE)
+    assertThat(bundle).string("ed_classroom_id").isEqualTo(TEST_CLASSROOM_ID)
     assertThat(bundle).string("ed_topic_id").isEqualTo(TEST_TOPIC_ID)
     assertThat(bundle).string("ed_story_id").isEqualTo(TEST_STORY_ID)
     assertThat(bundle).string("ed_exploration_id").isEqualTo(TEST_EXPLORATION_ID)

From b45ee76fba0f5a34ca2d8cd1afc0cbdcf4dc148d Mon Sep 17 00:00:00 2001
From: Saptak Manna <saptakmanna100@gmail.com>
Date: Thu, 4 Jul 2024 09:30:49 +0530
Subject: [PATCH 11/21] Fix app module tests

---
 .../app/home/RouteToExplorationListener.kt    |  1 +
 .../recentlyplayed/RecentlyPlayedActivity.kt  |  2 +
 .../RecentlyPlayedFragmentPresenter.kt        |  1 +
 .../player/exploration/ExplorationActivity.kt |  2 +
 .../app/resumelesson/ResumeLessonActivity.kt  |  2 +
 .../ResumeLessonFragmentPresenter.kt          |  1 +
 .../oppia/android/app/story/StoryActivity.kt  |  2 +
 .../app/story/StoryFragmentPresenter.kt       |  1 +
 .../app/testing/ExplorationTestActivity.kt    |  2 +
 .../ExplorationTestActivityPresenter.kt       |  1 +
 .../android/app/testing/TopicTestActivity.kt  |  2 +
 .../app/testing/TopicTestActivityForStory.kt  |  2 +
 .../oppia/android/app/topic/TopicActivity.kt  |  2 +
 .../lessons/TopicLessonsFragmentPresenter.kt  |  1 +
 .../android/app/home/HomeActivityTest.kt      |  3 +-
 .../app/home/RecentlyPlayedFragmentTest.kt    |  2 +-
 .../exploration/ExplorationActivityTest.kt    | 70 +++++++++++++++++++
 .../topic/lessons/TopicLessonsFragmentTest.kt |  1 +
 .../ExplorationActivityLocalTest.kt           |  6 ++
 19 files changed, 102 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/org/oppia/android/app/home/RouteToExplorationListener.kt b/app/src/main/java/org/oppia/android/app/home/RouteToExplorationListener.kt
index 3c8081a3152..9523938373d 100755
--- a/app/src/main/java/org/oppia/android/app/home/RouteToExplorationListener.kt
+++ b/app/src/main/java/org/oppia/android/app/home/RouteToExplorationListener.kt
@@ -7,6 +7,7 @@ import org.oppia.android.app.model.ProfileId
 interface RouteToExplorationListener {
   fun routeToExploration(
     profileId: ProfileId,
+    classroomId: String,
     topicId: String,
     storyId: String,
     explorationId: String,
diff --git a/app/src/main/java/org/oppia/android/app/home/recentlyplayed/RecentlyPlayedActivity.kt b/app/src/main/java/org/oppia/android/app/home/recentlyplayed/RecentlyPlayedActivity.kt
index 9d068eaf49a..3450d510fbe 100644
--- a/app/src/main/java/org/oppia/android/app/home/recentlyplayed/RecentlyPlayedActivity.kt
+++ b/app/src/main/java/org/oppia/android/app/home/recentlyplayed/RecentlyPlayedActivity.kt
@@ -62,6 +62,7 @@ class RecentlyPlayedActivity :
 
   override fun routeToExploration(
     profileId: ProfileId,
+    classroomId: String,
     topicId: String,
     storyId: String,
     explorationId: String,
@@ -72,6 +73,7 @@ class RecentlyPlayedActivity :
       ExplorationActivity.createExplorationActivityIntent(
         this,
         profileId,
+        classroomId,
         topicId,
         storyId,
         explorationId,
diff --git a/app/src/main/java/org/oppia/android/app/home/recentlyplayed/RecentlyPlayedFragmentPresenter.kt b/app/src/main/java/org/oppia/android/app/home/recentlyplayed/RecentlyPlayedFragmentPresenter.kt
index d479eb9468c..98b7617e0eb 100755
--- a/app/src/main/java/org/oppia/android/app/home/recentlyplayed/RecentlyPlayedFragmentPresenter.kt
+++ b/app/src/main/java/org/oppia/android/app/home/recentlyplayed/RecentlyPlayedFragmentPresenter.kt
@@ -196,6 +196,7 @@ class RecentlyPlayedFragmentPresenter @Inject constructor(
           oppiaLogger.d("RecentlyPlayedFragment", "Successfully loaded exploration")
           routeToExplorationListener.routeToExploration(
             profileId,
+            classroomId,
             topicId,
             storyId,
             explorationId,
diff --git a/app/src/main/java/org/oppia/android/app/player/exploration/ExplorationActivity.kt b/app/src/main/java/org/oppia/android/app/player/exploration/ExplorationActivity.kt
index 699e1bc0cf2..b95785bf2d0 100755
--- a/app/src/main/java/org/oppia/android/app/player/exploration/ExplorationActivity.kt
+++ b/app/src/main/java/org/oppia/android/app/player/exploration/ExplorationActivity.kt
@@ -80,6 +80,7 @@ class ExplorationActivity :
     fun createExplorationActivityIntent(
       context: Context,
       profileId: ProfileId,
+      classroomId: String,
       topicId: String,
       storyId: String,
       explorationId: String,
@@ -88,6 +89,7 @@ class ExplorationActivity :
     ): Intent {
       val params = ExplorationActivityParams.newBuilder().apply {
         this.profileId = profileId
+        this.classroomId = classroomId
         this.topicId = topicId
         this.storyId = storyId
         this.explorationId = explorationId
diff --git a/app/src/main/java/org/oppia/android/app/resumelesson/ResumeLessonActivity.kt b/app/src/main/java/org/oppia/android/app/resumelesson/ResumeLessonActivity.kt
index 26859bb4d43..77bb464cdfc 100644
--- a/app/src/main/java/org/oppia/android/app/resumelesson/ResumeLessonActivity.kt
+++ b/app/src/main/java/org/oppia/android/app/resumelesson/ResumeLessonActivity.kt
@@ -84,6 +84,7 @@ class ResumeLessonActivity :
 
   override fun routeToExploration(
     profileId: ProfileId,
+    classroomId: String,
     topicId: String,
     storyId: String,
     explorationId: String,
@@ -94,6 +95,7 @@ class ResumeLessonActivity :
       ExplorationActivity.createExplorationActivityIntent(
         this,
         profileId,
+        classroomId,
         topicId,
         storyId,
         explorationId,
diff --git a/app/src/main/java/org/oppia/android/app/resumelesson/ResumeLessonFragmentPresenter.kt b/app/src/main/java/org/oppia/android/app/resumelesson/ResumeLessonFragmentPresenter.kt
index 6613095973a..55514a7957a 100644
--- a/app/src/main/java/org/oppia/android/app/resumelesson/ResumeLessonFragmentPresenter.kt
+++ b/app/src/main/java/org/oppia/android/app/resumelesson/ResumeLessonFragmentPresenter.kt
@@ -199,6 +199,7 @@ class ResumeLessonFragmentPresenter @Inject constructor(
           oppiaLogger.d("ResumeLessonFragment", "Successfully loaded exploration")
           routeToExplorationListener.routeToExploration(
             profileId,
+            classroomId,
             topicId,
             storyId,
             explorationId,
diff --git a/app/src/main/java/org/oppia/android/app/story/StoryActivity.kt b/app/src/main/java/org/oppia/android/app/story/StoryActivity.kt
index 79214423f26..43e56fe01c0 100644
--- a/app/src/main/java/org/oppia/android/app/story/StoryActivity.kt
+++ b/app/src/main/java/org/oppia/android/app/story/StoryActivity.kt
@@ -55,6 +55,7 @@ class StoryActivity :
 
   override fun routeToExploration(
     profileId: ProfileId,
+    classroomId: String,
     topicId: String,
     storyId: String,
     explorationId: String,
@@ -65,6 +66,7 @@ class StoryActivity :
       ExplorationActivity.createExplorationActivityIntent(
         this,
         profileId,
+        classroomId,
         topicId,
         storyId,
         explorationId,
diff --git a/app/src/main/java/org/oppia/android/app/story/StoryFragmentPresenter.kt b/app/src/main/java/org/oppia/android/app/story/StoryFragmentPresenter.kt
index 511e79df785..1d9ff2372c8 100644
--- a/app/src/main/java/org/oppia/android/app/story/StoryFragmentPresenter.kt
+++ b/app/src/main/java/org/oppia/android/app/story/StoryFragmentPresenter.kt
@@ -306,6 +306,7 @@ class StoryFragmentPresenter @Inject constructor(
           oppiaLogger.d("Story Fragment", "Successfully loaded exploration: $explorationId")
           routeToExplorationListener.routeToExploration(
             profileId,
+            classroomId,
             topicId,
             storyId,
             explorationId,
diff --git a/app/src/main/java/org/oppia/android/app/testing/ExplorationTestActivity.kt b/app/src/main/java/org/oppia/android/app/testing/ExplorationTestActivity.kt
index 1a29b4f6507..e16d9e451a6 100644
--- a/app/src/main/java/org/oppia/android/app/testing/ExplorationTestActivity.kt
+++ b/app/src/main/java/org/oppia/android/app/testing/ExplorationTestActivity.kt
@@ -33,6 +33,7 @@ class ExplorationTestActivity :
 
   override fun routeToExploration(
     profileId: ProfileId,
+    classroomId: String,
     topicId: String,
     storyId: String,
     explorationId: String,
@@ -43,6 +44,7 @@ class ExplorationTestActivity :
       ExplorationActivity.createExplorationActivityIntent(
         this,
         profileId,
+        classroomId,
         topicId,
         storyId,
         explorationId,
diff --git a/app/src/main/java/org/oppia/android/app/testing/ExplorationTestActivityPresenter.kt b/app/src/main/java/org/oppia/android/app/testing/ExplorationTestActivityPresenter.kt
index 96e96f3173f..196785a2dea 100644
--- a/app/src/main/java/org/oppia/android/app/testing/ExplorationTestActivityPresenter.kt
+++ b/app/src/main/java/org/oppia/android/app/testing/ExplorationTestActivityPresenter.kt
@@ -70,6 +70,7 @@ class ExplorationTestActivityPresenter @Inject constructor(
             oppiaLogger.d(TAG_EXPLORATION_TEST_ACTIVITY, "Successfully loaded exploration")
             routeToExplorationListener.routeToExploration(
               ProfileId.newBuilder().apply { internalId = INTERNAL_PROFILE_ID }.build(),
+              CLASSROOM_ID,
               TOPIC_ID,
               STORY_ID,
               EXPLORATION_ID,
diff --git a/app/src/main/java/org/oppia/android/app/testing/TopicTestActivity.kt b/app/src/main/java/org/oppia/android/app/testing/TopicTestActivity.kt
index 1f828668d86..8355cc46beb 100644
--- a/app/src/main/java/org/oppia/android/app/testing/TopicTestActivity.kt
+++ b/app/src/main/java/org/oppia/android/app/testing/TopicTestActivity.kt
@@ -68,6 +68,7 @@ class TopicTestActivity :
 
   override fun routeToExploration(
     profileId: ProfileId,
+    classroomId: String,
     topicId: String,
     storyId: String,
     explorationId: String,
@@ -78,6 +79,7 @@ class TopicTestActivity :
       ExplorationActivity.createExplorationActivityIntent(
         this,
         profileId,
+        classroomId,
         topicId,
         storyId,
         explorationId,
diff --git a/app/src/main/java/org/oppia/android/app/testing/TopicTestActivityForStory.kt b/app/src/main/java/org/oppia/android/app/testing/TopicTestActivityForStory.kt
index 7f1e7c2e4c2..2c130de8648 100644
--- a/app/src/main/java/org/oppia/android/app/testing/TopicTestActivityForStory.kt
+++ b/app/src/main/java/org/oppia/android/app/testing/TopicTestActivityForStory.kt
@@ -96,6 +96,7 @@ class TopicTestActivityForStory :
 
   override fun routeToExploration(
     profileId: ProfileId,
+    classroomId: String,
     topicId: String,
     storyId: String,
     explorationId: String,
@@ -106,6 +107,7 @@ class TopicTestActivityForStory :
       ExplorationActivity.createExplorationActivityIntent(
         this,
         profileId,
+        classroomId,
         topicId,
         storyId,
         explorationId,
diff --git a/app/src/main/java/org/oppia/android/app/topic/TopicActivity.kt b/app/src/main/java/org/oppia/android/app/topic/TopicActivity.kt
index 2620d07432b..cf7f441857b 100755
--- a/app/src/main/java/org/oppia/android/app/topic/TopicActivity.kt
+++ b/app/src/main/java/org/oppia/android/app/topic/TopicActivity.kt
@@ -110,6 +110,7 @@ class TopicActivity :
 
   override fun routeToExploration(
     profileId: ProfileId,
+    classroomId: String,
     topicId: String,
     storyId: String,
     explorationId: String,
@@ -120,6 +121,7 @@ class TopicActivity :
       ExplorationActivity.createExplorationActivityIntent(
         this,
         profileId,
+        classroomId,
         topicId,
         storyId,
         explorationId,
diff --git a/app/src/main/java/org/oppia/android/app/topic/lessons/TopicLessonsFragmentPresenter.kt b/app/src/main/java/org/oppia/android/app/topic/lessons/TopicLessonsFragmentPresenter.kt
index 9ba83983ff0..66a5a32b2df 100644
--- a/app/src/main/java/org/oppia/android/app/topic/lessons/TopicLessonsFragmentPresenter.kt
+++ b/app/src/main/java/org/oppia/android/app/topic/lessons/TopicLessonsFragmentPresenter.kt
@@ -399,6 +399,7 @@ class TopicLessonsFragmentPresenter @Inject constructor(
           oppiaLogger.d("TopicLessonsFragment", "Successfully loaded exploration")
           routeToExplorationListener.routeToExploration(
             profileId,
+            classroomId,
             topicId,
             storyId,
             explorationId,
diff --git a/app/src/sharedTest/java/org/oppia/android/app/home/HomeActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/home/HomeActivityTest.kt
index 145afb38929..b6962460974 100644
--- a/app/src/sharedTest/java/org/oppia/android/app/home/HomeActivityTest.kt
+++ b/app/src/sharedTest/java/org/oppia/android/app/home/HomeActivityTest.kt
@@ -100,6 +100,7 @@ import org.oppia.android.domain.classify.rules.numericexpressioninput.NumericExp
 import org.oppia.android.domain.classify.rules.numericinput.NumericInputRuleModule
 import org.oppia.android.domain.classify.rules.ratioinput.RatioInputModule
 import org.oppia.android.domain.classify.rules.textinput.TextInputRuleModule
+import org.oppia.android.domain.classroom.TEST_CLASSROOM_ID_0
 import org.oppia.android.domain.classroom.TEST_CLASSROOM_ID_1
 import org.oppia.android.domain.exploration.ExplorationProgressModule
 import org.oppia.android.domain.exploration.ExplorationStorageModule
@@ -1208,7 +1209,7 @@ class HomeActivityTest {
       onView(atPosition(R.id.home_recycler_view, 3)).perform(click())
 
       val args = TopicActivityParams.newBuilder().apply {
-        this.classroomId = TEST_CLASSROOM_ID_1
+        this.classroomId = TEST_CLASSROOM_ID_0
         this.topicId = TEST_TOPIC_ID_0
         this.storyId = TEST_STORY_ID_0
       }.build()
diff --git a/app/src/sharedTest/java/org/oppia/android/app/home/RecentlyPlayedFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/home/RecentlyPlayedFragmentTest.kt
index a3fe99fc59d..973c7f603a4 100644
--- a/app/src/sharedTest/java/org/oppia/android/app/home/RecentlyPlayedFragmentTest.kt
+++ b/app/src/sharedTest/java/org/oppia/android/app/home/RecentlyPlayedFragmentTest.kt
@@ -844,7 +844,7 @@ class RecentlyPlayedFragmentTest {
         explorationId = FRACTIONS_EXPLORATION_ID_0
         storyId = FRACTIONS_STORY_ID_0
         topicId = FRACTIONS_TOPIC_ID
-        classroomId = TEST_CLASSROOM_ID_0
+        classroomId = TEST_CLASSROOM_ID_1
         profileId = ProfileId.newBuilder().apply { internalId = internalProfileId }.build()
         parentScreen = ExplorationActivityParams.ParentScreen.PARENT_SCREEN_UNSPECIFIED
         checkpoint = ExplorationCheckpoint.newBuilder().apply {
diff --git a/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt
index ff11e33ea58..2aa11b4f77a 100644
--- a/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt
+++ b/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt
@@ -284,6 +284,7 @@ class ExplorationActivityTest {
   fun testActivity_createIntent_verifyScreenNameInIntent() {
     val screenName = createExplorationActivityIntent(
       internalProfileId,
+      TEST_CLASSROOM_ID_0,
       TEST_TOPIC_ID_0,
       TEST_STORY_ID_0,
       TEST_EXPLORATION_ID_2,
@@ -299,6 +300,7 @@ class ExplorationActivityTest {
     explorationActivityTestRule.launchActivity(
       createExplorationActivityIntent(
         internalProfileId,
+        TEST_CLASSROOM_ID_0,
         TEST_TOPIC_ID_0,
         TEST_STORY_ID_0,
         TEST_EXPLORATION_ID_2,
@@ -317,6 +319,7 @@ class ExplorationActivityTest {
     launch<ExplorationActivity>(
       createExplorationActivityIntent(
         internalProfileId,
+        TEST_CLASSROOM_ID_0,
         TEST_TOPIC_ID_0,
         TEST_STORY_ID_0,
         TEST_EXPLORATION_ID_2,
@@ -344,6 +347,7 @@ class ExplorationActivityTest {
     explorationActivityTestRule.launchActivity(
       createExplorationActivityIntent(
         internalProfileId,
+        TEST_CLASSROOM_ID_0,
         TEST_TOPIC_ID_0,
         TEST_STORY_ID_0,
         TEST_EXPLORATION_ID_2,
@@ -367,6 +371,7 @@ class ExplorationActivityTest {
     explorationActivityTestRule.launchActivity(
       createExplorationActivityIntent(
         internalProfileId,
+        TEST_CLASSROOM_ID_0,
         TEST_TOPIC_ID_0,
         TEST_STORY_ID_0,
         TEST_EXPLORATION_ID_2,
@@ -390,6 +395,7 @@ class ExplorationActivityTest {
     explorationActivityTestRule.launchActivity(
       createExplorationActivityIntent(
         internalProfileId,
+        TEST_CLASSROOM_ID_0,
         TEST_TOPIC_ID_0,
         TEST_STORY_ID_0,
         TEST_EXPLORATION_ID_2,
@@ -413,6 +419,7 @@ class ExplorationActivityTest {
     explorationActivityTestRule.launchActivity(
       createExplorationActivityIntent(
         internalProfileId,
+        TEST_CLASSROOM_ID_0,
         TEST_TOPIC_ID_0,
         TEST_STORY_ID_0,
         TEST_EXPLORATION_ID_2,
@@ -434,6 +441,7 @@ class ExplorationActivityTest {
     launch<ExplorationActivity>(
       createExplorationActivityIntent(
         internalProfileId,
+        TEST_CLASSROOM_ID_0,
         TEST_TOPIC_ID_0,
         TEST_STORY_ID_0,
         TEST_EXPLORATION_ID_2,
@@ -461,6 +469,7 @@ class ExplorationActivityTest {
     launch<ExplorationActivity>(
       createExplorationActivityIntent(
         internalProfileId,
+        TEST_CLASSROOM_ID_1,
         FRACTIONS_TOPIC_ID,
         FRACTIONS_STORY_ID_0,
         FRACTIONS_EXPLORATION_ID_0,
@@ -490,6 +499,7 @@ class ExplorationActivityTest {
     launch<ExplorationActivity>(
       createExplorationActivityIntent(
         internalProfileId,
+        TEST_CLASSROOM_ID_1,
         FRACTIONS_TOPIC_ID,
         FRACTIONS_STORY_ID_0,
         FRACTIONS_EXPLORATION_ID_0,
@@ -520,6 +530,7 @@ class ExplorationActivityTest {
     launch<ExplorationActivity>(
       createExplorationActivityIntent(
         internalProfileId,
+        TEST_CLASSROOM_ID_1,
         FRACTIONS_TOPIC_ID,
         FRACTIONS_STORY_ID_0,
         FRACTIONS_EXPLORATION_ID_0,
@@ -543,6 +554,7 @@ class ExplorationActivityTest {
     launch<ExplorationActivity>(
       createExplorationActivityIntent(
         internalProfileId,
+        TEST_CLASSROOM_ID_1,
         FRACTIONS_TOPIC_ID,
         FRACTIONS_STORY_ID_0,
         FRACTIONS_EXPLORATION_ID_0,
@@ -570,6 +582,7 @@ class ExplorationActivityTest {
     launch<ExplorationActivity>(
       createExplorationActivityIntent(
         internalProfileId,
+        TEST_CLASSROOM_ID_1,
         FRACTIONS_TOPIC_ID,
         FRACTIONS_STORY_ID_0,
         FRACTIONS_EXPLORATION_ID_0,
@@ -597,6 +610,7 @@ class ExplorationActivityTest {
     launch<ExplorationActivity>(
       createExplorationActivityIntent(
         internalProfileId,
+        TEST_CLASSROOM_ID_1,
         FRACTIONS_TOPIC_ID,
         FRACTIONS_STORY_ID_0,
         FRACTIONS_EXPLORATION_ID_0,
@@ -617,6 +631,7 @@ class ExplorationActivityTest {
     launch<ExplorationActivity>(
       createExplorationActivityIntent(
         internalProfileId,
+        TEST_CLASSROOM_ID_1,
         FRACTIONS_TOPIC_ID,
         FRACTIONS_STORY_ID_0,
         FRACTIONS_EXPLORATION_ID_0,
@@ -645,6 +660,7 @@ class ExplorationActivityTest {
     launch<ExplorationActivity>(
       createExplorationActivityIntent(
         internalProfileId,
+        TEST_CLASSROOM_ID_1,
         FRACTIONS_TOPIC_ID,
         FRACTIONS_STORY_ID_0,
         FRACTIONS_EXPLORATION_ID_0,
@@ -673,6 +689,7 @@ class ExplorationActivityTest {
     launch<ExplorationActivity>(
       createExplorationActivityIntent(
         internalProfileId,
+        TEST_CLASSROOM_ID_1,
         FRACTIONS_TOPIC_ID,
         FRACTIONS_STORY_ID_0,
         FRACTIONS_EXPLORATION_ID_0,
@@ -693,6 +710,7 @@ class ExplorationActivityTest {
     launch<ExplorationActivity>(
       createExplorationActivityIntent(
         internalProfileId,
+        TEST_CLASSROOM_ID_1,
         FRACTIONS_TOPIC_ID,
         FRACTIONS_STORY_ID_0,
         FRACTIONS_EXPLORATION_ID_0,
@@ -720,6 +738,7 @@ class ExplorationActivityTest {
     launch<ExplorationActivity>(
       createExplorationActivityIntent(
         internalProfileId,
+        TEST_CLASSROOM_ID_1,
         FRACTIONS_TOPIC_ID,
         FRACTIONS_STORY_ID_0,
         FRACTIONS_EXPLORATION_ID_0,
@@ -747,6 +766,7 @@ class ExplorationActivityTest {
     launch<ExplorationActivity>(
       createExplorationActivityIntent(
         internalProfileId,
+        TEST_CLASSROOM_ID_1,
         FRACTIONS_TOPIC_ID,
         FRACTIONS_STORY_ID_0,
         FRACTIONS_EXPLORATION_ID_0,
@@ -775,6 +795,7 @@ class ExplorationActivityTest {
     launch<ExplorationActivity>(
       createExplorationActivityIntent(
         internalProfileId,
+        TEST_CLASSROOM_ID_1,
         FRACTIONS_TOPIC_ID,
         FRACTIONS_STORY_ID_0,
         FRACTIONS_EXPLORATION_ID_0,
@@ -803,6 +824,7 @@ class ExplorationActivityTest {
     launch<ExplorationActivity>(
       createExplorationActivityIntent(
         internalProfileId,
+        TEST_CLASSROOM_ID_0,
         TEST_TOPIC_ID_0,
         TEST_STORY_ID_0,
         TEST_EXPLORATION_ID_2,
@@ -826,6 +848,7 @@ class ExplorationActivityTest {
     launch<ExplorationActivity>(
       createExplorationActivityIntent(
         internalProfileId,
+        TEST_CLASSROOM_ID_0,
         TEST_TOPIC_ID_0,
         TEST_STORY_ID_0,
         TEST_EXPLORATION_ID_2,
@@ -852,6 +875,7 @@ class ExplorationActivityTest {
     launch<ExplorationActivity>(
       createExplorationActivityIntent(
         internalProfileId,
+        TEST_CLASSROOM_ID_1,
         RATIOS_TOPIC_ID,
         RATIOS_STORY_ID_0,
         RATIOS_EXPLORATION_ID_0,
@@ -882,6 +906,7 @@ class ExplorationActivityTest {
     launch<ExplorationActivity>(
       createExplorationActivityIntent(
         internalProfileId,
+        TEST_CLASSROOM_ID_1,
         RATIOS_TOPIC_ID,
         RATIOS_STORY_ID_0,
         RATIOS_EXPLORATION_ID_0,
@@ -912,6 +937,7 @@ class ExplorationActivityTest {
     launch<ExplorationActivity>(
       createExplorationActivityIntent(
         internalProfileId,
+        TEST_CLASSROOM_ID_1,
         RATIOS_TOPIC_ID,
         RATIOS_STORY_ID_0,
         RATIOS_EXPLORATION_ID_0,
@@ -943,6 +969,7 @@ class ExplorationActivityTest {
     launch<ExplorationActivity>(
       createExplorationActivityIntent(
         internalProfileId,
+        TEST_CLASSROOM_ID_1,
         RATIOS_TOPIC_ID,
         RATIOS_STORY_ID_0,
         RATIOS_EXPLORATION_ID_0,
@@ -983,6 +1010,7 @@ class ExplorationActivityTest {
     launch<ExplorationActivity>(
       createExplorationActivityIntent(
         internalProfileId,
+        TEST_CLASSROOM_ID_1,
         RATIOS_TOPIC_ID,
         RATIOS_STORY_ID_0,
         RATIOS_EXPLORATION_ID_0,
@@ -1030,6 +1058,7 @@ class ExplorationActivityTest {
     launch<ExplorationActivity>(
       createExplorationActivityIntent(
         internalProfileId,
+        TEST_CLASSROOM_ID_1,
         RATIOS_TOPIC_ID,
         RATIOS_STORY_ID_0,
         RATIOS_EXPLORATION_ID_0,
@@ -1074,6 +1103,7 @@ class ExplorationActivityTest {
     launch<ExplorationActivity>(
       createExplorationActivityIntent(
         internalProfileId,
+        TEST_CLASSROOM_ID_1,
         RATIOS_TOPIC_ID,
         RATIOS_STORY_ID_0,
         RATIOS_EXPLORATION_ID_0,
@@ -1119,6 +1149,7 @@ class ExplorationActivityTest {
     launch<ExplorationActivity>(
       createExplorationActivityIntent(
         internalProfileId,
+        TEST_CLASSROOM_ID_1,
         RATIOS_TOPIC_ID,
         RATIOS_STORY_ID_0,
         RATIOS_EXPLORATION_ID_0,
@@ -1159,6 +1190,7 @@ class ExplorationActivityTest {
     launch<ExplorationActivity>(
       createExplorationActivityIntent(
         internalProfileId,
+        TEST_CLASSROOM_ID_1,
         FRACTIONS_TOPIC_ID,
         FRACTIONS_STORY_ID_0,
         FRACTIONS_EXPLORATION_ID_0,
@@ -1222,6 +1254,7 @@ class ExplorationActivityTest {
     launch<ExplorationActivity>(
       createExplorationActivityIntent(
         internalProfileId,
+        TEST_CLASSROOM_ID_1,
         RATIOS_TOPIC_ID,
         RATIOS_STORY_ID_0,
         RATIOS_EXPLORATION_ID_0,
@@ -1267,6 +1300,7 @@ class ExplorationActivityTest {
     launch<ExplorationActivity>(
       createExplorationActivityIntent(
         internalProfileId,
+        TEST_CLASSROOM_ID_1,
         FRACTIONS_TOPIC_ID,
         FRACTIONS_STORY_ID_0,
         FRACTIONS_EXPLORATION_ID_0,
@@ -1283,6 +1317,7 @@ class ExplorationActivityTest {
     launch<ExplorationActivity>(
       createExplorationActivityIntent(
         internalProfileId,
+        TEST_CLASSROOM_ID_1,
         FRACTIONS_TOPIC_ID,
         FRACTIONS_STORY_ID_0,
         FRACTIONS_EXPLORATION_ID_0,
@@ -1313,6 +1348,7 @@ class ExplorationActivityTest {
     launch<ExplorationActivity>(
       createExplorationActivityIntent(
         internalProfileId,
+        TEST_CLASSROOM_ID_1,
         FRACTIONS_TOPIC_ID,
         FRACTIONS_STORY_ID_0,
         FRACTIONS_EXPLORATION_ID_0,
@@ -1343,6 +1379,7 @@ class ExplorationActivityTest {
     launch<ExplorationActivity>(
       createExplorationActivityIntent(
         internalProfileId,
+        TEST_CLASSROOM_ID_1,
         RATIOS_TOPIC_ID,
         RATIOS_STORY_ID_0,
         RATIOS_EXPLORATION_ID_0,
@@ -1382,6 +1419,7 @@ class ExplorationActivityTest {
     explorationActivityTestRule.launchActivity(
       createExplorationActivityIntent(
         internalProfileId,
+        TEST_CLASSROOM_ID_1,
         FRACTIONS_TOPIC_ID,
         FRACTIONS_STORY_ID_0,
         FRACTIONS_EXPLORATION_ID_0,
@@ -1411,6 +1449,7 @@ class ExplorationActivityTest {
     explorationActivityTestRule.launchActivity(
       createExplorationActivityIntent(
         internalProfileId,
+        TEST_CLASSROOM_ID_1,
         FRACTIONS_TOPIC_ID,
         FRACTIONS_STORY_ID_0,
         FRACTIONS_EXPLORATION_ID_0,
@@ -1443,6 +1482,7 @@ class ExplorationActivityTest {
     explorationActivityTestRule.launchActivity(
       createExplorationActivityIntent(
         internalProfileId,
+        TEST_CLASSROOM_ID_1,
         FRACTIONS_TOPIC_ID,
         FRACTIONS_STORY_ID_0,
         FRACTIONS_EXPLORATION_ID_0,
@@ -1484,6 +1524,7 @@ class ExplorationActivityTest {
     explorationActivityTestRule.launchActivity(
       createExplorationActivityIntent(
         internalProfileId,
+        TEST_CLASSROOM_ID_1,
         FRACTIONS_TOPIC_ID,
         FRACTIONS_STORY_ID_0,
         FRACTIONS_EXPLORATION_ID_0,
@@ -1517,6 +1558,7 @@ class ExplorationActivityTest {
     explorationActivityTestRule.launchActivity(
       createExplorationActivityIntent(
         internalProfileId,
+        TEST_CLASSROOM_ID_1,
         FRACTIONS_TOPIC_ID,
         FRACTIONS_STORY_ID_0,
         FRACTIONS_EXPLORATION_ID_0,
@@ -1544,6 +1586,7 @@ class ExplorationActivityTest {
     explorationActivityTestRule.launchActivity(
       createExplorationActivityIntent(
         internalProfileId,
+        TEST_CLASSROOM_ID_1,
         FRACTIONS_TOPIC_ID,
         FRACTIONS_STORY_ID_0,
         FRACTIONS_EXPLORATION_ID_0,
@@ -1578,6 +1621,7 @@ class ExplorationActivityTest {
     explorationActivityTestRule.launchActivity(
       createExplorationActivityIntent(
         internalProfileId,
+        TEST_CLASSROOM_ID_1,
         FRACTIONS_TOPIC_ID,
         FRACTIONS_STORY_ID_0,
         FRACTIONS_EXPLORATION_ID_0,
@@ -1619,6 +1663,7 @@ class ExplorationActivityTest {
     launch<ExplorationActivity>(
       createExplorationActivityIntent(
         internalProfileId,
+        TEST_CLASSROOM_ID_1,
         FRACTIONS_TOPIC_ID,
         FRACTIONS_STORY_ID_0,
         FRACTIONS_EXPLORATION_ID_0,
@@ -1656,6 +1701,7 @@ class ExplorationActivityTest {
     launch<ExplorationActivity>(
       createExplorationActivityIntent(
         internalProfileId,
+        TEST_CLASSROOM_ID_1,
         FRACTIONS_TOPIC_ID,
         FRACTIONS_STORY_ID_0,
         FRACTIONS_EXPLORATION_ID_0,
@@ -1694,6 +1740,7 @@ class ExplorationActivityTest {
     launch<ExplorationActivity>(
       createExplorationActivityIntent(
         internalProfileId,
+        TEST_CLASSROOM_ID_1,
         FRACTIONS_TOPIC_ID,
         FRACTIONS_STORY_ID_0,
         FRACTIONS_EXPLORATION_ID_0,
@@ -1734,6 +1781,7 @@ class ExplorationActivityTest {
     launch<ExplorationActivity>(
       createExplorationActivityIntent(
         internalProfileId,
+        TEST_CLASSROOM_ID_1,
         FRACTIONS_TOPIC_ID,
         FRACTIONS_STORY_ID_0,
         FRACTIONS_EXPLORATION_ID_0,
@@ -1775,6 +1823,7 @@ class ExplorationActivityTest {
     launch<ExplorationActivity>(
       createExplorationActivityIntent(
         internalProfileId,
+        TEST_CLASSROOM_ID_1,
         FRACTIONS_TOPIC_ID,
         FRACTIONS_STORY_ID_0,
         FRACTIONS_EXPLORATION_ID_0,
@@ -1815,6 +1864,7 @@ class ExplorationActivityTest {
     launch<ExplorationActivity>(
       createExplorationActivityIntent(
         internalProfileId,
+        TEST_CLASSROOM_ID_1,
         FRACTIONS_TOPIC_ID,
         FRACTIONS_STORY_ID_0,
         FRACTIONS_EXPLORATION_ID_0,
@@ -1867,6 +1917,7 @@ class ExplorationActivityTest {
     launch<ExplorationActivity>(
       createExplorationActivityIntent(
         internalProfileId,
+        TEST_CLASSROOM_ID_1,
         FRACTIONS_TOPIC_ID,
         FRACTIONS_STORY_ID_0,
         FRACTIONS_EXPLORATION_ID_0,
@@ -1919,6 +1970,7 @@ class ExplorationActivityTest {
     launch<ExplorationActivity>(
       createExplorationActivityIntent(
         internalProfileId,
+        TEST_CLASSROOM_ID_1,
         FRACTIONS_TOPIC_ID,
         FRACTIONS_STORY_ID_0,
         FRACTIONS_EXPLORATION_ID_0,
@@ -1961,6 +2013,7 @@ class ExplorationActivityTest {
     explorationActivityTestRule.launchActivity(
       createExplorationActivityIntent(
         internalProfileId,
+        TEST_CLASSROOM_ID_1,
         FRACTIONS_TOPIC_ID,
         FRACTIONS_STORY_ID_0,
         FRACTIONS_EXPLORATION_ID_0,
@@ -1994,6 +2047,7 @@ class ExplorationActivityTest {
     explorationActivityTestRule.launchActivity(
       createExplorationActivityIntent(
         internalProfileId,
+        TEST_CLASSROOM_ID_1,
         FRACTIONS_TOPIC_ID,
         FRACTIONS_STORY_ID_0,
         FRACTIONS_EXPLORATION_ID_0,
@@ -2025,6 +2079,7 @@ class ExplorationActivityTest {
     explorationActivityTestRule.launchActivity(
       createExplorationActivityIntent(
         internalProfileId,
+        TEST_CLASSROOM_ID_1,
         FRACTIONS_TOPIC_ID,
         FRACTIONS_STORY_ID_0,
         FRACTIONS_EXPLORATION_ID_0,
@@ -2059,6 +2114,7 @@ class ExplorationActivityTest {
     explorationActivityTestRule.launchActivity(
       createExplorationActivityIntent(
         internalProfileId,
+        TEST_CLASSROOM_ID_1,
         FRACTIONS_TOPIC_ID,
         FRACTIONS_STORY_ID_0,
         FRACTIONS_EXPLORATION_ID_0,
@@ -2090,6 +2146,7 @@ class ExplorationActivityTest {
     explorationActivityTestRule.launchActivity(
       createExplorationActivityIntent(
         internalProfileId,
+        TEST_CLASSROOM_ID_1,
         FRACTIONS_TOPIC_ID,
         FRACTIONS_STORY_ID_0,
         FRACTIONS_EXPLORATION_ID_0,
@@ -2125,6 +2182,7 @@ class ExplorationActivityTest {
     launch<ExplorationActivity>(
       createExplorationActivityIntent(
         internalProfileId,
+        TEST_CLASSROOM_ID_0,
         TEST_TOPIC_ID_0,
         TEST_STORY_ID_0,
         TEST_EXPLORATION_ID_2,
@@ -2156,6 +2214,7 @@ class ExplorationActivityTest {
     launch<ExplorationActivity>(
       createExplorationActivityIntent(
         internalProfileId,
+        TEST_CLASSROOM_ID_0,
         TEST_TOPIC_ID_0,
         TEST_STORY_ID_0,
         TEST_EXPLORATION_ID_2,
@@ -2187,6 +2246,7 @@ class ExplorationActivityTest {
     launch<ExplorationActivity>(
       createExplorationActivityIntent(
         internalProfileId,
+        TEST_CLASSROOM_ID_0,
         TEST_TOPIC_ID_0,
         TEST_STORY_ID_0,
         TEST_EXPLORATION_ID_2,
@@ -2224,6 +2284,7 @@ class ExplorationActivityTest {
     launch<ExplorationActivity>(
       createExplorationActivityIntent(
         internalProfileId,
+        TEST_CLASSROOM_ID_0,
         TEST_TOPIC_ID_0,
         TEST_STORY_ID_0,
         TEST_EXPLORATION_ID_2,
@@ -2270,6 +2331,7 @@ class ExplorationActivityTest {
     launch<ExplorationActivity>(
       createExplorationActivityIntent(
         internalProfileId,
+        TEST_CLASSROOM_ID_0,
         TEST_TOPIC_ID_0,
         TEST_STORY_ID_0,
         TEST_EXPLORATION_ID_2,
@@ -2307,6 +2369,7 @@ class ExplorationActivityTest {
     launch<ExplorationActivity>(
       createExplorationActivityIntent(
         internalProfileId,
+        TEST_CLASSROOM_ID_0,
         TEST_TOPIC_ID_0,
         TEST_STORY_ID_0,
         TEST_EXPLORATION_ID_2,
@@ -2349,6 +2412,7 @@ class ExplorationActivityTest {
     launch<ExplorationActivity>(
       createExplorationActivityIntent(
         internalProfileId,
+        TEST_CLASSROOM_ID_0,
         TEST_TOPIC_ID_0,
         TEST_STORY_ID_0,
         TEST_EXPLORATION_ID_2,
@@ -2386,6 +2450,7 @@ class ExplorationActivityTest {
     launch<ExplorationActivity>(
       createExplorationActivityIntent(
         internalProfileId,
+        TEST_CLASSROOM_ID_0,
         TEST_TOPIC_ID_0,
         TEST_STORY_ID_0,
         TEST_EXPLORATION_ID_2,
@@ -2413,6 +2478,7 @@ class ExplorationActivityTest {
     launch<ExplorationActivity>(
       createExplorationActivityIntent(
         internalProfileId,
+        TEST_CLASSROOM_ID_0,
         TEST_TOPIC_ID_0,
         TEST_STORY_ID_0,
         TEST_EXPLORATION_ID_2,
@@ -2451,6 +2517,7 @@ class ExplorationActivityTest {
     launch<ExplorationActivity>(
       createExplorationActivityIntent(
         internalProfileId,
+        TEST_CLASSROOM_ID_0,
         TEST_TOPIC_ID_0,
         TEST_STORY_ID_0,
         TEST_EXPLORATION_ID_2,
@@ -2489,6 +2556,7 @@ class ExplorationActivityTest {
     launch<ExplorationActivity>(
       createExplorationActivityIntent(
         internalProfileId,
+        TEST_CLASSROOM_ID_0,
         TEST_TOPIC_ID_0,
         TEST_STORY_ID_0,
         TEST_EXPLORATION_ID_2,
@@ -2533,6 +2601,7 @@ class ExplorationActivityTest {
 
   private fun createExplorationActivityIntent(
     internalProfileId: Int,
+    classroomId: String,
     topicId: String,
     storyId: String,
     explorationId: String,
@@ -2543,6 +2612,7 @@ class ExplorationActivityTest {
     return ExplorationActivity.createExplorationActivityIntent(
       ApplicationProvider.getApplicationContext(),
       ProfileId.newBuilder().apply { internalId = internalProfileId }.build(),
+      classroomId,
       topicId,
       storyId,
       explorationId,
diff --git a/app/src/sharedTest/java/org/oppia/android/app/topic/lessons/TopicLessonsFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/topic/lessons/TopicLessonsFragmentTest.kt
index 39f9fff33c4..075b49e8ac0 100644
--- a/app/src/sharedTest/java/org/oppia/android/app/topic/lessons/TopicLessonsFragmentTest.kt
+++ b/app/src/sharedTest/java/org/oppia/android/app/topic/lessons/TopicLessonsFragmentTest.kt
@@ -370,6 +370,7 @@ class TopicLessonsFragmentTest {
       val args = StoryActivityParams.newBuilder().apply {
         this.storyId = RATIOS_STORY_ID_0
         this.topicId = RATIOS_TOPIC_ID
+        this.classroomId = TEST_CLASSROOM_ID_1
       }.build()
       intended(hasComponent(StoryActivity::class.java.name))
       intended(hasProtoExtra(STORY_ACTIVITY_PARAMS_KEY, args))
diff --git a/app/src/test/java/org/oppia/android/app/player/exploration/ExplorationActivityLocalTest.kt b/app/src/test/java/org/oppia/android/app/player/exploration/ExplorationActivityLocalTest.kt
index fde3a1be3a5..c62ba27d2a0 100644
--- a/app/src/test/java/org/oppia/android/app/player/exploration/ExplorationActivityLocalTest.kt
+++ b/app/src/test/java/org/oppia/android/app/player/exploration/ExplorationActivityLocalTest.kt
@@ -157,6 +157,7 @@ class ExplorationActivityLocalTest {
     launch<ExplorationActivity>(
       createExplorationActivityIntent(
         internalProfileId,
+        TEST_CLASSROOM_ID_0,
         TEST_TOPIC_ID_0,
         TEST_STORY_ID_0,
         TEST_EXPLORATION_ID_2
@@ -191,6 +192,7 @@ class ExplorationActivityLocalTest {
     launch<ExplorationActivity>(
       createExplorationActivityIntent(
         internalProfileId,
+        TEST_CLASSROOM_ID_0,
         TEST_TOPIC_ID_0,
         TEST_STORY_ID_0,
         TEST_EXPLORATION_ID_2
@@ -244,6 +246,7 @@ class ExplorationActivityLocalTest {
     launch<ExplorationActivity>(
       createExplorationActivityIntent(
         internalProfileId,
+        TEST_CLASSROOM_ID_0,
         TEST_TOPIC_ID_0,
         TEST_STORY_ID_0,
         TEST_EXPLORATION_ID_2
@@ -288,6 +291,7 @@ class ExplorationActivityLocalTest {
     launch<ExplorationActivity>(
       createExplorationActivityIntent(
         internalProfileId,
+        TEST_CLASSROOM_ID_0,
         TEST_TOPIC_ID_0,
         TEST_STORY_ID_0,
         TEST_EXPLORATION_ID_2
@@ -375,6 +379,7 @@ class ExplorationActivityLocalTest {
 
   private fun createExplorationActivityIntent(
     internalProfileId: Int,
+    classroomId: String,
     topicId: String,
     storyId: String,
     explorationId: String
@@ -382,6 +387,7 @@ class ExplorationActivityLocalTest {
     return ExplorationActivity.createExplorationActivityIntent(
       ApplicationProvider.getApplicationContext(),
       ProfileId.newBuilder().apply { internalId = internalProfileId }.build(),
+      classroomId,
       topicId,
       storyId,
       explorationId,

From 59f37c56791c4bd85c6b36ce927f7027d39275f4 Mon Sep 17 00:00:00 2001
From: Saptak Manna <saptakmanna100@gmail.com>
Date: Thu, 4 Jul 2024 09:36:31 +0530
Subject: [PATCH 12/21] Fix ktlint checks

---
 .../org/oppia/android/app/home/RecentlyPlayedFragmentTest.kt     | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/src/sharedTest/java/org/oppia/android/app/home/RecentlyPlayedFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/home/RecentlyPlayedFragmentTest.kt
index 973c7f603a4..c45a0580213 100644
--- a/app/src/sharedTest/java/org/oppia/android/app/home/RecentlyPlayedFragmentTest.kt
+++ b/app/src/sharedTest/java/org/oppia/android/app/home/RecentlyPlayedFragmentTest.kt
@@ -84,7 +84,6 @@ import org.oppia.android.domain.classify.rules.numericexpressioninput.NumericExp
 import org.oppia.android.domain.classify.rules.numericinput.NumericInputRuleModule
 import org.oppia.android.domain.classify.rules.ratioinput.RatioInputModule
 import org.oppia.android.domain.classify.rules.textinput.TextInputRuleModule
-import org.oppia.android.domain.classroom.TEST_CLASSROOM_ID_0
 import org.oppia.android.domain.classroom.TEST_CLASSROOM_ID_1
 import org.oppia.android.domain.exploration.ExplorationProgressModule
 import org.oppia.android.domain.exploration.testing.ExplorationStorageTestModule

From abdf00cb1903f843df75ecfced62f4cfa64f7e39 Mon Sep 17 00:00:00 2001
From: Saptak Manna <saptakmanna100@gmail.com>
Date: Thu, 4 Jul 2024 09:36:37 +0530
Subject: [PATCH 13/21] Update FeatureFlagLogger with the
 ENABLE_MULTIPLE_CLASSROOMS flag

---
 .../domain/oppialogger/analytics/FeatureFlagsLogger.kt   | 9 +++++++--
 .../oppialogger/analytics/FeatureFlagsLoggerTest.kt      | 4 +++-
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/domain/src/main/java/org/oppia/android/domain/oppialogger/analytics/FeatureFlagsLogger.kt b/domain/src/main/java/org/oppia/android/domain/oppialogger/analytics/FeatureFlagsLogger.kt
index 1175075751e..f6983f25aee 100644
--- a/domain/src/main/java/org/oppia/android/domain/oppialogger/analytics/FeatureFlagsLogger.kt
+++ b/domain/src/main/java/org/oppia/android/domain/oppialogger/analytics/FeatureFlagsLogger.kt
@@ -6,6 +6,7 @@ import org.oppia.android.app.model.EventLog.FeatureFlagListContext
 import org.oppia.android.util.platformparameter.APP_AND_OS_DEPRECATION
 import org.oppia.android.util.platformparameter.DOWNLOADS_SUPPORT
 import org.oppia.android.util.platformparameter.EDIT_ACCOUNTS_OPTIONS_UI
+import org.oppia.android.util.platformparameter.ENABLE_MULTIPLE_CLASSROOMS
 import org.oppia.android.util.platformparameter.ENABLE_NPS_SURVEY
 import org.oppia.android.util.platformparameter.ENABLE_ONBOARDING_FLOW_V2
 import org.oppia.android.util.platformparameter.ENABLE_PERFORMANCE_METRICS_COLLECTION
@@ -18,6 +19,7 @@ import org.oppia.android.util.platformparameter.EnableFastLanguageSwitchingInLes
 import org.oppia.android.util.platformparameter.EnableInteractionConfigChangeStateRetention
 import org.oppia.android.util.platformparameter.EnableLearnerStudyAnalytics
 import org.oppia.android.util.platformparameter.EnableLoggingLearnerStudyIds
+import org.oppia.android.util.platformparameter.EnableMultipleClassrooms
 import org.oppia.android.util.platformparameter.EnableNpsSurvey
 import org.oppia.android.util.platformparameter.EnableOnboardingFlowV2
 import org.oppia.android.util.platformparameter.EnablePerformanceMetricsCollection
@@ -64,7 +66,9 @@ class FeatureFlagsLogger @Inject constructor(
   @EnableNpsSurvey
   private val enableNpsSurvey: PlatformParameterValue<Boolean>,
   @EnableOnboardingFlowV2
-  private val enableOnboardingFlowV2: PlatformParameterValue<Boolean>
+  private val enableOnboardingFlowV2: PlatformParameterValue<Boolean>,
+  @EnableMultipleClassrooms
+  private val enableMultipleClassrooms: PlatformParameterValue<Boolean>,
 ) {
   /**
    * A variable containing a list of all the feature flags in the app.
@@ -83,7 +87,8 @@ class FeatureFlagsLogger @Inject constructor(
     INTERACTION_CONFIG_CHANGE_STATE_RETENTION to enableInteractionConfigChangeStateRetention,
     APP_AND_OS_DEPRECATION to enableAppAndOsDeprecation,
     ENABLE_NPS_SURVEY to enableNpsSurvey,
-    ENABLE_ONBOARDING_FLOW_V2 to enableOnboardingFlowV2
+    ENABLE_ONBOARDING_FLOW_V2 to enableOnboardingFlowV2,
+    ENABLE_MULTIPLE_CLASSROOMS to enableMultipleClassrooms,
   )
 
   /**
diff --git a/domain/src/test/java/org/oppia/android/domain/oppialogger/analytics/FeatureFlagsLoggerTest.kt b/domain/src/test/java/org/oppia/android/domain/oppialogger/analytics/FeatureFlagsLoggerTest.kt
index d62953c56f0..73abeb09be5 100644
--- a/domain/src/test/java/org/oppia/android/domain/oppialogger/analytics/FeatureFlagsLoggerTest.kt
+++ b/domain/src/test/java/org/oppia/android/domain/oppialogger/analytics/FeatureFlagsLoggerTest.kt
@@ -46,6 +46,7 @@ import org.oppia.android.util.networking.NetworkConnectionUtilDebugModule
 import org.oppia.android.util.platformparameter.APP_AND_OS_DEPRECATION
 import org.oppia.android.util.platformparameter.DOWNLOADS_SUPPORT
 import org.oppia.android.util.platformparameter.EDIT_ACCOUNTS_OPTIONS_UI
+import org.oppia.android.util.platformparameter.ENABLE_MULTIPLE_CLASSROOMS
 import org.oppia.android.util.platformparameter.ENABLE_NPS_SURVEY
 import org.oppia.android.util.platformparameter.ENABLE_ONBOARDING_FLOW_V2
 import org.oppia.android.util.platformparameter.ENABLE_PERFORMANCE_METRICS_COLLECTION
@@ -152,7 +153,7 @@ class FeatureFlagsLoggerTest {
 
   @Test
   fun testLogFeatureFlags_correctNumberOfFeatureFlagsIsLogged() {
-    val expectedFeatureFlagCount = 12
+    val expectedFeatureFlagCount = 13
 
     featureFlagsLogger.logAllFeatureFlags(TEST_SESSION_ID)
     testCoroutineDispatchers.runCurrent()
@@ -185,6 +186,7 @@ class FeatureFlagsLoggerTest {
   @Iteration("app_and_os_deprecation", "index=9", "flagName=$APP_AND_OS_DEPRECATION")
   @Iteration("enable_nps_survey", "index=10", "flagName=$ENABLE_NPS_SURVEY")
   @Iteration("enable_onboarding_flow_v2", "index=11", "flagName=$ENABLE_ONBOARDING_FLOW_V2")
+  @Iteration("enable_multiple_classrooms", "index=12", "flagName=$ENABLE_MULTIPLE_CLASSROOMS")
   fun testLogFeatureFlags_allFeatureFlagNamesAreLogged() {
     featureFlagsLogger.logAllFeatureFlags(TEST_SESSION_ID)
 

From 34e72bd4d559e8d8ea5a76e6b03529050c745dce Mon Sep 17 00:00:00 2001
From: Saptak Manna <saptakmanna100@gmail.com>
Date: Mon, 8 Jul 2024 18:58:01 +0530
Subject: [PATCH 14/21] Import intent directly

---
 .../oppia/android/app/classroom/ClassroomListActivity.kt   | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/org/oppia/android/app/classroom/ClassroomListActivity.kt b/app/src/main/java/org/oppia/android/app/classroom/ClassroomListActivity.kt
index da13bd19a17..c8f075f10bf 100644
--- a/app/src/main/java/org/oppia/android/app/classroom/ClassroomListActivity.kt
+++ b/app/src/main/java/org/oppia/android/app/classroom/ClassroomListActivity.kt
@@ -19,7 +19,8 @@ import org.oppia.android.app.model.ProfileId
 import org.oppia.android.app.model.RecentlyPlayedActivityParams
 import org.oppia.android.app.model.RecentlyPlayedActivityTitle
 import org.oppia.android.app.model.ScreenName.CLASSROOM_LIST_ACTIVITY
-import org.oppia.android.app.topic.TopicActivity
+import org.oppia.android.app.topic.TopicActivity.Companion.createTopicActivityIntent
+import org.oppia.android.app.topic.TopicActivity.Companion.createTopicPlayStoryActivityIntent
 import org.oppia.android.app.translation.AppLanguageResourceHandler
 import org.oppia.android.util.logging.CurrentAppScreenNameIntentDecorator.decorateWithScreenName
 import org.oppia.android.util.profile.CurrentUserProfileIdIntentDecorator.decorateWithUserProfileId
@@ -100,7 +101,7 @@ class ClassroomListActivity :
 
   override fun routeToTopic(internalProfileId: Int, classroomId: String, topicId: String) {
     startActivity(
-      TopicActivity.createTopicActivityIntent(this, internalProfileId, classroomId, topicId)
+      createTopicActivityIntent(this, internalProfileId, classroomId, topicId)
     )
   }
 
@@ -111,7 +112,7 @@ class ClassroomListActivity :
     storyId: String
   ) {
     startActivity(
-      TopicActivity.createTopicPlayStoryActivityIntent(
+      createTopicPlayStoryActivityIntent(
         this,
         internalProfileId,
         classroomId,

From 23533c4001764e13e815fcba6482a588ee45037d Mon Sep 17 00:00:00 2001
From: Saptak Manna <saptakmanna100@gmail.com>
Date: Mon, 8 Jul 2024 19:06:09 +0530
Subject: [PATCH 15/21] Fix comments of intent argument parameters

---
 model/src/main/proto/arguments.proto | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/model/src/main/proto/arguments.proto b/model/src/main/proto/arguments.proto
index a3e404c9239..2dab9440c9a 100644
--- a/model/src/main/proto/arguments.proto
+++ b/model/src/main/proto/arguments.proto
@@ -201,7 +201,7 @@ message ResumeLessonFragmentArguments {
   // The ID of the profile that wants to start an exploration play session.
   ProfileId profile_id = 1;
 
-  // The ID of the topic to which the opening exploration belongs.
+  // The ID of the classroom to which the opening exploration belongs.
   string classroom_id = 7;
 
   // The ID of the topic to which the opening exploration belongs.
@@ -342,7 +342,7 @@ message SurveyActivityParams {
 
 // Represents the parameters needed to create TopicActivity.
 message TopicActivityParams {
-  // The ID of the classroom to be loaded.
+  // The ID of the classroom to which the topic to be loaded belongs.
   string classroom_id = 3;
 
   // The ID of the topic to be loaded.
@@ -354,7 +354,7 @@ message TopicActivityParams {
 
 // Arguments required when creating a TopicFragment.
 message TopicFragmentArguments {
-  // The ID of the classroom to be loaded.
+  // The ID of the classroom to which the topic to be loaded belongs.
   string classroom_id = 3;
 
   // The ID of the topic to be loaded.

From 396f5a79ffadbf87c54ceff4758dec15f18face4 Mon Sep 17 00:00:00 2001
From: Saptak Manna <saptakmanna100@gmail.com>
Date: Mon, 8 Jul 2024 19:23:00 +0530
Subject: [PATCH 16/21] Fix punctuation of error messages

---
 .../java/org/oppia/android/app/story/StoryFragment.kt     | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/org/oppia/android/app/story/StoryFragment.kt b/app/src/main/java/org/oppia/android/app/story/StoryFragment.kt
index 4291059baa3..2821248a6e0 100644
--- a/app/src/main/java/org/oppia/android/app/story/StoryFragment.kt
+++ b/app/src/main/java/org/oppia/android/app/story/StoryFragment.kt
@@ -60,7 +60,7 @@ class StoryFragment : InjectableFragment(), ExplorationSelectionListener, StoryF
     savedInstanceState: Bundle?
   ): View? {
     val arguments = checkNotNull(arguments) {
-      "Expected arguments to be passed to StoryFragment"
+      "Expected arguments to be passed to StoryFragment."
     }
     val args =
       arguments.getProto(STORY_FRAGMENT_ARGUMENTS_KEY, StoryFragmentArguments.getDefaultInstance())
@@ -68,15 +68,15 @@ class StoryFragment : InjectableFragment(), ExplorationSelectionListener, StoryF
     val internalProfileId = arguments.extractCurrentUserProfileId().internalId
     val classroomId =
       checkNotNull(args.classroomId) {
-        "Expected classroomId to be passed to StoryFragment"
+        "Expected classroomId to be passed to StoryFragment."
       }
     val topicId =
       checkNotNull(args.topicId) {
-        "Expected topicId to be passed to StoryFragment"
+        "Expected topicId to be passed to StoryFragment."
       }
     val storyId =
       checkNotNull(args.storyId) {
-        "Expected storyId to be passed to StoryFragment"
+        "Expected storyId to be passed to StoryFragment."
       }
     return storyFragmentPresenter.handleCreateView(
       inflater,

From 7bbab2a5c2bb120b8ec886f939a05c21c276bbc3 Mon Sep 17 00:00:00 2001
From: Saptak Manna <saptakmanna100@gmail.com>
Date: Mon, 8 Jul 2024 19:23:23 +0530
Subject: [PATCH 17/21] Fix formatting

---
 .../java/org/oppia/android/app/topic/TopicActivity.kt     | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/org/oppia/android/app/topic/TopicActivity.kt b/app/src/main/java/org/oppia/android/app/topic/TopicActivity.kt
index cf7f441857b..eafcf9156ae 100755
--- a/app/src/main/java/org/oppia/android/app/topic/TopicActivity.kt
+++ b/app/src/main/java/org/oppia/android/app/topic/TopicActivity.kt
@@ -50,14 +50,10 @@ class TopicActivity :
       TOPIC_ACTIVITY_PARAMS_KEY,
       TopicActivityParams.getDefaultInstance()
     )
-    classroomId = checkNotNull(
-      args?.classroomId
-    ) {
+    classroomId = checkNotNull(args?.classroomId) {
       "Expected classroom ID to be included in intent for TopicActivity."
     }
-    topicId = checkNotNull(
-      args?.topicId
-    ) {
+    topicId = checkNotNull(args?.topicId) {
       "Expected topic ID to be included in intent for TopicActivity."
     }
     storyId = args?.storyId

From e53fae3f5ded13aaf3837519e5559af71058cb71 Mon Sep 17 00:00:00 2001
From: Saptak Manna <saptakmanna100@gmail.com>
Date: Mon, 8 Jul 2024 19:24:36 +0530
Subject: [PATCH 18/21] Remove unused function

---
 .../exploration/ExplorationActivityTest.kt    | 21 -------------------
 1 file changed, 21 deletions(-)

diff --git a/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt
index 2aa11b4f77a..679eb9927e7 100644
--- a/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt
+++ b/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt
@@ -251,27 +251,6 @@ class ExplorationActivityTest {
     ApplicationProvider.getApplicationContext<TestApplication>().inject(this)
   }
 
-  private fun getApplicationDependencies(
-    internalProfileId: Int,
-    classroomId: String,
-    topicId: String,
-    storyId: String,
-    explorationId: String
-  ) {
-    launch(ExplorationInjectionActivity::class.java).use {
-      it.onActivity { activity ->
-        explorationDataController = activity.explorationDataController
-        explorationDataController.startPlayingNewExploration(
-          internalProfileId,
-          classroomId,
-          topicId,
-          storyId,
-          explorationId
-        )
-      }
-    }
-  }
-
   // TODO(#388): Fill in remaining tests for this activity.
   @get:Rule
   var explorationActivityTestRule: ActivityTestRule<ExplorationActivity> = ActivityTestRule(

From 4f09a6471bddae3756b9128fb0613e92186ac602 Mon Sep 17 00:00:00 2001
From: Saptak Manna <saptakmanna100@gmail.com>
Date: Mon, 8 Jul 2024 19:31:26 +0530
Subject: [PATCH 19/21] Remove unused import

---
 .../android/app/player/exploration/ExplorationActivityTest.kt    | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt
index 679eb9927e7..ec53953d954 100644
--- a/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt
+++ b/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt
@@ -81,7 +81,6 @@ import org.oppia.android.app.player.state.itemviewmodel.SplitScreenInteractionMo
 import org.oppia.android.app.player.state.itemviewmodel.StateItemViewModel
 import org.oppia.android.app.recyclerview.RecyclerViewMatcher.Companion.atPositionOnView
 import org.oppia.android.app.shim.ViewBindingShimModule
-import org.oppia.android.app.testing.ExplorationInjectionActivity
 import org.oppia.android.app.translation.testing.ActivityRecreatorTestModule
 import org.oppia.android.app.utility.EspressoTestsMatchers.hasProtoExtra
 import org.oppia.android.app.utility.EspressoTestsMatchers.withDrawable

From 5a9b16a2eb32f81800d7ccea4bbcd8a83c1e3f78 Mon Sep 17 00:00:00 2001
From: Saptak Manna <saptakmanna100@gmail.com>
Date: Tue, 9 Jul 2024 09:04:10 +0530
Subject: [PATCH 20/21] Migrate getClassroomIdByTopicId function

---
 .../domain/classroom/ClassroomController.kt   |  89 ++++++++++++++
 .../android/domain/topic/TopicController.kt   | 109 +-----------------
 .../classroom/ClassroomControllerTest.kt      |  42 +++++++
 3 files changed, 136 insertions(+), 104 deletions(-)

diff --git a/domain/src/main/java/org/oppia/android/domain/classroom/ClassroomController.kt b/domain/src/main/java/org/oppia/android/domain/classroom/ClassroomController.kt
index 80175c999e5..20cc3ee832e 100644
--- a/domain/src/main/java/org/oppia/android/domain/classroom/ClassroomController.kt
+++ b/domain/src/main/java/org/oppia/android/domain/classroom/ClassroomController.kt
@@ -84,6 +84,20 @@ class ClassroomController @Inject constructor(
     }
   }
 
+  /**
+   * Returns the classroomId of the classroom to which the topic with the given [topicId]
+   * belongs to.
+   */
+  fun getClassroomIdByTopicId(topicId: String): String {
+    var classroomId = ""
+    loadClassrooms().forEach {
+      if (it.topicPrerequisitesMap.keys.contains(topicId)) {
+        classroomId = it.id
+      }
+    }
+    return classroomId
+  }
+
   private fun createClassroomList(
     contentLocale: OppiaLocale.ContentLocale
   ): ClassroomList {
@@ -318,6 +332,81 @@ class ClassroomController @Inject constructor(
       .setFirstStoryId(firstStoryId)
       .build()
   }
+
+  private fun loadClassrooms(): List<ClassroomRecord> {
+    return if (loadLessonProtosFromAssets) {
+      assetRepository.loadProtoFromLocalAssets(
+        assetName = "classrooms",
+        baseMessage = ClassroomIdList.getDefaultInstance()
+      ).classroomIdsList.map { classroomId ->
+        loadClassroomById(classroomId)
+      }
+    } else loadClassroomsFromJson()
+  }
+
+  private fun loadClassroomsFromJson(): List<ClassroomRecord> {
+    // Load the classrooms.json file.
+    val classroomIdsObj = jsonAssetRetriever.loadJsonFromAsset("classrooms.json")
+    checkNotNull(classroomIdsObj) { "Failed to load classrooms.json." }
+    val classroomIds = classroomIdsObj.optJSONArray("classroom_id_list")
+    checkNotNull(classroomIds) { "classrooms.json is missing classroom IDs." }
+
+    // Initialize a list to store the [ClassroomRecord]s.
+    val classroomRecords = mutableListOf<ClassroomRecord>()
+
+    // Iterate over all classroomIds and load each classroom's JSON.
+    for (i in 0 until classroomIds.length()) {
+      val classroomId = checkNotNull(classroomIds.optString(i)) {
+        "Expected non-null classroom ID at index $i."
+      }
+      val classroomRecord = loadClassroomById(classroomId)
+      classroomRecords.add(classroomRecord)
+    }
+
+    return classroomRecords
+  }
+
+  private fun loadClassroomById(classroomId: String): ClassroomRecord {
+    return if (loadLessonProtosFromAssets) {
+      assetRepository.tryLoadProtoFromLocalAssets(
+        assetName = classroomId,
+        defaultMessage = ClassroomRecord.getDefaultInstance()
+      ) ?: ClassroomRecord.getDefaultInstance()
+    } else loadClassroomByIdFromJson(classroomId)
+  }
+
+  private fun loadClassroomByIdFromJson(classroomId: String): ClassroomRecord {
+    // Load the classroom obj.
+    val classroomObj = jsonAssetRetriever.loadJsonFromAsset("$classroomId.json")
+    checkNotNull(classroomObj) { "Failed to load $classroomId.json." }
+
+    // Load the topic prerequisite map.
+    val topicPrereqsObj = checkNotNull(classroomObj.optJSONObject("topic_prerequisites")) {
+      "Expected classroom to have non-null topic_prerequisites."
+    }
+    val topicPrereqs = topicPrereqsObj.keys().asSequence().associateWith { topicId ->
+      val topicIdArray = checkNotNull(topicPrereqsObj.optJSONArray(topicId)) {
+        "Expected topic $topicId to have a non-null string list."
+      }
+      return@associateWith List(topicIdArray.length()) { index ->
+        checkNotNull(topicIdArray.optString(index)) {
+          "Expected topic $topicId to have non-null string at index $index."
+        }
+      }
+    }
+    return ClassroomRecord.newBuilder().apply {
+      id = checkNotNull(classroomObj.optString("classroom_id")) {
+        "Expected classroom to have ID."
+      }
+      putAllTopicPrerequisites(
+        topicPrereqs.mapValues { (_, topicIds) ->
+          ClassroomRecord.TopicIdList.newBuilder().apply {
+            addAllTopicIds(topicIds)
+          }.build()
+        }
+      )
+    }.build()
+  }
 }
 
 /** Creates a [LessonThumbnail] from a classroomJsonObject. */
diff --git a/domain/src/main/java/org/oppia/android/domain/topic/TopicController.kt b/domain/src/main/java/org/oppia/android/domain/topic/TopicController.kt
index f414b7ea636..d561ccff816 100755
--- a/domain/src/main/java/org/oppia/android/domain/topic/TopicController.kt
+++ b/domain/src/main/java/org/oppia/android/domain/topic/TopicController.kt
@@ -6,8 +6,6 @@ import org.json.JSONObject
 import org.oppia.android.app.model.ChapterPlayState
 import org.oppia.android.app.model.ChapterRecord
 import org.oppia.android.app.model.ChapterSummary
-import org.oppia.android.app.model.ClassroomIdList
-import org.oppia.android.app.model.ClassroomRecord
 import org.oppia.android.app.model.CompletedStory
 import org.oppia.android.app.model.CompletedStoryList
 import org.oppia.android.app.model.EphemeralChapterSummary
@@ -32,7 +30,7 @@ import org.oppia.android.app.model.Topic
 import org.oppia.android.app.model.TopicPlayAvailability
 import org.oppia.android.app.model.TopicProgress
 import org.oppia.android.app.model.TopicRecord
-import org.oppia.android.domain.classroom.TEST_CLASSROOM_ID_0
+import org.oppia.android.domain.classroom.ClassroomController
 import org.oppia.android.domain.question.QuestionRetriever
 import org.oppia.android.domain.translation.TranslationController
 import org.oppia.android.domain.util.JsonAssetRetriever
@@ -108,7 +106,8 @@ class TopicController @Inject constructor(
   private val storyProgressController: StoryProgressController,
   private val assetRepository: AssetRepository,
   @LoadLessonProtosFromAssets private val loadLessonProtosFromAssets: Boolean,
-  private val translationController: TranslationController
+  private val translationController: TranslationController,
+  private val classroomController: ClassroomController,
 ) {
 
   /**
@@ -562,12 +561,13 @@ class TopicController @Inject constructor(
       contentId = "description"
       html = topicData.getStringFromObject("topic_description")
     }.build()
+    val classroomId = classroomController.getClassroomIdByTopicId(topicId)
     // No written translations are included since none are retrieved from JSON.
     return Topic.newBuilder()
       .setTopicId(topicId)
       .setTitle(topicTitle)
       .setDescription(topicDescription)
-      .setClassroomId(getClassroomIdByTopicId(topicId))
+      .setClassroomId(classroomId)
       .addAllStory(storySummaryList)
       .setTopicThumbnail(createTopicThumbnailFromJson(topicData))
       .setDiskSizeBytes(computeTopicSizeBytes(getJsonAssetFileNameList(topicId)).toLong())
@@ -917,105 +917,6 @@ class TopicController @Inject constructor(
     }.build()
   }
 
-  private fun getClassroomIdByTopicId(topicId: String): String {
-    var classroomId = TEST_CLASSROOM_ID_0
-    loadClassrooms().forEach {
-      if (it.topicPrerequisitesMap.keys.contains(topicId)) {
-        classroomId = it.id
-      }
-    }
-    return classroomId
-  }
-
-  // TODO(#5344): Remove this in favor of per-classroom data handling.
-  private fun loadClassrooms(): List<ClassroomRecord> {
-    return if (loadLessonProtosFromAssets) {
-      assetRepository.loadProtoFromLocalAssets(
-        assetName = "classrooms",
-        baseMessage = ClassroomIdList.getDefaultInstance()
-      ).classroomIdsList.map { classroomId ->
-        loadClassroomById(classroomId)
-      }
-    } else loadClassroomsFromJson()
-  }
-
-  // TODO(#5344): Remove this in favor of per-classroom data handling.
-  private fun loadClassroomsFromJson(): List<ClassroomRecord> {
-    // Load the classrooms.json file.
-    val classroomIdsObj = jsonAssetRetriever.loadJsonFromAsset("classrooms.json")
-    checkNotNull(classroomIdsObj) { "Failed to load classrooms.json." }
-    val classroomIds = classroomIdsObj.optJSONArray("classroom_id_list")
-    checkNotNull(classroomIds) { "classrooms.json is missing classroom IDs." }
-
-    // Initialize a list to store the [ClassroomRecord]s.
-    val classroomRecords = mutableListOf<ClassroomRecord>()
-
-    // Iterate over all classroomIds and load each classroom's JSON.
-    for (i in 0 until classroomIds.length()) {
-      val classroomId = checkNotNull(classroomIds.optString(i)) {
-        "Expected non-null classroom ID at index $i."
-      }
-      val classroomRecord = loadClassroomById(classroomId)
-      classroomRecords.add(classroomRecord)
-    }
-
-    return classroomRecords
-  }
-
-  // TODO(#5344): Move this to classroom controller.
-  private fun loadClassroomById(classroomId: String): ClassroomRecord {
-    return if (loadLessonProtosFromAssets) {
-      assetRepository.tryLoadProtoFromLocalAssets(
-        assetName = classroomId,
-        defaultMessage = ClassroomRecord.getDefaultInstance()
-      ) ?: ClassroomRecord.getDefaultInstance()
-    } else loadClassroomByIdFromJson(classroomId)
-  }
-
-  // TODO(#5344): Remove this in favor of per-classroom data handling.
-  private fun loadClassroomByIdFromJson(classroomId: String): ClassroomRecord {
-    // Load the classroom obj.
-    val classroomObj = jsonAssetRetriever.loadJsonFromAsset("$classroomId.json")
-    checkNotNull(classroomObj) { "Failed to load $classroomId.json." }
-
-    val classroomTitle = classroomObj.getJSONObject("classroom_title")
-
-    // Load the topic prerequisite map.
-    val topicPrereqsObj = checkNotNull(classroomObj.optJSONObject("topic_prerequisites")) {
-      "Expected classroom to have non-null topic_prerequisites."
-    }
-    val topicPrereqs = topicPrereqsObj.keys().asSequence().associateWith { topicId ->
-      val topicIdArray = checkNotNull(topicPrereqsObj.optJSONArray(topicId)) {
-        "Expected topic $topicId to have a non-null string list."
-      }
-      return@associateWith List(topicIdArray.length()) { index ->
-        checkNotNull(topicIdArray.optString(index)) {
-          "Expected topic $topicId to have non-null string at index $index."
-        }
-      }
-    }
-    return ClassroomRecord.newBuilder().apply {
-      id = checkNotNull(classroomObj.optString("classroom_id")) {
-        "Expected classroom to have ID."
-      }
-      translatableTitle = SubtitledHtml.newBuilder().apply {
-        contentId = classroomTitle.getStringFromObject("content_id")
-        html = classroomTitle.getStringFromObject("html")
-      }.build()
-      putAllTopicPrerequisites(
-        topicPrereqs.mapValues { (_, topicIds) ->
-          ClassroomRecord.TopicIdList.newBuilder().apply {
-            addAllTopicIds(topicIds)
-          }.build()
-        }
-      )
-    }.build()
-  }
-
-  // TODO(#5344): Remove this in favor of per-classroom data handling.
-  private fun loadCombinedClassroomsTopicIdList(): List<String> =
-    loadClassrooms().flatMap { it.topicPrerequisitesMap.keys.toList() }
-
   private companion object {
     private fun JSONObject.getRemovableOptionalString(name: String) =
       optString(name).takeIf { it.isNotEmpty() && it != "<removed>" && it != "<unknown>" }
diff --git a/domain/src/test/java/org/oppia/android/domain/classroom/ClassroomControllerTest.kt b/domain/src/test/java/org/oppia/android/domain/classroom/ClassroomControllerTest.kt
index 9ff4b0f29fc..da769363f26 100644
--- a/domain/src/test/java/org/oppia/android/domain/classroom/ClassroomControllerTest.kt
+++ b/domain/src/test/java/org/oppia/android/domain/classroom/ClassroomControllerTest.kt
@@ -252,6 +252,48 @@ class ClassroomControllerTest {
     assertThat(topicIds).doesNotContain(TEST_TOPIC_ID_2)
   }
 
+  @Test
+  fun testGetClassroomIdByTopicId_testTopic0_returnsCorrectClassroomId() {
+    val classroomId = classroomController.getClassroomIdByTopicId(TEST_TOPIC_ID_0)
+
+    assertThat(classroomId).isEqualTo(TEST_CLASSROOM_ID_0)
+  }
+
+  @Test
+  fun testGetClassroomIdByTopicId_testTopic1_returnsCorrectClassroomId() {
+    val classroomId = classroomController.getClassroomIdByTopicId(TEST_TOPIC_ID_1)
+
+    assertThat(classroomId).isEqualTo(TEST_CLASSROOM_ID_0)
+  }
+
+  @Test
+  fun testGetClassroomIdByTopicId_fractionsTopic_returnsCorrectClassroomId() {
+    val classroomId = classroomController.getClassroomIdByTopicId(FRACTIONS_TOPIC_ID)
+
+    assertThat(classroomId).isEqualTo(TEST_CLASSROOM_ID_1)
+  }
+
+  @Test
+  fun testGetClassroomIdByTopicId_ratiosTopic_returnsCorrectClassroomId() {
+    val classroomId = classroomController.getClassroomIdByTopicId(RATIOS_TOPIC_ID)
+
+    assertThat(classroomId).isEqualTo(TEST_CLASSROOM_ID_1)
+  }
+
+  @Test
+  fun testGetClassroomIdByTopicId_testTopic2_returnsCorrectClassroomId() {
+    val classroomId = classroomController.getClassroomIdByTopicId(TEST_TOPIC_ID_2)
+
+    assertThat(classroomId).isEqualTo(TEST_CLASSROOM_ID_2)
+  }
+
+  @Test
+  fun testGetClassroomIdByTopicId_nonExistentTopic_returnsNull() {
+    val classroomId = classroomController.getClassroomIdByTopicId("invalid_topic_id")
+
+    assertThat(classroomId).isEmpty()
+  }
+
   private fun getClassroomList(profileId: ProfileId) =
     monitorFactory.waitForNextSuccessfulResult(classroomController.getClassroomList(profileId))
 

From 6543df58900e41614397d1ae91d934c2e4cc25ed Mon Sep 17 00:00:00 2001
From: Saptak Manna <saptakmanna100@gmail.com>
Date: Wed, 10 Jul 2024 20:32:32 +0530
Subject: [PATCH 21/21] Address review comments

---
 .../oppia/android/domain/classroom/ClassroomControllerTest.kt   | 2 +-
 .../java/org/oppia/android/testing/logging/EventLogSubject.kt   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/domain/src/test/java/org/oppia/android/domain/classroom/ClassroomControllerTest.kt b/domain/src/test/java/org/oppia/android/domain/classroom/ClassroomControllerTest.kt
index da769363f26..24129abc307 100644
--- a/domain/src/test/java/org/oppia/android/domain/classroom/ClassroomControllerTest.kt
+++ b/domain/src/test/java/org/oppia/android/domain/classroom/ClassroomControllerTest.kt
@@ -288,7 +288,7 @@ class ClassroomControllerTest {
   }
 
   @Test
-  fun testGetClassroomIdByTopicId_nonExistentTopic_returnsNull() {
+  fun testGetClassroomIdByTopicId_nonExistentTopic_returnsEmptyId() {
     val classroomId = classroomController.getClassroomIdByTopicId("invalid_topic_id")
 
     assertThat(classroomId).isEmpty()
diff --git a/testing/src/main/java/org/oppia/android/testing/logging/EventLogSubject.kt b/testing/src/main/java/org/oppia/android/testing/logging/EventLogSubject.kt
index 792482e2754..2100e3028b8 100644
--- a/testing/src/main/java/org/oppia/android/testing/logging/EventLogSubject.kt
+++ b/testing/src/main/java/org/oppia/android/testing/logging/EventLogSubject.kt
@@ -786,7 +786,7 @@ class EventLogSubject private constructor(
 
   /**
    * Verifies the [EventLog]'s context and executes [block] in the same way as
-   * [hasOpenExplorationActivityContextThat] except for the conditions of, and subject returned by,
+   * [hasStartExplorationContextThat] except for the conditions of, and subject returned by,
    * [hasStartExplorationContextThat].
    */
   fun hasStartExplorationContextThat(block: ExplorationContextSubject.() -> Unit) {