Skip to content
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions backend/plugins/zentao/e2e/task_worklogs_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (
"testing"

"github.com/apache/incubator-devlake/core/models/common"
"github.com/apache/incubator-devlake/core/models/domainlayer/crossdomain"
"github.com/apache/incubator-devlake/core/models/domainlayer/ticket"
"github.com/apache/incubator-devlake/helpers/e2ehelper"
"github.com/apache/incubator-devlake/plugins/zentao/impl"
"github.com/apache/incubator-devlake/plugins/zentao/models"
Expand Down Expand Up @@ -56,9 +56,9 @@ func TestZentaoTaskWorklogDataFlow(t *testing.T) {
})

// verify task repo commit conversion
dataflowTester.FlushTabler(&crossdomain.IssueWorklog{})
dataflowTester.FlushTabler(&ticket.IssueWorklog{})
dataflowTester.Subtask(tasks.ConvertTaskWorklogsMeta, taskData)
dataflowTester.VerifyTableWithOptions(&crossdomain.IssueWorklog{}, e2ehelper.TableOptions{
dataflowTester.VerifyTableWithOptions(&ticket.IssueWorklog{}, e2ehelper.TableOptions{
CSVRelPath: "./snapshot_tables/issue_worklogs.csv",
IgnoreTypes: []interface{}{common.NoPKModel{}},
})
Expand Down
6 changes: 3 additions & 3 deletions backend/plugins/zentao/tasks/task_worklog_collector.go
Original file line number Diff line number Diff line change
Expand Up @@ -84,9 +84,9 @@ func CollectTaskWorklogs(taskCtx plugin.SubTaskContext) errors.Error {

// collect task worklogs
err = apiCollector.InitCollector(api.ApiCollectorArgs{
Input: iterator,
ApiClient: data.ApiClient,
UrlTemplate: "tasks/{{ .Input.Id }}/estimate",
Input: iterator,
ApiClient: data.ApiClient,
UrlTemplate: "tasks/{{ .Input.Id }}/estimate",
Query: func(reqData *api.RequestData) (url.Values, errors.Error) {
return nil, nil
},
Expand Down
4 changes: 2 additions & 2 deletions backend/plugins/zentao/tasks/task_worklog_convertor.go
Original file line number Diff line number Diff line change
Expand Up @@ -73,8 +73,8 @@ func ConvertTaskWorklogs(taskCtx plugin.SubTaskContext) errors.Error {
Options: data.Options,
Table: RAW_TASK_WORKLOGS_TABLE,
},
InputRowType: reflect.TypeOf(models.ZentaoWorklog{}),
Input: cursor,
InputRowType: reflect.TypeOf(models.ZentaoWorklog{}),
Input: cursor,
Convert: func(inputRow interface{}) ([]interface{}, errors.Error) {
toolL := inputRow.(*models.ZentaoWorklog)
domainL := &ticket.IssueWorklog{
Expand Down
Loading