Fix part of #5344: Update models to support classrooms

domain/BUILD.bazel

@@ -37,6 +37,11 @@ MIGRATED_PROD_FILES = glob([
 
 DOMAIN_ASSETS = generate_assets_list_from_text_protos(
     name = "domain_assets",
+    classroom_file_names = [
+        "test_classroom_id_0",
+        "test_classroom_id_1",
+        "test_classroom_id_2",
+    ],
     classroom_list_file_names = [
         "classrooms",
     ],

domain/domain_assets.bzl

@@ -6,6 +6,7 @@ load("//model:text_proto_assets.bzl", "generate_proto_binary_assets")
 
 def generate_assets_list_from_text_protos(
         name,
+        classroom_file_names,
         classroom_list_file_names,
         topic_file_names,
         subtopic_file_names,
@@ -17,6 +18,7 @@ def generate_assets_list_from_text_protos(
 
     Args:
         name: str. The name of this generation instance. This will be a prefix for derived targets.
+        classroom_file_names: list of str. The list of classroom file names.
         classroom_list_file_names: list of str. The classroom list file names.
         topic_file_names: list of str. The list of topic file names.
         subtopic_file_names: list of str. The list of subtopic file names.
@@ -31,8 +33,17 @@ def generate_assets_list_from_text_protos(
         name = name,
         names = classroom_list_file_names,
         proto_dep_name = "topic",
-        proto_type_name = "ClassroomList",
-        name_prefix = "classroom_list",
+        proto_type_name = "ClassroomIdList",
+        name_prefix = "classroom_id_list",
+        asset_dir = "src/main/assets",
+        proto_dep_bazel_target_prefix = "//model/src/main/proto",
+        proto_package = "model",
+    ) + generate_proto_binary_assets(
+        name = name,
+        names = classroom_file_names,
+        proto_dep_name = "topic",
+        proto_type_name = "ClassroomRecord",
+        name_prefix = "classroom_record",
         asset_dir = "src/main/assets",
         proto_dep_bazel_target_prefix = "//model/src/main/proto",
         proto_package = "model",

domain/src/main/assets/GJ2rLXRKD5hw.json

@@ -13,6 +13,8 @@
   "topic_name": "Fractions",
   "topic_description": "You'll often need to talk about part of an object or group. For example, a jar of milk might be half-full, or some of the eggs in a box might have broken. In these lessons, you'll learn to use fractions to describe situations like these.",
   "topic_id": "GJ2rLXRKD5hw",
+  "classroom_id": "test_classroom_id_1",
+  "classroom_name": "Maths",
   "thumbnail_bg_color": "#000000",
   "thumbnail_filename": "",
   "skill_descriptions": {},

domain/src/main/assets/GJ2rLXRKD5hw.textproto

@@ -25,3 +25,8 @@ translatable_description {
   html: "You\'ll often need to talk about part of an object or group. For example, a jar of milk might be half-full, or some of the eggs in a box might have broken. In these lessons, you\'ll learn to use fractions to describe situations like these."
   content_id: "description"
 }
+classroom_id: "test_classroom_id_1"
+translatable_classroom_title {
+  html: "Maths"
+  content_id: "classroom_title"
+}

domain/src/main/assets/classrooms.json

@@ -1,12 +1,3 @@
 {
-  "classrooms": [{
-    "id": "test_classroom_id_0",
-    "topic_prerequisites": {
-      "test_topic_id_0": ["GJ2rLXRKD5hw"],
-      "test_topic_id_1": ["test_topic_id_0", "omzF4oqgeTXd"],
-      "test_topic_id_2": [],
-      "GJ2rLXRKD5hw": [],
-      "omzF4oqgeTXd": []
-    }
-  }]
+  "classroom_id_list": ["test_classroom_id_0", "test_classroom_id_1", "test_classroom_id_2"]
 }

domain/src/main/assets/classrooms.textproto

@@ -1,31 +1,3 @@
-classrooms {
-  id: "test_classroom_id_0"
-  topic_prerequisites {
-    key: "test_topic_id_0"
-    value {
-      topic_ids: "GJ2rLXRKD5hw"
-    }
-  }
-  topic_prerequisites {
-    key: "test_topic_id_1"
-    value {
-      topic_ids: "test_topic_id_0"
-      topic_ids: "omzF4oqgeTXd"
-    }
-  }
-  topic_prerequisites {
-    key: "test_topic_id_2"
-    value {
-    }
-  }
-  topic_prerequisites {
-    key: "GJ2rLXRKD5hw"
-    value {
-    }
-  }
-  topic_prerequisites {
-    key: "omzF4oqgeTXd"
-    value {
-    }
-  }
-}
+classroom_ids: "test_classroom_id_0"
+classroom_ids: "test_classroom_id_1"
+classroom_ids: "test_classroom_id_2"

domain/src/main/assets/omzF4oqgeTXd.json

@@ -21,6 +21,8 @@
   "topic_name": "Ratios and Proportional Reasoning",
   "topic_description": "Many everyday problems involve thinking about proportions. For example, if 30 apples cost 6 dollars, how much would 12 apples cost? In these lessons, you'll learn about how to use ratios and proportional reasoning to solve problems like this.",
   "topic_id": "omzF4oqgeTXd",
+  "classroom_id": "test_classroom_id_1",
+  "classroom_name": "Maths",
   "thumbnail_bg_color": "#000000",
   "thumbnail_filename": "",
   "skill_descriptions": {},

domain/src/main/assets/omzF4oqgeTXd.textproto

@@ -23,3 +23,8 @@ translatable_description {
   html: "Many everyday problems involve thinking about proportions. For example, if 30 apples cost 6 dollars, how much would 12 apples cost? In these lessons, you\'ll learn about how to use ratios and proportional reasoning to solve problems like this."
   content_id: "description"
 }
+classroom_id: "test_classroom_id_1"
+translatable_classroom_title {
+  html: "Maths"
+  content_id: "classroom_title"
+}

domain/src/main/assets/test_classroom_id_0.json

@@ -0,0 +1,13 @@
+{
+  "classroom_id": "test_classroom_id_0",
+  "classroom_title": {
+    "content_id": "classroom_title",
+    "html": "Science"
+  },
+  "thumbnail_bg_color": "#00FFFFFF",
+  "thumbnail_filename": "",
+  "topic_prerequisites": {
+    "test_topic_id_0": ["GJ2rLXRKD5hw"],
+    "test_topic_id_1": ["test_topic_id_0", "omzF4oqgeTXd"]
+  }
+}

domain/src/main/assets/test_classroom_id_0.textproto

@@ -0,0 +1,20 @@
+id: "test_classroom_id_0"
+translatable_title {
+  content_id: "classroom_title"
+  html: "Science"
+}
+classroom_thumbnail {
+}
+topic_prerequisites {
+  key: "test_topic_id_0"
+  value {
+    topic_ids: "GJ2rLXRKD5hw"
+  }
+}
+topic_prerequisites {
+  key: "test_topic_id_1"
+  value {
+    topic_ids: "test_topic_id_0"
+    topic_ids: "omzF4oqgeTXd"
+  }
+}

domain/src/main/assets/test_classroom_id_1.json

@@ -0,0 +1,13 @@
+{
+  "classroom_id": "test_classroom_id_1",
+  "classroom_title": {
+    "content_id": "classroom_title",
+    "html": "Maths"
+  },
+  "thumbnail_bg_color": "#00FFFFFF",
+  "thumbnail_filename": "",
+  "topic_prerequisites": {
+    "GJ2rLXRKD5hw": [],
+    "omzF4oqgeTXd": []
+  }
+}

domain/src/main/assets/test_classroom_id_1.textproto

@@ -0,0 +1,17 @@
+id: "test_classroom_id_1"
+translatable_title {
+  content_id: "classroom_title"
+  html: "Maths"
+}
+classroom_thumbnail {
+}
+topic_prerequisites {
+  key: "GJ2rLXRKD5hw"
+  value {
+  }
+}
+topic_prerequisites {
+  key: "omzF4oqgeTXd"
+  value {
+  }
+}

domain/src/main/assets/test_classroom_id_2.json

@@ -0,0 +1,12 @@
+{
+  "classroom_id": "test_classroom_id_2",
+  "classroom_title": {
+    "content_id": "classroom_title",
+    "html": "English"
+  },
+  "thumbnail_bg_color": "#00FFFFFF",
+  "thumbnail_filename": "",
+  "topic_prerequisites": {
+    "test_topic_id_2": []
+  }
+}

domain/src/main/assets/test_classroom_id_2.textproto

@@ -0,0 +1,12 @@
+id: "test_classroom_id_2"
+translatable_title {
+  content_id: "classroom_title"
+  html: "English"
+}
+classroom_thumbnail {
+}
+topic_prerequisites {
+  key: "test_topic_id_2"
+  value {
+  }
+}

domain/src/main/assets/test_topic_id_0.json

@@ -13,6 +13,8 @@
   "topic_name": "First Test Topic",
   "topic_description": "A topic investigating the interesting aspects of the Oppia Android app.",
   "topic_id": "test_topic_id_0",
+  "classroom_id": "test_classroom_id_0",
+  "classroom_name": "Science",
   "thumbnail_bg_color": "#000000",
   "thumbnail_filename": "",
   "skill_descriptions": {},

domain/src/main/assets/test_topic_id_0.textproto

@@ -22,3 +22,8 @@ translatable_description {
   html: "A topic investigating the interesting aspects of the Oppia Android app."
   content_id: "description"
 }
+classroom_id: "test_classroom_id_0"
+translatable_classroom_title {
+  html: "Science"
+  content_id: "classroom_title"
+}

domain/src/main/assets/test_topic_id_1.json

@@ -13,6 +13,8 @@
   "topic_name": "Second Test Topic",
   "topic_description": "A topic considering the various implications of having especially long topic descriptions. These descriptions almost certainly need to wrap, which should be interesting in the UI (especially on small screens). Consider also that there may even be multiple points pertaining to a topic, some of which may require expanding the description section in order to read the whole topic description.",
   "topic_id": "test_topic_id_1",
+  "classroom_id": "test_classroom_id_0",
+  "classroom_name": "Science",
   "thumbnail_bg_color": "#000000",
   "thumbnail_filename": "",
   "skill_descriptions": {},

domain/src/main/assets/test_topic_id_1.textproto

@@ -21,3 +21,8 @@ translatable_description {
   html: "A topic considering the various implications of having especially long topic descriptions. These descriptions almost certainly need to wrap, which should be interesting in the UI (especially on small screens). Consider also that there may even be multiple points pertaining to a topic, some of which may require expanding the description section in order to read the whole topic description."
   content_id: "description"
 }
+classroom_id: "test_classroom_id_0"
+translatable_classroom_title {
+  html: "Science"
+  content_id: "classroom_title"
+}

domain/src/main/assets/test_topic_id_2.json

@@ -5,6 +5,8 @@
   "topic_description": "A topic that's not yet ready to be played.",
   "topic_name": "Third Test Topic",
   "topic_id": "test_topic_id_2",
+  "classroom_id": "test_classroom_id_2",
+  "classroom_name": "English",
   "version": -1,
   "published": false,
   "skill_descriptions": {},

domain/src/main/assets/test_topic_id_2.textproto

@@ -7,3 +7,8 @@ translatable_description {
   html: "A topic that\'s not yet ready to be played."
   content_id: "description"
 }
+classroom_id: "test_classroom_id_2"
+translatable_classroom_title {
+  html: "English"
+  content_id: "classroom_title"
+}

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

@@ -473,6 +473,8 @@ class TopicController @Inject constructor(
           putAllWrittenTranslations(topicRecord.writtenTranslationsMap)
           title = topicRecord.translatableTitle
           description = topicRecord.translatableDescription
+          classroomId = topicRecord.classroomId
+          classroomTitle = topicRecord.translatableClassroomTitle
           addAllStory(stories)
           topicThumbnail = createTopicThumbnailFromProto(topicId, topicRecord.topicThumbnail)
           diskSizeBytes = computeTopicSizeBytes(getProtoAssetFileNameList(topicId)).toLong()
@@ -554,6 +556,11 @@ class TopicController @Inject constructor(
       contentId = "title"
       html = topicData.getStringFromObject("topic_name")
     }.build()
+    val classroomId = topicData.getStringFromObject("classroom_id")
+    val classroomTitle = SubtitledHtml.newBuilder().apply {
+      contentId = "classroom_title"
+      html = topicData.getStringFromObject("classroom_name")
+    }
     val topicDescription = SubtitledHtml.newBuilder().apply {
       contentId = "description"
       html = topicData.getStringFromObject("topic_description")
@@ -562,6 +569,8 @@ class TopicController @Inject constructor(
     return Topic.newBuilder()
       .setTopicId(topicId)
       .setTitle(topicTitle)
+      .setClassroomId(classroomId)
+      .setClassroomTitle(classroomTitle)
       .setDescription(topicDescription)
       .addAllStory(storySummaryList)
       .setTopicThumbnail(createTopicThumbnailFromJson(topicData))