This is an automated email from the ASF dual-hosted git repository. warren pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/incubator-devlake.git
commit d2d13492a809f7db5941fe0347cd869124ba0174 Author: tgp <[email protected]> AuthorDate: Wed May 25 22:35:56 2022 +0800 some modify --- plugins/gitlab/models/issue.go | 2 ++ plugins/gitlab/tasks/issue_convertor.go | 3 +++ plugins/gitlab/tasks/issue_extractor.go | 6 ++++-- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/plugins/gitlab/models/issue.go b/plugins/gitlab/models/issue.go index 71d1f1d3..4e093e8e 100644 --- a/plugins/gitlab/models/issue.go +++ b/plugins/gitlab/models/issue.go @@ -24,6 +24,8 @@ type GitlabIssue struct { GitlabUpdatedAt time.Time `gorm:"index"` Severity string `gorm:"type:varchar(255)"` Component string `gorm:"type:varchar(255)"` + TimeEstimate int64 + TotalTimeSpent int64 common.NoPKModel } func (GitlabIssue) TableName() string { diff --git a/plugins/gitlab/tasks/issue_convertor.go b/plugins/gitlab/tasks/issue_convertor.go index 7767d974..dfc12bc2 100644 --- a/plugins/gitlab/tasks/issue_convertor.go +++ b/plugins/gitlab/tasks/issue_convertor.go @@ -65,6 +65,9 @@ func ConvertIssues(taskCtx core.SubTaskContext) error { ResolutionDate: issue.ClosedAt, Severity: issue.Severity, Component: issue.Component, + OriginalStatus: issue.Status, + OriginalEstimateMinutes: issue.TimeEstimate, + TimeSpentMinutes: issue.TotalTimeSpent, } if issue.State == "closed" { domainIssue.Status = ticket.DONE diff --git a/plugins/gitlab/tasks/issue_extractor.go b/plugins/gitlab/tasks/issue_extractor.go index 1c083e84..c50d6c50 100644 --- a/plugins/gitlab/tasks/issue_extractor.go +++ b/plugins/gitlab/tasks/issue_extractor.go @@ -82,8 +82,8 @@ type IssuesResponse struct { Full string } TimeStats struct { - TimeEstimate int - TotalTimeSpent int + TimeEstimate int64 + TotalTimeSpent int64 HumanTimeEstimate string HumanTotalTimeSpent string } @@ -179,6 +179,8 @@ func convertGitlabIssue(issue *IssuesResponse, projectId int) (*models.GitlabIss ClosedAt: helper.Iso8601TimeToTime(issue.GitlabClosedAt), GitlabCreatedAt: issue.GitlabCreatedAt.ToTime(), GitlabUpdatedAt: issue.GitlabUpdatedAt.ToTime(), + TimeEstimate: issue.TimeStats.TimeEstimate, + TotalTimeSpent: issue.TimeStats.TotalTimeSpent, } if issue.Assignee != nil {
