feat: migrate to diesel and new error type in users

src/api/v1/users/mod.rs

@@ -1,15 +1,19 @@
-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 actix_web::{HttpRequest, HttpResponse, Scope, get, web};
+use diesel::{prelude::Queryable, QueryDsl, Selectable, SelectableHelper};
+use diesel_async::RunQueryDsl;
 use serde::Serialize;
-use sqlx::prelude::FromRow;
+use ::uuid::Uuid;
+
+use crate::{error::Error,api::v1::auth::check_access_token, schema::users::{self, dsl}, structs::StartAmountQuery, utils::get_auth_header, Data};
 
 mod me;
 mod uuid;
 
-#[derive(Serialize, FromRow)]
+#[derive(Serialize, Queryable, Selectable)]
+#[diesel(table_name = users)]
+#[diesel(check_for_backend(diesel::pg::Pg))]
 struct Response {
-    uuid: String,
+    uuid: Uuid,
     username: String,
     display_name: Option<String>,
     email: String,
@@ -30,7 +34,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);
 
@@ -40,24 +44,17 @@ 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 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 users: Vec<Response> = dsl::users
+        .order_by(dsl::username)
+        .offset(start)
+        .limit(amount)
+        .select(Response::as_select())
+        .load(&mut conn)
+        .await?;
 
-    if let Err(error) = row {
-        error!("{}", error);
-        return Ok(HttpResponse::InternalServerError().finish());
-    }
-
-    let accounts: Vec<Response> = row.unwrap();
-
-    Ok(HttpResponse::Ok().json(accounts))
+    Ok(HttpResponse::Ok().json(users))
 }