From e71bb730e583846725a04e4f7e991aadf108a54e Mon Sep 17 00:00:00 2001
From: StNicolay <stnicolay2007@mail.ru>
Date: Fri, 9 Aug 2024 23:15:00 +0300
Subject: [PATCH] More fixes

---
 src/endpoints/folder/delete.rs             | 2 +-
 src/endpoints/permissions/get.rs           | 6 +++---
 src/endpoints/permissions/get_top_level.rs | 6 +++---
 src/endpoints/users/put.rs                 | 2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/endpoints/folder/delete.rs b/src/endpoints/folder/delete.rs
index 30e9c4d..1c6ba90 100644
--- a/src/endpoints/folder/delete.rs
+++ b/src/endpoints/folder/delete.rs
@@ -8,7 +8,7 @@ pub struct Params {
 pub async fn delete(
     State(state): State<AppState>,
     claims: Claims,
-    Json(params): Json<Params>,
+    Query(params): Query<Params>,
 ) -> GeneralResult<()> {
     let root = db::folder::get_root(claims.user_id, &state.pool)
         .await
diff --git a/src/endpoints/permissions/get.rs b/src/endpoints/permissions/get.rs
index 98983b2..d302fd2 100644
--- a/src/endpoints/permissions/get.rs
+++ b/src/endpoints/permissions/get.rs
@@ -18,8 +18,8 @@ pub async fn get(
         .await
         .can_manage_guard()?;
 
-    let permissions = db::permissions::get_all_for_folder(params.folder_id, &pool)
+    db::permissions::get_all_for_folder(params.folder_id, &pool)
         .await
-        .handle_internal("Error getting permissions")?;
-    Ok(Json(permissions))
+        .handle_internal("Error getting permissions")
+        .map(Json)
 }
diff --git a/src/endpoints/permissions/get_top_level.rs b/src/endpoints/permissions/get_top_level.rs
index e311ba0..0f96c3e 100644
--- a/src/endpoints/permissions/get_top_level.rs
+++ b/src/endpoints/permissions/get_top_level.rs
@@ -6,8 +6,8 @@ pub async fn get_top_level(
     State(pool): State<Pool>,
     claims: Claims,
 ) -> GeneralResult<Json<Vec<FolderWithoutParentId>>> {
-    let folders = db::permissions::get_top_level_permitted_folders(claims.user_id, &pool)
+    db::permissions::get_top_level_permitted_folders(claims.user_id, &pool)
         .await
-        .handle_internal("Error reading from the database")?;
-    Ok(Json(folders))
+        .handle_internal("Error reading from the database")
+        .map(Json)
 }
diff --git a/src/endpoints/users/put.rs b/src/endpoints/users/put.rs
index c1de3d2..fa41ddb 100644
--- a/src/endpoints/users/put.rs
+++ b/src/endpoints/users/put.rs
@@ -4,7 +4,7 @@ use crate::prelude::*;
 
 #[derive(Deserialize, Debug, Validate)]
 pub struct Params {
-    #[validate(email)]
+    #[validate(length(min = 3, max = 10))]
     username: String,
     #[validate(email)]
     email: String,