Lucus/gamenight
1
0
Fork 0
forked from Roflin/gamenight
Code Issues Pull Requests Projects Releases Wiki Activity

Abstracted away getting a PgConnection with expect().

Browse Source
This commit is contained in:
Dennis Brentjes
2023-03-26 11:14:05 +02:00
parent 217e5ee64b
commit 3509a70a6a
4 changed files with 25 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
backend-actix/src/request/user_handlers.rs
View File

@@ -7,6 +7,7 @@ use crate::request::requests::{Login, Register};
use crate::request::error::ApiError;
use crate::request::responses::LoginResponse;
use crate::request::authorization::get_token;
use crate::request::util::GetPgConnection;
use crate::schema::{self};
use serde_json;
@@ -36,7 +37,7 @@ pub async fn login(pool: web::Data<DbPool>, login_data: web::Json<Login>) -> Res
let data = login_data.into_inner();
let response = if let Some(user) = web::block(move || {
let mut conn = pool.get().expect("couldn't get db connection from pool");
let mut conn = pool.get_conn();
schema::login(&mut conn, data.into())
})
.await??
@@ -58,17 +59,15 @@ pub async fn login(pool: web::Data<DbPool>, login_data: web::Json<Login>) -> Res
pub async fn register(pool: web::Data<DbPool>, register_data: web::Json<Register>) -> Result<impl Responder, ApiError> {
let data1 = register_data.clone();
let data2 = register_data.clone();
let register_request : schema::user::Register = data2.into();
let mut conn1 = pool.get().expect("couldn't get db connection from pool");
let mut conn2 = pool.get().expect("couldn't get db connection from pool");
let register_request = data2.into();
let mut conn1 = pool.get_conn();
let mut conn2 = pool.get_conn();
let _validation_result = web::block(move || {
data1.validate_args((&mut conn1, &mut conn2))
}).await??;
let mut conn3 = pool.get().expect("couldn't get db connection from pool");
let mut conn3 = pool.get_conn();
let _register_result = web::block(move || {
schema::register(&mut conn3, register_request)
}).await??;