This is an automated email from the ASF dual-hosted git repository.
abeizn 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 28d90900 fix(tapd): set assigneeId only when assigneeName is valid
28d90900 is described below
commit 28d909001978b23eeacaf55aa8762cb6a12c5daa
Author: Yingchu Chen <[email protected]>
AuthorDate: Tue Oct 18 16:04:48 2022 +0800
fix(tapd): set assigneeId only when assigneeName is valid
closes #3454
---
.../snapshot_tables/_tool_tapd_bug_labels_bug.csv | 22 +++++++++++-----------
plugins/tapd/tasks/bug_converter.go | 4 +++-
plugins/tapd/tasks/story_converter.go | 4 +++-
plugins/tapd/tasks/task_converter.go | 4 +++-
4 files changed, 20 insertions(+), 14 deletions(-)
diff --git a/plugins/tapd/e2e/snapshot_tables/_tool_tapd_bug_labels_bug.csv
b/plugins/tapd/e2e/snapshot_tables/_tool_tapd_bug_labels_bug.csv
index 4d947861..a236ec35 100644
--- a/plugins/tapd/e2e/snapshot_tables/_tool_tapd_bug_labels_bug.csv
+++ b/plugins/tapd/e2e/snapshot_tables/_tool_tapd_bug_labels_bug.csv
@@ -1,21 +1,21 @@
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
-tapd:TapdIssue:1:11991001001025,https://www.tapd.cn/991/prong/stories/view/11991001001025,11991001001025,,,,BUG,IN_PROGRESS,,0,2020-02-14T07:14:30.000+00:00,2020-02-13T06:04:29.000+00:00,2020-02-14T08:50:03.000+00:00,1510,tapd:TapdIssue:1:0,medium,0,0,0,tapd:TapdAccount:1:test-11test-11.,tapd:TapdAccount:1:,,normal,,,test-11test-11.,"{""ConnectionId"":1,""CompanyId"":0,""WorkspaceId"":991}",_raw_tapd_api_bugs,1271,
-tapd:TapdIssue:1:11991001001030,https://www.tapd.cn/991/prong/stories/view/11991001001030,11991001001030,,,,BUG,IN_PROGRESS,开发中,0,2020-02-14T07:12:58.000+00:00,2020-02-13T06:33:47.000+00:00,2020-02-17T03:57:42.000+00:00,1479,tapd:TapdIssue:1:0,medium,0,0,0,tapd:TapdAccount:1:test-11test-11.,tapd:TapdAccount:1:,,normal,,,test-11test-11.,"{""ConnectionId"":1,""CompanyId"":0,""WorkspaceId"":991}",_raw_tapd_api_bugs,1272,
-tapd:TapdIssue:1:11991001001031,https://www.tapd.cn/991/prong/stories/view/11991001001031,11991001001031,,,,BUG,IN_PROGRESS,开发中,0,2020-02-14T08:30:23.000+00:00,2020-02-13T06:45:11.000+00:00,2020-02-17T03:56:58.000+00:00,1545,tapd:TapdIssue:1:0,medium,0,0,0,tapd:TapdAccount:1:test-11test-11.,tapd:TapdAccount:1:,,normal,,,test-11test-11.,"{""ConnectionId"":1,""CompanyId"":0,""WorkspaceId"":991}",_raw_tapd_api_bugs,1273,
-tapd:TapdIssue:1:11991001001032,https://www.tapd.cn/991/prong/stories/view/11991001001032,11991001001032,,,,BUG,IN_PROGRESS,,0,2020-02-13T09:33:17.000+00:00,2020-02-13T06:50:33.000+00:00,2020-02-17T03:56:36.000+00:00,162,tapd:TapdIssue:1:0,medium,0,0,0,tapd:TapdAccount:1:test-11test-11.,tapd:TapdAccount:1:,,normal,,,test-11test-11.,"{""ConnectionId"":1,""CompanyId"":0,""WorkspaceId"":991}",_raw_tapd_api_bugs,1274,
+tapd:TapdIssue:1:11991001001025,https://www.tapd.cn/991/prong/stories/view/11991001001025,11991001001025,,,,BUG,IN_PROGRESS,,0,2020-02-14T07:14:30.000+00:00,2020-02-13T06:04:29.000+00:00,2020-02-14T08:50:03.000+00:00,1510,tapd:TapdIssue:1:0,medium,0,0,0,tapd:TapdAccount:1:test-11test-11.,,,normal,,,test-11test-11.,"{""ConnectionId"":1,""CompanyId"":0,""WorkspaceId"":991}",_raw_tapd_api_bugs,1271,
+tapd:TapdIssue:1:11991001001030,https://www.tapd.cn/991/prong/stories/view/11991001001030,11991001001030,,,,BUG,IN_PROGRESS,开发中,0,2020-02-14T07:12:58.000+00:00,2020-02-13T06:33:47.000+00:00,2020-02-17T03:57:42.000+00:00,1479,tapd:TapdIssue:1:0,medium,0,0,0,tapd:TapdAccount:1:test-11test-11.,,,normal,,,test-11test-11.,"{""ConnectionId"":1,""CompanyId"":0,""WorkspaceId"":991}",_raw_tapd_api_bugs,1272,
+tapd:TapdIssue:1:11991001001031,https://www.tapd.cn/991/prong/stories/view/11991001001031,11991001001031,,,,BUG,IN_PROGRESS,开发中,0,2020-02-14T08:30:23.000+00:00,2020-02-13T06:45:11.000+00:00,2020-02-17T03:56:58.000+00:00,1545,tapd:TapdIssue:1:0,medium,0,0,0,tapd:TapdAccount:1:test-11test-11.,,,normal,,,test-11test-11.,"{""ConnectionId"":1,""CompanyId"":0,""WorkspaceId"":991}",_raw_tapd_api_bugs,1273,
+tapd:TapdIssue:1:11991001001032,https://www.tapd.cn/991/prong/stories/view/11991001001032,11991001001032,,,,BUG,IN_PROGRESS,,0,2020-02-13T09:33:17.000+00:00,2020-02-13T06:50:33.000+00:00,2020-02-17T03:56:36.000+00:00,162,tapd:TapdIssue:1:0,medium,0,0,0,tapd:TapdAccount:1:test-11test-11.,,,normal,,,test-11test-11.,"{""ConnectionId"":1,""CompanyId"":0,""WorkspaceId"":991}",_raw_tapd_api_bugs,1274,
tapd:TapdIssue:1:11991001001417,https://www.tapd.cn/991/prong/stories/view/11991001001417,11991001001417,,,,BUG,DONE,已拒绝,0,,2020-02-25T08:01:11.000+00:00,2020-03-04T08:12:14.000+00:00,0,tapd:TapdIssue:1:0,medium,0,0,0,tapd:TapdAccount:1:test-11test-11test-11,tapd:TapdAccount:1:test-11test-11test-11,test-11test-11test-11,normal,,,test-11test-11test-11,"{""ConnectionId"":1,""CompanyId"":0,""WorkspaceId"":991}",_raw_tapd_api_bugs,1275,
tapd:TapdIssue:1:11991001001418,https://www.tapd.cn/991/prong/stories/view/11991001001418,11991001001418,,,,BUG,DONE,已拒绝,0,,2020-02-25T08:04:12.000+00:00,2020-03-04T08:27:29.000+00:00,0,tapd:TapdIssue:1:0,medium,0,0,0,tapd:TapdAccount:1:test-11test-11test-11,tapd:TapdAccount:1:test-11test-11test-11,test-11test-11test-11,normal,,,test-11test-11test-11,"{""ConnectionId"":1,""CompanyId"":0,""WorkspaceId"":991}",_raw_tapd_api_bugs,1276,
-tapd:TapdIssue:1:11991001001420,https://www.tapd.cn/991/prong/stories/view/11991001001420,11991001001420,,,,BUG,IN_PROGRESS,,0,2020-03-04T07:41:18.000+00:00,2020-02-25T08:07:04.000+00:00,2020-03-04T08:20:12.000+00:00,11494,tapd:TapdIssue:1:0,medium,0,0,0,tapd:TapdAccount:1:test-11test-11test-11,tapd:TapdAccount:1:,,normal,,,test-11test-11test-11,"{""ConnectionId"":1,""CompanyId"":0,""WorkspaceId"":991}",_raw_tapd_api_bugs,1277,
+tapd:TapdIssue:1:11991001001420,https://www.tapd.cn/991/prong/stories/view/11991001001420,11991001001420,,,,BUG,IN_PROGRESS,,0,2020-03-04T07:41:18.000+00:00,2020-02-25T08:07:04.000+00:00,2020-03-04T08:20:12.000+00:00,11494,tapd:TapdIssue:1:0,medium,0,0,0,tapd:TapdAccount:1:test-11test-11test-11,,,normal,,,test-11test-11test-11,"{""ConnectionId"":1,""CompanyId"":0,""WorkspaceId"":991}",_raw_tapd_api_bugs,1277,
tapd:TapdIssue:1:11991001001422,https://www.tapd.cn/991/prong/stories/view/11991001001422,11991001001422,,,,BUG,DONE,已拒绝,0,,2020-02-25T08:10:51.000+00:00,2020-03-04T08:12:17.000+00:00,0,tapd:TapdIssue:1:0,medium,0,0,0,tapd:TapdAccount:1:test-11test-11test-11,tapd:TapdAccount:1:test-11test-11test-11,test-11test-11test-11,normal,,,test-11test-11test-11,"{""ConnectionId"":1,""CompanyId"":0,""WorkspaceId"":991}",_raw_tapd_api_bugs,1278,
tapd:TapdIssue:1:11991001001423,https://www.tapd.cn/991/prong/stories/view/11991001001423,11991001001423,,,,BUG,DONE,已拒绝,0,,2020-02-25T08:12:56.000+00:00,2020-03-04T08:25:19.000+00:00,0,tapd:TapdIssue:1:0,medium,0,0,0,tapd:TapdAccount:1:test-11test-11test-11,tapd:TapdAccount:1:test-11test-11test-11,test-11test-11test-11,normal,,,test-11test-11test-11,"{""ConnectionId"":1,""CompanyId"":0,""WorkspaceId"":991}",_raw_tapd_api_bugs,1279,
-tapd:TapdIssue:1:11991001001425,https://www.tapd.cn/991/prong/stories/view/11991001001425,11991001001425,,,,BUG,IN_PROGRESS,,0,2020-03-04T07:41:01.000+00:00,2020-02-25T08:18:40.000+00:00,2020-03-04T08:19:48.000+00:00,11482,tapd:TapdIssue:1:0,medium,0,0,0,tapd:TapdAccount:1:test-11test-11test-11,tapd:TapdAccount:1:,,normal,,,test-11test-11test-11,"{""ConnectionId"":1,""CompanyId"":0,""WorkspaceId"":991}",_raw_tapd_api_bugs,1280,
+tapd:TapdIssue:1:11991001001425,https://www.tapd.cn/991/prong/stories/view/11991001001425,11991001001425,,,,BUG,IN_PROGRESS,,0,2020-03-04T07:41:01.000+00:00,2020-02-25T08:18:40.000+00:00,2020-03-04T08:19:48.000+00:00,11482,tapd:TapdIssue:1:0,medium,0,0,0,tapd:TapdAccount:1:test-11test-11test-11,,,normal,,,test-11test-11test-11,"{""ConnectionId"":1,""CompanyId"":0,""WorkspaceId"":991}",_raw_tapd_api_bugs,1280,
tapd:TapdIssue:1:11991001001426,https://www.tapd.cn/991/prong/stories/view/11991001001426,11991001001426,,,,BUG,DONE,已拒绝,0,,2020-02-25T08:23:39.000+00:00,2020-03-04T08:12:19.000+00:00,0,tapd:TapdIssue:1:0,medium,0,0,0,tapd:TapdAccount:1:test-11test-11test-11,tapd:TapdAccount:1:test-11test-11test-11,test-11test-11test-11,normal,,,test-11test-11test-11,"{""ConnectionId"":1,""CompanyId"":0,""WorkspaceId"":991}",_raw_tapd_api_bugs,1281,
-tapd:TapdIssue:1:11991001001447,https://www.tapd.cn/991/prong/stories/view/11991001001447,11991001001447,,,,BUG,IN_PROGRESS,,0,2020-03-17T08:43:28.000+00:00,2020-02-27T03:06:59.000+00:00,2020-03-18T08:24:37.000+00:00,27696,tapd:TapdIssue:1:0,medium,0,0,0,tapd:TapdAccount:1:test-11test-11test-11,tapd:TapdAccount:1:,,normal,,,test-11test-11test-11,"{""ConnectionId"":1,""CompanyId"":0,""WorkspaceId"":991}",_raw_tapd_api_bugs,1282,
+tapd:TapdIssue:1:11991001001447,https://www.tapd.cn/991/prong/stories/view/11991001001447,11991001001447,,,,BUG,IN_PROGRESS,,0,2020-03-17T08:43:28.000+00:00,2020-02-27T03:06:59.000+00:00,2020-03-18T08:24:37.000+00:00,27696,tapd:TapdIssue:1:0,medium,0,0,0,tapd:TapdAccount:1:test-11test-11test-11,,,normal,,,test-11test-11test-11,"{""ConnectionId"":1,""CompanyId"":0,""WorkspaceId"":991}",_raw_tapd_api_bugs,1282,
tapd:TapdIssue:1:11991001001448,https://www.tapd.cn/991/prong/stories/view/11991001001448,11991001001448,,,,BUG,DONE,已拒绝,0,,2020-02-27T03:14:02.000+00:00,2020-04-27T02:53:11.000+00:00,0,tapd:TapdIssue:1:0,medium,0,0,0,tapd:TapdAccount:1:test-11test-11test-11,tapd:TapdAccount:1:test-11test-11test-11,test-11test-11test-11,normal,,,test-11test-11test-11,"{""ConnectionId"":1,""CompanyId"":0,""WorkspaceId"":991}",_raw_tapd_api_bugs,1283,
-tapd:TapdIssue:1:11991001001450,https://www.tapd.cn/991/prong/stories/view/11991001001450,11991001001450,,,,BUG,IN_PROGRESS,,0,2020-03-17T08:43:04.000+00:00,2020-02-27T03:18:04.000+00:00,2020-03-18T08:24:15.000+00:00,27685,tapd:TapdIssue:1:0,medium,0,0,0,tapd:TapdAccount:1:test-11test-11test-11,tapd:TapdAccount:1:,,normal,,,test-11test-11test-11,"{""ConnectionId"":1,""CompanyId"":0,""WorkspaceId"":991}",_raw_tapd_api_bugs,1284,
-tapd:TapdIssue:1:11991001001451,https://www.tapd.cn/991/prong/stories/view/11991001001451,11991001001451,,,,BUG,IN_PROGRESS,,0,2020-03-17T08:42:17.000+00:00,2020-02-27T03:36:29.000+00:00,2020-03-18T08:23:08.000+00:00,27665,tapd:TapdIssue:1:0,medium,0,0,0,tapd:TapdAccount:1:test-11test-11test-11,tapd:TapdAccount:1:,,normal,,,test-11test-11test-11,"{""ConnectionId"":1,""CompanyId"":0,""WorkspaceId"":991}",_raw_tapd_api_bugs,1285,
+tapd:TapdIssue:1:11991001001450,https://www.tapd.cn/991/prong/stories/view/11991001001450,11991001001450,,,,BUG,IN_PROGRESS,,0,2020-03-17T08:43:04.000+00:00,2020-02-27T03:18:04.000+00:00,2020-03-18T08:24:15.000+00:00,27685,tapd:TapdIssue:1:0,medium,0,0,0,tapd:TapdAccount:1:test-11test-11test-11,,,normal,,,test-11test-11test-11,"{""ConnectionId"":1,""CompanyId"":0,""WorkspaceId"":991}",_raw_tapd_api_bugs,1284,
+tapd:TapdIssue:1:11991001001451,https://www.tapd.cn/991/prong/stories/view/11991001001451,11991001001451,,,,BUG,IN_PROGRESS,,0,2020-03-17T08:42:17.000+00:00,2020-02-27T03:36:29.000+00:00,2020-03-18T08:23:08.000+00:00,27665,tapd:TapdIssue:1:0,medium,0,0,0,tapd:TapdAccount:1:test-11test-11test-11,,,normal,,,test-11test-11test-11,"{""ConnectionId"":1,""CompanyId"":0,""WorkspaceId"":991}",_raw_tapd_api_bugs,1285,
tapd:TapdIssue:1:11991001001710,https://www.tapd.cn/991/prong/stories/view/11991001001710,11991001001710,,,,BUG,DONE,已拒绝,0,,2020-03-13T06:14:26.000+00:00,2020-04-01T09:38:36.000+00:00,0,tapd:TapdIssue:1:0,medium,0,0,0,tapd:TapdAccount:1:test-11test-11test-11,tapd:TapdAccount:1:test-11test-11test-11,test-11test-11test-11,normal,,,test-11test-11test-11,"{""ConnectionId"":1,""CompanyId"":0,""WorkspaceId"":991}",_raw_tapd_api_bugs,1286,
tapd:TapdIssue:1:11991001001711,https://www.tapd.cn/991/prong/stories/view/11991001001711,11991001001711,,,,BUG,DONE,已拒绝,0,,2020-03-13T06:20:04.000+00:00,2020-04-01T09:37:52.000+00:00,0,tapd:TapdIssue:1:0,medium,0,0,0,tapd:TapdAccount:1:test-11test-11test-11,tapd:TapdAccount:1:test-11test-11test-11,test-11test-11test-11,normal,,,test-11test-11test-11,"{""ConnectionId"":1,""CompanyId"":0,""WorkspaceId"":991}",_raw_tapd_api_bugs,1287,
-tapd:TapdIssue:1:11991001001737,https://www.tapd.cn/991/prong/stories/view/11991001001737,11991001001737,,,,BUG,IN_PROGRESS,,0,2020-03-26T08:31:05.000+00:00,2020-03-18T07:27:14.000+00:00,2020-03-26T09:02:54.000+00:00,11583,tapd:TapdIssue:1:0,medium,0,0,0,tapd:TapdAccount:1:test-11test-11test-11,tapd:TapdAccount:1:,,normal,,,test-11test-11test-11,"{""ConnectionId"":1,""CompanyId"":0,""WorkspaceId"":991}",_raw_tapd_api_bugs,1288,
-tapd:TapdIssue:1:11991001001739,https://www.tapd.cn/991/prong/stories/view/11991001001739,11991001001739,,,,BUG,IN_PROGRESS,,0,2020-03-26T08:25:10.000+00:00,2020-03-18T07:32:55.000+00:00,2020-03-26T09:02:37.000+00:00,11572,tapd:TapdIssue:1:0,medium,0,0,0,tapd:TapdAccount:1:tt90ddtt9a81tt5bb5,tapd:TapdAccount:1:,,normal,,,tt90ddtt9a81tt5bb5,"{""ConnectionId"":1,""CompanyId"":0,""WorkspaceId"":991}",_raw_tapd_api_bugs,1289,
+tapd:TapdIssue:1:11991001001737,https://www.tapd.cn/991/prong/stories/view/11991001001737,11991001001737,,,,BUG,IN_PROGRESS,,0,2020-03-26T08:31:05.000+00:00,2020-03-18T07:27:14.000+00:00,2020-03-26T09:02:54.000+00:00,11583,tapd:TapdIssue:1:0,medium,0,0,0,tapd:TapdAccount:1:test-11test-11test-11,,,normal,,,test-11test-11test-11,"{""ConnectionId"":1,""CompanyId"":0,""WorkspaceId"":991}",_raw_tapd_api_bugs,1288,
+tapd:TapdIssue:1:11991001001739,https://www.tapd.cn/991/prong/stories/view/11991001001739,11991001001739,,,,BUG,IN_PROGRESS,,0,2020-03-26T08:25:10.000+00:00,2020-03-18T07:32:55.000+00:00,2020-03-26T09:02:37.000+00:00,11572,tapd:TapdIssue:1:0,medium,0,0,0,tapd:TapdAccount:1:tt90ddtt9a81tt5bb5,,,normal,,,tt90ddtt9a81tt5bb5,"{""ConnectionId"":1,""CompanyId"":0,""WorkspaceId"":991}",_raw_tapd_api_bugs,1289,
tapd:TapdIssue:1:11991001001740,https://www.tapd.cn/991/prong/stories/view/11991001001740,11991001001740,,,,BUG,DONE,已拒绝,0,,2020-03-18T07:37:43.000+00:00,2020-03-25T02:38:34.000+00:00,0,tapd:TapdIssue:1:0,medium,0,0,0,tapd:TapdAccount:1:郝骁宵,tapd:TapdAccount:1:郝骁宵,郝骁宵,normal,,,郝骁宵,"{""ConnectionId"":1,""CompanyId"":0,""WorkspaceId"":991}",_raw_tapd_api_bugs,1290,
diff --git a/plugins/tapd/tasks/bug_converter.go
b/plugins/tapd/tasks/bug_converter.go
index ad603f14..89a634f7 100644
--- a/plugins/tapd/tasks/bug_converter.go
+++ b/plugins/tapd/tasks/bug_converter.go
@@ -76,12 +76,14 @@ func ConvertBug(taskCtx core.SubTaskContext) errors.Error {
Priority: toolL.Priority,
CreatorId:
accountIdGen.Generate(data.Options.ConnectionId, toolL.Reporter),
CreatorName: toolL.Reporter,
- AssigneeId:
accountIdGen.Generate(data.Options.ConnectionId, toolL.CurrentOwner),
AssigneeName: toolL.CurrentOwner,
Severity: toolL.Severity,
Component: toolL.Feature, // todo not sure
about this
OriginalStatus: toolL.Status,
}
+ if domainL.AssigneeName != "" {
+ domainL.AssigneeId =
accountIdGen.Generate(data.Options.ConnectionId, toolL.CurrentOwner)
+ }
if domainL.ResolutionDate != nil && domainL.CreatedDate
!= nil {
domainL.LeadTimeMinutes =
int64(domainL.ResolutionDate.Sub(*domainL.CreatedDate).Minutes())
}
diff --git a/plugins/tapd/tasks/story_converter.go
b/plugins/tapd/tasks/story_converter.go
index a688b2af..b8b6099a 100644
--- a/plugins/tapd/tasks/story_converter.go
+++ b/plugins/tapd/tasks/story_converter.go
@@ -79,11 +79,13 @@ func ConvertStory(taskCtx core.SubTaskContext) errors.Error
{
TimeRemainingMinutes: int64(toolL.Remain),
CreatorId:
accountIdGen.Generate(data.Options.ConnectionId, toolL.Creator),
CreatorName: toolL.Creator,
- AssigneeId:
accountIdGen.Generate(data.Options.ConnectionId, toolL.Owner),
AssigneeName: toolL.Owner,
Severity: "",
Component: toolL.Feature,
}
+ if domainL.AssigneeName != "" {
+ domainL.AssigneeId =
accountIdGen.Generate(data.Options.ConnectionId, toolL.Owner)
+ }
if domainL.ResolutionDate != nil && domainL.CreatedDate
!= nil {
domainL.LeadTimeMinutes =
int64(domainL.ResolutionDate.Sub(*domainL.CreatedDate).Minutes())
}
diff --git a/plugins/tapd/tasks/task_converter.go
b/plugins/tapd/tasks/task_converter.go
index 30dad0a2..2a8a91a1 100644
--- a/plugins/tapd/tasks/task_converter.go
+++ b/plugins/tapd/tasks/task_converter.go
@@ -78,9 +78,11 @@ func ConvertTask(taskCtx core.SubTaskContext) errors.Error {
Priority: toolL.Priority,
CreatorId:
accountIdGen.Generate(data.Options.ConnectionId, toolL.Creator),
CreatorName: toolL.Creator,
- AssigneeId:
accountIdGen.Generate(data.Options.ConnectionId, toolL.Owner),
AssigneeName: toolL.Owner,
}
+ if domainL.AssigneeName != "" {
+ domainL.AssigneeId =
accountIdGen.Generate(data.Options.ConnectionId, toolL.Owner)
+ }
if domainL.ResolutionDate != nil && domainL.CreatedDate
!= nil {
domainL.LeadTimeMinutes =
int64(domainL.ResolutionDate.Sub(*domainL.CreatedDate).Minutes())
}
