From 54ee3a0a1898dee7a79366397c092a558727b6de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=9A=D0=B0=D1=88=D0=B8=D0=BD=20=D0=9C=D0=B0=D0=BA=D1=81?=
 =?UTF-8?q?=D0=B8=D0=BC?= <kashin20031984@mail.ru>
Date: Sun, 24 Dec 2023 18:16:37 +0400
Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8=D0=BB=20?=
 =?UTF-8?q?=D0=BF=D0=BE=D0=BB=D0=B5=20role,=20=D1=87=D0=B8=D1=87=D0=B0?=
 =?UTF-8?q?=D1=81=20=D0=B1=D1=83=D0=B4=D1=83=20=D0=BC=D0=B5=D0=BD=D1=8F?=
 =?UTF-8?q?=D1=82=D1=8C=20UI=20=D0=BF=D0=BE=D0=B4=20=D0=BD=D0=B5=D0=B5...?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../myapplication/api/user/UserRemote.kt      |  3 +++
 .../myapplication/database/AppDatabase.kt     |  2 +-
 .../composeui/RegisterUserViewModel.kt        |  2 +-
 .../database/entities/model/User.kt           |  1 +
 server/data.json                              | 22 +++++++++++++++++++
 5 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/com/example/myapplication/api/user/UserRemote.kt b/app/src/main/java/com/example/myapplication/api/user/UserRemote.kt
index 22ea36a..9b4f30d 100644
--- a/app/src/main/java/com/example/myapplication/api/user/UserRemote.kt
+++ b/app/src/main/java/com/example/myapplication/api/user/UserRemote.kt
@@ -8,6 +8,7 @@ import kotlinx.serialization.Serializable
 data class UserRemote(
     val id: Int? = 0,
     val login: String = "",
+    val role: String = "",
     val password: String = "",
     var items: List<ItemFromCartRemote> = emptyList()
 )
@@ -15,11 +16,13 @@ data class UserRemote(
 fun UserRemote.toUser(): User = User(
     id,
     login,
+    role,
     password
 )
 
 fun User.toUserRemote(): UserRemote = UserRemote(
     uid,
     login,
+    role,
     password
 )
\ No newline at end of file
diff --git a/app/src/main/java/com/example/myapplication/database/AppDatabase.kt b/app/src/main/java/com/example/myapplication/database/AppDatabase.kt
index 60d39cb..94def3c 100644
--- a/app/src/main/java/com/example/myapplication/database/AppDatabase.kt
+++ b/app/src/main/java/com/example/myapplication/database/AppDatabase.kt
@@ -60,7 +60,7 @@ abstract class AppDatabase : RoomDatabase() {
             INSTANCE?.let { database ->
                 // Users
                 val userDao = database.userDao()
-                val user1 = User(1, "login", "password")
+                val user1 = User(1, "login", "admin", "password")
                 userDao.insert(user1)
                 /*// Bikes
                 val bikeDao = database.bikeDao()
diff --git a/app/src/main/java/com/example/myapplication/database/entities/composeui/RegisterUserViewModel.kt b/app/src/main/java/com/example/myapplication/database/entities/composeui/RegisterUserViewModel.kt
index 6323d29..9caf4d3 100644
--- a/app/src/main/java/com/example/myapplication/database/entities/composeui/RegisterUserViewModel.kt
+++ b/app/src/main/java/com/example/myapplication/database/entities/composeui/RegisterUserViewModel.kt
@@ -27,7 +27,7 @@ class RegisterUserViewModel(private val userRepository: UserRepository) : ViewMo
         if (password.isNotEmpty() && username.isNotEmpty()) {
             val existingUser = _users.value?.find { it.login == username }
             if (existingUser == null) {
-                val newUser = User(null, username, password)
+                val newUser = User(null, username,"user" ,password)
                 insertUser(newUser)
                 setUserList()
                 return true
diff --git a/app/src/main/java/com/example/myapplication/database/entities/model/User.kt b/app/src/main/java/com/example/myapplication/database/entities/model/User.kt
index 72a0ec3..72e2a9a 100644
--- a/app/src/main/java/com/example/myapplication/database/entities/model/User.kt
+++ b/app/src/main/java/com/example/myapplication/database/entities/model/User.kt
@@ -8,6 +8,7 @@ data class User(
     @PrimaryKey(autoGenerate = true)
     val uid: Int? = 0,
     val login: String,
+    val role: String,
     val password: String
 ) {
     override fun equals(other: Any?): Boolean {
diff --git a/server/data.json b/server/data.json
index 1aba76b..dbc46d9 100644
--- a/server/data.json
+++ b/server/data.json
@@ -3,6 +3,7 @@
     {
       "id": 1,
       "login": "login",
+      "role": "admin",
       "password": "password",
       "items": [
         {
@@ -20,41 +21,49 @@
     {
       "id": 2,
       "login": "hello",
+      "role": "admin",
       "password": "hello"
     },
     {
       "id": 3,
       "login": "максимка",
+      "role": "admin",
       "password": "мпака"
     },
     {
       "id": 4,
       "login": "радар",
+      "role": "admin",
       "password": "ура"
     },
     {
       "id": 5,
       "login": "677",
+      "role": "admin",
       "password": "по оллл"
     },
     {
       "id": 6,
       "login": "ежжпжпж",
+      "role": "admin",
       "password": "ззрзрзе"
     },
     {
       "id": 7,
       "login": "1",
+      "role": "user",
       "password": "1"
     },
     {
       "id": 8,
       "login": "ickxkx",
+      "role": "user",
       "password": "dpldllflfl"
     },
     {
       "id": 9,
       "login": "привет",
+      "role": "user",
       "password": "привет",
       "items": [
         {
@@ -67,37 +76,50 @@
     {
       "id": 10,
       "login": "q",
+      "role": "user",
       "password": "q"
     },
     {
       "id": 11,
       "login": "пр",
+      "role": "user",
       "password": "пр"
     },
     {
       "id": 12,
       "login": "лог",
+      "role": "user",
       "password": "логин"
     },
     {
       "id": 13,
       "login": "привето",
+      "role": "user",
       "password": "приаето"
     },
     {
       "id": 14,
       "login": "123",
+      "role": "user",
       "password": "123"
     },
     {
       "id": 15,
       "login": "лол",
+      "role": "user",
       "password": "лол"
     },
     {
       "id": 16,
       "login": "хелп",
+      "role": "user",
       "password": "хелло"
+    },
+    {
+      "id": 17,
+      "login": "привет 2",
+      "role": "user",
+      "password": "привет 2"
     }
   ],
   "rents": [