Merge pull request #349 from elimu-ai/239-query-letters-by-sort-order-in-loadallbylettersound

query letters & sounds by sort order in loadallbylettersound

Author: jo-elimu

README.md

@@ -48,7 +48,7 @@ See https://jitpack.io/#ai.elimu/content-provider/ for the latest version availa
 
 1. Publish the library to your local Maven repository:
     ```sh
-    ./gradlew clean utils:publishReleasePublicationToMavenLocal
+    ./gradlew clean build utils:publishAarPublicationToMavenLocal
     ```
 2. In the app that will be testing the `-SNAPSHOT` version of the library, add `mavenLocal()`:
     ```diff

app/src/main/java/ai/elimu/content_provider/room/dao/LetterDao.kt

@@ -24,7 +24,10 @@ interface LetterDao {
     @Query("SELECT * FROM Letter ORDER BY usageCount DESC")
     fun loadAllOrderedByUsageCountCursor(): Cursor
 
-    @Query("SELECT * FROM Letter l WHERE l.id IN (SELECT letters_id FROM LetterSound_Letter WHERE LetterSound_id = :letterSoundId)")
+    @Query("SELECT * FROM Letter l " +
+            "INNER JOIN LetterSound_Letter lsl ON l.id = lsl.letters_id " +
+            "WHERE lsl.LetterSound_id = :letterSoundId " +
+            "ORDER BY lsl.letters_ORDER")
     fun loadAllByLetterSound(letterSoundId: Long?): Cursor
 
     @Update

app/src/main/java/ai/elimu/content_provider/room/dao/SoundDao.kt

@@ -24,7 +24,10 @@ interface SoundDao {
     @Query("SELECT * FROM Sound ORDER BY usageCount DESC")
     fun loadAllOrderedByUsageCountCursor(): Cursor
 
-    @Query("SELECT * FROM Sound s WHERE s.id IN (SELECT sounds_id FROM LetterSound_Sound WHERE LetterSound_id = :letterSoundId)")
+    @Query("SELECT * FROM Sound s " +
+            "INNER JOIN LetterSound_Sound lss ON s.id = lss.sounds_id " +
+            "WHERE lss.LetterSound_id = :letterSoundId " +
+            "ORDER BY lss.sounds_ORDER")
     fun loadAllByLetterSound(letterSoundId: Long?): Cursor
 
     @Update