Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 3 additions & 10 deletions Auth/schemas/com.infomaniak.core.auth.room.UserDatabase/6.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
"formatVersion": 1,
"database": {
"version": 6,
"identityHash": "0532703853a371ea02741038e7cf8b1d",
"identityHash": "7286131e7d3d85b51151dbb92bfa37e2",
"entities": [
{
"tableName": "User",
"createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER NOT NULL, `displayName` TEXT, `firstname` TEXT NOT NULL, `lastname` TEXT NOT NULL, `email` TEXT NOT NULL, `avatar` TEXT, `login` TEXT NOT NULL, `isStaff` INTEGER NOT NULL DEFAULT false, `organizations` TEXT NOT NULL, `preferences_security_score` INTEGER DEFAULT 0, `preferences_security_dateLastChangedPassword` INTEGER DEFAULT 0, `preferences_organizationPreference_currentOrganizationId` INTEGER NOT NULL DEFAULT 0, `preferences_organizationPreference_lastLoginAt` INTEGER NOT NULL DEFAULT 0, `accessToken` TEXT NOT NULL, `refreshToken` TEXT, `tokenType` TEXT NOT NULL, `expiresIn` INTEGER NOT NULL, `userId` INTEGER NOT NULL, `scope` TEXT, `expiresAt` INTEGER, PRIMARY KEY(`id`))",
"createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER NOT NULL, `displayName` TEXT, `firstname` TEXT NOT NULL, `lastname` TEXT NOT NULL, `email` TEXT NOT NULL, `avatar` TEXT, `login` TEXT NOT NULL, `isStaff` INTEGER NOT NULL DEFAULT false, `organizations` TEXT NOT NULL, `preferences_security_score` INTEGER DEFAULT 0, `preferences_security_dateLastChangedPassword` INTEGER DEFAULT 0, `preferences_organizationPreference_currentOrganizationId` INTEGER NOT NULL DEFAULT 0, `accessToken` TEXT NOT NULL, `refreshToken` TEXT, `tokenType` TEXT NOT NULL, `expiresIn` INTEGER NOT NULL, `userId` INTEGER NOT NULL, `scope` TEXT, `expiresAt` INTEGER, PRIMARY KEY(`id`))",
"fields": [
Comment thread
LouisCAD marked this conversation as resolved.
{
"fieldPath": "id",
Expand Down Expand Up @@ -80,13 +80,6 @@
"notNull": true,
"defaultValue": "0"
},
{
"fieldPath": "preferences.organizationPreference.lastLoginAt",
"columnName": "preferences_organizationPreference_lastLoginAt",
"affinity": "INTEGER",
"notNull": true,
"defaultValue": "0"
},
{
"fieldPath": "apiToken.accessToken",
"columnName": "accessToken",
Expand Down Expand Up @@ -160,7 +153,7 @@
],
"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, '0532703853a371ea02741038e7cf8b1d')"
"INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, '7286131e7d3d85b51151dbb92bfa37e2')"
]
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,4 @@ data class OrganizationPreference(
@SerializedName("current_account_id") @SerialName("current_account_id")
@ColumnInfo(defaultValue = "0")
var currentOrganizationId: Int,
@SerializedName("last_login_at") @SerialName("last_login_at")
@ColumnInfo(defaultValue = "0")
var lastLoginAt: Long,
) : Parcelable
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,7 @@ class UserV3Migration : AutoMigrationSpec
@DeleteColumn(tableName = "User", columnName = "preferences_timezone_gmt")
@DeleteColumn(tableName = "User", columnName = "preferences_timezone_id")
@DeleteColumn(tableName = "User", columnName = "preferences_timezone_name")
@DeleteColumn(tableName = "User", columnName = "preferences_organizationPreference_lastLoginAt")
@DeleteColumn(tableName = "User", columnName = "phones")
@DeleteColumn(tableName = "User", columnName = "emails")
class UserV6Migration : AutoMigrationSpec
Comment thread
LouisCAD marked this conversation as resolved.
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ abstract class BaseAccountUtilsTest {
}

protected fun userOf(id: Int): User {
val dummyOrganization = OrganizationPreference(1234, 0L)
val dummyOrganization = OrganizationPreference(1234)
val dummyPreferences = Preferences(null, dummyOrganization)
val dummyApiToken = ApiToken("", null, "", 0, id, null, null)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ private val usersPreviewData = listOf(
)

fun dummyUserOf(id: Int, firstName: String, lastName: String): User {
val dummyOrganization = OrganizationPreference(1234, 0L)
val dummyOrganization = OrganizationPreference(1234)
val dummyPreferences = Preferences(null, dummyOrganization)
val dummyApiToken = ApiToken("", null, "", 0, id, null, null)

Expand Down
Loading