diff --git a/Auth/schemas/com.infomaniak.core.auth.room.UserDatabase/6.json b/Auth/schemas/com.infomaniak.core.auth.room.UserDatabase/6.json index be6e77f6e..fbeb3345f 100644 --- a/Auth/schemas/com.infomaniak.core.auth.room.UserDatabase/6.json +++ b/Auth/schemas/com.infomaniak.core.auth.room.UserDatabase/6.json @@ -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": [ { "fieldPath": "id", @@ -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", @@ -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')" ] } } \ No newline at end of file diff --git a/Auth/src/main/kotlin/com/infomaniak/core/auth/models/user/preferences/OrganizationPreference.kt b/Auth/src/main/kotlin/com/infomaniak/core/auth/models/user/preferences/OrganizationPreference.kt index 8ec543ac3..ad0ca711a 100644 --- a/Auth/src/main/kotlin/com/infomaniak/core/auth/models/user/preferences/OrganizationPreference.kt +++ b/Auth/src/main/kotlin/com/infomaniak/core/auth/models/user/preferences/OrganizationPreference.kt @@ -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 diff --git a/Auth/src/main/kotlin/com/infomaniak/core/auth/room/UserMigration.kt b/Auth/src/main/kotlin/com/infomaniak/core/auth/room/UserMigration.kt index 92f7242db..bdf0ba8ee 100644 --- a/Auth/src/main/kotlin/com/infomaniak/core/auth/room/UserMigration.kt +++ b/Auth/src/main/kotlin/com/infomaniak/core/auth/room/UserMigration.kt @@ -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 diff --git a/Auth/src/test/java/com/infomaniak/core/auth/BaseAccountUtilsTest.kt b/Auth/src/test/java/com/infomaniak/core/auth/BaseAccountUtilsTest.kt index 8c0678df8..466eadc55 100644 --- a/Auth/src/test/java/com/infomaniak/core/auth/BaseAccountUtilsTest.kt +++ b/Auth/src/test/java/com/infomaniak/core/auth/BaseAccountUtilsTest.kt @@ -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) diff --git a/Ui/Compose/Preview/src/main/kotlin/com/infomaniak/core/ui/compose/preview/previewparameter/UserListPreviewParameterProvider.kt b/Ui/Compose/Preview/src/main/kotlin/com/infomaniak/core/ui/compose/preview/previewparameter/UserListPreviewParameterProvider.kt index 03d10aba0..8b09be163 100644 --- a/Ui/Compose/Preview/src/main/kotlin/com/infomaniak/core/ui/compose/preview/previewparameter/UserListPreviewParameterProvider.kt +++ b/Ui/Compose/Preview/src/main/kotlin/com/infomaniak/core/ui/compose/preview/previewparameter/UserListPreviewParameterProvider.kt @@ -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)