Skip to content

Commit 4badd00

Browse files
warren830warren830
authored
Cherrypick #4723 #4733 to v0.16 (#4753)
* fix(tapd): fix bug url and priority for task and story * fix(tapd): fix issue 4731
1 parent f367af5 commit 4badd00

14 files changed

Lines changed: 115 additions & 151 deletions

‎backend/helpers/e2ehelper/data_flow_tester.go‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -224,6 +224,12 @@ func (t *DataFlowTester) CreateSnapshot(dst schema.Tabler, opts TableOptions) {
224224
if err != nil {
225225
panic(err)
226226
}
227+
for i := 0; i < len(pkColumnNames); i++ {
228+
group := strings.Split(pkColumnNames[i], ".")
229+
if len(group) > 1 {
230+
pkColumnNames[i] = group[len(group)-1]
231+
}
232+
}
227233
allFields := append(pkColumnNames, targetFields...)
228234
allFields = utils.StringsUniq(allFields)
229235
dbCursor, err := t.Dal.Cursor(

‎backend/plugins/tapd/e2e/bugs_test.go‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,10 @@ func TestTapdBugDataFlow(t *testing.T) {
4141
"BUG": {StandardType: "缺陷"},
4242
"TASK": {StandardType: "任务"},
4343
},
44+
StatusMappings: map[string]tasks.OriginalStatus{
45+
"完成": []string{"已关闭"},
46+
"处理中": []string{"接受/处理"},
47+
},
4448
},
4549
},
4650
}

‎backend/plugins/tapd/e2e/raw_tables/_raw_tapd_api_bugs.csv‎

Lines changed: 2 additions & 2 deletions
Large diffs are not rendered by default.

‎backend/plugins/tapd/e2e/snapshot_tables/_tool_tapd_bugs.csv‎

Lines changed: 20 additions & 20 deletions
Large diffs are not rendered by default.

‎backend/plugins/tapd/e2e/snapshot_tables/_tool_tapd_stories.csv‎

Lines changed: 5 additions & 5 deletions
Large diffs are not rendered by default.

‎backend/plugins/tapd/e2e/snapshot_tables/issue_bug.csv‎

Lines changed: 20 additions & 20 deletions
Large diffs are not rendered by default.

‎backend/plugins/tapd/e2e/snapshot_tables/issues_story.csv‎

Lines changed: 21 additions & 21 deletions
Large diffs are not rendered by default.

‎backend/plugins/tapd/e2e/snapshot_tables/issues_task.csv‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
1-
id,url,issue_key,title,description,epic_key,type,status,original_status,story_point,resolution_date,created_date,updated_date,lead_time_minutes,parent_issue_id,priority,original_estimate_minutes,time_spent_minutes,time_remaining_minutes,creator_id,assignee_id,assignee_name,severity,component,icon_url,creator_name,_raw_data_params,_raw_data_table,_raw_data_id,_raw_data_remark
2-
tapd:TapdTask:1:11991001015107,https://www.tapd.cn/991/prong/stories/view/11991001015107,11991001015107,test-11test-11test-11test-11test-11test-11test-11,,,任务,DONE,done,0,2020-11-03T09:53:39.000+00:00,2020-11-03T09:52:00.000+00:00,2022-06-01T11:53:30.000+00:00,1,tapd:TapdTask:1:11991001001301,,0,0,0,tapd:TapdAccount:1:test-11test-11,tapd:TapdAccount:1:test-11test-11,test-11test-11,,,,test-11test-11,"{""ConnectionId"":1,""CompanyId"":0,""WorkspaceId"":991}",_raw_tapd_api_tasks,4339,
3-
tapd:TapdTask:1:11991001015121,https://www.tapd.cn/991/prong/stories/view/11991001015121,11991001015121,test-11test-11test-11test-11test-11test-11test-11test-11test-11test-11,,,任务,DONE,done,0,2020-11-03T10:40:17.000+00:00,2020-11-03T10:39:57.000+00:00,2020-11-03T10:40:17.000+00:00,0,tapd:TapdTask:1:0,,0,0,0,tapd:TapdAccount:1:test-11test-11;,tapd:TapdAccount:1:test-11test-11,test-11test-11,,,,test-11test-11;,"{""ConnectionId"":1,""CompanyId"":0,""WorkspaceId"":991}",_raw_tapd_api_tasks,4340,
4-
tapd:TapdTask:1:11991001015142,https://www.tapd.cn/991/prong/stories/view/11991001015142,11991001015142,test-11test-11test-11test-11test-11test-11test-11,,,任务,DONE,done,0,2020-11-03T11:00:18.000+00:00,2020-11-03T10:58:43.000+00:00,2022-06-01T11:53:30.000+00:00,1,tapd:TapdTask:1:11991001001301,,0,0,0,tapd:TapdAccount:1:test-11test-11test-11,tapd:TapdAccount:1:test-11test-11test-11,test-11test-11test-11,,,,test-11test-11test-11,"{""ConnectionId"":1,""CompanyId"":0,""WorkspaceId"":991}",_raw_tapd_api_tasks,4341,
5-
tapd:TapdTask:1:11991001015184,https://www.tapd.cn/991/prong/stories/view/11991001015184,11991001015184,test-11test-11test-11test-11test-11test-11test-11,,,任务,DONE,done,0,2020-11-04T09:14:22.000+00:00,2020-11-04T09:12:11.000+00:00,2022-06-01T11:53:30.000+00:00,2,tapd:TapdTask:1:11991001001301,,0,0,0,tapd:TapdAccount:1:test-11test-11,tapd:TapdAccount:1:test-11test-11,test-11test-11,,,,test-11test-11,"{""ConnectionId"":1,""CompanyId"":0,""WorkspaceId"":991}",_raw_tapd_api_tasks,4342,
6-
tapd:TapdTask:1:11991001015203,https://www.tapd.cn/991/prong/stories/view/11991001015203,11991001015203,test-11test-11test-11test-11test-11test-11test-11,,,任务,DONE,done,0,2020-11-04T10:38:54.000+00:00,2020-11-04T10:38:10.000+00:00,2022-06-01T11:53:30.000+00:00,0,tapd:TapdTask:1:11991001001301,,0,0,0,tapd:TapdAccount:1:test-11test-11test-11,tapd:TapdAccount:1:test-11test-11test-11,test-11test-11test-11,,,,test-11test-11test-11,"{""ConnectionId"":1,""CompanyId"":0,""WorkspaceId"":991}",_raw_tapd_api_tasks,4343,
7-
tapd:TapdTask:1:11991001015207,https://www.tapd.cn/991/prong/stories/view/11991001015207,11991001015207,pctest-11test-11test-11test-11test-11test-11test-11test-11,,,任务,DONE,done,0,2020-11-10T11:01:47.000+00:00,2020-11-04T10:43:02.000+00:00,2020-11-10T11:01:47.000+00:00,8658,tapd:TapdTask:1:0,,0,0,0,tapd:TapdAccount:1:test-11test-11,tapd:TapdAccount:1:test-11test-11,test-11test-11,,,,test-11test-11,"{""ConnectionId"":1,""CompanyId"":0,""WorkspaceId"":991}",_raw_tapd_api_tasks,4344,
8-
tapd:TapdTask:1:11991001015253,https://www.tapd.cn/991/prong/stories/view/11991001015253,11991001015253,test-11test-11test-11test-11test-11test-11test-11,,,任务,DONE,done,0,2020-11-05T08:50:55.000+00:00,2020-11-05T08:49:42.000+00:00,2022-06-01T11:53:30.000+00:00,1,tapd:TapdTask:1:11991001001301,,0,0,0,tapd:TapdAccount:1:test-11test-11,tapd:TapdAccount:1:test-11test-11,test-11test-11,,,,test-11test-11,"{""ConnectionId"":1,""CompanyId"":0,""WorkspaceId"":991}",_raw_tapd_api_tasks,4345,
9-
tapd:TapdTask:1:11991001015307,https://www.tapd.cn/991/prong/stories/view/11991001015307,11991001015307,Mtest-11test-11test-11test-11test-11,,,任务,DONE,done,0,2020-11-06T11:03:43.000+00:00,2020-11-05T11:12:13.000+00:00,2020-11-06T11:03:43.000+00:00,1431,tapd:TapdTask:1:0,,0,0,0,tapd:TapdAccount:1:test-11test-11,tapd:TapdAccount:1:test-11test-11,test-11test-11,,,,test-11test-11,"{""ConnectionId"":1,""CompanyId"":0,""WorkspaceId"":991}",_raw_tapd_api_tasks,4346,
10-
tapd:TapdTask:1:11991001015309,https://www.tapd.cn/991/prong/stories/view/11991001015309,11991001015309,test-11test-11test-11test-11test-11test-11test-11,,,任务,DONE,done,0,2020-11-05T11:16:00.000+00:00,2020-11-05T11:14:41.000+00:00,2022-06-01T11:53:30.000+00:00,1,tapd:TapdTask:1:11991001001301,,0,0,0,tapd:TapdAccount:1:test-11test-11test-11,tapd:TapdAccount:1:test-11test-11test-11,test-11test-11test-11,,,,test-11test-11test-11,"{""ConnectionId"":1,""CompanyId"":0,""WorkspaceId"":991}",_raw_tapd_api_tasks,4347,
11-
tapd:TapdTask:1:11991001015340,https://www.tapd.cn/991/prong/stories/view/11991001015340,11991001015340,test-11test-11test-11test-11test-11test-11test-11,,,任务,DONE,done,0,2020-11-06T09:12:19.000+00:00,2020-11-06T09:10:44.000+00:00,2022-06-01T11:53:30.000+00:00,1,tapd:TapdTask:1:11991001001301,,0,0,0,tapd:TapdAccount:1:test-11test-11,tapd:TapdAccount:1:test-11test-11,test-11test-11,,,,test-11test-11,"{""ConnectionId"":1,""CompanyId"":0,""WorkspaceId"":991}",_raw_tapd_api_tasks,4348,
12-
tapd:TapdTask:1:11991001015361,https://www.tapd.cn/991/prong/stories/view/11991001015361,11991001015361,test-11test-11test-11test-11test-11test-11test-11,,,任务,DONE,done,0,2020-11-06T10:50:31.000+00:00,2020-11-06T10:49:54.000+00:00,2022-06-01T11:53:30.000+00:00,0,tapd:TapdTask:1:11991001001301,,0,0,0,tapd:TapdAccount:1:test-11test-11test-11,tapd:TapdAccount:1:test-11test-11test-11,test-11test-11test-11,,,,test-11test-11test-11,"{""ConnectionId"":1,""CompanyId"":0,""WorkspaceId"":991}",_raw_tapd_api_tasks,4349,
13-
tapd:TapdTask:1:11991001015431,https://www.tapd.cn/991/prong/stories/view/11991001015431,11991001015431,test-11test-11test-11test-11test-11test-11test-11,,,任务,DONE,done,0,2020-11-09T04:46:54.000+00:00,2020-11-09T04:45:27.000+00:00,2022-06-01T11:53:30.000+00:00,1,tapd:TapdTask:1:11991001001301,,0,0,0,tapd:TapdAccount:1:test-11test-11test-11,tapd:TapdAccount:1:test-11test-11test-11,test-11test-11test-11,,,,test-11test-11test-11,"{""ConnectionId"":1,""CompanyId"":0,""WorkspaceId"":991}",_raw_tapd_api_tasks,4350,
14-
tapd:TapdTask:1:11991001015441,https://www.tapd.cn/991/prong/stories/view/11991001015441,11991001015441,test-11test-11test-11test-11test-11test-11test-11,,,任务,DONE,done,0,2020-11-09T09:16:32.000+00:00,2020-11-09T09:14:15.000+00:00,2022-06-01T11:53:30.000+00:00,2,tapd:TapdTask:1:11991001001301,,0,0,0,tapd:TapdAccount:1:test-11test-11,tapd:TapdAccount:1:test-11test-11,test-11test-11,,,,test-11test-11,"{""ConnectionId"":1,""CompanyId"":0,""WorkspaceId"":991}",_raw_tapd_api_tasks,4351,
15-
tapd:TapdTask:1:11991001015452,https://www.tapd.cn/991/prong/stories/view/11991001015452,11991001015452,Mtest-11test-11test-11test-11test-11test-11test-11test-11test-11,,,任务,DONE,done,0,2020-11-11T10:47:24.000+00:00,2020-11-09T10:22:28.000+00:00,2020-11-11T10:47:24.000+00:00,2904,tapd:TapdTask:1:0,,0,0,0,tapd:TapdAccount:1:test-11test-11,tapd:TapdAccount:1:test-11test-11,test-11test-11,,,,test-11test-11,"{""ConnectionId"":1,""CompanyId"":0,""WorkspaceId"":991}",_raw_tapd_api_tasks,4352,
16-
tapd:TapdTask:1:11991001015583,https://www.tapd.cn/991/prong/stories/view/11991001015583,11991001015583,test-11test-11test-11test-11test-11test-11test-11,,,任务,DONE,done,0,2020-11-10T03:47:30.000+00:00,2020-11-10T03:45:34.000+00:00,2022-06-01T11:53:30.000+00:00,1,tapd:TapdTask:1:11991001001301,,0,0,0,tapd:TapdAccount:1:test-11test-11test-11,tapd:TapdAccount:1:test-11test-11test-11,test-11test-11test-11,,,,test-11test-11test-11,"{""ConnectionId"":1,""CompanyId"":0,""WorkspaceId"":991}",_raw_tapd_api_tasks,4353,
1+
id,_raw_data_params,_raw_data_table,_raw_data_id,_raw_data_remark,url,icon_url,issue_key,title,description,epic_key,type,original_type,status,original_status,story_point,resolution_date,created_date,updated_date,lead_time_minutes,parent_issue_id,priority,original_estimate_minutes,time_spent_minutes,time_remaining_minutes,creator_id,creator_name,assignee_id,assignee_name,severity,component,original_project
2+
tapd:TapdTask:1:11991001015107,"{""ConnectionId"":1,""CompanyId"":0,""WorkspaceId"":991}",_raw_tapd_api_tasks,4339,,https://www.tapd.cn/991/prong/stories/view/11991001015107,,11991001015107,test-11test-11test-11test-11test-11test-11test-11,,,任务,TASK,DONE,done,0,2020-11-03T09:53:39.000+00:00,2020-11-03T09:52:00.000+00:00,2022-06-01T11:53:30.000+00:00,1,tapd:TapdTask:1:11991001001301,,0,0,0,tapd:TapdAccount:1:test-11test-11,test-11test-11,tapd:TapdAccount:1:test-11test-11,test-11test-11,,,
3+
tapd:TapdTask:1:11991001015121,"{""ConnectionId"":1,""CompanyId"":0,""WorkspaceId"":991}",_raw_tapd_api_tasks,4340,,https://www.tapd.cn/991/prong/stories/view/11991001015121,,11991001015121,test-11test-11test-11test-11test-11test-11test-11test-11test-11test-11,,,任务,TASK,DONE,done,0,2020-11-03T10:40:17.000+00:00,2020-11-03T10:39:57.000+00:00,2020-11-03T10:40:17.000+00:00,0,tapd:TapdTask:1:0,,0,0,0,tapd:TapdAccount:1:test-11test-11;,test-11test-11;,tapd:TapdAccount:1:test-11test-11,test-11test-11,,,
4+
tapd:TapdTask:1:11991001015142,"{""ConnectionId"":1,""CompanyId"":0,""WorkspaceId"":991}",_raw_tapd_api_tasks,4341,,https://www.tapd.cn/991/prong/stories/view/11991001015142,,11991001015142,test-11test-11test-11test-11test-11test-11test-11,,,任务,TASK,DONE,done,0,2020-11-03T11:00:18.000+00:00,2020-11-03T10:58:43.000+00:00,2022-06-01T11:53:30.000+00:00,1,tapd:TapdTask:1:11991001001301,,0,0,0,tapd:TapdAccount:1:test-11test-11test-11,test-11test-11test-11,tapd:TapdAccount:1:test-11test-11test-11,test-11test-11test-11,,,
5+
tapd:TapdTask:1:11991001015184,"{""ConnectionId"":1,""CompanyId"":0,""WorkspaceId"":991}",_raw_tapd_api_tasks,4342,,https://www.tapd.cn/991/prong/stories/view/11991001015184,,11991001015184,test-11test-11test-11test-11test-11test-11test-11,,,任务,TASK,DONE,done,0,2020-11-04T09:14:22.000+00:00,2020-11-04T09:12:11.000+00:00,2022-06-01T11:53:30.000+00:00,2,tapd:TapdTask:1:11991001001301,,0,0,0,tapd:TapdAccount:1:test-11test-11,test-11test-11,tapd:TapdAccount:1:test-11test-11,test-11test-11,,,
6+
tapd:TapdTask:1:11991001015203,"{""ConnectionId"":1,""CompanyId"":0,""WorkspaceId"":991}",_raw_tapd_api_tasks,4343,,https://www.tapd.cn/991/prong/stories/view/11991001015203,,11991001015203,test-11test-11test-11test-11test-11test-11test-11,,,任务,TASK,DONE,done,0,2020-11-04T10:38:54.000+00:00,2020-11-04T10:38:10.000+00:00,2022-06-01T11:53:30.000+00:00,0,tapd:TapdTask:1:11991001001301,,0,0,0,tapd:TapdAccount:1:test-11test-11test-11,test-11test-11test-11,tapd:TapdAccount:1:test-11test-11test-11,test-11test-11test-11,,,
7+
tapd:TapdTask:1:11991001015207,"{""ConnectionId"":1,""CompanyId"":0,""WorkspaceId"":991}",_raw_tapd_api_tasks,4344,,https://www.tapd.cn/991/prong/stories/view/11991001015207,,11991001015207,pctest-11test-11test-11test-11test-11test-11test-11test-11,,,任务,TASK,DONE,done,0,2020-11-10T11:01:47.000+00:00,2020-11-04T10:43:02.000+00:00,2020-11-10T11:01:47.000+00:00,8658,tapd:TapdTask:1:0,,0,0,0,tapd:TapdAccount:1:test-11test-11,test-11test-11,tapd:TapdAccount:1:test-11test-11,test-11test-11,,,
8+
tapd:TapdTask:1:11991001015253,"{""ConnectionId"":1,""CompanyId"":0,""WorkspaceId"":991}",_raw_tapd_api_tasks,4345,,https://www.tapd.cn/991/prong/stories/view/11991001015253,,11991001015253,test-11test-11test-11test-11test-11test-11test-11,,,任务,TASK,DONE,done,0,2020-11-05T08:50:55.000+00:00,2020-11-05T08:49:42.000+00:00,2022-06-01T11:53:30.000+00:00,1,tapd:TapdTask:1:11991001001301,,0,0,0,tapd:TapdAccount:1:test-11test-11,test-11test-11,tapd:TapdAccount:1:test-11test-11,test-11test-11,,,
9+
tapd:TapdTask:1:11991001015307,"{""ConnectionId"":1,""CompanyId"":0,""WorkspaceId"":991}",_raw_tapd_api_tasks,4346,,https://www.tapd.cn/991/prong/stories/view/11991001015307,,11991001015307,Mtest-11test-11test-11test-11test-11,,,任务,TASK,DONE,done,0,2020-11-06T11:03:43.000+00:00,2020-11-05T11:12:13.000+00:00,2020-11-06T11:03:43.000+00:00,1431,tapd:TapdTask:1:0,,0,0,0,tapd:TapdAccount:1:test-11test-11,test-11test-11,tapd:TapdAccount:1:test-11test-11,test-11test-11,,,
10+
tapd:TapdTask:1:11991001015309,"{""ConnectionId"":1,""CompanyId"":0,""WorkspaceId"":991}",_raw_tapd_api_tasks,4347,,https://www.tapd.cn/991/prong/stories/view/11991001015309,,11991001015309,test-11test-11test-11test-11test-11test-11test-11,,,任务,TASK,DONE,done,0,2020-11-05T11:16:00.000+00:00,2020-11-05T11:14:41.000+00:00,2022-06-01T11:53:30.000+00:00,1,tapd:TapdTask:1:11991001001301,,0,0,0,tapd:TapdAccount:1:test-11test-11test-11,test-11test-11test-11,tapd:TapdAccount:1:test-11test-11test-11,test-11test-11test-11,,,
11+
tapd:TapdTask:1:11991001015340,"{""ConnectionId"":1,""CompanyId"":0,""WorkspaceId"":991}",_raw_tapd_api_tasks,4348,,https://www.tapd.cn/991/prong/stories/view/11991001015340,,11991001015340,test-11test-11test-11test-11test-11test-11test-11,,,任务,TASK,DONE,done,0,2020-11-06T09:12:19.000+00:00,2020-11-06T09:10:44.000+00:00,2022-06-01T11:53:30.000+00:00,1,tapd:TapdTask:1:11991001001301,,0,0,0,tapd:TapdAccount:1:test-11test-11,test-11test-11,tapd:TapdAccount:1:test-11test-11,test-11test-11,,,
12+
tapd:TapdTask:1:11991001015361,"{""ConnectionId"":1,""CompanyId"":0,""WorkspaceId"":991}",_raw_tapd_api_tasks,4349,,https://www.tapd.cn/991/prong/stories/view/11991001015361,,11991001015361,test-11test-11test-11test-11test-11test-11test-11,,,任务,TASK,DONE,done,0,2020-11-06T10:50:31.000+00:00,2020-11-06T10:49:54.000+00:00,2022-06-01T11:53:30.000+00:00,0,tapd:TapdTask:1:11991001001301,,0,0,0,tapd:TapdAccount:1:test-11test-11test-11,test-11test-11test-11,tapd:TapdAccount:1:test-11test-11test-11,test-11test-11test-11,,,
13+
tapd:TapdTask:1:11991001015431,"{""ConnectionId"":1,""CompanyId"":0,""WorkspaceId"":991}",_raw_tapd_api_tasks,4350,,https://www.tapd.cn/991/prong/stories/view/11991001015431,,11991001015431,test-11test-11test-11test-11test-11test-11test-11,,,任务,TASK,DONE,done,0,2020-11-09T04:46:54.000+00:00,2020-11-09T04:45:27.000+00:00,2022-06-01T11:53:30.000+00:00,1,tapd:TapdTask:1:11991001001301,,0,0,0,tapd:TapdAccount:1:test-11test-11test-11,test-11test-11test-11,tapd:TapdAccount:1:test-11test-11test-11,test-11test-11test-11,,,
14+
tapd:TapdTask:1:11991001015441,"{""ConnectionId"":1,""CompanyId"":0,""WorkspaceId"":991}",_raw_tapd_api_tasks,4351,,https://www.tapd.cn/991/prong/stories/view/11991001015441,,11991001015441,test-11test-11test-11test-11test-11test-11test-11,,,任务,TASK,DONE,done,0,2020-11-09T09:16:32.000+00:00,2020-11-09T09:14:15.000+00:00,2022-06-01T11:53:30.000+00:00,2,tapd:TapdTask:1:11991001001301,,0,0,0,tapd:TapdAccount:1:test-11test-11,test-11test-11,tapd:TapdAccount:1:test-11test-11,test-11test-11,,,
15+
tapd:TapdTask:1:11991001015452,"{""ConnectionId"":1,""CompanyId"":0,""WorkspaceId"":991}",_raw_tapd_api_tasks,4352,,https://www.tapd.cn/991/prong/stories/view/11991001015452,,11991001015452,Mtest-11test-11test-11test-11test-11test-11test-11test-11test-11,,,任务,TASK,DONE,done,0,2020-11-11T10:47:24.000+00:00,2020-11-09T10:22:28.000+00:00,2020-11-11T10:47:24.000+00:00,2904,tapd:TapdTask:1:0,,0,0,0,tapd:TapdAccount:1:test-11test-11,test-11test-11,tapd:TapdAccount:1:test-11test-11,test-11test-11,,,
16+
tapd:TapdTask:1:11991001015583,"{""ConnectionId"":1,""CompanyId"":0,""WorkspaceId"":991}",_raw_tapd_api_tasks,4353,,https://www.tapd.cn/991/prong/stories/view/11991001015583,,11991001015583,test-11test-11test-11test-11test-11test-11test-11,,,任务,TASK,DONE,done,0,2020-11-10T03:47:30.000+00:00,2020-11-10T03:45:34.000+00:00,2022-06-01T11:53:30.000+00:00,1,tapd:TapdTask:1:11991001001301,,0,0,0,tapd:TapdAccount:1:test-11test-11test-11,test-11test-11test-11,tapd:TapdAccount:1:test-11test-11test-11,test-11test-11test-11,,,

‎backend/plugins/tapd/e2e/stories_test.go‎

Lines changed: 6 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ limitations under the License.
1818
package e2e
1919

2020
import (
21+
"github.com/apache/incubator-devlake/core/models/common"
2122
"github.com/apache/incubator-devlake/core/models/domainlayer/ticket"
2223
"github.com/apache/incubator-devlake/helpers/e2ehelper"
2324
"github.com/apache/incubator-devlake/plugins/tapd/impl"
@@ -205,38 +206,11 @@ func TestTapdStoryDataFlow(t *testing.T) {
205206
dataflowTester.FlushTabler(&ticket.SprintIssue{})
206207
dataflowTester.FlushTabler(&ticket.IssueLabel{})
207208
dataflowTester.Subtask(tasks.ConvertStoryMeta, taskData)
208-
dataflowTester.VerifyTable(
209-
ticket.Issue{},
210-
"./snapshot_tables/issues_story.csv",
211-
e2ehelper.ColumnWithRawData(
212-
"id",
213-
"url",
214-
"issue_key",
215-
"title",
216-
"description",
217-
"epic_key",
218-
"type",
219-
"status",
220-
"original_status",
221-
"story_point",
222-
"resolution_date",
223-
"created_date",
224-
"updated_date",
225-
"lead_time_minutes",
226-
"parent_issue_id",
227-
"priority",
228-
"original_estimate_minutes",
229-
"time_spent_minutes",
230-
"time_remaining_minutes",
231-
"creator_id",
232-
"assignee_id",
233-
"assignee_name",
234-
"severity",
235-
"component",
236-
"icon_url",
237-
"creator_name",
238-
),
239-
)
209+
dataflowTester.VerifyTableWithOptions(&ticket.Issue{}, e2ehelper.TableOptions{
210+
CSVRelPath: "./snapshot_tables/issues_story.csv",
211+
IgnoreTypes: []interface{}{common.Model{}},
212+
})
213+
240214
dataflowTester.VerifyTable(
241215
ticket.BoardIssue{},
242216
"./snapshot_tables/board_issues_story.csv",

‎backend/plugins/tapd/e2e/tasks_test.go‎

Lines changed: 5 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ limitations under the License.
1818
package e2e
1919

2020
import (
21+
"github.com/apache/incubator-devlake/core/models/common"
2122
"github.com/apache/incubator-devlake/core/models/domainlayer/ticket"
2223
"github.com/apache/incubator-devlake/helpers/e2ehelper"
2324
"github.com/apache/incubator-devlake/plugins/tapd/impl"
@@ -180,38 +181,10 @@ func TestTapdTaskDataFlow(t *testing.T) {
180181
dataflowTester.FlushTabler(&ticket.SprintIssue{})
181182
dataflowTester.FlushTabler(&ticket.IssueLabel{})
182183
dataflowTester.Subtask(tasks.ConvertTaskMeta, taskData)
183-
dataflowTester.VerifyTable(
184-
ticket.Issue{},
185-
"./snapshot_tables/issues_task.csv",
186-
e2ehelper.ColumnWithRawData(
187-
"id",
188-
"url",
189-
"issue_key",
190-
"title",
191-
"description",
192-
"epic_key",
193-
"type",
194-
"status",
195-
"original_status",
196-
"story_point",
197-
"resolution_date",
198-
"created_date",
199-
"updated_date",
200-
"lead_time_minutes",
201-
"parent_issue_id",
202-
"priority",
203-
"original_estimate_minutes",
204-
"time_spent_minutes",
205-
"time_remaining_minutes",
206-
"creator_id",
207-
"assignee_id",
208-
"assignee_name",
209-
"severity",
210-
"component",
211-
"icon_url",
212-
"creator_name",
213-
),
214-
)
184+
dataflowTester.VerifyTableWithOptions(&ticket.Issue{}, e2ehelper.TableOptions{
185+
CSVRelPath: "./snapshot_tables/issues_task.csv",
186+
IgnoreTypes: []interface{}{common.Model{}},
187+
})
215188
dataflowTester.VerifyTable(
216189
ticket.BoardIssue{},
217190
"./snapshot_tables/board_issues_task.csv",

0 commit comments

Comments
 (0)