合并最近修改

.gitignore

@@ -24,6 +24,7 @@ go.work
 /go.work.sum
 /internal/user/internal/integration/logs/
 config/local.yaml
+config/.DS_Store
 logs/
 /internal/baguwen/internal/integration/logs/
 /**/**/logs

internal/question/internal/integration/examine_handler_test.go

@@ -259,6 +259,81 @@ func (s *ExamineHandlerTest) TestExamine() {
 	}
 }
 
+func (s *ExamineHandlerTest) TestCorrect() {
+	testCases := []struct {
+		name   string
+		before func(t *testing.T)
+		after  func(t *testing.T)
+
+		req web.CorrectReq
+
+		wantCode int
+		wantResp test.Result[web.ExamineResult]
+	}{
+		{
+			name: "修改成通过",
+			before: func(t *testing.T) {
+				err := s.db.Create(&dao.QuestionResult{
+					Id:     2,
+					Uid:    uid,
+					Qid:    1,
+					Result: domain.ResultFailed.ToUint8(),
+					Ctime:  123,
+					Utime:  123,
+				}).Error
+				require.NoError(t, err)
+			},
+			after: func(t *testing.T) {
+				ctx, cancel := context.WithTimeout(context.Background(), time.Second*10)
+				defer cancel()
+				var record dao.QuestionResult
+				err := s.db.WithContext(ctx).Where("uid = ? AND qid = ?", uid, 1).First(&record).Error
+
+				require.NoError(t, err)
+				assert.True(t, record.Utime > 0)
+				record.Utime = 0
+				assert.True(t, record.Ctime > 0)
+				record.Ctime = 0
+				assert.True(t, record.Id > 0)
+				record.Id = 0
+
+				assert.Equal(t, dao.QuestionResult{
+					Uid:    uid,
+					Qid:    1,
+					Result: domain.ResultBasic.ToUint8(),
+				}, record)
+
+			},
+			req: web.CorrectReq{
+				Qid:    1,
+				Result: domain.ResultBasic.ToUint8(),
+			},
+			wantCode: 200,
+			wantResp: test.Result[web.ExamineResult]{
+				Data: web.ExamineResult{
+					Qid:    1,
+					Result: domain.ResultBasic.ToUint8(),
+				},
+			},
+		},
+	}
+
+	for _, tc := range testCases {
+		s.T().Run(tc.name, func(t *testing.T) {
+			tc.before(t)
+			req, err := http.NewRequest(http.MethodPost,
+				"/question/examine/correct", iox.NewJSONReader(tc.req))
+			req.Header.Set("content-type", "application/json")
+			require.NoError(t, err)
+			recorder := test.NewJSONResponseRecorder[web.ExamineResult]()
+			s.server.ServeHTTP(recorder, req)
+			require.Equal(t, tc.wantCode, recorder.Code)
+			assert.Equal(t, tc.wantResp, recorder.MustScan())
+			tc.after(t)
+		})
+	}
+}
+
 func TestExamineHandler(t *testing.T) {
 	suite.Run(t, new(ExamineHandlerTest))
 }

internal/question/internal/repository/dao/examine.go

@@ -29,6 +29,7 @@ type ExamineDAO interface {
 	SaveResult(ctx context.Context, record ExamineRecord) error
 	GetResultByUidAndQid(ctx context.Context, uid int64, qid int64) (QuestionResult, error)
 	GetResultByUidAndQids(ctx context.Context, uid int64, ids []int64) ([]QuestionResult, error)
+	UpdateQuestionResult(ctx context.Context, result QuestionResult) error
 }
 
 var _ ExamineDAO = &GORMExamineDAO{}
@@ -73,6 +74,19 @@ func (dao *GORMExamineDAO) SaveResult(ctx context.Context, record ExamineRecord)
 	})
 }
 
+func (dao *GORMExamineDAO) UpdateQuestionResult(ctx context.Context, result QuestionResult) error {
+	now := time.Now().UnixMilli()
+	return dao.db.WithContext(ctx).Transaction(func(tx *gorm.DB) error {
+		res := tx.Model(&result).Where("uid = ? and qid = ?", result.Uid, result.Qid).Updates(map[string]any{
+			"uid":    result.Uid,
+			"qid":    result.Qid,
+			"result": result.Result,
+			"utime":  now,
+		})
+		return res.Error
+	})
+}
+
 func NewGORMExamineDAO(db *egorm.Component) ExamineDAO {
 	return &GORMExamineDAO{db: db}
 }

internal/question/internal/repository/examine.go

@@ -27,6 +27,7 @@ type ExamineRepository interface {
 	SaveResult(ctx context.Context, uid, qid int64, result domain.ExamineResult) error
 	GetResultByUidAndQid(ctx context.Context, uid int64, qid int64) (domain.Result, error)
 	GetResultsByIds(ctx context.Context, uid int64, ids []int64) ([]domain.ExamineResult, error)
+	UpdateQuestionResult(ctx context.Context, uid int64, qid int64, result domain.Result) error
 }
 
 var _ ExamineRepository = &CachedExamineRepository{}
@@ -67,6 +68,15 @@ func (repo *CachedExamineRepository) SaveResult(ctx context.Context, uid, qid in
 	return err
 }
 
+func (repo *CachedExamineRepository) UpdateQuestionResult(ctx context.Context, uid int64, qid int64, result domain.Result) error {
+	err := repo.dao.UpdateQuestionResult(ctx, dao.QuestionResult{
+		Uid:    uid,
+		Qid:    qid,
+		Result: result.ToUint8(),
+	})
+	return err
+}
+
 func NewCachedExamineRepository(dao dao.ExamineDAO) ExamineRepository {
 	return &CachedExamineRepository{dao: dao}
 }

internal/question/internal/service/examine.go

@@ -36,6 +36,7 @@ type ExamineService interface {
 	Examine(ctx context.Context, uid, qid int64, input string) (domain.ExamineResult, error)
 	QuestionResult(ctx context.Context, uid, qid int64) (domain.Result, error)
 	GetResults(ctx context.Context, uid int64, ids []int64) (map[int64]domain.ExamineResult, error)
+	Correct(ctx context.Context, uid int64, qid int64, questionResult domain.Result) error
 }
 
 var _ ExamineService = &LLMExamineService{}
@@ -92,6 +93,12 @@ func (svc *LLMExamineService) Examine(ctx context.Context,
 	return result, err
 }
 
+func (svc *LLMExamineService) Correct(ctx context.Context, uid int64,
+	qid int64, questionResult domain.Result) error {
+	// 更新结果
+	return svc.repo.UpdateQuestionResult(ctx, uid, qid, questionResult)
+}
+
 func (svc *LLMExamineService) parseExamineResult(answer string) domain.Result {
 	answer = strings.TrimSpace(answer)
 	// 获取第一行

internal/question/internal/web/examine_hander.go

@@ -19,6 +19,7 @@ import (
 
 	"github.com/ecodeclub/ginx"
 	"github.com/ecodeclub/ginx/session"
+	"github.com/ecodeclub/webook/internal/question/internal/domain"
 	"github.com/ecodeclub/webook/internal/question/internal/errs"
 	"github.com/ecodeclub/webook/internal/question/internal/service"
 	"github.com/gin-gonic/gin"
@@ -59,7 +60,18 @@ func (h *ExamineHandler) Examine(ctx *ginx.Context, req ExamineReq, sess session
 	}
 }
 
+// 修改题目的结果
 func (h *ExamineHandler) Correct(ctx *ginx.Context, req CorrectReq, sess session.Session) (ginx.Result, error) {
 	// 实现这个接口
-	panic("implement me")
+	err := h.svc.Correct(ctx, sess.Claims().Uid, req.Qid, domain.Result(req.Result))
+	if err != nil {
+		return systemErrorResult, err
+	}
+	return ginx.Result{
+		Data: newExamineResult(domain.ExamineResult{
+			Qid:    req.Qid,
+			Result: domain.Result(req.Result),
+		}),
+	}, nil
+
 }

internal/question/internal/web/examine_vo.go

@@ -41,3 +41,9 @@ func newExamineResult(r domain.ExamineResult) ExamineResult {
 		Amount:    r.Amount,
 	}
 }
+
+type CorrectReq struct {
+	Qid int64 `json:"qid"`
+	// 修正结果，对应 domain.Result
+	Result uint8 `json:"result"`
+}

internal/question/internal/web/vo.go

@@ -200,9 +200,3 @@ type BizReq struct {
 	Biz   string `json:"biz"`
 	BizId int64  `json:"bizId"`
 }
-
-type CorrectReq struct {
-	Qid int64 `json:"qid"`
-	// 修正结果，对应 domain.Result
-	Result uint8 `json:"result"`
-}

internal/skill/internal/domain/skill.go

@@ -34,6 +34,18 @@ func (s Skill) questionSetLen() int {
 	return len(s.Basic.QuestionSets) + len(s.Intermediate.QuestionSets) + len(s.Advanced.QuestionSets)
 }
 
+func (s Skill) CaseSets() []int64 {
+	res := make([]int64, 0, s.caseSetLen())
+	res = append(res, s.Basic.CaseSets...)
+	res = append(res, s.Intermediate.CaseSets...)
+	res = append(res, s.Advanced.CaseSets...)
+	return res
+}
+
+func (s Skill) caseSetLen() int {
+	return len(s.Basic.CaseSets) + len(s.Intermediate.CaseSets) + len(s.Advanced.CaseSets)
+}
+
 func (s Skill) caseLen() int {
 	return len(s.Basic.Cases) + len(s.Intermediate.Cases) + len(s.Advanced.Cases)
 }
@@ -58,4 +70,5 @@ type SkillLevel struct {
 	Questions    []int64
 	Cases        []int64
 	QuestionSets []int64
+	CaseSets     []int64
 }