update outcomes table to include session_time column

* Update database version to v9 and make migration.
* I default this new `session_time` to a value of `1` instead of `0` intentionally to work around an issue from the v5.0.0-beta's for migration's sake and get these outcomes migrated, sent, and done with.
* When outcome requests fail, they are cached for retrying. The v5.0.0-beta's likely encountered failure responses and cached these. If there are cached `os__session_duration` outcomes and we send them off with zero session_time, the server will keep sending us a failure response. So, let's just send a time of 1 second.

Author: nan-li

OneSignalSDK/onesignal/core/src/main/java/com/onesignal/core/internal/database/impl/OSDatabase.kt

@@ -16,7 +16,7 @@ import com.onesignal.core.internal.database.IDatabase
 import com.onesignal.debug.internal.logging.Logging
 import com.onesignal.session.internal.outcomes.impl.OutcomeTableProvider
 import com.onesignal.session.internal.outcomes.impl.OutcomesDbContract.SQL_CREATE_OUTCOME_ENTRIES_V1
-import com.onesignal.session.internal.outcomes.impl.OutcomesDbContract.SQL_CREATE_OUTCOME_ENTRIES_V3
+import com.onesignal.session.internal.outcomes.impl.OutcomesDbContract.SQL_CREATE_OUTCOME_ENTRIES_V4
 import com.onesignal.session.internal.outcomes.impl.OutcomesDbContract.SQL_CREATE_UNIQUE_OUTCOME_ENTRIES_V1
 import com.onesignal.session.internal.outcomes.impl.OutcomesDbContract.SQL_CREATE_UNIQUE_OUTCOME_ENTRIES_V2
 
@@ -246,7 +246,7 @@ internal open class OSDatabase(
 
     override fun onCreate(db: SQLiteDatabase) {
         db.execSQL(SQL_CREATE_ENTRIES)
-        db.execSQL(SQL_CREATE_OUTCOME_ENTRIES_V3)
+        db.execSQL(SQL_CREATE_OUTCOME_ENTRIES_V4)
         db.execSQL(SQL_CREATE_UNIQUE_OUTCOME_ENTRIES_V2)
         db.execSQL(SQL_CREATE_IN_APP_MESSAGE_ENTRIES)
         for (ind in SQL_INDEX_ENTRIES) {
@@ -277,6 +277,7 @@ internal open class OSDatabase(
         if (oldVersion == 5 && newVersion >= 6) upgradeFromV5ToV6(db)
         if (oldVersion < 7 && newVersion >= 7) upgradeToV7(db)
         if (oldVersion < 8 && newVersion >= 8) upgradeToV8(db)
+        if (oldVersion < 9 && newVersion >= 9) upgradeToV9(db)
     }
 
     // Add collapse_id field and index
@@ -342,6 +343,10 @@ internal open class OSDatabase(
         _outcomeTableProvider.upgradeCacheOutcomeTableRevision1To2(db)
     }
 
+    private fun upgradeToV9(db: SQLiteDatabase) {
+        _outcomeTableProvider.upgradeOutcomeTableRevision3To4(db)
+    }
+
     override fun onDowngrade(db: SQLiteDatabase, oldVersion: Int, newVersion: Int) {
         Logging.warn("SDK version rolled back! Clearing $DATABASE_NAME as it could be in an unexpected state.")
 
@@ -357,7 +362,7 @@ internal open class OSDatabase(
     }
 
     companion object {
-        private const val dbVersion = 8
+        private const val dbVersion = 9
         private val LOCK = Any()
         private const val DATABASE_NAME = "OneSignal.db"
         private const val INTEGER_PRIMARY_KEY_TYPE = " INTEGER PRIMARY KEY"

OneSignalSDK/onesignal/core/src/main/java/com/onesignal/session/internal/outcomes/impl/OutcomeTableProvider.kt

@@ -78,6 +78,24 @@ internal class OutcomeTableProvider {
         }
     }
 
+    /**
+     * On the outcome table this adds the new session_time column.
+     *
+     * @param db
+     */
+    fun upgradeOutcomeTableRevision3To4(db: SQLiteDatabase) {
+        try {
+            db.execSQL("BEGIN TRANSACTION;")
+            db.execSQL("ALTER TABLE " + OutcomeEventsTable.TABLE_NAME + " ADD COLUMN " + OutcomeEventsTable.COLUMN_NAME_SESSION_TIME + " INTEGER DEFAULT 1;")
+            // We intentionally choose to default session_time to 1 to address a bug on cached outcomes from v5.0.0-beta's
+            // os__session_duration requests expect a session_time and these will keep failing and caching, so let's just send them with a time of 1 for migrations
+        } catch (e: SQLiteException) {
+            e.printStackTrace()
+        } finally {
+            db.execSQL("COMMIT;")
+        }
+    }
+
     /**
      * On the cache unique outcome table rename table, rename column notification id to influence id
      * Add column channel type

OneSignalSDK/onesignal/core/src/main/java/com/onesignal/session/internal/outcomes/impl/OutcomesDbContract.kt

@@ -20,6 +20,9 @@ internal object OutcomeEventsTable {
     const val COLUMN_NAME_WEIGHT = "weight" // Added on DB v5 SDK v3.12.1, migration added on DB v6 SDK v3.12.2
     const val COLUMN_NAME_TIMESTAMP = "timestamp" // Added on DB v4 SDK v3.12.0
     const val COLUMN_NAME_PARAMS = "params" // Added on DB v4 SDK v3.12.0 replaced with weight on DB v5 SDK v3.12.1, migration added on DB v6 SDK v3.12.2
+
+    // Session time
+    const val COLUMN_NAME_SESSION_TIME = "session_time" // Added on DB v9 SDK v5.0.0 (note that 5.0.0-beta's were still on v8)
 }
 
 internal object CachedUniqueOutcomeTable {
@@ -72,6 +75,22 @@ internal object OutcomesDbContract {
         OutcomeEventsTable.COLUMN_NAME_TIMESTAMP + TIMESTAMP_TYPE + "," + // "params TEXT" Added in v4, removed in v5.
         OutcomeEventsTable.COLUMN_NAME_WEIGHT + FLOAT_TYPE + // New in v5, missing migration added in v6
         ");"
+
+    /**
+     * Adds a new column called session_time
+     */
+    const val SQL_CREATE_OUTCOME_ENTRIES_V4 = "CREATE TABLE " + OutcomeEventsTable.TABLE_NAME + " (" +
+        OutcomeEventsTable.ID + INTEGER_PRIMARY_KEY_TYPE + "," +
+        OutcomeEventsTable.COLUMN_NAME_NOTIFICATION_INFLUENCE_TYPE + TEXT_TYPE + "," +
+        OutcomeEventsTable.COLUMN_NAME_IAM_INFLUENCE_TYPE + TEXT_TYPE + "," +
+        OutcomeEventsTable.COLUMN_NAME_NOTIFICATION_IDS + TEXT_TYPE + "," +
+        OutcomeEventsTable.COLUMN_NAME_IAM_IDS + TEXT_TYPE + "," +
+        OutcomeEventsTable.COLUMN_NAME_NAME + TEXT_TYPE + "," +
+        OutcomeEventsTable.COLUMN_NAME_TIMESTAMP + TIMESTAMP_TYPE + "," +
+        OutcomeEventsTable.COLUMN_NAME_WEIGHT + FLOAT_TYPE + "," +
+        OutcomeEventsTable.COLUMN_NAME_SESSION_TIME + INT_TYPE +
+        ");"
+
     const val SQL_CREATE_UNIQUE_OUTCOME_ENTRIES_V1 = "CREATE TABLE " + CachedUniqueOutcomeTable.TABLE_NAME_V1 + " (" +
         CachedUniqueOutcomeTable.ID + INTEGER_PRIMARY_KEY_TYPE + "," +
         CachedUniqueOutcomeTable.COLUMN_NAME_NOTIFICATION_ID + TEXT_TYPE + "," +