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

feat: implement proper user and me structs

Browse source
This commit is contained in:
Radical 2025-05-20 18:04:44 +02:00
parent cee1b41e89
commit b66c8f0613
5 changed files with 191 additions and 76 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,8 +1,6 @@
use crate::{Data, api::v1::auth::check_access_token, utils::get_auth_header};
use crate::{api::v1::auth::check_access_token, structs::User, utils::get_auth_header, Data};
use actix_web::{Error, HttpRequest, HttpResponse, Scope, get, web};
use log::error;
use serde::{Deserialize, Serialize};
use sqlx::prelude::FromRow;
use serde::Deserialize;
mod me;
mod uuid;
@ -13,14 +11,6 @@ struct RequestQuery {
amount: Option<i32>,
}
#[derive(Serialize, FromRow)]
struct Response {
uuid: String,
username: String,
display_name: Option<String>,
email: String,
}
pub fn web() -> Scope {
web::scope("/users")
.service(res)
@ -52,18 +42,11 @@ pub async fn res(
return Ok(error);
}
let row = sqlx::query_as("SELECT CAST(uuid AS VARCHAR), username, display_name, email FROM users ORDER BY username LIMIT $1 OFFSET $2")
.bind(amount)
.bind(start)
.fetch_all(&data.pool)
.await;
let accounts = User::fetch_all(&data.pool, start, amount).await;
if let Err(error) = row {
error!("{}", error);
return Ok(HttpResponse::InternalServerError().finish());
if let Err(error) = accounts {
return Ok(error);
}
let accounts: Vec<Response> = row.unwrap();
Ok(HttpResponse::Ok().json(accounts))
Ok(HttpResponse::Ok().json(accounts.unwrap()))
}