Merge pull request #399 from elimu-ai/default-sorting

jo-elimu · web-flow · commit 2abb080f4361 · 2025-07-17T17:32:44.000+07:00
refactor: set default sorting for cursor and entities
diff --git a/app/src/main/java/ai/elimu/analytics/dao/LetterSoundAssessmentEventDao.kt b/app/src/main/java/ai/elimu/analytics/dao/LetterSoundAssessmentEventDao.kt
@@ -11,14 +11,14 @@ interface LetterSoundAssessmentEventDao {
     @Insert
     fun insert(letterSoundAssessmentEvent: LetterSoundAssessmentEvent)
 
-    @Query("SELECT * FROM LetterSoundAssessmentEvent ORDER BY id")
-    fun loadAll(): List<LetterSoundAssessmentEvent>
+    @Query("SELECT * FROM LetterSoundAssessmentEvent ORDER BY time ASC")
+    fun loadAllOrderedByTimestampAsc(): List<LetterSoundAssessmentEvent>
 
-    @Query("SELECT * FROM LetterSoundAssessmentEvent ORDER BY id")
-    fun loadAllCursor(): Cursor
+    @Query("SELECT * FROM LetterSoundAssessmentEvent ORDER BY time DESC")
+    fun loadAllOrderedByTimestampDesc(): Cursor
 
-    @Query("SELECT * FROM LetterSoundAssessmentEvent WHERE letterSoundId = :letterSoundId ORDER BY id")
-    fun loadAllCursor(letterSoundId: Long): Cursor
+    @Query("SELECT * FROM LetterSoundAssessmentEvent WHERE letterSoundId = :letterSoundId ORDER BY time DESC")
+    fun loadAllOrderedByTimestampDesc(letterSoundId: Long): Cursor
 
     @Query("SELECT COUNT(*) FROM LetterSoundAssessmentEvent")
     fun getCount(): Int
diff --git a/app/src/main/java/ai/elimu/analytics/dao/LetterSoundLearningEventDao.kt b/app/src/main/java/ai/elimu/analytics/dao/LetterSoundLearningEventDao.kt
@@ -11,11 +11,11 @@ interface LetterSoundLearningEventDao {
     @Insert
     fun insert(letterSoundLearningEvent: LetterSoundLearningEvent)
 
-    @Query("SELECT * FROM LetterSoundLearningEvent ORDER BY timestamp")
-    fun loadAllOrderedByTime(): List<LetterSoundLearningEvent>
+    @Query("SELECT * FROM LetterSoundLearningEvent ORDER BY timestamp ASC")
+    fun loadAllOrderedByTimestampAsc(): List<LetterSoundLearningEvent>
 
-    @Query("SELECT * FROM LetterSoundLearningEvent ORDER BY timestamp")
-    fun loadAllOrderedByTimeCursor(): Cursor
+    @Query("SELECT * FROM LetterSoundLearningEvent ORDER BY timestamp DESC")
+    fun loadAllOrderedByTimestampDesc(): Cursor
 
     @Query("SELECT COUNT(*) FROM LetterSoundLearningEvent")
     fun getCount(): Int
diff --git a/app/src/main/java/ai/elimu/analytics/dao/NumberAssessmentEventDao.kt b/app/src/main/java/ai/elimu/analytics/dao/NumberAssessmentEventDao.kt
@@ -11,17 +11,11 @@ interface NumberAssessmentEventDao {
     @Insert
     fun insert(numberAssessmentEvent: NumberAssessmentEvent)
 
-    @Query("SELECT * FROM NumberAssessmentEvent ORDER BY " +
-            "CASE WHEN :isAsc = 1 THEN time END ASC," +
-            "CASE WHEN :isAsc = 0 THEN time END DESC"
-    )
-    fun loadAllOrderedByTimestamp(isAsc: Boolean): List<NumberAssessmentEvent>
+    @Query("SELECT * FROM NumberAssessmentEvent ORDER BY time ASC")
+    fun loadAllOrderedByTimestampAsc(): List<NumberAssessmentEvent>
 
-    @Query("SELECT * FROM NumberAssessmentEvent ORDER BY " +
-            "CASE WHEN :isDesc = 1 THEN time END DESC," +
-            "CASE WHEN :isDesc = 0 THEN time END ASC"
-    )
-    fun loadAllOrderedByTimestampCursor(isDesc: Boolean): Cursor
+    @Query("SELECT * FROM NumberAssessmentEvent ORDER BY time DESC")
+    fun loadAllOrderedByTimestampDesc(): Cursor
 
     @Query("SELECT COUNT(*) FROM NumberAssessmentEvent")
     fun getCount(): Int
diff --git a/app/src/main/java/ai/elimu/analytics/dao/NumberLearningEventDao.kt b/app/src/main/java/ai/elimu/analytics/dao/NumberLearningEventDao.kt
@@ -11,14 +11,11 @@ interface NumberLearningEventDao {
     @Insert
     fun insert(numberLearningEvent: NumberLearningEvent)
 
-    @Query("SELECT * FROM NumberLearningEvent ORDER BY " +
-            "CASE WHEN :isDesc = 1 THEN timestamp END DESC," +
-            "CASE WHEN :isDesc = 0 THEN timestamp END ASC"
-    )
-    fun loadAllOrderedByTime(isDesc: Boolean = true): List<NumberLearningEvent>
+    @Query("SELECT * FROM NumberLearningEvent ORDER BY timestamp ASC")
+    fun loadAllOrderedByTimestampAsc(): List<NumberLearningEvent>
 
-    @Query("SELECT * FROM NumberLearningEvent ORDER BY timestamp")
-    fun loadAllOrderedByTime(): Cursor
+    @Query("SELECT * FROM NumberLearningEvent ORDER BY timestamp DESC")
+    fun loadAllOrderedByTimestampDesc(): Cursor
 
     @Query("SELECT COUNT(*) FROM NumberLearningEvent")
     fun getCount(): Int
diff --git a/app/src/main/java/ai/elimu/analytics/dao/StoryBookLearningEventDao.kt b/app/src/main/java/ai/elimu/analytics/dao/StoryBookLearningEventDao.kt
@@ -10,11 +10,8 @@ interface StoryBookLearningEventDao {
     @Insert
     fun insert(storyBookLearningEvent: StoryBookLearningEvent)
 
-    @Query("SELECT * FROM StoryBookLearningEvent ORDER BY " +
-            "CASE WHEN :isDesc = 1 THEN timestamp END DESC," +
-            "CASE WHEN :isDesc = 0 THEN timestamp END ASC"
-    )
-    fun loadAll(isDesc: Boolean = true): List<StoryBookLearningEvent>
+    @Query("SELECT * FROM StoryBookLearningEvent ORDER BY timestamp ASC")
+    fun loadAllOrderedByTimestampAsc(): List<StoryBookLearningEvent>
 
     @Query("SELECT COUNT(*) FROM StoryBookLearningEvent")
     fun getCount(): Int
diff --git a/app/src/main/java/ai/elimu/analytics/dao/VideoLearningEventDao.kt b/app/src/main/java/ai/elimu/analytics/dao/VideoLearningEventDao.kt
@@ -14,15 +14,11 @@ interface VideoLearningEventDao {
     @Insert(onConflict = OnConflictStrategy.REPLACE)
     fun insert(videoLearningEvent: VideoLearningEvent)
 
-    @Query(
-        "SELECT * FROM VideoLearningEvent ORDER BY " +
-                "CASE WHEN :isDesc = 1 THEN timestamp END DESC," +
-                "CASE WHEN :isDesc = 0 THEN timestamp END ASC"
-    )
-    fun loadAll(isDesc: Boolean = true): List<VideoLearningEvent>
+    @Query("SELECT * FROM VideoLearningEvent ORDER BY timestamp ASC")
+    fun loadAllOrderedByTimestampAsc(): List<VideoLearningEvent>
 
-    @Query("SELECT * FROM VideoLearningEvent ORDER BY timestamp")
-    fun loadAllToCursor(): Cursor
+    @Query("SELECT * FROM VideoLearningEvent ORDER BY timestamp DESC")
+    fun loadAllOrderedByTimestampDesc(): Cursor
 
     @Query("SELECT COUNT(*) FROM VideoLearningEvent")
     fun getCount(): Int
diff --git a/app/src/main/java/ai/elimu/analytics/dao/WordAssessmentEventDao.kt b/app/src/main/java/ai/elimu/analytics/dao/WordAssessmentEventDao.kt
@@ -12,13 +12,13 @@ interface WordAssessmentEventDao {
     fun insert(wordAssessmentEvent: WordAssessmentEvent)
 
     @Query("SELECT * FROM WordAssessmentEvent ORDER BY time ASC")
-    fun loadAllOrderedByTimeAsc(): List<WordAssessmentEvent>
+    fun loadAllOrderedByTimestampAsc(): List<WordAssessmentEvent>
 
     @Query("SELECT * FROM WordAssessmentEvent ORDER BY time DESC")
-    fun loadAllOrderedByTimeDesc(): Cursor
+    fun loadAllOrderedByTimestampDesc(): Cursor
 
     @Query("SELECT * FROM WordAssessmentEvent WHERE wordId = :wordId ORDER BY time DESC")
-    fun loadAllOrderedByTimeDesc(wordId: Long?): Cursor
+    fun loadAllOrderedByTimestampDesc(wordId: Long?): Cursor
 
     @Query("SELECT COUNT(*) FROM WordAssessmentEvent")
     fun getCount(): Int
diff --git a/app/src/main/java/ai/elimu/analytics/dao/WordLearningEventDao.kt b/app/src/main/java/ai/elimu/analytics/dao/WordLearningEventDao.kt
@@ -11,14 +11,11 @@ interface WordLearningEventDao {
     @Insert
     fun insert(wordLearningEvent: WordLearningEvent)
 
-    @Query("SELECT * FROM WordLearningEvent ORDER BY " +
-            "CASE WHEN :isDesc = 1 THEN timestamp END DESC," +
-            "CASE WHEN :isDesc = 0 THEN timestamp END ASC"
-    )
-    fun loadAllOrderedByTime(isDesc: Boolean = true): List<WordLearningEvent>
+    @Query("SELECT * FROM WordLearningEvent ORDER BY timestamp ASC")
+    fun loadAllOrderedByTimestampAsc(): List<WordLearningEvent>
 
-    @Query("SELECT * FROM WordLearningEvent ORDER BY timestamp")
-    fun loadAllOrderedByTime(): Cursor
+    @Query("SELECT * FROM WordLearningEvent ORDER BY timestamp DESC")
+    fun loadAllOrderedByTimestampDesc(): Cursor
 
     @Query("SELECT COUNT(*) FROM WordLearningEvent")
     fun getCount(): Int
diff --git a/app/src/main/java/ai/elimu/analytics/db/AnalyticEventDBExtension.kt b/app/src/main/java/ai/elimu/analytics/db/AnalyticEventDBExtension.kt
@@ -22,25 +22,25 @@ fun EventType.getAllEvents(context: Context): List<BaseEntity> {
     val roomDb = RoomDb.getDatabase(context)
     return when(this) {
         EventType.LETTER_SOUND_ASSESSMENT -> {
-            roomDb.letterSoundAssessmentEventDao().loadAll()
+            roomDb.letterSoundAssessmentEventDao().loadAllOrderedByTimestampAsc()
         }
         EventType.LETTER_SOUND_LEARNING -> {
-            roomDb.letterSoundLearningEventDao().loadAllOrderedByTime()
+            roomDb.letterSoundLearningEventDao().loadAllOrderedByTimestampAsc()
         }
         EventType.STORY_BOOK_LEARNING -> {
-            roomDb.storyBookLearningEventDao().loadAll(isDesc = false)
+            roomDb.storyBookLearningEventDao().loadAllOrderedByTimestampAsc()
         }
         EventType.WORD_ASSESSMENT -> {
-            roomDb.wordAssessmentEventDao().loadAllOrderedByTimeAsc()
+            roomDb.wordAssessmentEventDao().loadAllOrderedByTimestampAsc()
         }
         EventType.WORD_LEARNING -> {
-            roomDb.wordLearningEventDao().loadAllOrderedByTime(isDesc = false)
+            roomDb.wordLearningEventDao().loadAllOrderedByTimestampAsc()
         }
         EventType.VIDEO_LEARNING -> {
-            roomDb.videoLearningEventDao().loadAll(isDesc = false)
+            roomDb.videoLearningEventDao().loadAllOrderedByTimestampAsc()
         }
         EventType.NUMBER_LEARNING -> {
-            roomDb.numberLearningEventDao().loadAllOrderedByTime(isDesc = false)
+            roomDb.numberLearningEventDao().loadAllOrderedByTimestampAsc()
         }
     }
 }
@@ -70,7 +70,6 @@ fun BaseEntity.persistEvent(context: Context) {
             is NumberLearningEvent -> {
                 roomDb.numberLearningEventDao().insert(this)
             }
-            // TODO: number assessment
 
             is StoryBookLearningEvent -> {
                 roomDb.storyBookLearningEventDao().insert(this)
diff --git a/app/src/main/java/ai/elimu/analytics/enum/EventType.kt b/app/src/main/java/ai/elimu/analytics/enum/EventType.kt
@@ -34,7 +34,6 @@ enum class EventType(val type: String) {
     WORD_ASSESSMENT("word-assessment-events"),
     WORD_LEARNING("word-learning-events"),
 
-    // TODO: number assessment
     NUMBER_LEARNING("number-learning-events"),
 
     STORY_BOOK_LEARNING("storybook-learning-events"),
@@ -51,7 +50,6 @@ fun EventType.toServiceClass(): Class<out UploadService> {
         EventType.WORD_LEARNING -> WordLearningEventService::class.java
 
         EventType.NUMBER_LEARNING -> NumberLearningEventService::class.java
-        // TODO: number assessment
 
         EventType.STORY_BOOK_LEARNING -> StoryBookLearningEventService::class.java
 
@@ -83,7 +81,6 @@ fun EventType.getCSVHeaders(): Array<String> {
         EventType.WORD_LEARNING -> CSVHeaders.WORD_LEARNING
 
         EventType.NUMBER_LEARNING -> CSVHeaders.NUMBER_LEARNING
-        // TODO: number assessment
 
         EventType.STORY_BOOK_LEARNING -> CSVHeaders.STORYBOOK_LEARNING
 
diff --git a/app/src/main/java/ai/elimu/analytics/provider/LetterSoundAssessmentEventProvider.kt b/app/src/main/java/ai/elimu/analytics/provider/LetterSoundAssessmentEventProvider.kt
@@ -61,7 +61,7 @@ class LetterSoundAssessmentEventProvider : ContentProvider() {
                 // Get the Room Cursor
                 val roomDb = RoomDb.getDatabase(context)
                 val letterSoundAssessmentEventDao = roomDb.letterSoundAssessmentEventDao()
-                val cursor = letterSoundAssessmentEventDao.loadAllCursor()
+                val cursor = letterSoundAssessmentEventDao.loadAllOrderedByTimestampDesc()
                 Timber.i("cursor: ${cursor}")
                 cursor.setNotificationUri(context.contentResolver, uri)
                 cursor.extras = prepareBundle()
@@ -78,7 +78,7 @@ class LetterSoundAssessmentEventProvider : ContentProvider() {
                 // Get the Room Cursor
                 val roomDb = RoomDb.getDatabase(context)
                 val letterSoundAssessmentEventDao = roomDb.letterSoundAssessmentEventDao()
-                val cursor = letterSoundAssessmentEventDao.loadAllCursor(letterSoundId)
+                val cursor = letterSoundAssessmentEventDao.loadAllOrderedByTimestampDesc(letterSoundId)
                 Timber.i("cursor: ${cursor}")
                 cursor.setNotificationUri(context.contentResolver, uri)
                 cursor.extras = prepareBundle()
diff --git a/app/src/main/java/ai/elimu/analytics/provider/LetterSoundLearningEventProvider.kt b/app/src/main/java/ai/elimu/analytics/provider/LetterSoundLearningEventProvider.kt
@@ -47,7 +47,7 @@ class LetterSoundLearningEventProvider : ContentProvider() {
             // Get the Room Cursor
             val roomDb = RoomDb.getDatabase(context)
             val letterSoundLearningEventDao = roomDb.letterSoundLearningEventDao()
-            val cursor = letterSoundLearningEventDao.loadAllOrderedByTimeCursor()
+            val cursor = letterSoundLearningEventDao.loadAllOrderedByTimestampDesc()
             Timber.i("cursor: $cursor")
             cursor.setNotificationUri(context.contentResolver, uri)
             cursor.extras = prepareBundle()
diff --git a/app/src/main/java/ai/elimu/analytics/provider/NumberAssessmentEventProvider.kt b/app/src/main/java/ai/elimu/analytics/provider/NumberAssessmentEventProvider.kt
@@ -52,7 +52,7 @@ class NumberAssessmentEventProvider : ContentProvider() {
             // Get the Room Cursor
             val roomDb = RoomDb.getDatabase(context)
             val numberAssessmentEventDao = roomDb.numberAssessmentEventDao()
-            val cursor = numberAssessmentEventDao.loadAllOrderedByTimestampCursor(isDesc = true)
+            val cursor = numberAssessmentEventDao.loadAllOrderedByTimestampDesc()
             Timber.i("cursor: $cursor")
             cursor.setNotificationUri(context.contentResolver, uri)
             cursor.extras = prepareBundle()
diff --git a/app/src/main/java/ai/elimu/analytics/provider/NumberLearningEventProvider.kt b/app/src/main/java/ai/elimu/analytics/provider/NumberLearningEventProvider.kt
@@ -46,7 +46,7 @@ class NumberLearningEventProvider : ContentProvider() {
             // Get the Room Cursor
             val roomDb = RoomDb.getDatabase(context)
             val numberLearningEventDao = roomDb.numberLearningEventDao()
-            val cursor = numberLearningEventDao.loadAllOrderedByTime()
+            val cursor = numberLearningEventDao.loadAllOrderedByTimestampDesc()
             Timber.i("cursor: $cursor")
             cursor.setNotificationUri(context.contentResolver, uri)
             cursor.extras = prepareBundle()
diff --git a/app/src/main/java/ai/elimu/analytics/provider/VideoLearningEventProvider.kt b/app/src/main/java/ai/elimu/analytics/provider/VideoLearningEventProvider.kt
@@ -46,7 +46,7 @@ class VideoLearningEventProvider : ContentProvider() {
             // Get the Room Cursor
             val roomDb = RoomDb.getDatabase(context)
             val videoLearningEventDao = roomDb.videoLearningEventDao()
-            val cursor = videoLearningEventDao.loadAllToCursor()
+            val cursor = videoLearningEventDao.loadAllOrderedByTimestampDesc()
             Timber.i("cursor: $cursor")
             cursor.setNotificationUri(context.contentResolver, uri)
             cursor.extras = prepareBundle()
diff --git a/app/src/main/java/ai/elimu/analytics/provider/WordAssessmentEventProvider.kt b/app/src/main/java/ai/elimu/analytics/provider/WordAssessmentEventProvider.kt
@@ -47,7 +47,7 @@ class WordAssessmentEventProvider : ContentProvider() {
                 // Get the Room Cursor
                 val roomDb = RoomDb.getDatabase(context)
                 val wordAssessmentEventDao = roomDb.wordAssessmentEventDao()
-                val cursor = wordAssessmentEventDao.loadAllOrderedByTimeDesc()
+                val cursor = wordAssessmentEventDao.loadAllOrderedByTimestampDesc()
                 Timber.i("cursor: $cursor")
                 cursor.setNotificationUri(context.contentResolver, uri)
                 cursor.extras = prepareBundle()
@@ -64,7 +64,7 @@ class WordAssessmentEventProvider : ContentProvider() {
                 // Get the Room Cursor
                 val roomDb = RoomDb.getDatabase(context)
                 val wordAssessmentEventDao = roomDb.wordAssessmentEventDao()
-                val cursor = wordAssessmentEventDao.loadAllOrderedByTimeDesc(wordId)
+                val cursor = wordAssessmentEventDao.loadAllOrderedByTimestampDesc(wordId)
                 Timber.i("cursor: $cursor")
                 cursor.setNotificationUri(context.contentResolver, uri)
                 cursor.extras = prepareBundle()
diff --git a/app/src/main/java/ai/elimu/analytics/provider/WordLearningEventProvider.kt b/app/src/main/java/ai/elimu/analytics/provider/WordLearningEventProvider.kt
@@ -46,7 +46,7 @@ class WordLearningEventProvider : ContentProvider() {
             // Get the Room Cursor
             val roomDb = RoomDb.getDatabase(context)
             val wordLearningEventDao = roomDb.wordLearningEventDao()
-            val cursor = wordLearningEventDao.loadAllOrderedByTime()
+            val cursor = wordLearningEventDao.loadAllOrderedByTimestampDesc()
             Timber.i("cursor: $cursor")
             cursor.setNotificationUri(context.contentResolver, uri)
             cursor.extras = prepareBundle()
diff --git a/app/src/main/java/ai/elimu/analytics/task/CSVHeaders.kt b/app/src/main/java/ai/elimu/analytics/task/CSVHeaders.kt
@@ -65,8 +65,6 @@ object CSVHeaders {
         BundleKeys.KEY_NUMBER_ID
     ) }
 
-    // TODO: number assessment
-
 
     val STORYBOOK_LEARNING by lazy { arrayOf(
         BundleKeys.KEY_ID,
diff --git a/app/src/main/java/ai/elimu/analytics/task/EventExtForCSV.kt b/app/src/main/java/ai/elimu/analytics/task/EventExtForCSV.kt
@@ -81,8 +81,6 @@ fun NumberLearningEvent.getCSVFields(): List<Any?> {
     )
 }
 
-// TODO: number assessment
-
 fun StoryBookLearningEvent.getCSVFields(): List<Any?> {
     return listOf(
         this.id,
@@ -118,7 +116,6 @@ fun BaseEntity.getCSVFields(eventType: EventType): List<Any?> {
         EventType.WORD_LEARNING -> (this as WordLearningEvent).getCSVFields()
 
         EventType.NUMBER_LEARNING -> (this as NumberLearningEvent).getCSVFields()
-        // TODO: number assessment
 
         EventType.STORY_BOOK_LEARNING -> (this as StoryBookLearningEvent).getCSVFields()
 
diff --git a/app/src/main/java/ai/elimu/analytics/task/ExportEventsToCsvWorker.kt b/app/src/main/java/ai/elimu/analytics/task/ExportEventsToCsvWorker.kt
@@ -100,7 +100,7 @@ class ExportEventsToCsvWorker(context: Context, workerParams: WorkerParameters)
         // Read all the events from the database
         val roomDb = RoomDb.getDatabase(applicationContext)
         val numberAssessmentEventDao = roomDb.numberAssessmentEventDao()
-        val events = numberAssessmentEventDao.loadAllOrderedByTimestamp(isAsc = true)
+        val events = numberAssessmentEventDao.loadAllOrderedByTimestampAsc()
         Timber.i("events.size: ${events.size}")
 
         // Generate one CSV file per day of events, e.g:
diff --git a/app/src/main/java/ai/elimu/analytics/util/IntentActionExtensions.kt b/app/src/main/java/ai/elimu/analytics/util/IntentActionExtensions.kt
@@ -12,7 +12,6 @@ fun IntentAction.toEventType(): EventType {
         IntentAction.WORD_LEARNING -> EventType.WORD_LEARNING
 
         IntentAction.NUMBER_LEARNING -> EventType.NUMBER_LEARNING
-        // TODO: number assessment
 
         IntentAction.STORYBOOK_LEARNING -> EventType.STORY_BOOK_LEARNING
 
diff --git a/utils/src/main/java/ai/elimu/analytics/utils/EventProviderUtil.kt b/utils/src/main/java/ai/elimu/analytics/utils/EventProviderUtil.kt
diff --git a/utils/src/main/java/ai/elimu/analytics/utils/IntentAction.kt b/utils/src/main/java/ai/elimu/analytics/utils/IntentAction.kt

Original file line number	Diff line number	Diff line change
`@@ -22,25 +22,25 @@ fun EventType.getAllEvents(context: Context): List<BaseEntity> {`
`22`	`22`	`val roomDb = RoomDb.getDatabase(context)`
`23`	`23`	`return when(this) {`
`24`	`24`	`EventType.LETTER_SOUND_ASSESSMENT -> {`
`25`		`- roomDb.letterSoundAssessmentEventDao().loadAll()`
	`25`	`+ roomDb.letterSoundAssessmentEventDao().loadAllOrderedByTimestampAsc()`
`26`	`26`	`}`
`27`	`27`	`EventType.LETTER_SOUND_LEARNING -> {`
`28`		`- roomDb.letterSoundLearningEventDao().loadAllOrderedByTime()`
	`28`	`+ roomDb.letterSoundLearningEventDao().loadAllOrderedByTimestampAsc()`
`29`	`29`	`}`
`30`	`30`	`EventType.STORY_BOOK_LEARNING -> {`
`31`		`- roomDb.storyBookLearningEventDao().loadAll(isDesc = false)`
	`31`	`+ roomDb.storyBookLearningEventDao().loadAllOrderedByTimestampAsc()`
`32`	`32`	`}`
`33`	`33`	`EventType.WORD_ASSESSMENT -> {`
`34`		`- roomDb.wordAssessmentEventDao().loadAllOrderedByTimeAsc()`
	`34`	`+ roomDb.wordAssessmentEventDao().loadAllOrderedByTimestampAsc()`
`35`	`35`	`}`
`36`	`36`	`EventType.WORD_LEARNING -> {`
`37`		`- roomDb.wordLearningEventDao().loadAllOrderedByTime(isDesc = false)`
	`37`	`+ roomDb.wordLearningEventDao().loadAllOrderedByTimestampAsc()`
`38`	`38`	`}`
`39`	`39`	`EventType.VIDEO_LEARNING -> {`
`40`		`- roomDb.videoLearningEventDao().loadAll(isDesc = false)`
	`40`	`+ roomDb.videoLearningEventDao().loadAllOrderedByTimestampAsc()`
`41`	`41`	`}`
`42`	`42`	`EventType.NUMBER_LEARNING -> {`
`43`		`- roomDb.numberLearningEventDao().loadAllOrderedByTime(isDesc = false)`
	`43`	`+ roomDb.numberLearningEventDao().loadAllOrderedByTimestampAsc()`
`44`	`44`	`}`
`45`	`45`	`}`
`46`	`46`	`}`
`@@ -70,7 +70,6 @@ fun BaseEntity.persistEvent(context: Context) {`
`70`	`70`	`is NumberLearningEvent -> {`
`71`	`71`	`roomDb.numberLearningEventDao().insert(this)`
`72`	`72`	`}`
`73`		`- // TODO: number assessment`
`74`	`73`
`75`	`74`	`is StoryBookLearningEvent -> {`
`76`	`75`	`roomDb.storyBookLearningEventDao().insert(this)`