This is an automated email from the ASF dual-hosted git repository. abeizn pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/incubator-devlake.git
commit f1695c2a810b232050ded8d876f38565d210b8da Author: Yingchu Chen <[email protected]> AuthorDate: Tue Sep 20 21:08:37 2022 +0800 feat(dora): modify dora subtasks --- plugins/dora/tasks/change_lead_time_calculator.go | 10 +++++++--- plugins/dora/tasks/issue_deploy_connector.go | 8 +------- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/plugins/dora/tasks/change_lead_time_calculator.go b/plugins/dora/tasks/change_lead_time_calculator.go index d6649c37..7df0efdc 100644 --- a/plugins/dora/tasks/change_lead_time_calculator.go +++ b/plugins/dora/tasks/change_lead_time_calculator.go @@ -32,12 +32,16 @@ import ( ) func CalculateChangeLeadTime(taskCtx core.SubTaskContext) errors.Error { - data := taskCtx.GetData().(*DoraTaskData) db := taskCtx.GetDal() - repoId := data.Options.RepoId + repoIdList := make([]string, 0) + repoClause := dal.From(&code.Repo{}) + err := db.Pluck("id", repoIdList, repoClause) + if err != nil { + return err + } clauses := []dal.Clause{ dal.From(&code.PullRequest{}), - dal.Where("merged_date IS NOT NULL and head_repo_id = ?", repoId), + dal.Where("merged_date IS NOT NULL and head_repo_id in ?", repoIdList), } cursor, err := db.Cursor(clauses...) if err != nil { diff --git a/plugins/dora/tasks/issue_deploy_connector.go b/plugins/dora/tasks/issue_deploy_connector.go index c872e685..180e49ff 100644 --- a/plugins/dora/tasks/issue_deploy_connector.go +++ b/plugins/dora/tasks/issue_deploy_connector.go @@ -40,18 +40,12 @@ var ConnectIssueDeployMeta = core.SubTaskMeta{ func ConnectIssueDeploy(taskCtx core.SubTaskContext) errors.Error { db := taskCtx.GetDal() - data := taskCtx.GetData().(*DoraTaskData) - issue := &ticket.Issue{} // select all issues belongs to the board clauses := []dal.Clause{ dal.From(issue), - dal.Join(`left join board_issues - on issues.id = board_issues.issue_id`), - dal.Join("left join board_repos on board_repos.board_id = board_issues.board_id"), dal.Where( - "board_repos.repo_id = ? and issues.type = ?", - data.Options.RepoId, "INCIDENT", + "issues.type = ?", "INCIDENT", ), } cursor, err := db.Cursor(clauses...)
