Add NSWStops table and necessary migrations

sandook/Migrations.md

@@ -1,15 +1,17 @@
 ## Sandook
 
-Sandook is the db for KRAIL app. 
+Sandook is the db for KRAIL app.
 
 ## Migrations
 
 Add migration in .sqm files in `migrations` folder.
 
-### Android 
+### Android
 
 - Update in SandookCallback
 
-### iOS 
+### iOS
 
 - Create a new class for after version migration for `SandookMigration`
+- Update in `IosSandookDriverFactory` and add `SandookMigrationAfterX` to `getMigrationCallbacks()`
+  method.

sandook/README.md

@@ -0,0 +1,7 @@
+# Sandook
+
+### Generate Kotlin files for SQL tables
+
+Run `./gradlew generateCommonMainKrailSandookInterface` to generate the
+Kotlin files for the sql tables created in common module. The Kotlin files will be generated in the
+following dir: `build/generated/sqldelight/code/KrailSandook/commonMain`

sandook/src/commonMain/kotlin/xyz/ksharma/krail/sandook/RealSandook.kt

@@ -7,6 +7,8 @@ internal class RealSandook(factory: SandookDriverFactory) : Sandook {
     private val sandook = KrailSandook(factory.createDriver())
     private val query = sandook.krailSandookQueries
 
+    private val nswStopsQueries = sandook.nswStopsQueries
+
     // region Theme
     override fun insertOrReplaceTheme(productClass: Long) {
         query.insertOrReplaceProductClass(productClass)
@@ -79,4 +81,50 @@ internal class RealSandook(factory: SandookDriverFactory) : Sandook {
     }
 
     // endregion
+
+    // region NswStops
+
+    override fun insertNswStop(
+        stopId: String,
+        stopName: String,
+        stopLat: Double,
+        stopLon: Double,
+    ) {
+        nswStopsQueries.insertStop(
+            stopId = stopId,
+            stopName = stopName,
+            stopLat = stopLat,
+            stopLon = stopLon,
+        )
+    }
+
+    override fun insertNswStopProductClass(stopId: String, productClass: Int) {
+        nswStopsQueries.insertStopProductClass(stopId, productClass.toLong())
+    }
+
+    override fun selectStopsByPartialName(stopName: String): List<NswStops> {
+        return nswStopsQueries.selectStopsByPartialName(stopName).executeAsList()
+    }
+
+    override fun selectStopsByNameAndProductClass(
+        stopName: String,
+        includeProductClassList: List<Int>,
+    ): List<NswStops> {
+        return nswStopsQueries.selectStopsByNameAndProductClass(
+            stopName,
+            includeProductClassList.map { it.toLong() }
+        ).executeAsList()
+    }
+
+    override fun selectStopsByNameExcludingProductClass(
+        stopName: String,
+        excludeProductClassList: List<Int>
+    ): List<NswStops> {
+        return nswStopsQueries.selectStopsByNameExcludingProductClass(
+            stopName,
+            excludeProductClassList.map { it.toLong() }
+        ).executeAsList()
+    }
+
+    // endregion NswStops
 }

sandook/src/commonMain/kotlin/xyz/ksharma/krail/sandook/Sandook.kt

@@ -32,4 +32,32 @@ interface Sandook {
     fun insertAlerts(journeyId: String, alerts: List<SelectServiceAlertsByJourneyId>)
 
     // endregion
+
+    // region NswStops
+    fun insertNswStop(stopId: String, stopName: String, stopLat: Double, stopLon: Double)
+
+    fun insertNswStopProductClass(stopId: String, productClass: Int)
+
+    fun selectStopsByPartialName(stopName: String): List<NswStops>
+
+    /**
+     * Select stops by name and product class. This is useful for selecting stops that are of a certain product class.
+     * Use with care, because it may also include those stops which are of multiple product classes,
+     * that are not included in the include list.
+     */
+    fun selectStopsByNameAndProductClass(
+        stopName: String,
+        includeProductClassList: List<Int>,
+    ): List<NswStops>
+
+    /**
+     * Select stops by name excluding product classes. This is useful for selecting stops that are
+     * not of a certain product class.
+     */
+    fun selectStopsByNameExcludingProductClass(
+        stopName: String,
+        excludeProductClassList: List<Int>,
+    ): List<NswStops>
+
+    // endregion
 }

sandook/src/commonMain/sqldelight/migrations/2.sqm

@@ -0,0 +1,15 @@
+-- Create NSW Stops Table --
+CREATE TABLE IF NOT EXISTS NswStops (
+    stopId TEXT PRIMARY KEY,
+    stopName TEXT NOT NULL,
+    stopLat REAL NOT NULL,
+    stopLon REAL NOT NULL
+);
+
+-- Create NSW Stop Product Class Table --
+CREATE TABLE IF NOT EXISTS NswStopProductClass (
+    id INTEGER PRIMARY KEY AUTOINCREMENT,
+    stopId TEXT NOT NULL,
+    productClass INTEGER NOT NULL,
+    FOREIGN KEY (stopId) REFERENCES NswStops(stopId)
+);

sandook/src/commonMain/sqldelight/xyz/ksharma/krail/sandook/NswStops.sq

@@ -0,0 +1,50 @@
+-- Create NSW Stops Table --
+CREATE TABLE IF NOT EXISTS NswStops (
+    stopId TEXT PRIMARY KEY,
+    stopName TEXT NOT NULL,
+    stopLat REAL NOT NULL,
+    stopLon REAL NOT NULL
+);
+
+-- Create NSW Stop Product Class Table --
+-- Foregin key ensures that any stopId value inserted into NswStopProductClass must exist in
+-- NswStops, helping maintain data integrity between the two tables.
+CREATE TABLE IF NOT EXISTS NswStopProductClass (
+    id INTEGER PRIMARY KEY AUTOINCREMENT,
+    stopId TEXT NOT NULL,
+    productClass INTEGER NOT NULL,
+    FOREIGN KEY (stopId) REFERENCES NswStops(stopId)
+);
+
+-- Insert data into NswStops table (without productClass) --
+insertStop:
+INSERT OR IGNORE INTO NswStops(stopId, stopName, stopLat, stopLon)
+VALUES (?, ?, ?, ?);
+
+-- Insert each productClass value for a given stop into NswStopProductClass --
+insertStopProductClass:
+INSERT INTO NswStopProductClass(stopId, productClass)
+VALUES (?, ?);
+
+-- Select stops with partial match on stopName --
+selectStopsByPartialName:
+SELECT * FROM NswStops
+WHERE stopName LIKE '%' || ? || '%';
+
+-- Select stops with partial match on stopName and specific productClass values --
+selectStopsByNameAndProductClass:
+SELECT DISTINCT s.*
+FROM NswStops AS s
+JOIN NswStopProductClass AS p ON s.stopId = p.stopId
+WHERE s.stopName LIKE '%' || ? || '%'
+  AND p.productClass IN ?;
+
+selectStopsByNameExcludingProductClass:
+SELECT DISTINCT s.*
+FROM NswStops AS s
+WHERE s.stopName LIKE '%' || ? || '%'
+  AND s.stopId NOT IN (
+    SELECT p.stopId
+    FROM NswStopProductClass AS p
+    WHERE p.productClass IN ?
+  );

sandook/src/iosMain/kotlin/xyz/ksharma/krail/sandook/IosSandookDriverFactory.kt

@@ -4,6 +4,7 @@ import app.cash.sqldelight.db.AfterVersion
 import app.cash.sqldelight.db.SqlDriver
 import app.cash.sqldelight.driver.native.NativeSqliteDriver
 import xyz.ksharma.krail.sandook.migrations.SandookMigrationAfter1
+import xyz.ksharma.krail.sandook.migrations.SandookMigrationAfter2
 
 class IosSandookDriverFactory : SandookDriverFactory {
     override fun createDriver(): SqlDriver {
@@ -16,5 +17,6 @@ class IosSandookDriverFactory : SandookDriverFactory {
 
     private fun getMigrationCallbacks(): Array<AfterVersion> = arrayOf(
         AfterVersion(1) { SandookMigrationAfter1.migrate(it) },
+        AfterVersion(2) { SandookMigrationAfter2.migrate(it) },
     )
 }

sandook/src/iosMain/kotlin/xyz/ksharma/krail/sandook/migrations/SandookMigrationAfter2.kt

@@ -0,0 +1,30 @@
+package xyz.ksharma.krail.sandook.migrations
+
+import app.cash.sqldelight.db.SqlDriver
+import xyz.ksharma.krail.core.log.log
+
+internal object SandookMigrationAfter2 : SandookMigration {
+
+    override fun migrate(sqlDriver: SqlDriver) {
+        log("Upgrading database from version 2 to 3")
+        sqlDriver.execute(
+            identifier = null,
+            sql = """
+                    CREATE TABLE IF NOT EXISTS NswStops (
+                        stopId TEXT PRIMARY KEY,
+                        stopName TEXT NOT NULL,
+                        stopLat REAL NOT NULL,
+                        stopLon REAL NOT NULL
+                    );
+
+                    CREATE TABLE IF NOT EXISTS NswStopProductClass (
+                        id INTEGER PRIMARY KEY AUTOINCREMENT,
+                        stopId TEXT NOT NULL,
+                        productClass INTEGER NOT NULL,
+                        FOREIGN KEY (stopId) REFERENCES NswStops(stopId)
+                    );
+                """.trimIndent(),
+            parameters = 0,
+        )
+    }
+}