chore: re-add lastEventId to RemnantDataMigration

amplitude · Mar 22, 2024 · 2aa0afa · 2aa0afa
1 parent 5dfba6c
commit 2aa0afa
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 2 deletions.
diff --git a/android/src/main/java/com/amplitude/android/migration/RemnantDataMigration.kt b/android/src/main/java/com/amplitude/android/migration/RemnantDataMigration.kt
@@ -21,6 +21,7 @@ class RemnantDataMigration(
     companion object {
         const val DEVICE_ID_KEY = "device_id"
         const val USER_ID_KEY = "user_id"
+        const val LAST_EVENT_ID_KEY = "last_event_id"
     }
 
     lateinit var databaseStorage: DatabaseStorage
@@ -32,6 +33,7 @@ class RemnantDataMigration(
 
         // WARNING: We don't migrate session data as we want to reset on a new app install
         moveDeviceAndUserId()
+        moveTimelineData()
 
         if (firstRunSinceUpgrade) {
             moveInterceptedIdentifies()
@@ -64,6 +66,23 @@ class RemnantDataMigration(
         }
     }
 
+    private suspend fun moveTimelineData() {
+        try {
+            val currentLastEventId = amplitude.storage.read(Storage.Constants.LAST_EVENT_ID)?.toLongOrNull()
+
+            val lastEventId = databaseStorage.getLongValue(LAST_EVENT_ID_KEY)
+
+            if (currentLastEventId == null && lastEventId != null) {
+                amplitude.storage.write(Storage.Constants.LAST_EVENT_ID, lastEventId.toString())
+                databaseStorage.removeLongValue(LAST_EVENT_ID_KEY)
+            }
+        } catch (e: Exception) {
+            LogcatLogger.logger.error(
+                "timeline data migration failed: ${e.message}"
+            )
+        }
+    }
+
     private suspend fun moveEvents() {
         try {
             val remnantEvents = databaseStorage.readEventsContent()

diff --git a/android/src/test/java/com/amplitude/android/migration/RemnantDataMigrationTest.kt b/android/src/test/java/com/amplitude/android/migration/RemnantDataMigrationTest.kt
@@ -30,7 +30,7 @@ class RemnantDataMigrationTest {
 
     @Test
     fun `legacy data version 4 should be migrated`() {
-        checkLegacyDataMigration("legacy_v4.sqlite", 4)
+        checkLegacyDataMigration("legacy_v4.sqlite", 4, true, false)
     }
 
     @Test
@@ -113,7 +113,7 @@ class RemnantDataMigrationTest {
                 } else {
                     // Session start event has not been processed yet, so this is null
                     Assertions.assertEquals(
-                        null,
+                        if (!migrateLegacyData) null else 2,
                         amplitude.storage.read(Storage.Constants.LAST_EVENT_ID)?.toLongOrNull()
                     )
                 }