Contact Journal Event/Risk extension (EXPOSUREAPP-5413)

Corona-Warn-App/schemas/de.rki.coronawarnapp.contactdiary.storage.ContactDiaryDatabase/3.json

@@ -0,0 +1,244 @@
+{
+  "formatVersion": 1,
+  "database": {
+    "version": 3,
+    "identityHash": "f962ae2729d9b71eb3ed3fc51a110b95",
+    "entities": [
+      {
+        "tableName": "locations",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`locationId` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `locationName` TEXT NOT NULL, `phoneNumber` TEXT, `emailAddress` TEXT, `traceLocationGUID` TEXT)",
+        "fields": [
+          {
+            "fieldPath": "locationId",
+            "columnName": "locationId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "locationName",
+            "columnName": "locationName",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "phoneNumber",
+            "columnName": "phoneNumber",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "emailAddress",
+            "columnName": "emailAddress",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "traceLocationGUID",
+            "columnName": "traceLocationGUID",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "locationId"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "locationvisits",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `date` TEXT NOT NULL, `fkLocationId` INTEGER NOT NULL, `duration` INTEGER, `circumstances` TEXT, `checkInID` INTEGER, FOREIGN KEY(`fkLocationId`) REFERENCES `locations`(`locationId`) ON UPDATE CASCADE ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "fkLocationId",
+            "columnName": "fkLocationId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "duration",
+            "columnName": "duration",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "circumstances",
+            "columnName": "circumstances",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "checkInID",
+            "columnName": "checkInID",
+            "affinity": "INTEGER",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [
+          {
+            "name": "index_locationvisits_fkLocationId",
+            "unique": false,
+            "columnNames": [
+              "fkLocationId"
+            ],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_locationvisits_fkLocationId` ON `${TABLE_NAME}` (`fkLocationId`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "locations",
+            "onDelete": "CASCADE",
+            "onUpdate": "CASCADE",
+            "columns": [
+              "fkLocationId"
+            ],
+            "referencedColumns": [
+              "locationId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "persons",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`personId` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `fullName` TEXT NOT NULL, `phoneNumber` TEXT, `emailAddress` TEXT)",
+        "fields": [
+          {
+            "fieldPath": "personId",
+            "columnName": "personId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "fullName",
+            "columnName": "fullName",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "phoneNumber",
+            "columnName": "phoneNumber",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "emailAddress",
+            "columnName": "emailAddress",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "personId"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "personencounters",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `date` TEXT NOT NULL, `fkPersonId` INTEGER NOT NULL, `durationClassification` TEXT, `withMask` INTEGER, `wasOutside` INTEGER, `circumstances` TEXT, FOREIGN KEY(`fkPersonId`) REFERENCES `persons`(`personId`) ON UPDATE CASCADE ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "fkPersonId",
+            "columnName": "fkPersonId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "durationClassification",
+            "columnName": "durationClassification",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "withMask",
+            "columnName": "withMask",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "wasOutside",
+            "columnName": "wasOutside",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "circumstances",
+            "columnName": "circumstances",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [
+          {
+            "name": "index_personencounters_fkPersonId",
+            "unique": false,
+            "columnNames": [
+              "fkPersonId"
+            ],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_personencounters_fkPersonId` ON `${TABLE_NAME}` (`fkPersonId`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "persons",
+            "onDelete": "CASCADE",
+            "onUpdate": "CASCADE",
+            "columns": [
+              "fkPersonId"
+            ],
+            "referencedColumns": [
+              "personId"
+            ]
+          }
+        ]
+      }
+    ],
+    "views": [],
+    "setupQueries": [
+      "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
+      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, 'f962ae2729d9b71eb3ed3fc51a110b95')"
+    ]
+  }
+}

Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/contactdiary/storage/ContactDiaryDatabaseMigrationTest.kt

@@ -1,5 +1,7 @@
 package de.rki.coronawarnapp.contactdiary.storage
 
+import android.content.ContentValues
+import android.database.sqlite.SQLiteDatabase
 import android.database.sqlite.SQLiteException
 import androidx.room.testing.MigrationTestHelper
 import androidx.sqlite.db.framework.FrameworkSQLiteOpenHelperFactory
@@ -13,10 +15,12 @@ import de.rki.coronawarnapp.contactdiary.storage.entity.ContactDiaryPersonEncoun
 import de.rki.coronawarnapp.contactdiary.storage.entity.ContactDiaryPersonEncounterWrapper
 import de.rki.coronawarnapp.contactdiary.storage.entity.ContactDiaryPersonEntity
 import de.rki.coronawarnapp.contactdiary.storage.internal.migrations.ContactDiaryDatabaseMigration1To2
+import de.rki.coronawarnapp.contactdiary.storage.internal.migrations.ContactDiaryDatabaseMigration2To3
 import io.kotest.assertions.throwables.shouldThrow
 import io.kotest.matchers.shouldBe
 import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.runBlocking
+import org.joda.time.Duration
 import org.joda.time.LocalDate
 import org.junit.Rule
 import org.junit.Test
@@ -110,7 +114,8 @@ class ContactDiaryDatabaseMigrationTest : BaseTestInstrumentation() {
             locationId = 1,
             locationName = "Location1",
             phoneNumber = null,
-            emailAddress = null
+            emailAddress = null,
+            null
         )
         runBlocking { daoDb.locationDao().allEntries().first() }.single() shouldBe location
 
@@ -131,7 +136,8 @@ class ContactDiaryDatabaseMigrationTest : BaseTestInstrumentation() {
                 date = LocalDate.parse("2020-04-20"),
                 fkLocationId = 1,
                 duration = null,
-                circumstances = null
+                circumstances = null,
+                null
             )
         )
 
@@ -151,6 +157,79 @@ class ContactDiaryDatabaseMigrationTest : BaseTestInstrumentation() {
         )
     }
 
+    @Test
+    fun migrate2To3() {
+        val location = ContactDiaryLocationEntity(
+            locationId = 1,
+            locationName = "Why do you want to have this information?",
+            phoneNumber = "I'm not going to tell you yet",
+            emailAddress = "I'mnotgoingtotell@you.yet",
+            traceLocationGUID = null
+        )
+
+        val locationVisit = ContactDiaryLocationVisitEntity(
+            id = 2,
+            date = LocalDate.parse("2020-12-31"),
+            fkLocationId = 1,
+            duration = Duration.standardMinutes(13),
+            circumstances = "That's none of your business",
+            null
+        )
+
+        val locationAfter = location.copy(traceLocationGUID = "jshrgu-aifhioaio-aofsjof-samofp-kjsadngsgf")
+        val locationVisitAfter = locationVisit.copy(checkInID = 101)
+
+        val locationValues = ContentValues().apply {
+            put("locationId", location.locationId)
+            put("locationName", location.locationName)
+            put("phoneNumber", location.phoneNumber)
+            put("emailAddress", location.emailAddress)
+        }
+
+        val locationVisitValues = ContentValues().apply {
+            put("id", locationVisit.id)
+            put("date", locationVisit.date.toString())
+            put("fkLocationId", locationVisit.fkLocationId)
+            put("duration", locationVisit.duration?.millis)
+            put("circumstances", locationVisit.circumstances)
+        }
+
+        helper.createDatabase(DB_NAME, 2).apply {
+            insert("locations", SQLiteDatabase.CONFLICT_FAIL, locationValues)
+            insert("locationvisits", SQLiteDatabase.CONFLICT_FAIL, locationVisitValues)
+
+            close()
+        }
+
+        // Run migration
+        helper.runMigrationsAndValidate(
+            DB_NAME,
+            3,
+            true,
+            ContactDiaryDatabaseMigration2To3
+        )
+
+        val daoDb = ContactDiaryDatabase.Factory(
+            ctx = ApplicationProvider.getApplicationContext()
+        ).create(databaseName = DB_NAME)
+
+        runBlocking {
+            daoDb.locationVisitDao().allEntries().first().single() shouldBe ContactDiaryLocationVisitWrapper(
+                contactDiaryLocationEntity = location,
+                contactDiaryLocationVisitEntity = locationVisit
+            )
+
+            // Test if new attributes are added correctly
+            daoDb.locationDao().update(locationAfter)
+            daoDb.locationVisitDao().update(locationVisitAfter)
+
+            daoDb.locationVisitDao().allEntries().first().single() shouldBe ContactDiaryLocationVisitWrapper(
+                contactDiaryLocationEntity = locationAfter,
+                contactDiaryLocationVisitEntity = locationVisitAfter
+            )
+        }
+    }
+
     @Test
     fun migrate1To2_failure_throws() {
         helper.createDatabase(DB_NAME, 1).apply {
@@ -177,6 +256,26 @@ class ContactDiaryDatabaseMigrationTest : BaseTestInstrumentation() {
         }
     }
 
+    @Test
+    fun migrate2To3_failure_throws() {
+        helper.createDatabase(DB_NAME, 2).apply {
+            execSQL("DROP TABLE IF EXISTS locations")
+            // Has incompatible existing column phoneNumber of wrong type
+            execSQL("CREATE TABLE IF NOT EXISTS `locations` (`locationId` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `locationName` TEXT NOT NULL, `phoneNumber` TEXT, `emailAddress` TEXT, `traceLocationGUID` INTEGER)")
+            close()
+        }
+
+        shouldThrow<SQLiteException> {
+            // Run migration
+            helper.runMigrationsAndValidate(
+                DB_NAME,
+                3,
+                true,
+                ContactDiaryDatabaseMigration2To3
+            )
+        }
+    }
+
     @Test
     @Throws(IOException::class)
     fun migrateAll() {