finish tribally report logic

doc/sql/novatask.sql

@@ -175,9 +175,10 @@ CREATE TABLE `nh_tribally_user`
 (
     `id`         int(11) unsigned NOT NULL AUTO_INCREMENT,
     `uid`        int unsigned     NOT NULL COMMENT '用户id',
-    `chapter` int NOT NULL DEFAULT 0 COMMENT '章节',
-    `created_at` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
-    `updated_at` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '修改时间',
+    `email`      varchar(80)      NOT NULL COMMENT '邮箱',
+    `chapter`    int              NOT NULL DEFAULT 0 COMMENT '章节',
+    `created_at` timestamp        NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+    `updated_at` timestamp        NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '修改时间',
     PRIMARY KEY (`id`),
     UNIQUE KEY (`uid`),
     INDEX (`chapter`)

internal/job/tribally_report/cron.go

@@ -7,6 +7,7 @@ import (
 	"github.com/zeromicro/go-zero/core/logx"
 	"nova_task/internal/consts"
 	"nova_task/internal/model"
+	"nova_task/internal/pkg/tribally"
 	"nova_task/internal/svc"
 	"time"
 )
@@ -25,6 +26,15 @@ func (c *Cron) Spec() string {
 }
 
 func (c *Cron) Run() {
+	apiKey, err := c.svcCtx.ConfigModel.GetTriballyApiKey(c.ctx)
+	if err != nil {
+		logx.Errorw("get tribally api key failed", logx.Field("err", err))
+		return
+	}
+	if apiKey == "" {
+		logx.Errorw("tribally api key empty")
+		return
+	}
 	tr, err := c.svcCtx.GlobalDataModel.FindOneByKey(c.ctx, consts.TriballyReportTime)
 	if err != nil && !errors.Is(err, model.ErrNotFound) {
 		logx.Errorw("get tribally report time failed", logx.Field("err", err))
@@ -65,8 +75,24 @@ func (c *Cron) Run() {
 		logx.Infow("no tribally users", logx.Field("start", start), logx.Field("end", end))
 		return
 	}
+	var chapters []tribally.UserChapter
+	for _, u := range triballyUsers {
+		chapters = append(chapters, tribally.UserChapter{
+			Email:   u.Email,
+			Chapter: u.MaxChapter,
+		})
+	}
+	err = tribally.PostUserChapter(apiKey, chapters...)
+	if err != nil {
+		logx.Errorw("post user chapter failed", logx.Field("err", err))
+		return
+	}
+
+	for _, u := range triballyUsers {
+		err = c.svcCtx.TriballyUserModel.UpdateUserChapter(c.ctx, u.Uid, u.MaxChapter)
+		if err != nil {
+			logx.Errorw("update user chapter failed", logx.Field("err", err))
+		}
+	}
 
-	//for _, u := range triballyUsers {
-	//
-	//}
 }

internal/logic/task/verify_task_result_logic.go

@@ -11,6 +11,7 @@ import (
 	"nova_task/internal/pkg/aptos"
 	"nova_task/internal/pkg/errs"
 	"nova_task/internal/pkg/tribally"
+	"nova_task/internal/pkg/utils"
 	"nova_task/internal/svc"
 	"nova_task/internal/types"
 	"time"
@@ -32,7 +33,15 @@ func NewVerifyTaskResultLogic(ctx context.Context, svcCtx *svc.ServiceContext) *
 }
 
 func (l *VerifyTaskResultLogic) VerifyTaskResult(req *types.VerifyTaskResultReq) (*types.VerifyTaskResultResp, error) {
-	uid := cast.ToStringMapInt(l.ctx.Value("data"))["id"]
+	uid := utils.GetUid(l.ctx)
+	u, err := l.svcCtx.UserModel.FindOne(l.ctx, uint(uid))
+	if err != nil {
+		if errors.Is(err, model.ErrNotFound) {
+			return nil, errs.New(errs.ErrUserNotFound, "user not found")
+		}
+		l.Errorw("find user error", logx.Field("err", err), logx.Field("uid", uid))
+		return nil, errs.New(errs.ErrDatabaseOperate, err)
+	}
 	task, err := l.svcCtx.TaskModel.FindOne(l.ctx, req.ID)
 	if err != nil {
 		if errors.Is(err, model.ErrNotFound) {
@@ -103,6 +112,7 @@ func (l *VerifyTaskResultLogic) VerifyTaskResult(req *types.VerifyTaskResultReq)
 				// TriballyUser表中不存在此用户，插入
 				_, err = l.svcCtx.TriballyUserModel.Insert(l.ctx, &model.NhTriballyUser{
 					Uid:     uint(uid),
+					Email:   u.Email,
 					Chapter: -1,
 				})
 				if err != nil {

internal/model/nh_tribally_user_model.go

@@ -17,6 +17,7 @@ type (
 		nhTriballyUserModel
 		withSession(session sqlx.Session) NhTriballyUserModel
 		FindUpdateTriballyUsers(ctx context.Context, start, end time.Time, count int) ([]*TriballyUserChapter, error)
+		UpdateUserChapter(ctx context.Context, uid uint, chapter int) error
 	}
 
 	customNhTriballyUserModel struct {
@@ -26,14 +27,21 @@ type (
 	TriballyUserChapter struct {
 		Id         uint      `db:"id"`
 		Uid        uint      `db:"uid"`         // 用户id
+		Email      string    `db:"email"`       // 邮箱
 		Chapter    int       `db:"chapter"`     // 章节
 		MaxChapter int       `db:"max_chapter"` // 最大章节
 		UpdatedAt  time.Time `db:"updated_at"`  // 修改时间
 	}
 )
 
+func (m *customNhTriballyUserModel) UpdateUserChapter(ctx context.Context, uid uint, chapter int) error {
+	update := fmt.Sprintf("UPDATE %s SET `chapter` = ?, WHERE `uid` = ?", m.table)
+	_, err := m.conn.ExecCtx(ctx, update, chapter, uid)
+	return err
+}
+
 func (m *customNhTriballyUserModel) FindUpdateTriballyUsers(ctx context.Context, start, end time.Time, count int) ([]*TriballyUserChapter, error) {
-	query := fmt.Sprintf("SELECT t.uid, t.chapter, MAX(g.chapter) as max_chapter, g.updated_at FROM nh_tribally_user t JOIN nh_game_report g ON t.uid = g.uid WHERE g.updated_at >= ? AND g.updated_at < ? AND g.chapter > t.chapter GROUP BY uid LIMIT ?")
+	query := fmt.Sprintf("SELECT t.uid, t.email, t.chapter, MAX(g.chapter) as max_chapter, g.updated_at FROM nh_tribally_user t JOIN nh_game_report g ON t.uid = g.uid WHERE g.updated_at >= ? AND g.updated_at < ? AND g.chapter > t.chapter GROUP BY uid LIMIT ?")
 	var result []*TriballyUserChapter
 	err := m.conn.QueryRowsCtx(ctx, &result, query, start, end, count)
 	if err != nil && !errors.Is(err, sqlx.ErrNotFound) {

internal/model/nh_tribally_user_model_gen.go

@@ -40,6 +40,7 @@ type (
 	NhTriballyUser struct {
 		Id        uint      `db:"id"`
 		Uid       uint      `db:"uid"`        // 用户id
+		Email     string    `db:"email"`      // 邮箱
 		Chapter   int       `db:"chapter"`    // 章节
 		CreatedAt time.Time `db:"created_at"` // 创建时间
 		UpdatedAt time.Time `db:"updated_at"` // 修改时间
@@ -88,14 +89,14 @@ func (m *defaultNhTriballyUserModel) FindOneByUid(ctx context.Context, uid uint)
 }
 
 func (m *defaultNhTriballyUserModel) Insert(ctx context.Context, data *NhTriballyUser) (sql.Result, error) {
-	query := fmt.Sprintf("insert into %s (%s) values (?, ?)", m.table, nhTriballyUserRowsExpectAutoSet)
-	ret, err := m.conn.ExecCtx(ctx, query, data.Uid, data.Chapter)
+	query := fmt.Sprintf("insert into %s (%s) values (?, ?, ?)", m.table, nhTriballyUserRowsExpectAutoSet)
+	ret, err := m.conn.ExecCtx(ctx, query, data.Uid, data.Email, data.Chapter)
 	return ret, err
 }
 
 func (m *defaultNhTriballyUserModel) Update(ctx context.Context, newData *NhTriballyUser) error {
 	query := fmt.Sprintf("update %s set %s where `id` = ?", m.table, nhTriballyUserRowsWithPlaceHolder)
-	_, err := m.conn.ExecCtx(ctx, query, newData.Uid, newData.Chapter, newData.Id)
+	_, err := m.conn.ExecCtx(ctx, query, newData.Uid, newData.Email, newData.Chapter, newData.Id)
 	return err
 }