1 files changed, 43 insertions, 35 deletions

diff --git a/src/routers/queue/manage.rs b/src/routers/queue/manage.rs
index 8f42e07..b799458 100644
--- a/src/routers/queue/manage.rs
+++ b/src/routers/queue/manage.rs
@@ -1,50 +1,32 @@
 use axum::extract::State;
-use entity::{queues, users};
+use entity::queues;
 use sea_orm::{
-    ActiveModelTrait, ActiveValue::Set, ColumnTrait, DatabaseConnection, EntityTrait,
-    IntoActiveModel, ModelTrait, QueryFilter,
+    ActiveModelTrait, ActiveValue::Set, ColumnTrait, EntityTrait, IntoActiveModel, ModelTrait,
+    QueryFilter,
 };
 use serde::Deserialize;
 use utoipa::{IntoParams, ToSchema};
 use utoipa_axum::{router::OpenApiRouter, routes};
 
 use crate::{
-    ApiError, ApiResult, AppState, ClientError, GlobalResponses, SuccessResponse,
+    ApiResult, AppState, ClientError, GlobalResponses, SuccessResponse,
     extract::{ApiJson, ApiQuery, Auth},
     models::Queue,
     tags::QUEUE,
+    util::{get_owned_queue, user_exists},
 };
 
-async fn user_exists(id: i64, db: &DatabaseConnection) -> Result<bool, ApiError> {
-    Ok(users::Entity::find_by_id(id).one(db).await?.is_some())
-}
-
-async fn get_owned_queue(
-    id: i64,
-    owner_id: i64,
-    db: &DatabaseConnection,
-) -> Result<queues::Model, ApiError> {
-    let queue = queues::Entity::find_by_id(id)
-        .one(db)
-        .await?
-        .ok_or(ClientError::QueueNotFound { id })?;
-
-    if queue.owner_id != owner_id {
-        return Err(ClientError::NotQueueOwner { id: queue.id }.into());
-    }
-
-    Ok(queue)
-}
-
 #[derive(Deserialize, IntoParams)]
 #[into_params(parameter_in = Query)]
-struct GetByIdQueueQuery {
+struct GetQueueByIdQuery {
+    #[param(example = 1)]
     id: i64,
 }
 
 #[derive(Deserialize, IntoParams)]
 #[into_params(parameter_in = Query)]
 struct GetByOwnerIdQuery {
+    #[param(example = 1)]
     owner_id: i64,
 }
 
@@ -82,11 +64,11 @@ struct DeleteQueueRequest {
 
 #[utoipa::path(
     get,
-    path = "/get/id",
+    path = "/get/by_id",
     tag = QUEUE,
     summary = "Get by id",
     description = "Get the queue by id",
-    params(GetByIdQueueQuery),
+    params(GetQueueByIdQuery),
     responses(
         (
             status = 200, body = SuccessResponse<Option<Queue>>,
@@ -97,7 +79,7 @@ struct DeleteQueueRequest {
 )]
 async fn get_by_id(
     State(state): State<AppState>,
-    ApiQuery(req): ApiQuery<GetByIdQueueQuery>,
+    ApiQuery(req): ApiQuery<GetQueueByIdQuery>,
 ) -> ApiResult<Option<Queue>> {
     Ok(SuccessResponse::ok(
         queues::Entity::find_by_id(req.id)
@@ -109,10 +91,10 @@ async fn get_by_id(
 
 #[utoipa::path(
     get,
-    path = "/get/owner",
+    path = "/get/by_owner",
     tag = QUEUE,
     summary = "Get by owner",
-    description = "Get queues for a given owner",
+    description = "Get queues by the owner id",
     params(GetByOwnerIdQuery),
     responses(
         (
@@ -126,7 +108,7 @@ async fn get_by_owner(
     State(state): State<AppState>,
     ApiQuery(req): ApiQuery<GetByOwnerIdQuery>,
 ) -> ApiResult<Vec<Queue>> {
-    return Ok(SuccessResponse::ok(
+    Ok(SuccessResponse::ok(
         queues::Entity::find()
             .filter(queues::Column::OwnerId.eq(req.owner_id))
             .all(&state.db)
@@ -134,7 +116,32 @@ async fn get_by_owner(
             .into_iter()
             .map(Into::into)
             .collect(),
-    ));
+    ))
+}
+
+#[utoipa::path(
+    get,
+    path = "/get/owned",
+    tag = QUEUE,
+    summary = "Get owned",
+    description = "Get your queues",
+    responses(
+        (
+            status = 200, body = SuccessResponse<Vec<Queue>>,
+            description = "Success response with queues owned by you"
+        ),
+        GlobalResponses
+    ),
+)]
+async fn get_owned(State(state): State<AppState>, Auth(user): Auth) -> ApiResult<Vec<Queue>> {
+    Ok(SuccessResponse::ok(
+        user.find_related(queues::Entity)
+            .all(&state.db)
+            .await?
+            .into_iter()
+            .map(Into::into)
+            .collect(),
+    ))
 }
 
 #[utoipa::path(
@@ -171,7 +178,7 @@ async fn create(
 }
 
 #[utoipa::path(
-    put,
+    patch,
     path = "/update/name",
     tag = QUEUE,
     summary = "Change name",
@@ -202,7 +209,7 @@ async fn update_name(
 }
 
 #[utoipa::path(
-    put,
+    patch,
     path = "/update/owner",
     tag = QUEUE,
     summary = "Change owner",
@@ -269,6 +276,7 @@ pub fn router() -> OpenApiRouter<AppState> {
     OpenApiRouter::new()
         .routes(routes!(get_by_id))
         .routes(routes!(get_by_owner))
+        .routes(routes!(get_owned))
         .routes(routes!(create))
         .routes(routes!(update_name))
         .routes(routes!(update_owner))