Added a default value of EPOCH if migration from string to timestamp …

…fails (#2117) * Added a default value of EPOCH if migration from string to timestamp fails * Format query test in db migration test Co-authored-by: Omar Ismail <[email protected]> --------- Co-authored-by: Omar Ismail <[email protected]>
google · Aug 10, 2023 · 20916f4 · 20916f4
1 parent 8ccae97
commit 20916f4
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 6 deletions.
diff --git a/engine/src/androidTest/java/com/google/android/fhir/db/impl/ResourceDatabaseMigrationTest.kt b/engine/src/androidTest/java/com/google/android/fhir/db/impl/ResourceDatabaseMigrationTest.kt
@@ -25,6 +25,7 @@ import com.google.android.fhir.db.impl.entities.LocalChangeEntity
 import com.google.android.fhir.toTimeZoneString
 import com.google.common.truth.Truth.assertThat
 import java.io.IOException
+import java.time.Instant
 import java.util.Date
 import kotlinx.coroutines.runBlocking
 import org.hl7.fhir.r4.model.HumanName
@@ -197,6 +198,10 @@ class ResourceDatabaseMigrationTest {
  execSQL(
  "INSERT INTO LocalChangeEntity (resourceType, resourceId, timestamp, type, payload) VALUES ('Task', 'bed-net-001', '${date.toTimeZoneString()}', '${DbTypeConverters.localChangeTypeToInt(LocalChangeEntity.Type.INSERT)}', '$bedNetTask' );"
  )
+
+ execSQL(
+ "INSERT INTO LocalChangeEntity (resourceType, resourceId, timestamp, type, payload) VALUES ('Task', 'id-corrupted-timestamp', 'date-not-good', '${DbTypeConverters.localChangeTypeToInt(LocalChangeEntity.Type.INSERT)}', '$bedNetTask' );"
+ )
  close()
  }
 
@@ -205,24 +210,29 @@ class ResourceDatabaseMigrationTest {
  val retrievedTask: String?
  val localChangeEntityTimeStamp: Long
  val resourceEntityLastUpdatedLocal: Long
+ val localChangeEntityCorruptedTimeStamp: Long
+
  getMigratedRoomDatabase().apply {
  retrievedTask = this.resourceDao().getResource(taskId, ResourceType.Task)
  resourceEntityLastUpdatedLocal =
  query("Select lastUpdatedLocal from ResourceEntity", null).let {
  it.moveToFirst()
  it.getLong(0)
  }
- localChangeEntityTimeStamp =
- query("Select timestamp from LocalChangeEntity", null).let {
- it.moveToFirst()
- it.getLong(0)
- }
+
+ query("SELECT timestamp FROM LocalChangeEntity", null).let {
+ it.moveToFirst()
+ localChangeEntityTimeStamp = it.getLong(0)
+ it.moveToNext()
+ localChangeEntityCorruptedTimeStamp = it.getLong(0)
+ }
 
  openHelper.writableDatabase.close()
  }
 
  assertThat(retrievedTask).isEqualTo(bedNetTask)
  assertThat(localChangeEntityTimeStamp).isEqualTo(resourceEntityLastUpdatedLocal)
+ assertThat(Instant.ofEpochMilli(localChangeEntityCorruptedTimeStamp)).isEqualTo(Instant.EPOCH)
  }
 
  private fun getMigratedRoomDatabase(): ResourceDatabase =

diff --git a/engine/src/main/java/com/google/android/fhir/db/impl/ResourceDatabase.kt b/engine/src/main/java/com/google/android/fhir/db/impl/ResourceDatabase.kt
@@ -117,7 +117,7 @@ val MIGRATION_5_6 =
  "CREATE TABLE IF NOT EXISTS `_new_LocalChangeEntity` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `resourceType` TEXT NOT NULL, `resourceId` TEXT NOT NULL, `timestamp` INTEGER NOT NULL, `type` INTEGER NOT NULL, `payload` TEXT NOT NULL, `versionId` TEXT)"
  )
  database.execSQL(
- "INSERT INTO `_new_LocalChangeEntity` (`id`,`resourceType`,`resourceId`,`timestamp`,`type`,`payload`,`versionId`) SELECT `id`,`resourceType`,`resourceId`, strftime('%s', `timestamp`) || substr(strftime('%f', `timestamp`), 4),`type`,`payload`,`versionId` FROM `LocalChangeEntity`"
+ "INSERT INTO `_new_LocalChangeEntity` (`id`,`resourceType`,`resourceId`,`timestamp`,`type`,`payload`,`versionId`) SELECT `id`,`resourceType`,`resourceId`, COALESCE(strftime('%s', `timestamp`) || substr(strftime('%f', `timestamp`), 4) , /* default is EPOCH*/ 0 ),`type`,`payload`,`versionId` FROM `LocalChangeEntity`"
  )
  database.execSQL("DROP TABLE `LocalChangeEntity`")
  database.execSQL("ALTER TABLE `_new_LocalChangeEntity` RENAME TO `LocalChangeEntity`")