Splits database into a separate crate

This commit is contained in:
2025-05-30 14:31:00 +02:00
parent 3f7ed03973
commit 597a960bf1
34 changed files with 368 additions and 402 deletions

View File

@@ -2,27 +2,25 @@
use actix_web::http::header::ContentType;
use actix_web::{web, get, post, HttpResponse, Responder};
use validator::ValidateArgs;
use crate::DbPool;
use crate::request::requests::{Login, Register, RegisterContext};
use crate::request::error::ApiError;
use crate::request::responses::LoginResponse;
use crate::request::authorization::get_token;
use crate::util::GetConnection;
use crate::schema::{self};
use serde_json;
use gamenight_database::{DbPool, GetConnection};
impl From<Login> for schema::user::LoginUser {
impl From<Login> for gamenight_database::user::LoginUser {
fn from(val: Login) -> Self {
schema::user::LoginUser {
gamenight_database::user::LoginUser {
username: val.username,
password: val.password
}
}
}
impl From<Register> for schema::user::Register {
impl From<Register> for gamenight_database::user::Register {
fn from(val: Register) -> Self {
schema::user::Register {
gamenight_database::user::Register {
email: val.email,
username: val.username,
password: val.password
@@ -36,7 +34,7 @@ pub async fn login(pool: web::Data<DbPool>, login_data: web::Json<Login>) -> Res
if let Ok(Some(user)) = web::block(move || {
let mut conn = pool.get_conn();
schema::login(&mut conn, data.into())
gamenight_database::login(&mut conn, data.into())
})
.await?
{
@@ -58,7 +56,7 @@ pub async fn register(pool: web::Data<DbPool>, register_data: web::Json<Register
register_data.validate_with_args(&RegisterContext{pool: &pool})?;
let register_request = register_data.into_inner().into();
let mut conn = pool.get_conn();
schema::register(&mut conn, register_request)?;
gamenight_database::register(&mut conn, register_request)?;
Ok(())
}).await??;