You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@devlake.apache.org by zh...@apache.org on 2023/01/11 11:22:31 UTC

[incubator-devlake] branch main updated: fix(tapd): fix sprint std status (#4193)

This is an automated email from the ASF dual-hosted git repository.

zhangliang2022 pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-devlake.git


The following commit(s) were added to refs/heads/main by this push:
     new aa660f2a5 fix(tapd): fix sprint std status (#4193)
aa660f2a5 is described below

commit aa660f2a5e1086d725533ea44a8282673c12dccb
Author: Warren Chen <yi...@merico.dev>
AuthorDate: Wed Jan 11 19:22:24 2023 +0800

    fix(tapd): fix sprint std status (#4193)
    
    * fix(tapd): fix sprint std status
    
    * fix(tapd): update e2e
---
 plugins/tapd/e2e/snapshot_tables/sprints.csv | 20 ++++++++++----------
 plugins/tapd/tasks/iteration_converter.go    |  9 ++++++---
 2 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/plugins/tapd/e2e/snapshot_tables/sprints.csv b/plugins/tapd/e2e/snapshot_tables/sprints.csv
index 9d0c0d492..b7d7fa72a 100644
--- a/plugins/tapd/e2e/snapshot_tables/sprints.csv
+++ b/plugins/tapd/e2e/snapshot_tables/sprints.csv
@@ -1,11 +1,11 @@
 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,
+tapd:TapdIteration:1:11991001000077,test-11test-11test-11test-11test-11test-11,https://www.tapd.cn/991/prong/iterations/view/11991001000077,CLOSED,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,CLOSED,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,CLOSED,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,CLOSED,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,CLOSED,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,CLOSED,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,CLOSED,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,CLOSED,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,CLOSED,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,CLOSED,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 0e9b68823..0611fe0ad 100644
--- a/plugins/tapd/tasks/iteration_converter.go
+++ b/plugins/tapd/tasks/iteration_converter.go
@@ -35,7 +35,7 @@ func ConvertIteration(taskCtx core.SubTaskContext) errors.Error {
 	rawDataSubTaskArgs, data := CreateRawDataSubTaskArgs(taskCtx, RAW_ITERATION_TABLE, false)
 	logger := taskCtx.GetLogger()
 	db := taskCtx.GetDal()
-	logger.Info("collect board:%d", data.Options.WorkspaceId)
+	logger.Info("collect iteration :%d", data.Options.WorkspaceId)
 	clauses := []dal.Clause{
 		dal.From(&models.TapdIteration{}),
 		dal.Where("connection_id = ? AND workspace_id = ?", data.Options.ConnectionId, data.Options.WorkspaceId),
@@ -48,9 +48,12 @@ func ConvertIteration(taskCtx core.SubTaskContext) errors.Error {
 	defer cursor.Close()
 
 	getStdSprintStatus := func(original string) string {
-		if original == "open" {
+		switch original {
+		case "open":
+			return "ACTIVE"
+		case "done":
 			return "CLOSED"
-		} else {
+		default:
 			return ""
 		}
 	}