Skip to content

Commit 3ca635e

Browse files
tpfzCoda-bot
andcommitted
feat: [Coda] add TargetType parameter to MockEvalTargetOutput query chain
(LogID: 202509161632560100911101346893E51) Co-Authored-By: Coda <[email protected]>
1 parent b5a075c commit 3ca635e

File tree

5 files changed

+9
-9
lines changed

5 files changed

+9
-9
lines changed

backend/modules/evaluation/application/eval_target_app.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -404,7 +404,7 @@ func (e EvalTargetApplicationImpl) MockEvalTargetOutput(ctx context.Context, req
404404
}
405405

406406
// 获取评测目标信息,request.EvalTargetID实际上为SourceTargetID
407-
evalTarget, err := e.evalTargetService.GetEvalTargetVersionBySourceTarget(ctx, request.WorkspaceID, strconv.FormatInt(request.SourceTargetID, 10), request.EvalTargetVersion, false)
407+
evalTarget, err := e.evalTargetService.GetEvalTargetVersionBySourceTarget(ctx, request.WorkspaceID, strconv.FormatInt(request.SourceTargetID, 10), request.EvalTargetVersion, entity.EvalTargetType(request.TargetType), false)
408408
if err != nil {
409409
return nil, err
410410
}
@@ -438,4 +438,4 @@ func (e EvalTargetApplicationImpl) MockEvalTargetOutput(ctx context.Context, req
438438
EvalTarget: target.EvalTargetDO2DTO(evalTarget),
439439
MockOutput: mockOutput,
440440
}, nil
441-
}
441+
}

backend/modules/evaluation/domain/repo/target.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ type IEvalTargetRepo interface {
1515
GetEvalTarget(ctx context.Context, targetID int64) (do *entity.EvalTarget, err error)
1616
GetEvalTargetVersion(ctx context.Context, spaceID, versionID int64) (do *entity.EvalTarget, err error)
1717
GetEvalTargetVersionByTarget(ctx context.Context, spaceID int64, targetID int64, sourceTargetVersion string) (do *entity.EvalTarget, err error)
18-
GetEvalTargetVersionBySourceTarget(ctx context.Context, spaceID int64, sourceTargetID string, sourceTargetVersion string) (do *entity.EvalTarget, err error)
18+
GetEvalTargetVersionBySourceTarget(ctx context.Context, spaceID int64, sourceTargetID string, sourceTargetVersion string, targetType entity.EvalTargetType) (do *entity.EvalTarget, err error)
1919
BatchGetEvalTargetBySource(ctx context.Context, param *BatchGetEvalTargetBySourceParam) (dos []*entity.EvalTarget, err error)
2020
BatchGetEvalTargetVersion(ctx context.Context, spaceID int64, versionIDs []int64) (dos []*entity.EvalTarget, err error)
2121

backend/modules/evaluation/domain/service/target.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ type IEvalTargetService interface {
1616
GetEvalTargetVersion(ctx context.Context, spaceID int64, versionID int64, needSourceInfo bool) (do *entity.EvalTarget, err error)
1717
GetEvalTargetVersionBySource(ctx context.Context, spaceID int64, targetID int64, sourceVersion string, needSourceInfo bool) (do *entity.EvalTarget, err error)
1818
GetEvalTargetVersionByTarget(ctx context.Context, spaceID int64, targetID int64, sourceTargetVersion string, needSourceInfo bool) (do *entity.EvalTarget, err error)
19-
GetEvalTargetVersionBySourceTarget(ctx context.Context, spaceID int64, sourceTargetID string, sourceTargetVersion string, needSourceInfo bool) (do *entity.EvalTarget, err error)
19+
GetEvalTargetVersionBySourceTarget(ctx context.Context, spaceID int64, sourceTargetID string, sourceTargetVersion string, targetType entity.EvalTargetType, needSourceInfo bool) (do *entity.EvalTarget, err error)
2020
BatchGetEvalTargetBySource(ctx context.Context, param *entity.BatchGetEvalTargetBySourceParam) (dos []*entity.EvalTarget, err error)
2121
BatchGetEvalTargetVersion(ctx context.Context, spaceID int64, versionIDs []int64, needSourceInfo bool) (dos []*entity.EvalTarget, err error)
2222

backend/modules/evaluation/domain/service/target_impl.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,8 +87,8 @@ func (e *EvalTargetServiceImpl) GetEvalTargetVersion(ctx context.Context, spaceI
8787
return do, nil
8888
}
8989

90-
func (e *EvalTargetServiceImpl) GetEvalTargetVersionBySourceTarget(ctx context.Context, spaceID int64, sourceTargetID string, sourceTargetVersion string, needSourceInfo bool) (do *entity.EvalTarget, err error) {
91-
do, err = e.evalTargetRepo.GetEvalTargetVersionBySourceTarget(ctx, spaceID, sourceTargetID, sourceTargetVersion)
90+
func (e *EvalTargetServiceImpl) GetEvalTargetVersionBySourceTarget(ctx context.Context, spaceID int64, sourceTargetID string, sourceTargetVersion string, targetType entity.EvalTargetType, needSourceInfo bool) (do *entity.EvalTarget, err error) {
91+
do, err = e.evalTargetRepo.GetEvalTargetVersionBySourceTarget(ctx, spaceID, sourceTargetID, sourceTargetVersion, targetType)
9292
if err != nil {
9393
return nil, err
9494
}

backend/modules/evaluation/infra/repo/target/eval_target_repo_impl.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -164,11 +164,11 @@ func (e *EvalTargetRepoImpl) GetEvalTargetVersion(ctx context.Context, spaceID,
164164
return targetDO, nil
165165
}
166166

167-
func (e *EvalTargetRepoImpl) GetEvalTargetVersionBySourceTarget(ctx context.Context, spaceID int64, sourceTargetID string, sourceTargetVersion string) (targetDO *entity.EvalTarget, err error) {
167+
func (e *EvalTargetRepoImpl) GetEvalTargetVersionBySourceTarget(ctx context.Context, spaceID int64, sourceTargetID string, sourceTargetVersion string, targetType entity.EvalTargetType) (targetDO *entity.EvalTarget, err error) {
168168
var opts []db.Option
169169

170-
// 第一步:根据sourceTargetID查找target,获取targetID
171-
targetPO, err := e.evalTargetDao.GetEvalTargetBySourceID(ctx, spaceID, sourceTargetID, int32(entity.EvalTargetTypeLoopPrompt), opts...)
170+
// 第一步:根据sourceTargetID查找target,获取targetID,使用传入的targetType
171+
targetPO, err := e.evalTargetDao.GetEvalTargetBySourceID(ctx, spaceID, sourceTargetID, int32(targetType), opts...)
172172
if err != nil {
173173
return nil, err
174174
}

0 commit comments

Comments
 (0)