This is an automated email from the ASF dual-hosted git repository.
zhangliang2022 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 e85e5b1da fix: issue relationship e2e (#5777)
e85e5b1da is described below
commit e85e5b1da582c1b01e0dcdbacb62a42d9352b411
Author: abeizn <[email protected]>
AuthorDate: Mon Jul 31 18:38:53 2023 +0800
fix: issue relationship e2e (#5777)
* fix: issue relationship e2e
* fix: issue relationship e2e
* fix: issue relationship e2e
* fix: issue relationship e2e
---
backend/plugins/jira/e2e/epic_test.go | 1 +
.../plugins/jira/e2e/issue_relationship_test.go | 18 ++++++++++++----
.../snapshot_tables/_tool_jira_board_issues.csv | 23 ---------------------
.../_tool_jira_board_issues_relations.csv | 24 ++++++++++++++++++++++
4 files changed, 39 insertions(+), 27 deletions(-)
diff --git a/backend/plugins/jira/e2e/epic_test.go
b/backend/plugins/jira/e2e/epic_test.go
index b2f9714e2..9391b7f72 100644
--- a/backend/plugins/jira/e2e/epic_test.go
+++ b/backend/plugins/jira/e2e/epic_test.go
@@ -52,6 +52,7 @@ func TestEpicDataflow(t *testing.T) {
dataflowTester.FlushTabler(&models.JiraWorklog{})
dataflowTester.FlushTabler(&models.JiraAccount{})
dataflowTester.FlushTabler(&models.JiraIssueType{})
+ dataflowTester.FlushTabler(&models.JiraIssueComment{})
ctx := dataflowTester.SubtaskContext(taskData)
diff --git a/backend/plugins/jira/e2e/issue_relationship_test.go
b/backend/plugins/jira/e2e/issue_relationship_test.go
index f75df3d8a..e13e5900c 100644
--- a/backend/plugins/jira/e2e/issue_relationship_test.go
+++ b/backend/plugins/jira/e2e/issue_relationship_test.go
@@ -40,10 +40,19 @@ func TestIssueRelationshipDataFlow(t *testing.T) {
}
// import raw data table
-
dataflowTester.ImportCsvIntoRawTable("./raw_tables/_raw_jira_api_issue_relationships.csv",
"_raw_jira_api_issue_relationships")
-
+
dataflowTester.ImportCsvIntoRawTable("./raw_tables/_raw_jira_api_issue_relationships.csv",
"_raw_jira_api_issues")
// verify issue extraction
dataflowTester.FlushTabler(&models.JiraIssueRelationship{})
+ dataflowTester.FlushTabler(&models.JiraIssue{})
+ dataflowTester.FlushTabler(&models.JiraBoardIssue{})
+ dataflowTester.FlushTabler(&models.JiraSprintIssue{})
+ dataflowTester.FlushTabler(&models.JiraIssueComment{})
+ dataflowTester.FlushTabler(&models.JiraIssueChangelogs{})
+ dataflowTester.FlushTabler(&models.JiraIssueChangelogItems{})
+ dataflowTester.FlushTabler(&models.JiraWorklog{})
+ dataflowTester.FlushTabler(&models.JiraAccount{})
+ dataflowTester.FlushTabler(&models.JiraIssueType{})
+ dataflowTester.FlushTabler(&models.JiraIssueLabel{})
dataflowTester.Subtask(tasks.ExtractIssuesMeta, taskData)
dataflowTester.VerifyTableWithOptions(&models.JiraIssueRelationship{},
e2ehelper.TableOptions{
@@ -51,10 +60,11 @@ func TestIssueRelationshipDataFlow(t *testing.T) {
IgnoreTypes: []interface{}{common.NoPKModel{}},
})
-
dataflowTester.ImportCsvIntoTabler("./snapshot_tables/_tool_jira_board_issues.csv",
&models.JiraBoardIssue{})
-
// verify issue conversion
+ dataflowTester.FlushTabler(&models.JiraBoardIssue{})
dataflowTester.FlushTabler(&ticket.IssueRelationship{})
+
dataflowTester.ImportCsvIntoTabler("./snapshot_tables/_tool_jira_board_issues_relations.csv",
&models.JiraBoardIssue{})
+
dataflowTester.Subtask(tasks.ConvertIssueRelationshipsMeta, taskData)
dataflowTester.VerifyTableWithOptions(&ticket.IssueRelationship{},
e2ehelper.TableOptions{
CSVRelPath: "./snapshot_tables/issue_relationships.csv",
diff --git
a/backend/plugins/jira/e2e/snapshot_tables/_tool_jira_board_issues.csv
b/backend/plugins/jira/e2e/snapshot_tables/_tool_jira_board_issues.csv
index b1a34effe..9ac08ef7b 100644
--- a/backend/plugins/jira/e2e/snapshot_tables/_tool_jira_board_issues.csv
+++ b/backend/plugins/jira/e2e/snapshot_tables/_tool_jira_board_issues.csv
@@ -29,27 +29,4 @@
connection_id,board_id,issue_id,_raw_data_params,_raw_data_table,_raw_data_id,_r
2,8,10097,"{""ConnectionId"":2,""BoardId"":8}",_raw_jira_api_issues,12468,
2,8,10098,"{""ConnectionId"":2,""BoardId"":8}",_raw_jira_api_issues,12469,
2,8,10099,"{""ConnectionId"":2,""BoardId"":8}",_raw_jira_api_issues,12470,
-2,8,10802,"{""ConnectionId"":2,""BoardId"":8}","_raw_jira_api_issues",1,""
-2,8,10803,"{""ConnectionId"":2,""BoardId"":8}","_raw_jira_api_issues",2,""
-2,8,10804,"{""ConnectionId"":2,""BoardId"":8}","_raw_jira_api_issues",3,""
-2,8,10805,"{""ConnectionId"":2,""BoardId"":8}","_raw_jira_api_issues",4,""
-2,8,10806,"{""ConnectionId"":2,""BoardId"":8}","_raw_jira_api_issues",5,""
-2,8,10807,"{""ConnectionId"":2,""BoardId"":8}","_raw_jira_api_issues",6,""
-2,8,10808,"{""ConnectionId"":2,""BoardId"":8}","_raw_jira_api_issues",7,""
-2,8,10809,"{""ConnectionId"":2,""BoardId"":8}","_raw_jira_api_issues",8,""
-2,8,10810,"{""ConnectionId"":2,""BoardId"":8}","_raw_jira_api_issues",9,""
-2,8,10811,"{""ConnectionId"":2,""BoardId"":8}","_raw_jira_api_issues",10,""
-2,8,10812,"{""ConnectionId"":2,""BoardId"":8}","_raw_jira_api_issues",11,""
-2,8,10813,"{""ConnectionId"":2,""BoardId"":8}","_raw_jira_api_issues",12,""
-2,8,10814,"{""ConnectionId"":2,""BoardId"":8}","_raw_jira_api_issues",13,""
-2,8,10815,"{""ConnectionId"":2,""BoardId"":8}","_raw_jira_api_issues",14,""
-2,8,10816,"{""ConnectionId"":2,""BoardId"":8}","_raw_jira_api_issues",15,""
-2,8,10817,"{""ConnectionId"":2,""BoardId"":8}","_raw_jira_api_issues",16,""
-2,8,10818,"{""ConnectionId"":2,""BoardId"":8}","_raw_jira_api_issues",17,""
-2,8,10819,"{""ConnectionId"":2,""BoardId"":8}","_raw_jira_api_issues",18,""
-2,8,10820,"{""ConnectionId"":2,""BoardId"":8}","_raw_jira_api_issues",19,""
-2,8,10821,"{""ConnectionId"":2,""BoardId"":8}","_raw_jira_api_issues",20,""
-2,8,10822,"{""ConnectionId"":2,""BoardId"":8}","_raw_jira_api_issues",21,""
-2,8,10823,"{""ConnectionId"":2,""BoardId"":8}","_raw_jira_api_issues",22,""
-2,8,116800,"{""ConnectionId"":2,""BoardId"":8}","_raw_jira_api_issues",23,""
diff --git
a/backend/plugins/jira/e2e/snapshot_tables/_tool_jira_board_issues_relations.csv
b/backend/plugins/jira/e2e/snapshot_tables/_tool_jira_board_issues_relations.csv
new file mode 100644
index 000000000..5c9582653
--- /dev/null
+++
b/backend/plugins/jira/e2e/snapshot_tables/_tool_jira_board_issues_relations.csv
@@ -0,0 +1,24 @@
+connection_id,board_id,issue_id,_raw_data_params,_raw_data_table,_raw_data_id,_raw_data_remark
+2,8,10802,"{""ConnectionId"":2,""BoardId"":8}","_raw_jira_api_issues",1,""
+2,8,10803,"{""ConnectionId"":2,""BoardId"":8}","_raw_jira_api_issues",2,""
+2,8,10804,"{""ConnectionId"":2,""BoardId"":8}","_raw_jira_api_issues",3,""
+2,8,10805,"{""ConnectionId"":2,""BoardId"":8}","_raw_jira_api_issues",4,""
+2,8,10806,"{""ConnectionId"":2,""BoardId"":8}","_raw_jira_api_issues",5,""
+2,8,10807,"{""ConnectionId"":2,""BoardId"":8}","_raw_jira_api_issues",6,""
+2,8,10808,"{""ConnectionId"":2,""BoardId"":8}","_raw_jira_api_issues",7,""
+2,8,10809,"{""ConnectionId"":2,""BoardId"":8}","_raw_jira_api_issues",8,""
+2,8,10810,"{""ConnectionId"":2,""BoardId"":8}","_raw_jira_api_issues",9,""
+2,8,10811,"{""ConnectionId"":2,""BoardId"":8}","_raw_jira_api_issues",10,""
+2,8,10812,"{""ConnectionId"":2,""BoardId"":8}","_raw_jira_api_issues",11,""
+2,8,10813,"{""ConnectionId"":2,""BoardId"":8}","_raw_jira_api_issues",12,""
+2,8,10814,"{""ConnectionId"":2,""BoardId"":8}","_raw_jira_api_issues",13,""
+2,8,10815,"{""ConnectionId"":2,""BoardId"":8}","_raw_jira_api_issues",14,""
+2,8,10816,"{""ConnectionId"":2,""BoardId"":8}","_raw_jira_api_issues",15,""
+2,8,10817,"{""ConnectionId"":2,""BoardId"":8}","_raw_jira_api_issues",16,""
+2,8,10818,"{""ConnectionId"":2,""BoardId"":8}","_raw_jira_api_issues",17,""
+2,8,10819,"{""ConnectionId"":2,""BoardId"":8}","_raw_jira_api_issues",18,""
+2,8,10820,"{""ConnectionId"":2,""BoardId"":8}","_raw_jira_api_issues",19,""
+2,8,10821,"{""ConnectionId"":2,""BoardId"":8}","_raw_jira_api_issues",20,""
+2,8,10822,"{""ConnectionId"":2,""BoardId"":8}","_raw_jira_api_issues",21,""
+2,8,10823,"{""ConnectionId"":2,""BoardId"":8}","_raw_jira_api_issues",22,""
+2,8,116800,"{""ConnectionId"":2,""BoardId"":8}","_raw_jira_api_issues",23,""
\ No newline at end of file
