Skip to content

fix(linker): match issue keys case-insensitively in LinkPrToIssue #9336

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
VictorColomb wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(linker): match issue keys case-insensitively in LinkPrToIssue #9336

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 40 additions & 0 deletions backend/plugins/linker/e2e/link_pr_and_issue_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,46 @@ func TestLinkPrToIssueWithSharedRepo(t *testing.T) {
)
}

func TestLinkPrToIssueCaseInsensitive(t *testing.T) {
var plugin impl.Linker
dataflowTester := e2ehelper.NewDataFlowTester(t, "linker", plugin)

regexpStr := `(?i)\b(PROJ)-\d+\b`
taskData := &tasks.LinkerTaskData{
Options: &tasks.LinkerOptions{
PrToIssueRegexp: regexpStr,
ProjectName: "GitHub1",
},
PrToIssueRegexp: regexp.MustCompile(regexpStr),
}

dataflowTester.FlushTabler(&ticket.Issue{})
dataflowTester.FlushTabler(&code.PullRequest{})
dataflowTester.FlushTabler(&crossdomain.ProjectMapping{})
dataflowTester.FlushTabler(&ticket.BoardIssue{})
dataflowTester.ImportCsvIntoTabler("./snapshot_tables/case_issues.csv", &ticket.Issue{})
dataflowTester.ImportCsvIntoTabler("./snapshot_tables/case_pull_requests.csv", &code.PullRequest{})
dataflowTester.ImportCsvIntoTabler("./snapshot_tables/case_project_mapping.csv", &crossdomain.ProjectMapping{})
dataflowTester.ImportCsvIntoTabler("./snapshot_tables/case_board_issues.csv", &ticket.BoardIssue{})

dataflowTester.FlushTabler(&crossdomain.PullRequestIssue{})
dataflowTester.Subtask(tasks.LinkPrToIssueMeta, taskData)
dataflowTester.VerifyTable(
crossdomain.PullRequestIssue{},
"./snapshot_tables/case_pull_request_issues.csv",
[]string{
"pull_request_id",
"pull_request_key",
"issue_id",
"issue_key",
"_raw_data_params",
"_raw_data_table",
"_raw_data_id",
"_raw_data_remark",
},
)
}

func TestLinkPrToIssue(t *testing.T) {
var plugin impl.Linker
dataflowTester := e2ehelper.NewDataFlowTester(t, "linker", plugin)
Expand Down
3 changes: 3 additions & 0 deletions backend/plugins/linker/e2e/snapshot_tables/case_board_issues.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
"board_id","issue_id","created_at","updated_at","_raw_data_params","_raw_data_table","_raw_data_id","_raw_data_remark"
"jira:JiraBoard:1:1","jira:JiraIssue:1:123","2024-05-14 10:42:37.541","2024-05-28 00:25:41.436","","",0,""
"jira:JiraBoard:1:1","jira:JiraIssue:1:456","2024-05-14 10:42:37.541","2024-05-28 00:25:41.436","","",0,""
3 changes: 3 additions & 0 deletions backend/plugins/linker/e2e/snapshot_tables/case_issues.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
"id","created_at","updated_at","_raw_data_params","_raw_data_table","_raw_data_id","_raw_data_remark","issue_key","title"
"jira:JiraIssue:1:123","2024-05-14 10:42:37.529","2024-05-15 12:07:36.450","","",0,"","PROJ-123","Upper key"
"jira:JiraIssue:1:456","2024-05-14 10:42:37.529","2024-05-15 12:07:36.450","","",0,"","proj-456","Lower key"
3 changes: 3 additions & 0 deletions backend/plugins/linker/e2e/snapshot_tables/case_project_mapping.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
"project_name","table","row_id","created_at","updated_at","_raw_data_params","_raw_data_table","_raw_data_id","_raw_data_remark"
"GitHub1","repos","github:GithubRepo:1:1","2024-05-15 12:02:13.590","2024-05-15 12:02:13.590","GitHub1","",0,""
"GitHub1","boards","jira:JiraBoard:1:1","2024-05-15 12:02:13.590","2024-05-15 12:02:13.590","GitHub1","",0,""
3 changes: 3 additions & 0 deletions backend/plugins/linker/e2e/snapshot_tables/case_pull_request_issues.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
pull_request_id,issue_id,pull_request_key,issue_key,_raw_data_params,_raw_data_table,_raw_data_id,_raw_data_remark
github:GithubPullRequest:1:1,jira:JiraIssue:1:123,1,PROJ-123,,,0,"pull_requests,"
github:GithubPullRequest:1:2,jira:JiraIssue:1:456,2,proj-456,,,0,"pull_requests,"
4 changes: 4 additions & 0 deletions backend/plugins/linker/e2e/snapshot_tables/case_pull_requests.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
"id","created_at","updated_at","_raw_data_params","_raw_data_table","_raw_data_id","_raw_data_remark","base_repo_id","head_ref","title","description","pull_request_key"
"github:GithubPullRequest:1:1","2024-05-15 12:07:36.778","2024-05-15 12:07:36.778","","",0,"","github:GithubRepo:1:1","user/proj-123-short-title","","",1
"github:GithubPullRequest:1:2","2024-05-15 12:07:36.778","2024-05-15 12:07:36.778","","",0,"","github:GithubRepo:1:1","feature","Fix Proj-456","",2
"github:GithubPullRequest:1:3","2024-05-15 12:07:36.778","2024-05-15 12:07:36.778","","",0,"","github:GithubRepo:1:1","other","No key here","",3
4 changes: 2 additions & 2 deletions backend/plugins/linker/tasks/link_pr_and_issue.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ var LinkPrToIssueMeta = plugin.SubTaskMeta{
func normalizeIssueKey(issueKey string) string {
issueKey = strings.ReplaceAll(issueKey, "#", "")
issueKey = strings.TrimSpace(issueKey)
return issueKey
return strings.ToUpper(issueKey)
}

func clearHistoryData(db dal.Dal, data *LinkerTaskData) errors.Error {
Expand Down Expand Up @@ -122,7 +122,7 @@ func LinkPrToIssue(taskCtx plugin.SubTaskContext) errors.Error {

var clauses = []dal.Clause{
dal.From(&ticket.Issue{}),
dal.Where("issues.id in ? AND issues.issue_key in ?", projectIssueIds, issueKeys),
dal.Where("issues.id in ? AND UPPER(issues.issue_key) in ?", projectIssueIds, issueKeys),
}

if err := db.All(&issues, clauses...); err != nil {
Expand Down