[incubator-devlake] branch main updated: fix: generate TAPD task parent Issue identifier by Story model (#5526)

Tue, 20 Jun 2023 23:42:43 -0700 

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

klesh 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 1980e1b5c fix: generate TAPD task parent Issue identifier by Story 
model (#5526)
1980e1b5c is described below

commit 1980e1b5c320b2d85b274124ca611ed9dc08103b
Author: Chaojie Yan <[email protected]>
AuthorDate: Wed Jun 21 14:41:53 2023 +0800

    fix: generate TAPD task parent Issue identifier by Story model (#5526)
    
    Co-authored-by: Klesh Wong <[email protected]>
---
 .../tapd/e2e/snapshot_tables/issues_task.csv       | 30 +++++++++++-----------
 backend/plugins/tapd/tasks/task_converter.go       |  3 ++-
 2 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/backend/plugins/tapd/e2e/snapshot_tables/issues_task.csv 
b/backend/plugins/tapd/e2e/snapshot_tables/issues_task.csv
index c37af726b..d52a1b0dc 100644
--- a/backend/plugins/tapd/e2e/snapshot_tables/issues_task.csv
+++ b/backend/plugins/tapd/e2e/snapshot_tables/issues_task.csv
@@ -1,16 +1,16 @@
 
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
-tapd:TapdTask:1:11991001015107,"{""ConnectionId"":1,""WorkspaceId"":991}",_raw_tapd_api_tasks,4339,,https://www.tapd.cn/991/prong/tasks/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,,,
-tapd:TapdTask:1:11991001015121,"{""ConnectionId"":1,""WorkspaceId"":991}",_raw_tapd_api_tasks,4340,,https://www.tapd.cn/991/prong/tasks/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,,,
-tapd:TapdTask:1:11991001015142,"{""ConnectionId"":1,""WorkspaceId"":991}",_raw_tapd_api_tasks,4341,,https://www.tapd.cn/991/prong/tasks/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-11
 [...]
-tapd:TapdTask:1:11991001015184,"{""ConnectionId"":1,""WorkspaceId"":991}",_raw_tapd_api_tasks,4342,,https://www.tapd.cn/991/prong/tasks/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,,,
-tapd:TapdTask:1:11991001015203,"{""ConnectionId"":1,""WorkspaceId"":991}",_raw_tapd_api_tasks,4343,,https://www.tapd.cn/991/prong/tasks/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-11
 [...]
-tapd:TapdTask:1:11991001015207,"{""ConnectionId"":1,""WorkspaceId"":991}",_raw_tapd_api_tasks,4344,,https://www.tapd.cn/991/prong/tasks/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,,,
-tapd:TapdTask:1:11991001015253,"{""ConnectionId"":1,""WorkspaceId"":991}",_raw_tapd_api_tasks,4345,,https://www.tapd.cn/991/prong/tasks/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,,,
-tapd:TapdTask:1:11991001015307,"{""ConnectionId"":1,""WorkspaceId"":991}",_raw_tapd_api_tasks,4346,,https://www.tapd.cn/991/prong/tasks/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,,,
-tapd:TapdTask:1:11991001015309,"{""ConnectionId"":1,""WorkspaceId"":991}",_raw_tapd_api_tasks,4347,,https://www.tapd.cn/991/prong/tasks/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-11
 [...]
-tapd:TapdTask:1:11991001015340,"{""ConnectionId"":1,""WorkspaceId"":991}",_raw_tapd_api_tasks,4348,,https://www.tapd.cn/991/prong/tasks/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,,,
-tapd:TapdTask:1:11991001015361,"{""ConnectionId"":1,""WorkspaceId"":991}",_raw_tapd_api_tasks,4349,,https://www.tapd.cn/991/prong/tasks/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-11
 [...]
-tapd:TapdTask:1:11991001015431,"{""ConnectionId"":1,""WorkspaceId"":991}",_raw_tapd_api_tasks,4350,,https://www.tapd.cn/991/prong/tasks/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-11
 [...]
-tapd:TapdTask:1:11991001015441,"{""ConnectionId"":1,""WorkspaceId"":991}",_raw_tapd_api_tasks,4351,,https://www.tapd.cn/991/prong/tasks/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,,,
-tapd:TapdTask:1:11991001015452,"{""ConnectionId"":1,""WorkspaceId"":991}",_raw_tapd_api_tasks,4352,,https://www.tapd.cn/991/prong/tasks/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,,,
-tapd:TapdTask:1:11991001015583,"{""ConnectionId"":1,""WorkspaceId"":991}",_raw_tapd_api_tasks,4353,,https://www.tapd.cn/991/prong/tasks/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-11
 [...]
+tapd:TapdTask:1:11991001015107,"{""ConnectionId"":1,""WorkspaceId"":991}",_raw_tapd_api_tasks,4339,,https://www.tapd.cn/991/prong/tasks/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:TapdStory:1:11991001001301,,0,0,0,tapd:TapdAccount:1:test-11test-11,test-11test-11,tapd:TapdAccount:1:test-11test-11,test-11test-11,,,
+tapd:TapdTask:1:11991001015121,"{""ConnectionId"":1,""WorkspaceId"":991}",_raw_tapd_api_tasks,4340,,https://www.tapd.cn/991/prong/tasks/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:TapdStory:1:0,,0,0,0,tapd:TapdAccount:1:test-11test-11;,test-11test-11;,tapd:TapdAccount:1:test-11test-11,test-11test-11,,,
+tapd:TapdTask:1:11991001015142,"{""ConnectionId"":1,""WorkspaceId"":991}",_raw_tapd_api_tasks,4341,,https://www.tapd.cn/991/prong/tasks/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:TapdStory: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-1
 [...]
+tapd:TapdTask:1:11991001015184,"{""ConnectionId"":1,""WorkspaceId"":991}",_raw_tapd_api_tasks,4342,,https://www.tapd.cn/991/prong/tasks/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:TapdStory:1:11991001001301,,0,0,0,tapd:TapdAccount:1:test-11test-11,test-11test-11,tapd:TapdAccount:1:test-11test-11,test-11test-11,,,
+tapd:TapdTask:1:11991001015203,"{""ConnectionId"":1,""WorkspaceId"":991}",_raw_tapd_api_tasks,4343,,https://www.tapd.cn/991/prong/tasks/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:TapdStory: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-1
 [...]
+tapd:TapdTask:1:11991001015207,"{""ConnectionId"":1,""WorkspaceId"":991}",_raw_tapd_api_tasks,4344,,https://www.tapd.cn/991/prong/tasks/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:TapdStory:1:0,,0,0,0,tapd:TapdAccount:1:test-11test-11,test-11test-11,tapd:TapdAccount:1:test-11test-11,test-11test-11,,,
+tapd:TapdTask:1:11991001015253,"{""ConnectionId"":1,""WorkspaceId"":991}",_raw_tapd_api_tasks,4345,,https://www.tapd.cn/991/prong/tasks/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:TapdStory:1:11991001001301,,0,0,0,tapd:TapdAccount:1:test-11test-11,test-11test-11,tapd:TapdAccount:1:test-11test-11,test-11test-11,,,
+tapd:TapdTask:1:11991001015307,"{""ConnectionId"":1,""WorkspaceId"":991}",_raw_tapd_api_tasks,4346,,https://www.tapd.cn/991/prong/tasks/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:TapdStory:1:0,,0,0,0,tapd:TapdAccount:1:test-11test-11,test-11test-11,tapd:TapdAccount:1:test-11test-11,test-11test-11,,,
+tapd:TapdTask:1:11991001015309,"{""ConnectionId"":1,""WorkspaceId"":991}",_raw_tapd_api_tasks,4347,,https://www.tapd.cn/991/prong/tasks/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:TapdStory: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-1
 [...]
+tapd:TapdTask:1:11991001015340,"{""ConnectionId"":1,""WorkspaceId"":991}",_raw_tapd_api_tasks,4348,,https://www.tapd.cn/991/prong/tasks/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:TapdStory:1:11991001001301,,0,0,0,tapd:TapdAccount:1:test-11test-11,test-11test-11,tapd:TapdAccount:1:test-11test-11,test-11test-11,,,
+tapd:TapdTask:1:11991001015361,"{""ConnectionId"":1,""WorkspaceId"":991}",_raw_tapd_api_tasks,4349,,https://www.tapd.cn/991/prong/tasks/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:TapdStory: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-1
 [...]
+tapd:TapdTask:1:11991001015431,"{""ConnectionId"":1,""WorkspaceId"":991}",_raw_tapd_api_tasks,4350,,https://www.tapd.cn/991/prong/tasks/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:TapdStory: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-1
 [...]
+tapd:TapdTask:1:11991001015441,"{""ConnectionId"":1,""WorkspaceId"":991}",_raw_tapd_api_tasks,4351,,https://www.tapd.cn/991/prong/tasks/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:TapdStory:1:11991001001301,,0,0,0,tapd:TapdAccount:1:test-11test-11,test-11test-11,tapd:TapdAccount:1:test-11test-11,test-11test-11,,,
+tapd:TapdTask:1:11991001015452,"{""ConnectionId"":1,""WorkspaceId"":991}",_raw_tapd_api_tasks,4352,,https://www.tapd.cn/991/prong/tasks/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:TapdStory:1:0,,0,0,0,tapd:TapdAccount:1:test-11test-11,test-11test-11,tapd:TapdAccount:1:test-11test-11,test-11test-11,,,
+tapd:TapdTask:1:11991001015583,"{""ConnectionId"":1,""WorkspaceId"":991}",_raw_tapd_api_tasks,4353,,https://www.tapd.cn/991/prong/tasks/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:TapdStory: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-1
 [...]
diff --git a/backend/plugins/tapd/tasks/task_converter.go 
b/backend/plugins/tapd/tasks/task_converter.go
index ee2ad9fb4..014acb0ad 100644
--- a/backend/plugins/tapd/tasks/task_converter.go
+++ b/backend/plugins/tapd/tasks/task_converter.go
@@ -48,6 +48,7 @@ func ConvertTask(taskCtx plugin.SubTaskContext) errors.Error {
        }
        defer cursor.Close()
        taskIdGen := didgen.NewDomainIdGenerator(&models.TapdTask{})
+       storyIdGen := didgen.NewDomainIdGenerator(&models.TapdStory{})
        converter, err := helper.NewDataConverter(helper.DataConverterArgs{
                RawDataSubTaskArgs: *rawDataSubTaskArgs,
                InputRowType:       reflect.TypeOf(models.TapdTask{}),
@@ -69,7 +70,7 @@ func ConvertTask(taskCtx plugin.SubTaskContext) errors.Error {
                                ResolutionDate: (*time.Time)(toolL.Completed),
                                CreatedDate:    (*time.Time)(toolL.Created),
                                UpdatedDate:    (*time.Time)(toolL.Modified),
-                               ParentIssueId:  
taskIdGen.Generate(toolL.ConnectionId, toolL.StoryId),
+                               ParentIssueId:  
storyIdGen.Generate(toolL.ConnectionId, toolL.StoryId),
                                Priority:       toolL.Priority,
                                CreatorId:      
getAccountIdGen().Generate(data.Options.ConnectionId, toolL.Creator),
                                CreatorName:    toolL.Creator,

Reply via email to