From d89fc026163bbae4449d071c2e5425ecfc9cd2d3 Mon Sep 17 00:00:00 2001
From: luevard <99143550+saucepommefrite@users.noreply.github.com>
Date: Fri, 19 Jan 2024 22:57:46 +0100
Subject: [PATCH] :sparkles: Patch User UUID

---
 .../src/main/kotlin/allin/entities/ResponseEntity.kt  |  3 +--
 Sources/src/main/kotlin/allin/entities/UserEntity.kt  | 11 +++++------
 Sources/src/main/kotlin/allin/utils/CryptManager.kt   |  1 -
 3 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/Sources/src/main/kotlin/allin/entities/ResponseEntity.kt b/Sources/src/main/kotlin/allin/entities/ResponseEntity.kt
index ca61e88..c029a5e 100644
--- a/Sources/src/main/kotlin/allin/entities/ResponseEntity.kt
+++ b/Sources/src/main/kotlin/allin/entities/ResponseEntity.kt
@@ -27,8 +27,7 @@ object ResponsesEntity : Table<ResponseEntity>("response") {
         return database.from(ResponsesEntity)
             .select(response)
             .where { id eq idBet }
-            .map { it[response].toString() }
-            .toMutableList()
+            .map { it[response].toString() }.toMutableList()
     }
 
     fun addResponse(responses : MutableList<String>, idBet : UUID ) {
diff --git a/Sources/src/main/kotlin/allin/entities/UserEntity.kt b/Sources/src/main/kotlin/allin/entities/UserEntity.kt
index 6574bb4..9a1bcfc 100644
--- a/Sources/src/main/kotlin/allin/entities/UserEntity.kt
+++ b/Sources/src/main/kotlin/allin/entities/UserEntity.kt
@@ -6,10 +6,9 @@ import allin.model.User
 import allin.utils.Execute
 import org.ktorm.dsl.*
 import org.ktorm.entity.*
-import org.ktorm.schema.Table
-import org.ktorm.schema.double
-import org.ktorm.schema.int
-import org.ktorm.schema.varchar
+import org.ktorm.schema.*
+import java.util.*
+import java.util.UUID.fromString
 
 interface UserEntity : Entity<UserEntity> {
     val username: String
@@ -18,7 +17,7 @@ interface UserEntity : Entity<UserEntity> {
     var nbCoins: Double
 }
 object UsersEntity : Table<UserEntity>("utilisateur") {
-    val id = int("id").primaryKey()
+    val id = uuid("id").primaryKey()
     val username = varchar("username")
     val password = varchar("password")
     val nbCoins = double("coins")
@@ -63,7 +62,7 @@ object UsersEntity : Table<UserEntity>("utilisateur") {
 
     fun addUserEntity(user : User){
         database.insert(UsersEntity){
-            set(it.id,user.id)
+            set(it.id,fromString(user.id))
             set(it.nbCoins,user.nbCoins)
             set(it.username,user.username)
             set(it.password,user.password)
diff --git a/Sources/src/main/kotlin/allin/utils/CryptManager.kt b/Sources/src/main/kotlin/allin/utils/CryptManager.kt
index 9a34cc9..7f8d7fa 100644
--- a/Sources/src/main/kotlin/allin/utils/CryptManager.kt
+++ b/Sources/src/main/kotlin/allin/utils/CryptManager.kt
@@ -18,7 +18,6 @@ class CryptManager {
         return BCrypt.hashpw(password,salt)
     }
     fun passwordCrypt(user: User){
-        println(salt)
         user.password=BCrypt.hashpw(user.password,salt)
     }
     fun passwordDecrypt(password: String, passwordClear: String): Boolean{