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 2022/09/27 08:07:07 UTC
[incubator-devlake] branch release-v0.12 updated (9f6c14dc -> bb33828d)
This is an automated email from the ASF dual-hosted git repository.
zhangliang2022 pushed a change to branch release-v0.12
in repository https://gitbox.apache.org/repos/asf/incubator-devlake.git
from 9f6c14dc fix: pipeline failed to handle panicking (#3143)
new 1f9e2263 fix: use key as accountId
new bb33828d fix: fix e2e
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../e2e/snapshot_tables/_tool_jira_worklogs.csv | 60 +++++++++++-----------
plugins/jira/e2e/snapshot_tables/worklogs.csv | 12 ++---
plugins/jira/tasks/apiv2models/user.go | 3 ++
plugins/jira/tasks/apiv2models/user_test.go | 4 ++
plugins/jira/tasks/apiv2models/worklog.go | 4 +-
5 files changed, 45 insertions(+), 38 deletions(-)
[incubator-devlake] 02/02: fix: fix e2e
Posted by zh...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
zhangliang2022 pushed a commit to branch release-v0.12
in repository https://gitbox.apache.org/repos/asf/incubator-devlake.git
commit bb33828dce464fecc81e60d5df44bac9a24126b6
Author: zhangliang <li...@merico.dev>
AuthorDate: Tue Sep 27 15:08:51 2022 +0800
fix: fix e2e
---
.../e2e/snapshot_tables/_tool_jira_worklogs.csv | 60 +++++++++++-----------
plugins/jira/e2e/snapshot_tables/worklogs.csv | 12 ++---
2 files changed, 36 insertions(+), 36 deletions(-)
diff --git a/plugins/jira/e2e/snapshot_tables/_tool_jira_worklogs.csv b/plugins/jira/e2e/snapshot_tables/_tool_jira_worklogs.csv
index 0f65f409..0daec92b 100644
--- a/plugins/jira/e2e/snapshot_tables/_tool_jira_worklogs.csv
+++ b/plugins/jira/e2e/snapshot_tables/_tool_jira_worklogs.csv
@@ -1,31 +1,31 @@
connection_id,issue_id,worklog_id,author_id,update_author_id,time_spent,time_spent_seconds,updated,started,issue_updated,_raw_data_params,_raw_data_table,_raw_data_id,_raw_data_remark
-2,10076,10006,,,1d 2h,36000,2020-06-15T08:59:51.302+00:00,2020-06-05T20:59:00.000+00:00,2022-04-18T13:49:16.000+00:00,"{""ConnectionId"":2,""BoardId"":8}",_raw_jira_api_worklogs,1252,
-2,10077,10007,,,4h,14400,2020-06-15T09:00:26.952+00:00,2020-06-15T09:00:00.000+00:00,2022-04-18T13:49:16.000+00:00,"{""ConnectionId"":2,""BoardId"":8}",_raw_jira_api_worklogs,1250,
-2,10077,10008,,,4h,14400,2020-06-15T09:01:06.211+00:00,2020-06-15T05:00:42.836+00:00,2022-04-18T13:49:16.000+00:00,"{""ConnectionId"":2,""BoardId"":8}",_raw_jira_api_worklogs,1251,
-2,10078,10009,,,1h,3600,2020-06-15T09:01:44.154+00:00,2020-06-15T09:01:00.000+00:00,2022-04-18T13:49:16.000+00:00,"{""ConnectionId"":2,""BoardId"":8}",_raw_jira_api_worklogs,1253,
-2,10079,10218,,,2h,7200,2020-07-22T07:25:29.102+00:00,2020-07-22T07:24:00.000+00:00,2022-04-18T13:49:16.000+00:00,"{""ConnectionId"":2,""BoardId"":8}",_raw_jira_api_worklogs,1249,
-2,10085,10010,,,1h,3600,2020-06-15T09:07:56.793+00:00,2020-06-15T09:07:00.000+00:00,2022-04-18T13:49:16.000+00:00,"{""ConnectionId"":2,""BoardId"":8}",_raw_jira_api_worklogs,1248,
-2,11956,10713,cong.wang@merico.dev,cong.wang@merico.dev,3h,10800,2021-01-11T10:01:03.628+00:00,2021-01-11T06:58:43.580+00:00,2022-04-19T16:29:51.000+00:00,"{""ConnectionId"":2,""BoardId"":8}",_raw_jira_api_worklogs,1330,
-2,11956,10717,cong.wang@merico.dev,cong.wang@merico.dev,2h 30m,9000,2021-01-12T03:53:41.936+00:00,2021-01-12T01:00:00.000+00:00,2022-04-19T16:29:51.000+00:00,"{""ConnectionId"":2,""BoardId"":8}",_raw_jira_api_worklogs,1331,
-2,11956,10718,cong.wang@merico.dev,cong.wang@merico.dev,30m,1800,2021-01-12T05:11:25.368+00:00,2021-01-12T04:40:51.604+00:00,2022-04-19T16:29:51.000+00:00,"{""ConnectionId"":2,""BoardId"":8}",_raw_jira_api_worklogs,1332,
-2,11956,10719,cong.wang@merico.dev,cong.wang@merico.dev,4h,14400,2021-01-12T09:59:08.739+00:00,2021-01-12T05:58:22.015+00:00,2022-04-19T16:29:51.000+00:00,"{""ConnectionId"":2,""BoardId"":8}",_raw_jira_api_worklogs,1333,
-2,11956,10720,cong.wang@merico.dev,cong.wang@merico.dev,1h,3600,2021-01-12T12:09:23.539+00:00,2021-01-12T11:08:46.608+00:00,2022-04-19T16:29:51.000+00:00,"{""ConnectionId"":2,""BoardId"":8}",_raw_jira_api_worklogs,1334,
-2,11956,10726,cong.wang@merico.dev,cong.wang@merico.dev,2h 30m,9000,2021-01-13T03:55:02.070+00:00,2021-01-13T01:24:41.786+00:00,2022-04-19T16:29:51.000+00:00,"{""ConnectionId"":2,""BoardId"":8}",_raw_jira_api_worklogs,1335,
-2,11956,10729,cong.wang@merico.dev,cong.wang@merico.dev,20m,1200,2021-01-13T07:26:34.565+00:00,2021-01-13T07:06:14.927+00:00,2022-04-19T16:29:51.000+00:00,"{""ConnectionId"":2,""BoardId"":8}",_raw_jira_api_worklogs,1336,
-2,11956,10733,cong.wang@merico.dev,cong.wang@merico.dev,2h,7200,2021-01-13T11:10:46.917+00:00,2021-01-13T08:00:00.000+00:00,2022-04-19T16:29:51.000+00:00,"{""ConnectionId"":2,""BoardId"":8}",_raw_jira_api_worklogs,1337,
-2,12083,10611,,,1d,28800,2020-11-20T03:41:21.160+00:00,2020-11-19T19:41:16.606+00:00,2022-04-19T16:29:51.000+00:00,"{""ConnectionId"":2,""BoardId"":8}",_raw_jira_api_worklogs,1338,
-2,12263,10809,cong.wang@merico.dev,cong.wang@merico.dev,3h,10800,2021-01-27T01:54:00.883+00:00,2021-01-26T07:00:00.000+00:00,2022-04-19T16:29:51.000+00:00,"{""ConnectionId"":2,""BoardId"":8}",_raw_jira_api_worklogs,1339,
-2,12263,10810,cong.wang@merico.dev,cong.wang@merico.dev,1h,3600,2021-01-27T01:54:29.081+00:00,2021-01-27T01:00:00.000+00:00,2022-04-19T16:29:51.000+00:00,"{""ConnectionId"":2,""BoardId"":8}",_raw_jira_api_worklogs,1340,
-2,12263,10811,cong.wang@merico.dev,cong.wang@merico.dev,1h,3600,2021-01-27T03:34:04.537+00:00,2021-01-27T02:33:41.693+00:00,2022-04-19T16:29:51.000+00:00,"{""ConnectionId"":2,""BoardId"":8}",_raw_jira_api_worklogs,1341,
-2,12263,10922,cong.wang@merico.dev,cong.wang@merico.dev,6h,21600,2021-02-19T11:33:52.222+00:00,2021-02-19T05:33:21.257+00:00,2022-04-19T16:29:51.000+00:00,"{""ConnectionId"":2,""BoardId"":8}",_raw_jira_api_worklogs,1342,
-2,12351,10946,cong.wang@merico.dev,cong.wang@merico.dev,1h,3600,2021-03-02T09:20:19.608+00:00,2021-03-02T08:20:02.371+00:00,2022-04-19T16:29:51.000+00:00,"{""ConnectionId"":2,""BoardId"":8}",_raw_jira_api_worklogs,1343,
-2,12411,10708,cong.wang@merico.dev,cong.wang@merico.dev,2h,7200,2021-01-11T03:53:25.692+00:00,2021-01-11T01:52:40.264+00:00,2022-04-19T16:29:51.000+00:00,"{""ConnectionId"":2,""BoardId"":8}",_raw_jira_api_worklogs,1344,
-2,12604,10714,cong.wang@merico.dev,cong.wang@merico.dev,20m,1200,2021-01-11T11:35:33.757+00:00,2021-01-11T11:15:00.400+00:00,2022-04-19T16:29:51.000+00:00,"{""ConnectionId"":2,""BoardId"":8}",_raw_jira_api_worklogs,1345,
-2,12604,10728,cong.wang@merico.dev,cong.wang@merico.dev,45m,2700,2021-01-13T06:18:35.726+00:00,2021-01-13T05:33:16.447+00:00,2022-04-19T16:29:51.000+00:00,"{""ConnectionId"":2,""BoardId"":8}",_raw_jira_api_worklogs,1346,
-2,12692,10761,cong.wang@merico.dev,cong.wang@merico.dev,1h,3600,2021-01-20T09:55:38.918+00:00,2021-01-20T08:55:12.424+00:00,2022-04-19T16:29:51.000+00:00,"{""ConnectionId"":2,""BoardId"":8}",_raw_jira_api_worklogs,1347,
-2,12760,10738,cong.wang@merico.dev,cong.wang@merico.dev,3h,10800,2021-01-15T01:17:13.517+00:00,2021-01-14T06:00:00.000+00:00,2022-04-19T16:29:51.000+00:00,"{""ConnectionId"":2,""BoardId"":8}",_raw_jira_api_worklogs,1348,
-2,12760,10743,cong.wang@merico.dev,cong.wang@merico.dev,3h,10800,2021-01-18T01:13:18.808+00:00,2021-01-15T06:00:00.000+00:00,2022-04-19T16:29:51.000+00:00,"{""ConnectionId"":2,""BoardId"":8}",_raw_jira_api_worklogs,1349,
-2,12760,10750,cong.wang@merico.dev,cong.wang@merico.dev,3h,10800,2021-01-18T09:05:08.848+00:00,2021-01-18T07:00:00.000+00:00,2022-04-19T16:29:51.000+00:00,"{""ConnectionId"":2,""BoardId"":8}",_raw_jira_api_worklogs,1350,
-2,12760,10759,cong.wang@merico.dev,cong.wang@merico.dev,1h,3600,2021-01-20T05:21:40.077+00:00,2021-01-19T16:30:00.000+00:00,2022-04-19T16:29:51.000+00:00,"{""ConnectionId"":2,""BoardId"":8}",_raw_jira_api_worklogs,1351,
-2,12796,10732,cong.wang@merico.dev,cong.wang@merico.dev,30m,1800,2021-01-13T11:10:00.634+00:00,2021-01-13T10:39:45.227+00:00,2022-04-19T16:29:51.000+00:00,"{""ConnectionId"":2,""BoardId"":8}",_raw_jira_api_worklogs,1352,
-2,12796,10736,cong.wang@merico.dev,cong.wang@merico.dev,30m,1800,2021-01-14T06:30:51.411+00:00,2021-01-14T06:00:32.784+00:00,2022-04-19T16:29:51.000+00:00,"{""ConnectionId"":2,""BoardId"":8}",_raw_jira_api_worklogs,1353,
+2,10076,10006,5ecfbd0a47d31e0c2a15fd87,5ecfbd0a47d31e0c2a15fd87,1d 2h,36000,2020-06-15T08:59:51.302+00:00,2020-06-05T20:59:00.000+00:00,2022-04-18T13:49:16.000+00:00,"{""ConnectionId"":2,""BoardId"":8}",_raw_jira_api_worklogs,1252,
+2,10077,10007,5ecfbd0a47d31e0c2a15fd87,5ecfbd0a47d31e0c2a15fd87,4h,14400,2020-06-15T09:00:26.952+00:00,2020-06-15T09:00:00.000+00:00,2022-04-18T13:49:16.000+00:00,"{""ConnectionId"":2,""BoardId"":8}",_raw_jira_api_worklogs,1250,
+2,10077,10008,5ecfbd0a47d31e0c2a15fd87,5ecfbd0a47d31e0c2a15fd87,4h,14400,2020-06-15T09:01:06.211+00:00,2020-06-15T05:00:42.836+00:00,2022-04-18T13:49:16.000+00:00,"{""ConnectionId"":2,""BoardId"":8}",_raw_jira_api_worklogs,1251,
+2,10078,10009,5ecfbd0a47d31e0c2a15fd87,5ecfbd0a47d31e0c2a15fd87,1h,3600,2020-06-15T09:01:44.154+00:00,2020-06-15T09:01:00.000+00:00,2022-04-18T13:49:16.000+00:00,"{""ConnectionId"":2,""BoardId"":8}",_raw_jira_api_worklogs,1253,
+2,10079,10218,5ecfbd0a47d31e0c2a15fd87,5ecfbd0a47d31e0c2a15fd87,2h,7200,2020-07-22T07:25:29.102+00:00,2020-07-22T07:24:00.000+00:00,2022-04-18T13:49:16.000+00:00,"{""ConnectionId"":2,""BoardId"":8}",_raw_jira_api_worklogs,1249,
+2,10085,10010,5ecfbd0a47d31e0c2a15fd87,5ecfbd0a47d31e0c2a15fd87,1h,3600,2020-06-15T09:07:56.793+00:00,2020-06-15T09:07:00.000+00:00,2022-04-18T13:49:16.000+00:00,"{""ConnectionId"":2,""BoardId"":8}",_raw_jira_api_worklogs,1248,
+2,11956,10713,5fa8b6d142ab3b006eaa6f42,5fa8b6d142ab3b006eaa6f42,3h,10800,2021-01-11T10:01:03.628+00:00,2021-01-11T06:58:43.580+00:00,2022-04-19T16:29:51.000+00:00,"{""ConnectionId"":2,""BoardId"":8}",_raw_jira_api_worklogs,1330,
+2,11956,10717,5fa8b6d142ab3b006eaa6f42,5fa8b6d142ab3b006eaa6f42,2h 30m,9000,2021-01-12T03:53:41.936+00:00,2021-01-12T01:00:00.000+00:00,2022-04-19T16:29:51.000+00:00,"{""ConnectionId"":2,""BoardId"":8}",_raw_jira_api_worklogs,1331,
+2,11956,10718,5fa8b6d142ab3b006eaa6f42,5fa8b6d142ab3b006eaa6f42,30m,1800,2021-01-12T05:11:25.368+00:00,2021-01-12T04:40:51.604+00:00,2022-04-19T16:29:51.000+00:00,"{""ConnectionId"":2,""BoardId"":8}",_raw_jira_api_worklogs,1332,
+2,11956,10719,5fa8b6d142ab3b006eaa6f42,5fa8b6d142ab3b006eaa6f42,4h,14400,2021-01-12T09:59:08.739+00:00,2021-01-12T05:58:22.015+00:00,2022-04-19T16:29:51.000+00:00,"{""ConnectionId"":2,""BoardId"":8}",_raw_jira_api_worklogs,1333,
+2,11956,10720,5fa8b6d142ab3b006eaa6f42,5fa8b6d142ab3b006eaa6f42,1h,3600,2021-01-12T12:09:23.539+00:00,2021-01-12T11:08:46.608+00:00,2022-04-19T16:29:51.000+00:00,"{""ConnectionId"":2,""BoardId"":8}",_raw_jira_api_worklogs,1334,
+2,11956,10726,5fa8b6d142ab3b006eaa6f42,5fa8b6d142ab3b006eaa6f42,2h 30m,9000,2021-01-13T03:55:02.070+00:00,2021-01-13T01:24:41.786+00:00,2022-04-19T16:29:51.000+00:00,"{""ConnectionId"":2,""BoardId"":8}",_raw_jira_api_worklogs,1335,
+2,11956,10729,5fa8b6d142ab3b006eaa6f42,5fa8b6d142ab3b006eaa6f42,20m,1200,2021-01-13T07:26:34.565+00:00,2021-01-13T07:06:14.927+00:00,2022-04-19T16:29:51.000+00:00,"{""ConnectionId"":2,""BoardId"":8}",_raw_jira_api_worklogs,1336,
+2,11956,10733,5fa8b6d142ab3b006eaa6f42,5fa8b6d142ab3b006eaa6f42,2h,7200,2021-01-13T11:10:46.917+00:00,2021-01-13T08:00:00.000+00:00,2022-04-19T16:29:51.000+00:00,"{""ConnectionId"":2,""BoardId"":8}",_raw_jira_api_worklogs,1337,
+2,12083,10611,5e9711ba34f7b90c0fbc37d3,5e9711ba34f7b90c0fbc37d3,1d,28800,2020-11-20T03:41:21.160+00:00,2020-11-19T19:41:16.606+00:00,2022-04-19T16:29:51.000+00:00,"{""ConnectionId"":2,""BoardId"":8}",_raw_jira_api_worklogs,1338,
+2,12263,10809,5fa8b6d142ab3b006eaa6f42,5fa8b6d142ab3b006eaa6f42,3h,10800,2021-01-27T01:54:00.883+00:00,2021-01-26T07:00:00.000+00:00,2022-04-19T16:29:51.000+00:00,"{""ConnectionId"":2,""BoardId"":8}",_raw_jira_api_worklogs,1339,
+2,12263,10810,5fa8b6d142ab3b006eaa6f42,5fa8b6d142ab3b006eaa6f42,1h,3600,2021-01-27T01:54:29.081+00:00,2021-01-27T01:00:00.000+00:00,2022-04-19T16:29:51.000+00:00,"{""ConnectionId"":2,""BoardId"":8}",_raw_jira_api_worklogs,1340,
+2,12263,10811,5fa8b6d142ab3b006eaa6f42,5fa8b6d142ab3b006eaa6f42,1h,3600,2021-01-27T03:34:04.537+00:00,2021-01-27T02:33:41.693+00:00,2022-04-19T16:29:51.000+00:00,"{""ConnectionId"":2,""BoardId"":8}",_raw_jira_api_worklogs,1341,
+2,12263,10922,5fa8b6d142ab3b006eaa6f42,5fa8b6d142ab3b006eaa6f42,6h,21600,2021-02-19T11:33:52.222+00:00,2021-02-19T05:33:21.257+00:00,2022-04-19T16:29:51.000+00:00,"{""ConnectionId"":2,""BoardId"":8}",_raw_jira_api_worklogs,1342,
+2,12351,10946,5fa8b6d142ab3b006eaa6f42,5fa8b6d142ab3b006eaa6f42,1h,3600,2021-03-02T09:20:19.608+00:00,2021-03-02T08:20:02.371+00:00,2022-04-19T16:29:51.000+00:00,"{""ConnectionId"":2,""BoardId"":8}",_raw_jira_api_worklogs,1343,
+2,12411,10708,5fa8b6d142ab3b006eaa6f42,5fa8b6d142ab3b006eaa6f42,2h,7200,2021-01-11T03:53:25.692+00:00,2021-01-11T01:52:40.264+00:00,2022-04-19T16:29:51.000+00:00,"{""ConnectionId"":2,""BoardId"":8}",_raw_jira_api_worklogs,1344,
+2,12604,10714,5fa8b6d142ab3b006eaa6f42,5fa8b6d142ab3b006eaa6f42,20m,1200,2021-01-11T11:35:33.757+00:00,2021-01-11T11:15:00.400+00:00,2022-04-19T16:29:51.000+00:00,"{""ConnectionId"":2,""BoardId"":8}",_raw_jira_api_worklogs,1345,
+2,12604,10728,5fa8b6d142ab3b006eaa6f42,5fa8b6d142ab3b006eaa6f42,45m,2700,2021-01-13T06:18:35.726+00:00,2021-01-13T05:33:16.447+00:00,2022-04-19T16:29:51.000+00:00,"{""ConnectionId"":2,""BoardId"":8}",_raw_jira_api_worklogs,1346,
+2,12692,10761,5fa8b6d142ab3b006eaa6f42,5fa8b6d142ab3b006eaa6f42,1h,3600,2021-01-20T09:55:38.918+00:00,2021-01-20T08:55:12.424+00:00,2022-04-19T16:29:51.000+00:00,"{""ConnectionId"":2,""BoardId"":8}",_raw_jira_api_worklogs,1347,
+2,12760,10738,5fa8b6d142ab3b006eaa6f42,5fa8b6d142ab3b006eaa6f42,3h,10800,2021-01-15T01:17:13.517+00:00,2021-01-14T06:00:00.000+00:00,2022-04-19T16:29:51.000+00:00,"{""ConnectionId"":2,""BoardId"":8}",_raw_jira_api_worklogs,1348,
+2,12760,10743,5fa8b6d142ab3b006eaa6f42,5fa8b6d142ab3b006eaa6f42,3h,10800,2021-01-18T01:13:18.808+00:00,2021-01-15T06:00:00.000+00:00,2022-04-19T16:29:51.000+00:00,"{""ConnectionId"":2,""BoardId"":8}",_raw_jira_api_worklogs,1349,
+2,12760,10750,5fa8b6d142ab3b006eaa6f42,5fa8b6d142ab3b006eaa6f42,3h,10800,2021-01-18T09:05:08.848+00:00,2021-01-18T07:00:00.000+00:00,2022-04-19T16:29:51.000+00:00,"{""ConnectionId"":2,""BoardId"":8}",_raw_jira_api_worklogs,1350,
+2,12760,10759,5fa8b6d142ab3b006eaa6f42,5fa8b6d142ab3b006eaa6f42,1h,3600,2021-01-20T05:21:40.077+00:00,2021-01-19T16:30:00.000+00:00,2022-04-19T16:29:51.000+00:00,"{""ConnectionId"":2,""BoardId"":8}",_raw_jira_api_worklogs,1351,
+2,12796,10732,5fa8b6d142ab3b006eaa6f42,5fa8b6d142ab3b006eaa6f42,30m,1800,2021-01-13T11:10:00.634+00:00,2021-01-13T10:39:45.227+00:00,2022-04-19T16:29:51.000+00:00,"{""ConnectionId"":2,""BoardId"":8}",_raw_jira_api_worklogs,1352,
+2,12796,10736,5fa8b6d142ab3b006eaa6f42,5fa8b6d142ab3b006eaa6f42,30m,1800,2021-01-14T06:30:51.411+00:00,2021-01-14T06:00:32.784+00:00,2022-04-19T16:29:51.000+00:00,"{""ConnectionId"":2,""BoardId"":8}",_raw_jira_api_worklogs,1353,
diff --git a/plugins/jira/e2e/snapshot_tables/worklogs.csv b/plugins/jira/e2e/snapshot_tables/worklogs.csv
index e67603c3..5906d9a7 100644
--- a/plugins/jira/e2e/snapshot_tables/worklogs.csv
+++ b/plugins/jira/e2e/snapshot_tables/worklogs.csv
@@ -1,7 +1,7 @@
id,author_id,comment,time_spent_minutes,logged_date,started_date,issue_id
-jira:JiraWorklog:2:10076:10006,,,600,2020-06-15T08:59:51.302+00:00,2020-06-05T20:59:00.000+00:00,jira:JiraIssue:2:10076
-jira:JiraWorklog:2:10077:10007,,,240,2020-06-15T09:00:26.952+00:00,2020-06-15T09:00:00.000+00:00,jira:JiraIssue:2:10077
-jira:JiraWorklog:2:10077:10008,,,240,2020-06-15T09:01:06.211+00:00,2020-06-15T05:00:42.836+00:00,jira:JiraIssue:2:10077
-jira:JiraWorklog:2:10078:10009,,,60,2020-06-15T09:01:44.154+00:00,2020-06-15T09:01:00.000+00:00,jira:JiraIssue:2:10078
-jira:JiraWorklog:2:10079:10218,,,120,2020-07-22T07:25:29.102+00:00,2020-07-22T07:24:00.000+00:00,jira:JiraIssue:2:10079
-jira:JiraWorklog:2:10085:10010,,,60,2020-06-15T09:07:56.793+00:00,2020-06-15T09:07:00.000+00:00,jira:JiraIssue:2:10085
+jira:JiraWorklog:2:10076:10006,jira:JiraAccount:2:5ecfbd0a47d31e0c2a15fd87,,600,2020-06-15T08:59:51.302+00:00,2020-06-05T20:59:00.000+00:00,jira:JiraIssue:2:10076
+jira:JiraWorklog:2:10077:10007,jira:JiraAccount:2:5ecfbd0a47d31e0c2a15fd87,,240,2020-06-15T09:00:26.952+00:00,2020-06-15T09:00:00.000+00:00,jira:JiraIssue:2:10077
+jira:JiraWorklog:2:10077:10008,jira:JiraAccount:2:5ecfbd0a47d31e0c2a15fd87,,240,2020-06-15T09:01:06.211+00:00,2020-06-15T05:00:42.836+00:00,jira:JiraIssue:2:10077
+jira:JiraWorklog:2:10078:10009,jira:JiraAccount:2:5ecfbd0a47d31e0c2a15fd87,,60,2020-06-15T09:01:44.154+00:00,2020-06-15T09:01:00.000+00:00,jira:JiraIssue:2:10078
+jira:JiraWorklog:2:10079:10218,jira:JiraAccount:2:5ecfbd0a47d31e0c2a15fd87,,120,2020-07-22T07:25:29.102+00:00,2020-07-22T07:24:00.000+00:00,jira:JiraIssue:2:10079
+jira:JiraWorklog:2:10085:10010,jira:JiraAccount:2:5ecfbd0a47d31e0c2a15fd87,,60,2020-06-15T09:07:56.793+00:00,2020-06-15T09:07:00.000+00:00,jira:JiraIssue:2:10085
[incubator-devlake] 01/02: fix: use key as accountId
Posted by zh...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
zhangliang2022 pushed a commit to branch release-v0.12
in repository https://gitbox.apache.org/repos/asf/incubator-devlake.git
commit 1f9e22632bded276d65e27f5a4f5d6bf045ec2ae
Author: zhangliang <li...@merico.dev>
AuthorDate: Tue Sep 27 14:28:57 2022 +0800
fix: use key as accountId
---
plugins/jira/tasks/apiv2models/user.go | 3 +++
plugins/jira/tasks/apiv2models/user_test.go | 4 ++++
plugins/jira/tasks/apiv2models/worklog.go | 4 ++--
3 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/plugins/jira/tasks/apiv2models/user.go b/plugins/jira/tasks/apiv2models/user.go
index cecdf085..306134f9 100644
--- a/plugins/jira/tasks/apiv2models/user.go
+++ b/plugins/jira/tasks/apiv2models/user.go
@@ -46,6 +46,9 @@ func (u *Account) getAccountId() string {
if u.AccountId != "" {
return u.AccountId
}
+ if u.Key != "" {
+ return u.Key
+ }
return u.EmailAddress
}
diff --git a/plugins/jira/tasks/apiv2models/user_test.go b/plugins/jira/tasks/apiv2models/user_test.go
index 73af35fd..c99d30ca 100644
--- a/plugins/jira/tasks/apiv2models/user_test.go
+++ b/plugins/jira/tasks/apiv2models/user_test.go
@@ -48,6 +48,10 @@ func TestUser_getAccountId(t *testing.T) {
fields{EmailAddress: "abc"},
"abc",
},
+ {"",
+ fields{Key: "abc123", EmailAddress: "abc"},
+ "abc123",
+ },
{"",
fields{EmailAddress: "abc", AccountId: "abcd"},
"abcd",
diff --git a/plugins/jira/tasks/apiv2models/worklog.go b/plugins/jira/tasks/apiv2models/worklog.go
index d3f5aaff..5079052f 100644
--- a/plugins/jira/tasks/apiv2models/worklog.go
+++ b/plugins/jira/tasks/apiv2models/worklog.go
@@ -51,10 +51,10 @@ func (w Worklog) ToToolLayer(connectionId uint64, issueUpdated *time.Time) *mode
IssueUpdated: issueUpdated,
}
if w.Author != nil {
- result.AuthorId = w.Author.EmailAddress
+ result.AuthorId = w.Author.getAccountId()
}
if w.UpdateAuthor != nil {
- result.UpdateAuthorId = w.UpdateAuthor.EmailAddress
+ result.UpdateAuthorId = w.UpdateAuthor.getAccountId()
}
return result
}