feat: implement fetching of all servers
All checks were successful
ci/woodpecker/push/build-and-publish Pipeline was successful

This commit is contained in:
Radical 2025-05-20 22:49:41 +02:00
parent a676962316
commit fd8d823404
3 changed files with 101 additions and 13 deletions

View file

@ -1,9 +1,9 @@
use actix_web::{Error, HttpRequest, HttpResponse, Scope, post, web};
use actix_web::{get, post, web, Error, HttpRequest, HttpResponse, Scope};
use serde::Deserialize;
mod uuid;
use crate::{Data, api::v1::auth::check_access_token, structs::Guild, utils::get_auth_header};
use crate::{api::v1::auth::check_access_token, structs::{Guild, StartAmountQuery}, utils::get_auth_header, Data};
#[derive(Deserialize)]
struct GuildInfo {
@ -12,11 +12,14 @@ struct GuildInfo {
}
pub fn web() -> Scope {
web::scope("/servers").service(res).service(uuid::web())
web::scope("/servers")
.service(create)
.service(get)
.service(uuid::web())
}
#[post("")]
pub async fn res(
pub async fn create(
req: HttpRequest,
guild_info: web::Json<GuildInfo>,
data: web::Data<Data>,
@ -51,3 +54,37 @@ pub async fn res(
Ok(HttpResponse::Ok().json(guild.unwrap()))
}
#[get("")]
pub async fn get(
req: HttpRequest,
request_query: web::Query<StartAmountQuery>,
data: web::Data<Data>,
) -> Result<HttpResponse, Error> {
let headers = req.headers();
let auth_header = get_auth_header(headers);
let start = request_query.start.unwrap_or(0);
let amount = request_query.amount.unwrap_or(10);
if let Err(error) = auth_header {
return Ok(error);
}
let authorized = check_access_token(auth_header.unwrap(), &data.pool).await;
if let Err(error) = authorized {
return Ok(error);
}
let guilds = Guild::fetch_amount(&data.pool, start, amount).await;
if let Err(error) = guilds {
return Ok(error);
}
Ok(HttpResponse::Ok().json(guilds.unwrap()))
}

View file

@ -1,18 +1,12 @@
use crate::{Data, api::v1::auth::check_access_token, utils::get_auth_header};
use crate::{api::v1::auth::check_access_token, structs::StartAmountQuery, utils::get_auth_header, Data};
use actix_web::{Error, HttpRequest, HttpResponse, Scope, get, web};
use log::error;
use serde::{Deserialize, Serialize};
use serde::Serialize;
use sqlx::prelude::FromRow;
mod me;
mod uuid;
#[derive(Deserialize)]
struct RequestQuery {
start: Option<i32>,
amount: Option<i32>,
}
#[derive(Serialize, FromRow)]
struct Response {
uuid: String,
@ -31,7 +25,7 @@ pub fn web() -> Scope {
#[get("")]
pub async fn res(
req: HttpRequest,
request_query: web::Query<RequestQuery>,
request_query: web::Query<StartAmountQuery>,
data: web::Data<Data>,
) -> Result<HttpResponse, Error> {
let headers = req.headers();

View file

@ -329,6 +329,57 @@ impl Guild {
})
}
pub async fn fetch_amount(
pool: &Pool<Postgres>,
start: i32,
amount: i32,
) -> Result<Vec<Self>, HttpResponse> {
// Fetch guild data from database
let rows = sqlx::query_as::<_, (String, String, String, Option<String>)>(
"SELECT CAST(uuid AS VARCHAR), CAST(owner_uuid AS VARCHAR), name, description
FROM guilds
ORDER BY name
LIMIT $1 OFFSET $2",
)
.bind(amount)
.bind(start)
.fetch_all(pool)
.await
.map_err(|error| {
error!("{}", error);
HttpResponse::InternalServerError().finish()
})?;
// Process each guild concurrently
let guild_futures = rows.into_iter().map(|(guild_uuid_raw, owner_uuid_raw, name, description)| async move {
let uuid = Uuid::from_str(&guild_uuid_raw).map_err(|_| {
HttpResponse::BadRequest().body("Invalid guild UUID format")
})?;
let owner_uuid = Uuid::from_str(&owner_uuid_raw).map_err(|_| {
HttpResponse::BadRequest().body("Invalid owner UUID format")
})?;
let (member_count, roles) = tokio::try_join!(
Member::count(pool, uuid),
Role::fetch_all(pool, uuid)
)?;
Ok::<Guild, HttpResponse>(Self {
uuid,
name,
description,
icon: String::from("bogus"), // FIXME: Replace with actual icon handling
owner_uuid,
roles,
member_count,
})
});
// Execute all futures concurrently and collect results
futures::future::try_join_all(guild_futures).await
}
pub async fn new(
pool: &Pool<Postgres>,
name: String,
@ -710,3 +761,9 @@ impl Invite {
Ok(invite.unwrap().build())
}
}
#[derive(Deserialize)]
pub struct StartAmountQuery {
pub start: Option<i32>,
pub amount: Option<i32>,
}