You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@devlake.apache.org by ab...@apache.org on 2024/09/24 02:39:20 UTC
(incubator-devlake) 02/02: fix: bamboo using api client in tool/domain layer
This is an automated email from the ASF dual-hosted git repository.
abeizn pushed a commit to branch zk-0924
in repository https://gitbox.apache.org/repos/asf/incubator-devlake.git
commit 0ba7234a415d2bb5f44a0fcb620cbef05f9cf6ce
Author: abeizn <zi...@merico.dev>
AuthorDate: Tue Sep 24 10:39:05 2024 +0800
fix: bamboo using api client in tool/domain layer
---
.../plugins/jira/tasks/board_filter_begin_collector.go | 17 +++++++++++++++++
.../plugins/jira/tasks/board_filter_end_collector.go | 4 ++++
2 files changed, 21 insertions(+)
diff --git a/backend/plugins/jira/tasks/board_filter_begin_collector.go b/backend/plugins/jira/tasks/board_filter_begin_collector.go
index 6c513f1f8..60215c487 100644
--- a/backend/plugins/jira/tasks/board_filter_begin_collector.go
+++ b/backend/plugins/jira/tasks/board_filter_begin_collector.go
@@ -88,6 +88,7 @@ func CollectBoardFilterBegin(taskCtx plugin.SubTaskContext) errors.Error {
}
// change
if record.Jql != jql {
+<<<<<<< Updated upstream
cfg := taskCtx.GetConfigReader()
flag := cfg.GetBool("JIRA_JQL_AUTO_FULL_REFRESH")
if flag {
@@ -101,6 +102,22 @@ func CollectBoardFilterBegin(taskCtx plugin.SubTaskContext) errors.Error {
}
} else {
return errors.Default.New(fmt.Sprintf("connection_id:%d board_id:%d filter jql has changed, please use fullSync mode. And the previous jql is %s, now jql is %s", data.Options.ConnectionId, data.Options.BoardId, record.Jql, jql))
+=======
+ logger.Info("connection_id:%d board_id:%d filter jql has changed, And the previous jql is %s, now jql is %s, run it in fullSync mode", data.Options.ConnectionId, data.Options.BoardId, record.Jql, jql)
+ // set full sync
+ taskCtx.TaskContext().SetSyncPolicy(&coreModels.SyncPolicy{TriggerSyncPolicy: coreModels.TriggerSyncPolicy{FullSync: true}})
+ record.Jql = jql
+ err = db.Update(&record, dal.Where("connection_id = ? AND board_id = ? ", data.Options.ConnectionId, data.Options.BoardId))
+ if err != nil {
+ return errors.Default.Wrap(err, fmt.Sprintf("error updating record in _tool_jira_boards table for connection_id:%d board_id:%d", data.Options.ConnectionId, data.Options.BoardId))
+ }
+ // update pipeline
+ pipeline := &coreModels.Pipeline{}
+
+ err := db.Update(pipeline, dal.Where("id = ?", data.Options))
+ if err != nil {
+ return errors.BadInput.New("pipeline not found")
+>>>>>>> Stashed changes
}
}
// no change
diff --git a/backend/plugins/jira/tasks/board_filter_end_collector.go b/backend/plugins/jira/tasks/board_filter_end_collector.go
index 65d8eca14..6f939068c 100644
--- a/backend/plugins/jira/tasks/board_filter_end_collector.go
+++ b/backend/plugins/jira/tasks/board_filter_end_collector.go
@@ -64,11 +64,15 @@ func CollectBoardFilterEnd(taskCtx plugin.SubTaskContext) errors.Error {
logger.Info("get board filter jql:%s", record.Jql)
if record.Jql != jql {
+<<<<<<< Updated upstream
cfg := taskCtx.GetConfigReader()
flag := cfg.GetBool("JIRA_JQL_AUTO_FULL_REFRESH")
if !flag {
return errors.Default.New(fmt.Sprintf("connection_id:%d board_id:%d filter jql has changed, please use fullSync mode. And the previous jql is %s, now jql is %s", data.Options.ConnectionId, data.Options.BoardId, record.Jql, jql))
}
+=======
+ logger.Info(fmt.Sprintf("connection_id:%d board_id:%d filter jql has changed, please use fullSync mode. And the previous jql is %s, now jql is %s", data.Options.ConnectionId, data.Options.BoardId, record.Jql, jql))
+>>>>>>> Stashed changes
}
return nil