This is an automated email from the ASF dual-hosted git repository. lynwee pushed a commit to branch ee-0929 in repository https://gitbox.apache.org/repos/asf/incubator-devlake.git
commit d2aa630b58d05abba68a0d58054a0d7a5adad693 Author: d4x1 <[email protected]> AuthorDate: Mon Sep 30 12:04:50 2024 +0800 fix(zentao): update action field --- .../plugins/zentao/tasks/bug_commits_extractor.go | 25 ++++++++++++-------- .../zentao/tasks/story_commits_extractor.go | 26 ++++++++++++--------- .../plugins/zentao/tasks/task_commits_extractor.go | 27 +++++++++++++--------- 3 files changed, 46 insertions(+), 32 deletions(-) diff --git a/backend/plugins/zentao/tasks/bug_commits_extractor.go b/backend/plugins/zentao/tasks/bug_commits_extractor.go index 66d17a395..ccad6afd5 100644 --- a/backend/plugins/zentao/tasks/bug_commits_extractor.go +++ b/backend/plugins/zentao/tasks/bug_commits_extractor.go @@ -83,18 +83,23 @@ func ExtractBugCommits(taskCtx plugin.SubTaskContext) errors.Error { ActionDesc: res.Desc, } - match := re.FindStringSubmatch(res.Extra) - if len(match) > 1 { - bugCommits.Extra = match[1] - } else { - return nil, nil + if bugCommits.Actor == "linked2revision" { + match := re.FindStringSubmatch(res.Extra) + if len(match) > 1 { + bugCommits.Extra = match[1] + } else { + return nil, nil + } + u, err := url.Parse(match[1]) + if err != nil { + return nil, errors.Default.WrapRaw(err) + } + bugCommits.Host = u.Host + bugCommits.RepoRevision = "/" + path.Base(u.Path) } - u, err := url.Parse(match[1]) - if err != nil { - return nil, errors.Default.WrapRaw(err) + if bugCommits.Actor == "linked2revision" { + // how? } - bugCommits.Host = u.Host - bugCommits.RepoRevision = "/" + path.Base(u.Path) results := make([]interface{}, 0) results = append(results, bugCommits) diff --git a/backend/plugins/zentao/tasks/story_commits_extractor.go b/backend/plugins/zentao/tasks/story_commits_extractor.go index 91f1d3fa1..0d2c2d39c 100644 --- a/backend/plugins/zentao/tasks/story_commits_extractor.go +++ b/backend/plugins/zentao/tasks/story_commits_extractor.go @@ -78,20 +78,24 @@ func ExtractStoryCommits(taskCtx plugin.SubTaskContext) errors.Error { ActionDesc: res.Desc, } - match := re.FindStringSubmatch(res.Extra) - if len(match) > 1 { - storyCommits.Extra = match[1] - } else { - return nil, nil + if storyCommits.Actor == "linked2revision" { + match := re.FindStringSubmatch(res.Extra) + if len(match) > 1 { + storyCommits.Extra = match[1] + } else { + return nil, nil + } + u, err := url.Parse(match[1]) + if err != nil { + return nil, errors.Default.WrapRaw(err) + } + storyCommits.Host = u.Host + storyCommits.RepoRevision = "/" + path.Base(u.Path) } - u, err := url.Parse(match[1]) - if err != nil { - return nil, errors.Default.WrapRaw(err) + if storyCommits.Actor == "gitcommited" { + // how ? } - storyCommits.Host = u.Host - storyCommits.RepoRevision = "/" + path.Base(u.Path) - results := make([]interface{}, 0) results = append(results, storyCommits) return results, nil diff --git a/backend/plugins/zentao/tasks/task_commits_extractor.go b/backend/plugins/zentao/tasks/task_commits_extractor.go index c2f2bf157..eda8d2688 100644 --- a/backend/plugins/zentao/tasks/task_commits_extractor.go +++ b/backend/plugins/zentao/tasks/task_commits_extractor.go @@ -78,20 +78,25 @@ func ExtractTaskCommits(taskCtx plugin.SubTaskContext) errors.Error { ActionDesc: res.Desc, } - match := re.FindStringSubmatch(res.Extra) - if len(match) > 1 { - taskCommits.Extra = match[1] - } else { - return nil, nil + if taskCommits.Actor == "linked2revision" { + match := re.FindStringSubmatch(res.Extra) + if len(match) > 1 { + taskCommits.Extra = match[1] + } else { + return nil, nil + } + u, err := url.Parse(match[1]) + if err != nil { + return nil, errors.Default.WrapRaw(err) + } + + taskCommits.Host = u.Host + taskCommits.RepoRevision = "/" + path.Base(u.Path) } - u, err := url.Parse(match[1]) - if err != nil { - return nil, errors.Default.WrapRaw(err) + if taskCommits.Actor == "gitcommited" { + // how? } - taskCommits.Host = u.Host - taskCommits.RepoRevision = "/" + path.Base(u.Path) - results := make([]interface{}, 0) results = append(results, taskCommits) return results, nil
