Merge pull request #422 from elimu-ai/421-provide-lettersounds-by-word-id

jo-elimu · web-flow · commit 0795da2de857 · 2025-10-07T17:43:55.000+07:00
chore: provide letter-sounds by word id
diff --git a/app/schemas/ai.elimu.content_provider.room.db.RoomDb/31.json b/app/schemas/ai.elimu.content_provider.room.db.RoomDb/31.json
diff --git a/app/src/main/java/ai/elimu/content_provider/provider/LetterSoundContentProvider.kt b/app/src/main/java/ai/elimu/content_provider/provider/LetterSoundContentProvider.kt
@@ -55,6 +55,24 @@ class LetterSoundContentProvider : ContentProvider() {
 
                 return cursor
             }
+            CODE_LETTER_SOUNDS_BY_WORD_ID -> {
+                // Extract the Word ID from the URI
+                val pathSegments = uri.pathSegments
+                Log.i(this::class.simpleName, "pathSegments: ${pathSegments}")
+                val wordIdAsString = pathSegments[2]
+                val wordId = wordIdAsString.toLong()
+                Log.i(this::class.simpleName, "wordId: ${wordId}")
+
+                // Get the Room Cursor
+                val cursor = letterSoundDao.loadAllByWord(wordId)
+                Log.i(this::class.simpleName, "cursor: ${cursor}")
+
+                cursor.setNotificationUri(context.contentResolver, uri)
+
+                cursor.extras = prepareBundle()
+
+                return cursor
+            }
             CODE_LETTER_SOUND_ID -> {
                 // Extract the LetterSound ID from the URI
                 val pathSegments = uri.pathSegments
@@ -128,11 +146,13 @@ class LetterSoundContentProvider : ContentProvider() {
         private const val TABLE_LETTER_SOUNDS = "letter_sounds"
         private const val CODE_LETTER_SOUNDS = 1
         private const val CODE_LETTER_SOUND_ID = 2
+        private const val CODE_LETTER_SOUNDS_BY_WORD_ID = 3
         private val MATCHER = UriMatcher(UriMatcher.NO_MATCH)
 
         init {
             MATCHER.addURI(AUTHORITY, TABLE_LETTER_SOUNDS, CODE_LETTER_SOUNDS)
             MATCHER.addURI(AUTHORITY, "$TABLE_LETTER_SOUNDS/#", CODE_LETTER_SOUND_ID)
+            MATCHER.addURI(AUTHORITY, "$TABLE_LETTER_SOUNDS/by-word-id/#", CODE_LETTER_SOUNDS_BY_WORD_ID)
         }
     }
 }
diff --git a/app/src/main/java/ai/elimu/content_provider/room/dao/LetterSoundDao.kt b/app/src/main/java/ai/elimu/content_provider/room/dao/LetterSoundDao.kt
@@ -20,6 +20,12 @@ interface LetterSoundDao {
     @Query("SELECT * FROM LetterSound ORDER BY usageCount DESC")
     fun loadAllCursor(): Cursor
 
+    @Query("SELECT * FROM LetterSound ls " +
+            "INNER JOIN Word_LetterSound wls ON ls.id = wls.letterSounds_id " +
+            "WHERE wls.Word_id = :wordId " +
+            "ORDER BY wls.letterSounds_ORDER")
+    fun loadAllByWord(wordId: Long): Cursor
+
     @Query("DELETE FROM LetterSound")
     fun deleteAll()
 }
diff --git a/app/src/main/java/ai/elimu/content_provider/room/dao/Word_LetterSoundDao.kt b/app/src/main/java/ai/elimu/content_provider/room/dao/Word_LetterSoundDao.kt
@@ -0,0 +1,15 @@
+package ai.elimu.content_provider.room.dao
+
+import ai.elimu.content_provider.room.entity.Word_LetterSound
+import androidx.room.Dao
+import androidx.room.Insert
+import androidx.room.Query
+
+@Dao
+interface Word_LetterSoundDao {
+    @Insert
+    fun insert(word_letterSound: Word_LetterSound)
+
+    @Query("DELETE FROM Word_LetterSound")
+    fun deleteAll()
+}
diff --git a/app/src/main/java/ai/elimu/content_provider/room/db/RoomDb.java b/app/src/main/java/ai/elimu/content_provider/room/db/RoomDb.java
@@ -26,6 +26,7 @@
 import ai.elimu.content_provider.room.dao.StoryBookParagraphWordDao;
 import ai.elimu.content_provider.room.dao.VideoDao;
 import ai.elimu.content_provider.room.dao.WordDao;
+import ai.elimu.content_provider.room.dao.Word_LetterSoundDao;
 import ai.elimu.content_provider.room.entity.LetterSound;
 import ai.elimu.content_provider.room.entity.LetterSound_Letter;
 import ai.elimu.content_provider.room.entity.LetterSound_Sound;
@@ -42,8 +43,9 @@
 import ai.elimu.content_provider.room.entity.StoryBookParagraph_Word;
 import ai.elimu.content_provider.room.entity.Video;
 import ai.elimu.content_provider.room.entity.Word;
+import ai.elimu.content_provider.room.entity.Word_LetterSound;
 
-@Database(version = 30, entities = {Letter.class, Sound.class, LetterSound.class, LetterSound_Letter.class, LetterSound_Sound.class, Word.class, Number.class, Emoji.class, Emoji_Word.class, Image.class, Image_Word.class, StoryBook.class, StoryBookChapter.class, StoryBookParagraph.class, StoryBookParagraph_Word.class, Video.class})
+@Database(version = 31, entities = {Letter.class, Sound.class, LetterSound.class, LetterSound_Letter.class, LetterSound_Sound.class, Word.class, Word_LetterSound.class, Number.class, Emoji.class, Emoji_Word.class, Image.class, Image_Word.class, StoryBook.class, StoryBookChapter.class, StoryBookParagraph.class, StoryBookParagraph_Word.class, Video.class})
 @TypeConverters({Converters.class})
 public abstract class RoomDb extends RoomDatabase {
 
@@ -52,29 +54,23 @@ public abstract class RoomDb extends RoomDatabase {
     public abstract SoundDao soundDao();
 
     public abstract LetterSoundDao letterSoundDao();
-
     public abstract LetterSoundLetterDao letterSound_LetterDao();
-
     public abstract LetterSoundSoundDao letterSound_SoundDao();
 
     public abstract WordDao wordDao();
+    public abstract Word_LetterSoundDao word_letterSoundDao();
 
     public abstract NumberDao numberDao();
 
     public abstract EmojiDao emojiDao();
-
     public abstract EmojiWordDao emojiWordDao();
 
     public abstract ImageDao imageDao();
-
     public abstract ImageWordDao image_WordDao();
 
     public abstract StoryBookDao storyBookDao();
-
     public abstract StoryBookChapterDao storyBookChapterDao();
-
     public abstract StoryBookParagraphDao storyBookParagraphDao();
-
     public abstract StoryBookParagraphWordDao storyBookParagraph_WordDao();
 
     public abstract VideoDao videoDao();
@@ -115,7 +111,8 @@ public static RoomDb getDatabase(final Context context) {
                                     MIGRATION_26_27,
                                     MIGRATION_27_28,
                                     MIGRATION_28_29,
-                                    MIGRATION_29_30
+                                    MIGRATION_29_30,
+                                    MIGRATION_30_31
                             )
                             .build();
                 }
@@ -409,4 +406,15 @@ public void migrate(SupportSQLiteDatabase database) {
             database.execSQL(sql);
         }
     };
+
+    private static final Migration MIGRATION_30_31 = new Migration(30, 31) {
+        @Override
+        public void migrate(SupportSQLiteDatabase database) {
+            Log.i(getClass().getSimpleName(), "migrate (30 --> 31)");
+
+            String sql = "CREATE TABLE IF NOT EXISTS `Word_LetterSound` (`Word_id` INTEGER NOT NULL, `letterSounds_id` INTEGER NOT NULL, `letterSounds_ORDER` INTEGER NOT NULL, PRIMARY KEY(`Word_id`, `letterSounds_ORDER`))";
+            Log.i(getClass().getSimpleName(), "migrate sql: ${sql}");
+            database.execSQL(sql);
+        }
+    };
 }
diff --git a/app/src/main/java/ai/elimu/content_provider/room/entity/Word.kt b/app/src/main/java/ai/elimu/content_provider/room/entity/Word.kt
@@ -8,6 +8,7 @@ import androidx.room.Entity
  */
 @Entity
 class Word : Content() {
+    @Deprecated("Replaced by LetterSounds")
     @JvmField
     var text: String = ""
 
diff --git a/app/src/main/java/ai/elimu/content_provider/room/entity/Word_LetterSound.kt b/app/src/main/java/ai/elimu/content_provider/room/entity/Word_LetterSound.kt
@@ -0,0 +1,15 @@
+package ai.elimu.content_provider.room.entity
+
+import androidx.room.Entity
+
+/**
+ * For documentation, see [model](https://github.com/elimu-ai/webapp/tree/main/src/main/java/ai/elimu/entity)
+ */
+@Entity(primaryKeys = ["Word_id", "letterSounds_ORDER"])
+class Word_LetterSound {
+    var Word_id: Long = 0L
+
+    var letterSounds_id: Long = 0L
+
+    var letterSounds_ORDER: Int = 0
+}
diff --git a/app/src/main/java/ai/elimu/content_provider/ui/word/WordsFragment.kt b/app/src/main/java/ai/elimu/content_provider/ui/word/WordsFragment.kt
@@ -6,6 +6,8 @@ import ai.elimu.content_provider.databinding.FragmentWordsBinding
 import ai.elimu.content_provider.rest.WordsService
 import ai.elimu.content_provider.room.GsonToRoomConverter.getWord
 import ai.elimu.content_provider.room.db.RoomDb
+import ai.elimu.content_provider.room.entity.Word_LetterSound
+import ai.elimu.model.v2.gson.content.LetterSoundGson
 import ai.elimu.model.v2.gson.content.WordGson
 import android.os.Bundle
 import android.util.Log
@@ -113,8 +115,10 @@ class WordsFragment : Fragment() {
 
                 val roomDb = RoomDb.getDatabase(context)
                 val wordDao = roomDb.wordDao()
+                val word_LetterSoundDao = roomDb.word_letterSoundDao()
 
                 // Empty the database table before downloading up-to-date content
+                word_LetterSoundDao.deleteAll()
                 wordDao.deleteAll()
 
                 for (wordGson in wordGsons) {
@@ -125,6 +129,19 @@ class WordsFragment : Fragment() {
                         wordDao.insert(word)
                         Log.i(javaClass.name, "Stored Word in database with ID " + word.id)
                     }
+
+                    // Store all the Word's letter-sounds in the database
+                    val letterSoundGsons: List<LetterSoundGson> = wordGson.letterSounds
+                    Log.i(this::class.simpleName, "letterSoundGsons.size: ${letterSoundGsons.size}")
+                    for ((index, letterSoundGson) in letterSoundGsons.withIndex()) {
+                        Log.i(this::class.simpleName, "letterSoundGson.id: ${letterSoundGson.id}")
+                        val word_LetterSound = Word_LetterSound()
+                        word_LetterSound.Word_id = wordGson.id
+                        word_LetterSound.letterSounds_id = letterSoundGson.id
+                        word_LetterSound.letterSounds_ORDER = index
+                        word_LetterSoundDao.insert(word_LetterSound)
+                        Log.i(this::class.simpleName, "Stored Word_LetterSound in database. word_LetterSound.Word_id: ${word_LetterSound.Word_id}, word_LetterSound.letterSounds_id: ${word_LetterSound.letterSounds_id}")
+                    }
                 }
 
                 // Update the UI
diff --git a/utils/src/main/java/ai/elimu/content_provider/utils/ContentProviderUtil.kt b/utils/src/main/java/ai/elimu/content_provider/utils/ContentProviderUtil.kt
@@ -202,7 +202,7 @@ object ContentProviderUtil {
                     wordsCursor.moveToNext()
 
                     // Convert from Room to Gson
-                    val wordGson = CursorToWordGsonConverter.getWordGson(wordsCursor)
+                    val wordGson = CursorToWordGsonConverter.getWordGson(wordsCursor, context, contentProviderApplicationId)
 
                     wordGsons.add(wordGson)
 
@@ -249,7 +249,7 @@ object ContentProviderUtil {
                 wordCursor.moveToFirst()
 
                 // Convert from Room to Gson
-                wordGson = CursorToWordGsonConverter.getWordGson(wordCursor)
+                wordGson = CursorToWordGsonConverter.getWordGson(wordCursor, context, contentProviderApplicationId)
 
                 wordCursor.close()
                 Log.i(
diff --git a/utils/src/main/java/ai/elimu/content_provider/utils/converter/CursorToStoryBookParagraphGsonConverter.kt b/utils/src/main/java/ai/elimu/content_provider/utils/converter/CursorToStoryBookParagraphGsonConverter.kt
@@ -57,7 +57,7 @@ object CursorToStoryBookParagraphGsonConverter {
                     wordsCursor.moveToNext()
 
                     // Convert from Room to Gson
-                    val wordGson = CursorToWordGsonConverter.getWordGson(wordsCursor)
+                    val wordGson = CursorToWordGsonConverter.getWordGson(wordsCursor, context, contentProviderApplicationId)
                     wordGsons.add(wordGson)
 
                     isLast = wordsCursor.isLast
diff --git a/utils/src/main/java/ai/elimu/content_provider/utils/converter/CursorToWordGsonConverter.kt b/utils/src/main/java/ai/elimu/content_provider/utils/converter/CursorToWordGsonConverter.kt
@@ -1,16 +1,20 @@
 package ai.elimu.content_provider.utils.converter
 
 import ai.elimu.model.v2.enums.content.WordType
+import ai.elimu.model.v2.gson.content.LetterSoundGson
 import ai.elimu.model.v2.gson.content.WordGson
+import android.content.Context
 import android.database.Cursor
 import android.text.TextUtils
 import android.util.Log
+import android.widget.Toast
+import androidx.core.net.toUri
 
 object CursorToWordGsonConverter {
     
     private const val TAG = "CursorToWordGsonConverter"
     
-    fun getWordGson(cursor: Cursor): WordGson {
+    fun getWordGson(cursor: Cursor, context: Context, contentProviderApplicationId: String): WordGson {
         Log.i(TAG, "getWordGson")
 
         Log.i(TAG,
@@ -32,6 +36,28 @@ object CursorToWordGsonConverter {
         val text = cursor.getString(columnText)
         Log.i(TAG, "text: \"$text\"")
 
+        val letterSoundGsons = mutableListOf<LetterSoundGson>()
+        val letterSoundsUri = "content://${contentProviderApplicationId}.provider.letter_sound_provider/letter_sounds/by-word-id/${id}".toUri()
+        Log.i(this::class.simpleName, "letterSoundsUri: ${letterSoundsUri}")
+        val letterSoundsCursor = context.contentResolver.query(letterSoundsUri, null, null, null, null)
+        if (letterSoundsCursor == null) {
+            Log.e(this::class.simpleName, "letterSoundsCursor == null")
+            Toast.makeText(context, "letterSoundsCursor == null", Toast.LENGTH_LONG).show()
+        } else {
+            Log.i(this::class.simpleName, "letterSoundsCursor.count: ${letterSoundsCursor.count}")
+
+            var isLast = false
+            while (!isLast) {
+                letterSoundsCursor.moveToNext()
+
+                // Convert from Room to Gson
+                val letterSoundGson = CursorToLetterSoundGsonConverter.getLetterSoundGson(letterSoundsCursor, context, contentProviderApplicationId)
+                letterSoundGsons.add(letterSoundGson)
+
+                isLast = letterSoundsCursor.isLast
+            }
+        }
+
         val columnWordType = cursor.getColumnIndex("wordType")
         val wordTypeAsString = cursor.getString(columnWordType)
         var wordType: WordType? = null
@@ -45,6 +71,7 @@ object CursorToWordGsonConverter {
         word.revisionNumber = revisionNumber
         word.usageCount = usageCount
         word.text = text
+        word.letterSounds = letterSoundGsons
         word.wordType = wordType
 
         return word
