Patch User UUID
continuous-integration/drone/push Build is passing Details

pull/4/head
luevard 1 year ago
parent b46a97d4de
commit d89fc02616

@ -27,8 +27,7 @@ object ResponsesEntity : Table<ResponseEntity>("response") {
return database.from(ResponsesEntity) return database.from(ResponsesEntity)
.select(response) .select(response)
.where { id eq idBet } .where { id eq idBet }
.map { it[response].toString() } .map { it[response].toString() }.toMutableList()
.toMutableList()
} }
fun addResponse(responses : MutableList<String>, idBet : UUID ) { fun addResponse(responses : MutableList<String>, idBet : UUID ) {

@ -6,10 +6,9 @@ import allin.model.User
import allin.utils.Execute import allin.utils.Execute
import org.ktorm.dsl.* import org.ktorm.dsl.*
import org.ktorm.entity.* import org.ktorm.entity.*
import org.ktorm.schema.Table import org.ktorm.schema.*
import org.ktorm.schema.double import java.util.*
import org.ktorm.schema.int import java.util.UUID.fromString
import org.ktorm.schema.varchar
interface UserEntity : Entity<UserEntity> { interface UserEntity : Entity<UserEntity> {
val username: String val username: String
@ -18,7 +17,7 @@ interface UserEntity : Entity<UserEntity> {
var nbCoins: Double var nbCoins: Double
} }
object UsersEntity : Table<UserEntity>("utilisateur") { object UsersEntity : Table<UserEntity>("utilisateur") {
val id = int("id").primaryKey() val id = uuid("id").primaryKey()
val username = varchar("username") val username = varchar("username")
val password = varchar("password") val password = varchar("password")
val nbCoins = double("coins") val nbCoins = double("coins")
@ -63,7 +62,7 @@ object UsersEntity : Table<UserEntity>("utilisateur") {
fun addUserEntity(user : User){ fun addUserEntity(user : User){
database.insert(UsersEntity){ database.insert(UsersEntity){
set(it.id,user.id) set(it.id,fromString(user.id))
set(it.nbCoins,user.nbCoins) set(it.nbCoins,user.nbCoins)
set(it.username,user.username) set(it.username,user.username)
set(it.password,user.password) set(it.password,user.password)

@ -18,7 +18,6 @@ class CryptManager {
return BCrypt.hashpw(password,salt) return BCrypt.hashpw(password,salt)
} }
fun passwordCrypt(user: User){ fun passwordCrypt(user: User){
println(salt)
user.password=BCrypt.hashpw(user.password,salt) user.password=BCrypt.hashpw(user.password,salt)
} }
fun passwordDecrypt(password: String, passwordClear: String): Boolean{ fun passwordDecrypt(password: String, passwordClear: String): Boolean{

Loading…
Cancel
Save