radical/backend-ci-testing
1
0
Fork 0
forked from gorb/backend
Code Pull requests Activity

Merge branch 'main' into wip/images

Browse source
This commit is contained in:
Radical 2025-05-23 13:45:17 +02:00
commit 149b81973d
54 changed files with 1201 additions and 1691 deletions
Download patch file Download diff file Expand all files Collapse all files

48
src/api/v1/users/me.rs
View file

@ -1,33 +1,21 @@
use actix_web::{get, patch, web, Error, HttpRequest, HttpResponse};
use actix_web::{get, patch, web, HttpRequest, HttpResponse};
use serde::Deserialize;
use crate::{api::v1::auth::check_access_token, structs::Me, utils::get_auth_header, Data};
use crate::{error::Error, structs::Me, api::v1::auth::check_access_token, utils::get_auth_header, Data};
#[get("/me")]
pub async fn res(req: HttpRequest, data: web::Data<Data>) -> Result<HttpResponse, Error> {
let headers = req.headers();
let auth_header = get_auth_header(headers);
let auth_header = get_auth_header(headers)?;
if let Err(error) = auth_header {
return Ok(error);
}
let mut conn = data.pool.get().await?;
let authorized = check_access_token(auth_header.unwrap(), &data.pool).await;
let uuid = check_access_token(auth_header, &mut conn).await?;
if let Err(error) = authorized {
return Ok(error);
}
let me = Me::get(&mut conn, uuid).await?;
let uuid = authorized.unwrap();
let me = Me::get(&data.pool, uuid).await;
if let Err(error) = me {
return Ok(error);
}
Ok(HttpResponse::Ok().json(me.unwrap()))
Ok(HttpResponse::Ok().json(me))
}
#[derive(Deserialize)]
@ -42,27 +30,13 @@ struct NewInfo {
pub async fn update(req: HttpRequest, new_info: web::Json<NewInfo>, data: web::Data<Data>) -> Result<HttpResponse, Error> {
let headers = req.headers();
let auth_header = get_auth_header(headers);
let auth_header = get_auth_header(headers)?;
if let Err(error) = auth_header {
return Ok(error);
}
let mut conn = data.pool.get().await?;
let authorized = check_access_token(auth_header.unwrap(), &data.pool).await;
let uuid = check_access_token(auth_header, &mut conn).await?;
if let Err(error) = authorized {
return Ok(error);
}
let uuid = authorized.unwrap();
let me_result = Me::get(&data.pool, uuid).await;
if let Err(error) = me_result {
return Ok(error);
}
let me = me_result.unwrap();
let me = Me::get(&mut conn, uuid).await?;
if let Some(username) = &new_info.username {
todo!();

21
src/api/v1/users/mod.rs
View file

@ -1,5 +1,6 @@
use crate::{api::v1::auth::check_access_token, structs::{StartAmountQuery, User}, utils::get_auth_header, Data};
use actix_web::{Error, HttpRequest, HttpResponse, Scope, get, web};
use actix_web::{HttpRequest, HttpResponse, Scope, get, web};
use crate::{api::v1::auth::check_access_token, error::Error, structs::{StartAmountQuery, User}, utils::get_auth_header, Data};
mod me;
mod uuid;
@ -19,7 +20,7 @@ pub async fn res(
) -> Result<HttpResponse, Error> {
let headers = req.headers();
let auth_header = get_auth_header(headers);
let auth_header = get_auth_header(headers)?;
let start = request_query.start.unwrap_or(0);
@ -29,17 +30,11 @@ pub async fn res(
return Ok(HttpResponse::BadRequest().finish());
}
let authorized = check_access_token(auth_header.unwrap(), &data.pool).await;
let mut conn = data.pool.get().await?;
if let Err(error) = authorized {
return Ok(error);
}
check_access_token(auth_header, &mut conn).await?;
let accounts = User::fetch_amount(&data.pool, start, amount).await;
let users = User::fetch_amount(&mut conn, start, amount).await?;
if let Err(error) = accounts {
return Ok(error);
}
Ok(HttpResponse::Ok().json(accounts.unwrap()))
Ok(HttpResponse::Ok().json(users))
}

39
src/api/v1/users/uuid.rs
View file

@ -1,8 +1,8 @@
use actix_web::{Error, HttpRequest, HttpResponse, get, web};
use log::error;
use actix_web::{HttpRequest, HttpResponse, get, web};
use uuid::Uuid;
use crate::{api::v1::auth::check_access_token, structs::User, utils::get_auth_header, Data};
use crate::{error::Error, api::v1::auth::check_access_token, structs::User, utils::get_auth_header, Data};
#[get("/{uuid}")]
pub async fn res(
@ -14,42 +14,23 @@ pub async fn res(
let uuid = path.into_inner().0;
let auth_header = get_auth_header(headers);
let auth_header = get_auth_header(headers)?;
if let Err(error) = auth_header {
return Ok(error);
}
let mut conn = data.pool.get().await?;
let authorized = check_access_token(auth_header.unwrap(), &data.pool).await;
check_access_token(auth_header, &mut conn).await?;
if let Err(error) = authorized {
return Ok(error);
}
let cache_result = data.get_cache_key(uuid.to_string()).await;
if let Ok(cache_hit) = cache_result {
if let Ok(cache_hit) = data.get_cache_key(uuid.to_string()).await {
return Ok(HttpResponse::Ok()
.content_type("application/json")
.body(cache_hit));
}
let user_result = User::fetch_one(&data.pool, uuid).await;
let user = User::fetch_one(&mut conn, uuid).await?;
if let Err(error) = user_result {
return Ok(error);
}
let user = user_result.unwrap();
let cache_result = data
data
.set_cache_key(uuid.to_string(), user.clone(), 1800)
.await;
if let Err(error) = cache_result {
error!("{}", error);
return Ok(HttpResponse::InternalServerError().finish());
}
.await?;
Ok(HttpResponse::Ok().json(user))
}