diff --git a/README.md b/README.md index 8be6a1f..394d13f 100644 --- a/README.md +++ b/README.md @@ -25,7 +25,7 @@ - [ ] 從caddy日誌收集用戶訪問目標數據時間 - [ ] 計算指標作爲API提供輸出 - [ ] 數據與指標統覽後臺 -- [ ] 游戏 作品 文章 收藏夹 分别添加喜欢数点赞数是否喜欢是否点赞字段 +- [x] 游戏 作品 文章 收藏夹 分别添加喜欢数点赞数是否喜欢是否点赞字段 diff --git a/api/collect.go b/api/collect.go index 1d92fa0..068f43d 100644 --- a/api/collect.go +++ b/api/collect.go @@ -34,11 +34,11 @@ var CollectionItems = &graphql.Field{ Description: "收藏列表", Type: graphql.NewObject(graphql.ObjectConfig{ Name: "CollectConnection", - Description: "条件筛选收藏列表", + Description: "条件筛选收藏夹列表", Fields: graphql.Fields{ "list": &graphql.Field{Type: graphql.NewList(graphql.NewObject(graphql.ObjectConfig{ Name: "collection", - Description: "收藏", + Description: "收藏夹", Fields: graphql.Fields{ "id": &graphql.Field{Type: graphql.Int, Description: "ID"}, "type": &graphql.Field{Type: graphql.Int, Description: "类型"}, @@ -52,8 +52,8 @@ var CollectionItems = &graphql.Field{ "fan": &graphql.Field{Type: graphql.Boolean, Description: "当前用户是否关注"}, "user": &graphql.Field{Type: userType, Description: "用户"}, }, - })), Description: "收藏列表"}, - "total": &graphql.Field{Type: graphql.Int, Description: "收藏总数"}, + })), Description: "收藏夹列表"}, + "total": &graphql.Field{Type: graphql.Int, Description: "收藏夹总数"}, }, }), Args: graphql.FieldConfigArgument{ @@ -82,6 +82,7 @@ var CollectionItems = &graphql.Field{ Column: clause.Column{Name: p.Args["sort"].(string)}, Desc: p.Args["order"].(string) == "DESC", } + if err := db.Limit(limit).Preload("User").Order(order).Find(&collects).Error; err != nil { fmt.Println(err.Error()) return nil, err