You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@devlake.apache.org by wa...@apache.org on 2022/06/30 11:16:36 UTC
[incubator-devlake] branch main updated: fix(jira): change filter for jira_issues
This is an automated email from the ASF dual-hosted git repository.
warren 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 9ca13fa0 fix(jira): change filter for jira_issues
9ca13fa0 is described below
commit 9ca13fa0de868e1bd9a996b7a6963ac06ab66e86
Author: Yingchu Chen <yi...@merico.dev>
AuthorDate: Thu Jun 30 13:14:31 2022 +0800
fix(jira): change filter for jira_issues
closes #2386
---
plugins/jira/models/connection.go | 5 ++---
plugins/jira/tasks/issue_convertor.go | 4 +++-
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/plugins/jira/models/connection.go b/plugins/jira/models/connection.go
index fea93aaf..44d886e0 100644
--- a/plugins/jira/models/connection.go
+++ b/plugins/jira/models/connection.go
@@ -40,9 +40,8 @@ type BoardResponse struct {
}
type JiraConnection struct {
- helper.RestConnection `mapstructure:",squash"`
- helper.BasicAuth `mapstructure:",squash"`
- RemotelinkCommitShaPattern string `gorm:"type:varchar(255);comment='golang regexp, the first group will be recognized as commit sha, ref https://github.com/google/re2/wiki/Syntax'" json:"remotelinkCommitShaPattern"`
+ helper.RestConnection `mapstructure:",squash"`
+ helper.BasicAuth `mapstructure:",squash"`
}
func (JiraConnection) TableName() string {
diff --git a/plugins/jira/tasks/issue_convertor.go b/plugins/jira/tasks/issue_convertor.go
index 0c2a4876..d1be94d8 100644
--- a/plugins/jira/tasks/issue_convertor.go
+++ b/plugins/jira/tasks/issue_convertor.go
@@ -48,7 +48,9 @@ func ConvertIssues(taskCtx core.SubTaskContext) error {
clauses := []dal.Clause{
dal.Select("_tool_jira_issues.*"),
dal.From(jiraIssue),
- dal.Join("left join _tool_jira_board_issues on _tool_jira_board_issues.issue_id = _tool_jira_issues.issue_id"),
+ dal.Join(`left join _tool_jira_board_issues
+ on _tool_jira_board_issues.issue_id = _tool_jira_issues.issue_id
+ and _tool_jira_board_issues.connection_id = _tool_jira_issues.connection_id`),
dal.Where(
"_tool_jira_board_issues.connection_id = ? AND _tool_jira_board_issues.board_id = ?",
data.Options.ConnectionId,