fix api

ralinejs · Sep 21, 2024 · 5eaa6ea · 5eaa6ea
1 parent 4bf08fe
commit 5eaa6ea
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 19 deletions.
diff --git a/packages/api/package.json b/packages/api/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@raline/api",
-  "version": "0.0.2",
+  "version": "0.0.3",
   "description": "Client API for raline comment system",
   "keywords": [
     "api",

diff --git a/packages/api/src/comment.ts b/packages/api/src/comment.ts
@@ -15,18 +15,18 @@ export interface GetCommentOptions extends BaseAPIOptions {
   path: string;
 
   /**
-   * 评论分页数
+   * 评论偏移ID
    *
    * Comment pagination number
    */
-  page: number;
+  offset: number;
 
   /**
    * 每页评论个数
    *
    * Comment number per page
    */
-  pageSize: number;
+  limit: number;
 
   /**
    * 排序方式
@@ -91,8 +91,8 @@ export const getComment = ({
   serverURL,
   lang,
   path,
-  page,
-  pageSize,
+  offset,
+  limit,
   sortBy,
   signal,
   token,
@@ -104,7 +104,7 @@ export const getComment = ({
   return fetch(
     `${getFetchPrefix(serverURL)}comment?type=list&path=${encodeURIComponent(
       path,
-    )}&pageSize=${pageSize}&page=${page}&lang=${lang}&sortBy=${sortBy}`,
+    )}&limit=${limit}&offset=${offset}&lang=${lang}&sortBy=${sortBy}`,
     { signal, headers },
   )
     .then(

diff --git a/packages/client/pnpm-lock.yaml b/packages/client/pnpm-lock.yaml
diff --git a/src/dto/comment.rs b/src/dto/comment.rs
@@ -2,6 +2,7 @@ use super::Urls;
 use crate::model::comments::Model as Comments;
 use crate::model::sea_orm_active_enums::CommentStatus;
 use derive_more::derive::From;
+use sea_orm::Order;
 use serde::{Deserialize, Serialize};
 use serde_with::serde_as;
 use serde_with::DisplayFromStr;
@@ -34,7 +35,8 @@ pub struct CountCommentQuery {
 #[derive(Debug, Validate, Deserialize)]
 pub struct ListCommentQuery {
     pub path: String,
-    pub order_by: OrderBy,
+    #[serde(rename = "sortBy")]
+    pub sort_by: OrderBy,
     #[validate(range(max = 200, message = "查询数据过多"))]
     pub limit: u64,
     pub offset: i64,
@@ -82,15 +84,18 @@ pub enum Owner {
 pub enum OrderBy {
     #[serde(rename = "like_desc")]
     Like,
-    #[serde(rename = "insert_at_desc")]
-    CreatedAt,
+    #[serde(rename = "insertedAt_asc")]
+    CreatedAtAsc,
+    #[serde(rename = "insertedAt_desc")]
+    CreatedAtDesc,
 }
 
 impl OrderBy {
-    pub fn into_column(&self) -> crate::model::comments::Column {
+    pub fn into_column_order(&self) -> (crate::model::comments::Column, Order) {
         match self {
-            Self::Like => crate::model::comments::Column::Star,
-            Self::CreatedAt => crate::model::comments::Column::CreatedAt,
+            Self::Like => (crate::model::comments::Column::Star, Order::Desc),
+            Self::CreatedAtAsc => (crate::model::comments::Column::CreatedAt, Order::Asc),
+            Self::CreatedAtDesc => (crate::model::comments::Column::CreatedAt, Order::Desc),
         }
     }
 }

diff --git a/src/http/comment.rs b/src/http/comment.rs
@@ -134,9 +134,10 @@ async fn get_comment_list(
 
     let filter = filter.and(comments::Column::Id.gt(q.offset));
 
+    let (column, order) = q.sort_by.into_column_order();
     let data = Comments::find()
         .filter(filter)
-        .order_by_desc(q.order_by.into_column())
+        .order_by(column, order)
         .limit(q.limit)
         .all(db)
         .await