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 <[email protected]> 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 }
