swrup/geochan
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix user exists query

Browse source
This commit is contained in:
Swrup 2021-12-07 00:43:36 +01:00
parent 4bf9cdfc8e
commit 23bf81188a
1 changed files with 15 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

21
src/user.ml
View file

@ -16,10 +16,10 @@ module Q = struct
Caqti_request.find_opt Caqti_type.string Caqti_type.string Caqti_request.find_opt Caqti_type.string Caqti_type.string
"SELECT password FROM user WHERE nick=?;" "SELECT password FROM user WHERE nick=?;"
let find_user = let is_already_user =
Caqti_request.find_opt Caqti_request.find_opt
Caqti_type.(tup2 string string) Caqti_type.(tup2 string string)
Caqti_type.unit Caqti_type.int
"SELECT EXISTS(SELECT 1 FROM user WHERE nick=? OR email=?);" "SELECT EXISTS(SELECT 1 FROM user WHERE nick=? OR email=?);"
let inser_new_user = let inser_new_user =
@ -110,17 +110,22 @@ let register ~email ~nick ~password =
if not valid then if not valid then
Error "Something is wrong" Error "Something is wrong"
else else
let unique = Db.find_opt Q.find_user (nick, email) in let unique = Db.find_opt Q.is_already_user (nick, email) in
match unique with match unique with
| Ok unique -> ( | Ok unique -> (
match unique with match unique with
| Some _ -> Error "nick or email already exists" | Some nb -> (
| None -> ( match nb with
let res = Db.exec Q.inser_new_user (nick, password, email, ("", "")) in | 0 -> (
let res =
Db.exec Q.inser_new_user (nick, password, email, ("", ""))
in
match res with match res with
| Ok res -> Ok res | Ok res -> Ok res
| Error e -> Error (Format.sprintf "db error: %s" (Caqti_error.show e)) | Error e ->
) ) Error (Format.sprintf "db error: %s" (Caqti_error.show e)) )
| _ -> Error "nick or email already exists" )
| None -> Error "db error" )
| Error e -> Error (Format.sprintf "db error: %s" (Caqti_error.show e)) | Error e -> Error (Format.sprintf "db error: %s" (Caqti_error.show e))
let list () = let list () =