fix: issues

hitokoto-osc · Aug 26, 2023 · 8fe8b54 · 8fe8b54
1 parent 8efdc0d
commit 8fe8b54
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 7 deletions.
diff --git a/api/poll/v1/poll.go b/api/poll/v1/poll.go
@@ -7,7 +7,7 @@ import (
 
 type PollReq struct {
 	g.Meta  `path:"/poll/:id" tags:"Poll" method:"put" summary:"投票"`
-	ID      int               `json:"id" dc:"投票ID" v:"required|int" in:"path"`
+	ID      int               `json:"id" dc:"投票ID" v:"required|integer" in:"path"`
 	Method  consts.PollMethod `json:"method" dc:"投票方式" v:"required|enums"`
 	MarkIDs []int             `json:"mark_ids" dc:"标记"`
 	Comment string            `json:"comment" dc:"理由" v:"length:1,255"`

diff --git a/internal/boot/boot_enums.go b/internal/boot/boot_enums.go
diff --git a/internal/cmd/cmd.go b/internal/cmd/cmd.go
@@ -25,7 +25,6 @@ import (
 	"github.com/gogf/gf/v2/frame/g"
 	"github.com/gogf/gf/v2/net/ghttp"
 	"github.com/gogf/gf/v2/os/gcmd"
-	_ "github.com/hitokoto-osc/reviewer/internal/boot"
 )
 
 var (

diff --git a/internal/consts/consts.go b/internal/consts/consts.go
@@ -23,4 +23,5 @@ const (
 	PollOverdueThreshold                     = 7 // 7 天
 
 	ReviewerInactiveDays = 30 // 30 天
+	PollOverdueDays      = 15 // 15 天
 )
diff --git a/internal/logic/job/poll/move_overdue_poll.go b/internal/logic/job/poll/move_overdue_poll.go
@@ -33,7 +33,7 @@ func MoveOverduePolls(ctx context.Context) error {
 	)
 	query := dao.Poll.Ctx(ctx).
 		Where(dao.Poll.Columns().Status, consts.PollStatusOpen).
-		WhereLT(dao.Poll.Columns().CreatedAt, gdb.Raw("DATE_SUB(now(), INTERVAL 15 DAY)")) // 15 天
+		Wheref("%s < DATE_SUB(now(), INTERVAL %d DAY)", dao.Poll.Columns().CreatedAt, consts.PollOverdueDays) // 15 天
 	total, err := query.Clone().Fields("1").Count()
 	if err != nil {
 		return gerror.Wrap(err, "获取过期投票数量失败")
@@ -50,8 +50,6 @@ func MoveOverduePolls(ctx context.Context) error {
 		if err != nil {
 			return gerror.Wrapf(err, "获取第 %d 页记录失败", page)
 		}
-		// g.Log().Debug(ctx, "%+v", polls)
-		// return nil
 		// 获取 pollLogs
 		var (
 			poll    *entity.Poll

diff --git a/internal/logic/job/poll/remove_invalid_polls.go b/internal/logic/job/poll/remove_invalid_polls.go
@@ -42,7 +42,7 @@ func RemoveInvalidPolls(ctx context.Context) error {
 			poll := &out.Collection[i]
 			g.Log().Debugf(ctx, "正在处理投票 %d...", poll.ID)
 			if poll.Sentence.Status == consts.HitokotoStatusApproved || poll.Sentence.Status == consts.HitokotoStatusRejected {
-				g.Log().Debugf(ctx, "投票 %d: 句子 %s 状态为 %s，属于无效投票（已通过或已驳回），开始清除……", poll.ID, poll.Sentence.Status)
+				g.Log().Debugf(ctx, "投票 %d: 句子 %s 状态为 %s，属于无效投票（已通过或已驳回），开始清除……", poll.ID, poll.Sentence.UUID, poll.Sentence.Status)
 				var status int
 				if poll.Sentence.Status == consts.HitokotoStatusApproved {
 					status = int(consts.PollStatusApproved)

diff --git a/main.go b/main.go
@@ -3,6 +3,7 @@ package main
 import (
 	_ "github.com/gogf/gf/contrib/drivers/mysql/v2"
 	_ "github.com/gogf/gf/contrib/nosql/redis/v2"
+	_ "github.com/hitokoto-osc/reviewer/internal/boot"
 	_ "github.com/hitokoto-osc/reviewer/internal/logic"
 	_ "github.com/hitokoto-osc/reviewer/internal/packed"