You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@devlake.apache.org by kl...@apache.org on 2024/03/07 04:12:19 UTC
(incubator-devlake) branch main updated: Improving _tool_jira_accounts table filtering (#7121)
This is an automated email from the ASF dual-hosted git repository.
klesh 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 54eff2271 Improving _tool_jira_accounts table filtering (#7121)
54eff2271 is described below
commit 54eff227137db3b716c2845d15f6d67c500dba93
Author: sstojak1 <18...@users.noreply.github.com>
AuthorDate: Thu Mar 7 05:12:15 2024 +0100
Improving _tool_jira_accounts table filtering (#7121)
Co-authored-by: Josip Stojak <Jo...@infobip.com>
---
backend/plugins/jira/impl/impl.go | 4 ++--
backend/plugins/jira/tasks/account_collector.go | 9 ++++++++-
2 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/backend/plugins/jira/impl/impl.go b/backend/plugins/jira/impl/impl.go
index 259361475..5dd315393 100644
--- a/backend/plugins/jira/impl/impl.go
+++ b/backend/plugins/jira/impl/impl.go
@@ -125,8 +125,6 @@ func (p Jira) SubTaskMetas() []plugin.SubTaskMeta {
tasks.CollectIssueChangelogsMeta,
tasks.ExtractIssueChangelogsMeta,
- tasks.CollectAccountsMeta,
-
tasks.CollectWorklogsMeta,
tasks.ExtractWorklogsMeta,
@@ -139,6 +137,8 @@ func (p Jira) SubTaskMetas() []plugin.SubTaskMeta {
tasks.CollectEpicsMeta,
tasks.ExtractEpicsMeta,
+ tasks.CollectAccountsMeta,
+
tasks.ConvertBoardMeta,
tasks.ConvertIssuesMeta,
diff --git a/backend/plugins/jira/tasks/account_collector.go b/backend/plugins/jira/tasks/account_collector.go
index ac6ab01e2..fcf85dd6a 100644
--- a/backend/plugins/jira/tasks/account_collector.go
+++ b/backend/plugins/jira/tasks/account_collector.go
@@ -19,9 +19,11 @@ package tasks
import (
"encoding/json"
+ "fmt"
"net/http"
"net/url"
"reflect"
+ "strconv"
"github.com/apache/incubator-devlake/core/dal"
"github.com/apache/incubator-devlake/core/errors"
@@ -45,10 +47,15 @@ func CollectAccounts(taskCtx plugin.SubTaskContext) errors.Error {
db := taskCtx.GetDal()
logger := taskCtx.GetLogger()
logger.Info("collect account")
+ connectionId := strconv.FormatUint(data.Options.ConnectionId, 10)
+ boardId := strconv.FormatUint(data.Options.BoardId, 10)
cursor, err := db.Cursor(
dal.Select("account_id"),
dal.From("_tool_jira_accounts"),
- dal.Where("account_id != ? AND connection_id = ?", "", data.Options.ConnectionId),
+ dal.Where("account_id != ? AND _raw_data_params = ?",
+ "",
+ fmt.Sprintf("{\"ConnectionId\":%s,\"BoardId\":%s}", connectionId, boardId),
+ ),
)
if err != nil {
return err