Добавил поле role, чичас буду менять UI под нее...

This commit is contained in:
Кашин Максим 2023-12-24 18:16:37 +04:00
parent c3e82ff61b
commit 54ee3a0a18
5 changed files with 28 additions and 2 deletions

View File

@ -8,6 +8,7 @@ import kotlinx.serialization.Serializable
data class UserRemote( data class UserRemote(
val id: Int? = 0, val id: Int? = 0,
val login: String = "", val login: String = "",
val role: String = "",
val password: String = "", val password: String = "",
var items: List<ItemFromCartRemote> = emptyList() var items: List<ItemFromCartRemote> = emptyList()
) )
@ -15,11 +16,13 @@ data class UserRemote(
fun UserRemote.toUser(): User = User( fun UserRemote.toUser(): User = User(
id, id,
login, login,
role,
password password
) )
fun User.toUserRemote(): UserRemote = UserRemote( fun User.toUserRemote(): UserRemote = UserRemote(
uid, uid,
login, login,
role,
password password
) )

View File

@ -60,7 +60,7 @@ abstract class AppDatabase : RoomDatabase() {
INSTANCE?.let { database -> INSTANCE?.let { database ->
// Users // Users
val userDao = database.userDao() val userDao = database.userDao()
val user1 = User(1, "login", "password") val user1 = User(1, "login", "admin", "password")
userDao.insert(user1) userDao.insert(user1)
/*// Bikes /*// Bikes
val bikeDao = database.bikeDao() val bikeDao = database.bikeDao()

View File

@ -27,7 +27,7 @@ class RegisterUserViewModel(private val userRepository: UserRepository) : ViewMo
if (password.isNotEmpty() && username.isNotEmpty()) { if (password.isNotEmpty() && username.isNotEmpty()) {
val existingUser = _users.value?.find { it.login == username } val existingUser = _users.value?.find { it.login == username }
if (existingUser == null) { if (existingUser == null) {
val newUser = User(null, username, password) val newUser = User(null, username,"user" ,password)
insertUser(newUser) insertUser(newUser)
setUserList() setUserList()
return true return true

View File

@ -8,6 +8,7 @@ data class User(
@PrimaryKey(autoGenerate = true) @PrimaryKey(autoGenerate = true)
val uid: Int? = 0, val uid: Int? = 0,
val login: String, val login: String,
val role: String,
val password: String val password: String
) { ) {
override fun equals(other: Any?): Boolean { override fun equals(other: Any?): Boolean {

View File

@ -3,6 +3,7 @@
{ {
"id": 1, "id": 1,
"login": "login", "login": "login",
"role": "admin",
"password": "password", "password": "password",
"items": [ "items": [
{ {
@ -20,41 +21,49 @@
{ {
"id": 2, "id": 2,
"login": "hello", "login": "hello",
"role": "admin",
"password": "hello" "password": "hello"
}, },
{ {
"id": 3, "id": 3,
"login": "максимка", "login": "максимка",
"role": "admin",
"password": "мпака" "password": "мпака"
}, },
{ {
"id": 4, "id": 4,
"login": "радар", "login": "радар",
"role": "admin",
"password": "ура" "password": "ура"
}, },
{ {
"id": 5, "id": 5,
"login": "677", "login": "677",
"role": "admin",
"password": "по оллл" "password": "по оллл"
}, },
{ {
"id": 6, "id": 6,
"login": "ежжпжпж", "login": "ежжпжпж",
"role": "admin",
"password": "ззрзрзе" "password": "ззрзрзе"
}, },
{ {
"id": 7, "id": 7,
"login": "1", "login": "1",
"role": "user",
"password": "1" "password": "1"
}, },
{ {
"id": 8, "id": 8,
"login": "ickxkx", "login": "ickxkx",
"role": "user",
"password": "dpldllflfl" "password": "dpldllflfl"
}, },
{ {
"id": 9, "id": 9,
"login": "привет", "login": "привет",
"role": "user",
"password": "привет", "password": "привет",
"items": [ "items": [
{ {
@ -67,37 +76,50 @@
{ {
"id": 10, "id": 10,
"login": "q", "login": "q",
"role": "user",
"password": "q" "password": "q"
}, },
{ {
"id": 11, "id": 11,
"login": "пр", "login": "пр",
"role": "user",
"password": "пр" "password": "пр"
}, },
{ {
"id": 12, "id": 12,
"login": "лог", "login": "лог",
"role": "user",
"password": "логин" "password": "логин"
}, },
{ {
"id": 13, "id": 13,
"login": "привето", "login": "привето",
"role": "user",
"password": "приаето" "password": "приаето"
}, },
{ {
"id": 14, "id": 14,
"login": "123", "login": "123",
"role": "user",
"password": "123" "password": "123"
}, },
{ {
"id": 15, "id": 15,
"login": "лол", "login": "лол",
"role": "user",
"password": "лол" "password": "лол"
}, },
{ {
"id": 16, "id": 16,
"login": "хелп", "login": "хелп",
"role": "user",
"password": "хелло" "password": "хелло"
},
{
"id": 17,
"login": "привет 2",
"role": "user",
"password": "привет 2"
} }
], ],
"rents": [ "rents": [