feat(admin, hitokoto): add uuids search

hitokoto-osc · Oct 5, 2023 · 11f3a83 · 11f3a83
1 parent 22b6fc0
commit 11f3a83
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 9 deletions.
diff --git a/internal/controller/hitokoto/hitokoto_adminV1_move_list.go b/internal/controller/hitokoto/hitokoto_adminV1_move_list.go
@@ -23,8 +23,7 @@ func (c *ControllerAdminV1) MoveList(ctx context.Context, req *adminV1.MoveListR
 
 	failedChan := make(chan *moveErrCollector, total)
 	for _, uuid := range req.UUIDs {
-		uuid := uuid
-		go func() {
+		go func(uuid string) {
 			defer wg.Done()
 			sentence, err := service.Hitokoto().GetHitokotoV1SchemaByUUID(ctx, uuid)
 			if err != nil {
@@ -42,7 +41,7 @@ func (c *ControllerAdminV1) MoveList(ctx context.Context, req *adminV1.MoveListR
 				}
 				return
 			}
-		}()
+		}(uuid)
 	}
 	go func() {
 		wg.Wait()

diff --git a/internal/controller/hitokoto/hitokoto_admin_v1_get_list.go b/internal/controller/hitokoto/hitokoto_admin_v1_get_list.go
@@ -2,10 +2,11 @@ package hitokoto
 
 import (
 	"context"
-	"fmt"
+	"strings"
 
 	"github.com/hitokoto-osc/reviewer/internal/model"
 	"github.com/hitokoto-osc/reviewer/internal/service"
+	"github.com/samber/lo"
 
 	"github.com/gogf/gf/v2/errors/gcode"
 	"github.com/gogf/gf/v2/errors/gerror"
@@ -14,12 +15,17 @@ import (
 )
 
 func (c *ControllerAdminV1) GetList(ctx context.Context, req *adminV1.GetListReq) (res *adminV1.GetListRes, err error) {
-	fmt.Printf("GetList: %+v", req)
+	// fmt.Printf("GetList: %+v", req)
+	if len(req.UUIDs) > 0 {
+		req.UUIDs = lo.Map(req.UUIDs, func(item string, index int) string {
+			return strings.Trim(item, "\" '") // 去除首尾的引号
+		})
+	}
 	out, err := service.Hitokoto().GetList(ctx, &model.GetHitokotoV1SchemaListInput{
 		Page:     req.Page,
 		PageSize: req.PageSize,
 		Order:    req.Order,
-		UUID:     req.UUID,
+		UUIDs:    req.UUIDs,
 		Keywords: req.Keywords,
 		Creator:  req.Creator,
 		From:     req.From,

diff --git a/internal/logic/hitokoto/hitokoto.go b/internal/logic/hitokoto/hitokoto.go
@@ -137,8 +137,10 @@ func (s *sHitokoto) GetList(ctx context.Context, in *model.GetHitokotoV1SchemaLi
 		}
 	}
 
-	if in.UUID != nil {
-		query = query.Where(dao.Sentence.Columns().Uuid, *in.UUID)
+	if len(in.UUIDs) > 0 {
+		for _, uuid := range in.UUIDs {
+			query = query.WhereOr(dao.Sentence.Columns().Uuid, uuid)
+		}
 		goto startQuery // 跳过后续的查询条件
 	}
 

diff --git a/internal/logic/poll/ruling.go b/internal/logic/poll/ruling.go
@@ -74,7 +74,10 @@ func (s *sPoll) DoRuling(
 		e = dao.Pending.Ctx(ctx).TX(tx).Where(dao.Pending.Columns().Uuid, poll.SentenceUuid).Scan(&pending)
 		if e != nil {
 			return gerror.Wrapf(e, "获取句子 %s 的 pending 信息失败", poll.SentenceUuid)
+		} else if pending == nil {
+			return gerror.Newf("获取句子 %s 的 pending 信息失败", poll.SentenceUuid)
 		}
+
 		if target == consts.PollStatusApproved || target == consts.PollStatusRejected {
 			// 移动句子
 			_, e = dao.Pending.Ctx(ctx).TX(tx).Where(dao.Pending.Columns().Uuid, poll.SentenceUuid).Delete()

diff --git a/internal/model/hitokoto.go b/internal/model/hitokoto.go
@@ -38,7 +38,7 @@ type GetHitokotoV1SchemaListInput struct {
 	PageSize int    `json:"page_size" v:"min:0|max:1000" d:"30" dc:"每页数量"`
 	Order    string `json:"order" v:"in:desc,asc" d:"desc" dc:"排序方式"`
 	// 搜索参数
-	UUID     *string                `json:"uuid" dc:"句子 UUID"`
+	UUIDs    []string               `json:"uuids" dc:"句子 UUID"`
 	Keywords *string                `json:"keyword" dc:"句子内容"`
 	Creator  *string                `json:"creator" dc:"句子创建者（或 ID）"`
 	From     *string                `json:"from" dc:"句子来源"`