fix: use key as accountId
diff --git a/plugins/jira/tasks/apiv2models/user.go b/plugins/jira/tasks/apiv2models/user.go
index cecdf08..306134f 100644
--- a/plugins/jira/tasks/apiv2models/user.go
+++ b/plugins/jira/tasks/apiv2models/user.go
@@ -46,6 +46,9 @@
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 73af35f..c99d30c 100644
--- a/plugins/jira/tasks/apiv2models/user_test.go
+++ b/plugins/jira/tasks/apiv2models/user_test.go
@@ -49,6 +49,10 @@
"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 d3f5aaf..5079052 100644
--- a/plugins/jira/tasks/apiv2models/worklog.go
+++ b/plugins/jira/tasks/apiv2models/worklog.go
@@ -51,10 +51,10 @@
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
}
