This is an automated email from the ASF dual-hosted git repository. warren pushed a commit to branch release-v0.14 in repository https://gitbox.apache.org/repos/asf/incubator-devlake.git
commit f691100e57182dfada8740b3f5a27e9bd9193ad9 Author: Yingchu Chen <[email protected]> AuthorDate: Tue Oct 18 16:09:05 2022 +0800 fix(tapd): set sprint status to std closes #3453 --- plugins/tapd/e2e/snapshot_tables/sprints.csv | 22 +++++++++++----------- plugins/tapd/tasks/iteration_converter.go | 10 ++++++++-- 2 files changed, 19 insertions(+), 13 deletions(-) diff --git a/plugins/tapd/e2e/snapshot_tables/sprints.csv b/plugins/tapd/e2e/snapshot_tables/sprints.csv index 5d6ee8a8..9d0c0d49 100644 --- a/plugins/tapd/e2e/snapshot_tables/sprints.csv +++ b/plugins/tapd/e2e/snapshot_tables/sprints.csv @@ -1,11 +1,11 @@ -id,_raw_data_params,_raw_data_table,_raw_data_id,_raw_data_remark,name,url,status,started_date,ended_date,completed_date,original_board_id -tapd:TapdIteration:1:11991001000077,"{""ConnectionId"":1,""CompanyId"":0,""WorkspaceId"":991}",_raw_tapd_api_iterations,1,,test-11test-11test-11test-11test-11test-11,https://www.tapd.cn/991/prong/iterations/view/11991001000077,DONE,2020-02-09T16:00:00.000+00:00,2020-02-20T16:00:00.000+00:00,2021-06-21T02:44:22.000+00:00,tapd:TapdWorkspace:1:991 -tapd:TapdIteration:1:11991001000078,"{""ConnectionId"":1,""CompanyId"":0,""WorkspaceId"":991}",_raw_tapd_api_iterations,2,,test-11test-11test-11test-11test-11test-11,https://www.tapd.cn/991/prong/iterations/view/11991001000078,DONE,2020-02-16T16:00:00.000+00:00,2020-02-27T16:00:00.000+00:00,2021-06-21T02:44:22.000+00:00,tapd:TapdWorkspace:1:991 -tapd:TapdIteration:1:11991001000099,"{""ConnectionId"":1,""CompanyId"":0,""WorkspaceId"":991}",_raw_tapd_api_iterations,3,,test-11test-11test-11test-11test-11test-11test-11,https://www.tapd.cn/991/prong/iterations/view/11991001000099,DONE,2020-02-24T16:00:00.000+00:00,2020-03-23T16:00:00.000+00:00,2021-06-21T02:44:22.000+00:00,tapd:TapdWorkspace:1:991 -tapd:TapdIteration:1:11991001000205,"{""ConnectionId"":1,""CompanyId"":0,""WorkspaceId"":991}",_raw_tapd_api_iterations,4,,test-11test-11test-11test-11test-11test-11test-11test-11test-11test-11test-11,https://www.tapd.cn/991/prong/iterations/view/11991001000205,DONE,2020-04-28T16:00:00.000+00:00,2020-05-13T16:00:00.000+00:00,2021-06-21T02:44:22.000+00:00,tapd:TapdWorkspace:1:991 -tapd:TapdIteration:1:11991001000353,"{""ConnectionId"":1,""CompanyId"":0,""WorkspaceId"":991}",_raw_tapd_api_iterations,5,,test-11test-11test-11test-11test-11test-11test-11test-11test-11test-11test-11test-11test-11test-11,https://www.tapd.cn/991/prong/iterations/view/11991001000353,DONE,2020-06-17T16:00:00.000+00:00,2020-07-30T16:00:00.000+00:00,2021-06-21T02:44:22.000+00:00,tapd:TapdWorkspace:1:991 -tapd:TapdIteration:1:11991001000379,"{""ConnectionId"":1,""CompanyId"":0,""WorkspaceId"":991}",_raw_tapd_api_iterations,6,,test-11test-11test-11test-11test-11,https://www.tapd.cn/991/prong/iterations/view/11991001000379,DONE,2020-07-19T16:00:00.000+00:00,2020-07-30T16:00:00.000+00:00,2021-06-21T02:44:22.000+00:00,tapd:TapdWorkspace:1:991 -tapd:TapdIteration:1:11991001000381,"{""ConnectionId"":1,""CompanyId"":0,""WorkspaceId"":991}",_raw_tapd_api_iterations,7,,PCtest-11test-11test-11test-11test-11test-11test-11test-11,https://www.tapd.cn/991/prong/iterations/view/11991001000381,DONE,2020-07-20T16:00:00.000+00:00,2020-07-29T16:00:00.000+00:00,2021-06-21T02:44:22.000+00:00,tapd:TapdWorkspace:1:991 -tapd:TapdIteration:1:11991001000395,"{""ConnectionId"":1,""CompanyId"":0,""WorkspaceId"":991}",_raw_tapd_api_iterations,8,,test-11test-11test-11test-11,https://www.tapd.cn/991/prong/iterations/view/11991001000395,DONE,2020-08-06T16:00:00.000+00:00,2020-08-30T16:00:00.000+00:00,2021-06-21T02:44:22.000+00:00,tapd:TapdWorkspace:1:991 -tapd:TapdIteration:1:11991001000404,"{""ConnectionId"":1,""CompanyId"":0,""WorkspaceId"":991}",_raw_tapd_api_iterations,9,,test-11test-11test-11test-11test-11test-11test-11test-11test-11test-11test-11test-11test-11test-11test-11test-11test-11,https://www.tapd.cn/991/prong/iterations/view/11991001000404,DONE,2020-08-20T16:00:00.000+00:00,2020-08-25T16:00:00.000+00:00,2021-06-21T02:44:22.000+00:00,tapd:TapdWorkspace:1:991 -tapd:TapdIteration:1:11991001000406,"{""ConnectionId"":1,""CompanyId"":0,""WorkspaceId"":991}",_raw_tapd_api_iterations,10,,test-11test-11test-11test-11test-11test-11test-11test-11test-11,https://www.tapd.cn/991/prong/iterations/view/11991001000406,DONE,2020-08-16T16:00:00.000+00:00,2020-08-30T16:00:00.000+00:00,2021-06-21T02:44:22.000+00:00,tapd:TapdWorkspace:1:991 +id,name,url,status,started_date,ended_date,completed_date,original_board_id,_raw_data_params,_raw_data_table,_raw_data_id,_raw_data_remark +tapd:TapdIteration:1:11991001000077,test-11test-11test-11test-11test-11test-11,https://www.tapd.cn/991/prong/iterations/view/11991001000077,,2020-02-09T16:00:00.000+00:00,2020-02-20T16:00:00.000+00:00,2021-06-21T02:44:22.000+00:00,tapd:TapdWorkspace:1:991,"{""ConnectionId"":1,""CompanyId"":0,""WorkspaceId"":991}",_raw_tapd_api_iterations,1, +tapd:TapdIteration:1:11991001000078,test-11test-11test-11test-11test-11test-11,https://www.tapd.cn/991/prong/iterations/view/11991001000078,,2020-02-16T16:00:00.000+00:00,2020-02-27T16:00:00.000+00:00,2021-06-21T02:44:22.000+00:00,tapd:TapdWorkspace:1:991,"{""ConnectionId"":1,""CompanyId"":0,""WorkspaceId"":991}",_raw_tapd_api_iterations,2, +tapd:TapdIteration:1:11991001000099,test-11test-11test-11test-11test-11test-11test-11,https://www.tapd.cn/991/prong/iterations/view/11991001000099,,2020-02-24T16:00:00.000+00:00,2020-03-23T16:00:00.000+00:00,2021-06-21T02:44:22.000+00:00,tapd:TapdWorkspace:1:991,"{""ConnectionId"":1,""CompanyId"":0,""WorkspaceId"":991}",_raw_tapd_api_iterations,3, +tapd:TapdIteration:1:11991001000205,test-11test-11test-11test-11test-11test-11test-11test-11test-11test-11test-11,https://www.tapd.cn/991/prong/iterations/view/11991001000205,,2020-04-28T16:00:00.000+00:00,2020-05-13T16:00:00.000+00:00,2021-06-21T02:44:22.000+00:00,tapd:TapdWorkspace:1:991,"{""ConnectionId"":1,""CompanyId"":0,""WorkspaceId"":991}",_raw_tapd_api_iterations,4, +tapd:TapdIteration:1:11991001000353,test-11test-11test-11test-11test-11test-11test-11test-11test-11test-11test-11test-11test-11test-11,https://www.tapd.cn/991/prong/iterations/view/11991001000353,,2020-06-17T16:00:00.000+00:00,2020-07-30T16:00:00.000+00:00,2021-06-21T02:44:22.000+00:00,tapd:TapdWorkspace:1:991,"{""ConnectionId"":1,""CompanyId"":0,""WorkspaceId"":991}",_raw_tapd_api_iterations,5, +tapd:TapdIteration:1:11991001000379,test-11test-11test-11test-11test-11,https://www.tapd.cn/991/prong/iterations/view/11991001000379,,2020-07-19T16:00:00.000+00:00,2020-07-30T16:00:00.000+00:00,2021-06-21T02:44:22.000+00:00,tapd:TapdWorkspace:1:991,"{""ConnectionId"":1,""CompanyId"":0,""WorkspaceId"":991}",_raw_tapd_api_iterations,6, +tapd:TapdIteration:1:11991001000381,PCtest-11test-11test-11test-11test-11test-11test-11test-11,https://www.tapd.cn/991/prong/iterations/view/11991001000381,,2020-07-20T16:00:00.000+00:00,2020-07-29T16:00:00.000+00:00,2021-06-21T02:44:22.000+00:00,tapd:TapdWorkspace:1:991,"{""ConnectionId"":1,""CompanyId"":0,""WorkspaceId"":991}",_raw_tapd_api_iterations,7, +tapd:TapdIteration:1:11991001000395,test-11test-11test-11test-11,https://www.tapd.cn/991/prong/iterations/view/11991001000395,,2020-08-06T16:00:00.000+00:00,2020-08-30T16:00:00.000+00:00,2021-06-21T02:44:22.000+00:00,tapd:TapdWorkspace:1:991,"{""ConnectionId"":1,""CompanyId"":0,""WorkspaceId"":991}",_raw_tapd_api_iterations,8, +tapd:TapdIteration:1:11991001000404,test-11test-11test-11test-11test-11test-11test-11test-11test-11test-11test-11test-11test-11test-11test-11test-11test-11,https://www.tapd.cn/991/prong/iterations/view/11991001000404,,2020-08-20T16:00:00.000+00:00,2020-08-25T16:00:00.000+00:00,2021-06-21T02:44:22.000+00:00,tapd:TapdWorkspace:1:991,"{""ConnectionId"":1,""CompanyId"":0,""WorkspaceId"":991}",_raw_tapd_api_iterations,9, +tapd:TapdIteration:1:11991001000406,test-11test-11test-11test-11test-11test-11test-11test-11test-11,https://www.tapd.cn/991/prong/iterations/view/11991001000406,,2020-08-16T16:00:00.000+00:00,2020-08-30T16:00:00.000+00:00,2021-06-21T02:44:22.000+00:00,tapd:TapdWorkspace:1:991,"{""ConnectionId"":1,""CompanyId"":0,""WorkspaceId"":991}",_raw_tapd_api_iterations,10, diff --git a/plugins/tapd/tasks/iteration_converter.go b/plugins/tapd/tasks/iteration_converter.go index b883d182..e58211c3 100644 --- a/plugins/tapd/tasks/iteration_converter.go +++ b/plugins/tapd/tasks/iteration_converter.go @@ -21,7 +21,6 @@ import ( "fmt" "github.com/apache/incubator-devlake/errors" "reflect" - "strings" "time" "github.com/apache/incubator-devlake/models/domainlayer" @@ -50,6 +49,13 @@ func ConvertIteration(taskCtx core.SubTaskContext) errors.Error { } defer cursor.Close() + getStdSprintStatus := func(original string) string { + if original == "open" { + return "CLOSED" + } else { + return "" + } + } workspaceIdGen := didgen.NewDomainIdGenerator(&models.TapdWorkspace{}) converter, err := helper.NewDataConverter(helper.DataConverterArgs{ @@ -61,7 +67,7 @@ func ConvertIteration(taskCtx core.SubTaskContext) errors.Error { domainIter := &ticket.Sprint{ DomainEntity: domainlayer.DomainEntity{Id: iterIdGen.Generate(data.Options.ConnectionId, iter.Id)}, Url: fmt.Sprintf("https://www.tapd.cn/%d/prong/iterations/view/%d";, iter.WorkspaceId, iter.Id), - Status: strings.ToUpper(iter.Status), + Status: getStdSprintStatus(iter.Status), Name: iter.Name, StartedDate: (*time.Time)(iter.Startdate), EndedDate: (*time.Time)(iter.Enddate),
