From 17acfe36aac466fdae0fe6b42bb8d1d51a83ef55 Mon Sep 17 00:00:00 2001 From: zhangliang Date: Mon, 27 Mar 2023 17:13:55 +0800 Subject: [PATCH] fix: save the epic type issues as well as the normal issues --- backend/plugins/jira/tasks/epic_extractor.go | 2 +- backend/plugins/jira/tasks/issue_extractor.go | 16 +++++++--------- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/backend/plugins/jira/tasks/epic_extractor.go b/backend/plugins/jira/tasks/epic_extractor.go index c895fa9e986..8c3c8eab3f2 100644 --- a/backend/plugins/jira/tasks/epic_extractor.go +++ b/backend/plugins/jira/tasks/epic_extractor.go @@ -54,7 +54,7 @@ func ExtractEpics(taskCtx plugin.SubTaskContext) errors.Error { Table: RAW_EPIC_TABLE, }, Extract: func(row *api.RawData) ([]interface{}, errors.Error) { - return extractIssues(data, mappings, true, row) + return extractIssues(data, mappings, row) }, }) if err != nil { diff --git a/backend/plugins/jira/tasks/issue_extractor.go b/backend/plugins/jira/tasks/issue_extractor.go index 3639601215e..0267f10190a 100644 --- a/backend/plugins/jira/tasks/issue_extractor.go +++ b/backend/plugins/jira/tasks/issue_extractor.go @@ -75,7 +75,7 @@ func ExtractIssues(taskCtx plugin.SubTaskContext) errors.Error { Table: RAW_ISSUE_TABLE, }, Extract: func(row *api.RawData) ([]interface{}, errors.Error) { - return extractIssues(data, mappings, false, row) + return extractIssues(data, mappings, row) }, }) if err != nil { @@ -84,7 +84,7 @@ func ExtractIssues(taskCtx plugin.SubTaskContext) errors.Error { return extractor.Execute() } -func extractIssues(data *JiraTaskData, mappings *typeMappings, ignoreBoard bool, row *api.RawData) ([]interface{}, errors.Error) { +func extractIssues(data *JiraTaskData, mappings *typeMappings, row *api.RawData) ([]interface{}, errors.Error) { var apiIssue apiv2models.Issue err := errors.Convert(json.Unmarshal(row.Data, &apiIssue)) if err != nil { @@ -156,13 +156,11 @@ func extractIssues(data *JiraTaskData, mappings *typeMappings, ignoreBoard bool, results = append(results, user) } } - if !ignoreBoard { - results = append(results, &models.JiraBoardIssue{ - ConnectionId: data.Options.ConnectionId, - BoardId: data.Options.BoardId, - IssueId: issue.IssueId, - }) - } + results = append(results, &models.JiraBoardIssue{ + ConnectionId: data.Options.ConnectionId, + BoardId: data.Options.BoardId, + IssueId: issue.IssueId, + }) labels := apiIssue.Fields.Labels for _, v := range labels { issueLabel := &models.JiraIssueLabel{