feat: implement is_above for roles and reuse same functions from channels!

src/api/v1/servers/mod.rs

@@ -14,7 +14,6 @@ use crate::{
 #[derive(Deserialize)]
 struct GuildInfo {
     name: String,
-    description: Option<String>,
 }
 
 pub fn web() -> Scope {
@@ -41,7 +40,6 @@ pub async fn create(
     let guild = Guild::new(
         &mut conn,
         guild_info.name.clone(),
-        guild_info.description.clone(),
         uuid,
     )
     .await?;

src/api/v1/servers/uuid/channels/mod.rs

@@ -1,9 +1,5 @@
 use crate::{
-    Data,
-    api::v1::auth::check_access_token,
-    error::Error,
-    structs::{Channel, Member},
-    utils::{get_auth_header, order_channels},
+    api::v1::auth::check_access_token, error::Error, structs::{Channel, Member}, utils::{get_auth_header, order_by_is_above}, Data
 };
 use ::uuid::Uuid;
 use actix_web::{HttpRequest, HttpResponse, get, post, web};
@@ -43,7 +39,7 @@ pub async fn get(
 
     let channels = Channel::fetch_all(&data.pool, guild_uuid).await?;
 
-    let channels_ordered = order_channels(channels).await?;
+    let channels_ordered = order_by_is_above(channels).await?;
 
     data.set_cache_key(
         format!("{}_channels", guild_uuid),

src/api/v1/servers/uuid/roles/mod.rs

@@ -3,11 +3,7 @@ use actix_web::{HttpRequest, HttpResponse, get, post, web};
 use serde::Deserialize;
 
 use crate::{
-    Data,
-    api::v1::auth::check_access_token,
-    error::Error,
-    structs::{Member, Role},
-    utils::get_auth_header,
+    api::v1::auth::check_access_token, error::Error, structs::{Member, Role}, utils::{get_auth_header, order_by_is_above}, Data
 };
 
 pub mod uuid;
@@ -43,10 +39,12 @@ pub async fn get(
 
     let roles = Role::fetch_all(&mut conn, guild_uuid).await?;
 
-    data.set_cache_key(format!("{}_roles", guild_uuid), roles.clone(), 1800)
+    let roles_ordered = order_by_is_above(roles).await?;
+
+    data.set_cache_key(format!("{}_roles", guild_uuid), roles_ordered.clone(), 1800)
         .await?;
 
-    Ok(HttpResponse::Ok().json(roles))
+    Ok(HttpResponse::Ok().json(roles_ordered))
 }
 
 #[post("{uuid}/roles")]