Merge pull request #74 from kirill-markin/codex/local-numeric-due-at

[codex] Migrate local due scheduling to numeric keys

Author: kirill-markin

apps/android/data/local/src/androidTest/java/com/flashcardsopensourceapp/data/local/AppDatabaseMigrationTest.kt

@@ -8,8 +8,10 @@ import androidx.sqlite.db.SupportSQLiteOpenHelper
 import androidx.sqlite.db.framework.FrameworkSQLiteOpenHelperFactory
 import androidx.test.core.app.ApplicationProvider
 import androidx.test.ext.junit.runners.AndroidJUnit4
+import com.flashcardsopensourceapp.data.local.database.cardsReviewQueueIndexName
 import com.flashcardsopensourceapp.data.local.database.migration10To11
 import com.flashcardsopensourceapp.data.local.database.migration12To13
+import com.flashcardsopensourceapp.data.local.database.migration13To14
 import com.flashcardsopensourceapp.data.local.database.migration5To6
 import com.flashcardsopensourceapp.data.local.database.migration9To10
 import org.junit.After
@@ -274,6 +276,27 @@ class AppDatabaseMigrationTest {
         }
     }
 
+    @Test
+    fun migration13To14AddsCardsReviewQueueIndex() {
+        val context = ApplicationProvider.getApplicationContext<Context>()
+        createVersion13Database(context = context)
+
+        val openHelper = openDatabaseAtVersion(
+            context = context,
+            name = targetedMigrationDatabaseName,
+            version = 13
+        )
+        val database = openHelper.writableDatabase
+
+        try {
+            migration13To14.migrate(database)
+            assertCardsReviewQueueIndexExists(database = database)
+        } finally {
+            database.close()
+            openHelper.close()
+        }
+    }
+
     private fun createVersion5Database(context: Context) {
         val databaseFile = context.getDatabasePath(targetedMigrationDatabaseName)
         if (databaseFile.exists()) {
@@ -634,6 +657,47 @@ class AppDatabaseMigrationTest {
         sqliteDatabase.close()
     }
 
+    private fun createVersion13Database(context: Context) {
+        val databaseFile = context.getDatabasePath(targetedMigrationDatabaseName)
+        if (databaseFile.exists()) {
+            databaseFile.delete()
+        }
+        databaseFile.parentFile?.mkdirs()
+
+        val sqliteDatabase = SQLiteDatabase.openOrCreateDatabase(databaseFile, null)
+        sqliteDatabase.execSQL(
+            "CREATE TABLE workspaces (workspaceId TEXT NOT NULL PRIMARY KEY, name TEXT NOT NULL, createdAtMillis INTEGER NOT NULL)"
+        )
+        sqliteDatabase.execSQL(
+            """
+            CREATE TABLE cards (
+                cardId TEXT NOT NULL PRIMARY KEY,
+                workspaceId TEXT NOT NULL,
+                frontText TEXT NOT NULL,
+                backText TEXT NOT NULL,
+                effortLevel TEXT NOT NULL,
+                dueAtMillis INTEGER,
+                createdAtMillis INTEGER NOT NULL,
+                updatedAtMillis INTEGER NOT NULL,
+                reps INTEGER NOT NULL,
+                lapses INTEGER NOT NULL,
+                fsrsCardState TEXT NOT NULL,
+                fsrsStepIndex INTEGER,
+                fsrsStability REAL,
+                fsrsDifficulty REAL,
+                fsrsLastReviewedAtMillis INTEGER,
+                fsrsScheduledDays INTEGER,
+                deletedAtMillis INTEGER,
+                FOREIGN KEY(workspaceId) REFERENCES workspaces(workspaceId) ON DELETE CASCADE
+            )
+            """.trimIndent()
+        )
+        sqliteDatabase.execSQL("CREATE INDEX index_cards_workspaceId ON cards(workspaceId)")
+
+        sqliteDatabase.version = 13
+        sqliteDatabase.close()
+    }
+
     private fun openDatabaseAtVersion(
         context: Context,
         name: String,
@@ -745,4 +809,24 @@ class AppDatabaseMigrationTest {
 
         assertTrue(hasReviewedAtIndex)
     }
+
+    private fun assertCardsReviewQueueIndexExists(database: SupportSQLiteDatabase) {
+        assertEquals(
+            listOf("workspaceId", "dueAtMillis", "createdAtMillis", "cardId"),
+            readIndexColumns(database = database, indexName = cardsReviewQueueIndexName)
+        )
+    }
+
+    private fun readIndexColumns(database: SupportSQLiteDatabase, indexName: String): List<String> {
+        return database.query(SimpleSQLiteQuery("PRAGMA index_info('$indexName')")).use { cursor ->
+            val nameColumnIndex = cursor.getColumnIndexOrThrow("name")
+            val columns = mutableListOf<String>()
+
+            while (cursor.moveToNext()) {
+                columns.add(cursor.getString(nameColumnIndex))
+            }
+
+            columns.toList()
+        }
+    }
 }

apps/android/data/local/src/main/java/com/flashcardsopensourceapp/data/local/database/AppDatabase.kt

@@ -29,7 +29,7 @@ private const val androidInstallationId: String = "android-installation"
         ProgressReviewHistoryStateEntity::class,
         ProgressLocalCacheStateEntity::class
     ],
-    version = 13,
+    version = 14,
     exportSchema = false
 )
 @TypeConverters(DatabaseTypeConverters::class)
@@ -71,7 +71,8 @@ fun createAppDatabaseMigrations(): Array<Migration> {
         migration9To10,
         migration10To11,
         migration11To12,
-        migration12To13
+        migration12To13,
+        migration13To14
     )
 }
 
@@ -675,3 +676,14 @@ val migration12To13: Migration = object : Migration(12, 13) {
         db.execSQL("ALTER TABLE sync_state ADD COLUMN pendingReviewHistoryImport INTEGER NOT NULL DEFAULT 0")
     }
 }
+
+val migration13To14: Migration = object : Migration(13, 14) {
+    override fun migrate(db: SupportSQLiteDatabase) {
+        db.execSQL(
+            """
+            CREATE INDEX IF NOT EXISTS $cardsReviewQueueIndexName
+            ON cards(workspaceId, dueAtMillis, createdAtMillis, cardId)
+            """.trimIndent()
+        )
+    }
+}

apps/android/data/local/src/main/java/com/flashcardsopensourceapp/data/local/database/DatabaseEntities.kt

@@ -11,6 +11,8 @@ import com.flashcardsopensourceapp.data.local.model.EffortLevel
 import com.flashcardsopensourceapp.data.local.model.FsrsCardState
 import com.flashcardsopensourceapp.data.local.model.ReviewRating
 
+internal const val cardsReviewQueueIndexName: String = "index_cards_workspaceId_dueAtMillis_createdAtMillis_cardId"
+
 @Entity(tableName = "workspaces")
 data class WorkspaceEntity(
     @PrimaryKey val workspaceId: String,
@@ -62,7 +64,13 @@ data class DeckEntity(
             onDelete = ForeignKey.CASCADE
         )
     ],
-    indices = [Index("workspaceId")]
+    indices = [
+        Index("workspaceId"),
+        Index(
+            value = ["workspaceId", "dueAtMillis", "createdAtMillis", "cardId"],
+            name = cardsReviewQueueIndexName
+        )
+    ]
 )
 data class CardEntity(
     @PrimaryKey val cardId: String,

apps/android/data/local/src/main/java/com/flashcardsopensourceapp/data/local/model/CloudSupport.kt

@@ -8,6 +8,9 @@ import java.util.Locale
 
 private const val flashcardsOfficialApiBaseUrl: String = "https://api.flashcards-open-source-app.com/v1"
 private const val flashcardsOfficialAuthBaseUrl: String = "https://auth.flashcards-open-source-app.com"
+private val canonicalIsoTimestampFormatter: DateTimeFormatter = DateTimeFormatter
+    .ofPattern("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'", Locale.US)
+    .withZone(ZoneOffset.UTC)
 
 fun makeOfficialCloudServiceConfiguration(): CloudServiceConfiguration {
     return CloudServiceConfiguration(
@@ -88,7 +91,5 @@ fun parseIsoTimestamp(value: String): Long {
 }
 
 fun formatIsoTimestamp(timestampMillis: Long): String {
-    return DateTimeFormatter.ISO_OFFSET_DATE_TIME.format(
-        Instant.ofEpochMilli(timestampMillis).atOffset(ZoneOffset.UTC)
-    )
+    return canonicalIsoTimestampFormatter.format(Instant.ofEpochMilli(timestampMillis))
 }

apps/android/data/local/src/test/java/com/flashcardsopensourceapp/data/local/model/CloudSupportTest.kt

@@ -0,0 +1,18 @@
+package com.flashcardsopensourceapp.data.local.model
+
+import org.junit.Assert.assertEquals
+import org.junit.Test
+
+class CloudSupportTest {
+    @Test
+    fun formatIsoTimestampEmitsCanonicalUtcMilliseconds() {
+        assertEquals(
+            "2026-03-10T12:00:00.000Z",
+            formatIsoTimestamp(timestampMillis = 1773144000000L)
+        )
+        assertEquals(
+            "2026-03-10T12:00:00.100Z",
+            formatIsoTimestamp(timestampMillis = 1773144000100L)
+        )
+    }
+}