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/07/01 03:13:59 UTC

[incubator-devlake] branch release-v0.11-hotfix updated: fix(jira): change filter for jira_issues (#2398)

This is an automated email from the ASF dual-hosted git repository.

zhangliang2022 pushed a commit to branch release-v0.11-hotfix
in repository https://gitbox.apache.org/repos/asf/incubator-devlake.git


The following commit(s) were added to refs/heads/release-v0.11-hotfix by this push:
     new 4dc1e961 fix(jira): change filter for jira_issues (#2398)
4dc1e961 is described below

commit 4dc1e96128b5b7e89794715597475bb3aa076c72
Author: Warren Chen <yi...@merico.dev>
AuthorDate: Fri Jul 1 11:13:55 2022 +0800

    fix(jira): change filter for jira_issues (#2398)
    
    closes #2386
---
 plugins/jira/tasks/issue_convertor.go | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/plugins/jira/tasks/issue_convertor.go b/plugins/jira/tasks/issue_convertor.go
index 81ded160..277abb6d 100644
--- a/plugins/jira/tasks/issue_convertor.go
+++ b/plugins/jira/tasks/issue_convertor.go
@@ -38,9 +38,8 @@ func ConvertIssues(taskCtx core.SubTaskContext) error {
 	// select all issues belongs to the board
 	cursor, err := db.Model(jiraIssue).
 		Select("_tool_jira_issues.*").
-		Joins("left join _tool_jira_board_issues on _tool_jira_board_issues.issue_id = _tool_jira_issues.issue_id").
-		Where(
-			"_tool_jira_board_issues.connection_id = ? AND _tool_jira_board_issues.board_id = ?",
+		Joins("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").
+		Where("_tool_jira_board_issues.connection_id = ? AND _tool_jira_board_issues.board_id = ?",
 			data.Options.ConnectionId,
 			data.Options.BoardId,
 		).
@@ -61,7 +60,7 @@ func ConvertIssues(taskCtx core.SubTaskContext) error {
 		RawDataSubTaskArgs: helper.RawDataSubTaskArgs{
 			Ctx: taskCtx,
 			Params: JiraApiParams{
-				ConnectionId: data.Connection.ID,
+				ConnectionId: data.Options.ConnectionId,
 				BoardId:      data.Options.BoardId,
 			},
 			Table: RAW_ISSUE_TABLE,