[incubator-devlake] branch release-v0.11 updated: fix: issues.spent_minutes (#2144)

[zhangliang2022]

This is an automated email from the ASF dual-hosted git repository.

zhangliang2022 pushed a commit to branch release-v0.11
in repository https://gitbox.apache.org/repos/asf/incubator-devlake.git


The following commit(s) were added to refs/heads/release-v0.11 by this push:
     new 46aaa7f5 fix: issues.spent_minutes (#2144)
46aaa7f5 is described below

commit 46aaa7f50f73555b34bbbd4cedc824fe3e26d935
Author: NaRro <cong.w...@merico.dev>
AuthorDate: Thu Jun 9 13:56:26 2022 +0800

    fix: issues.spent_minutes (#2144)
    
    fixes #2136
---
 plugins/jira/tasks/apiv2models/issue.go | 9 ++++++---
 plugins/jira/tasks/issue_extractor.go   | 4 ++--
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/plugins/jira/tasks/apiv2models/issue.go 
b/plugins/jira/tasks/apiv2models/issue.go
index 3544150e..c6a70d80 100644
--- a/plugins/jira/tasks/apiv2models/issue.go
+++ b/plugins/jira/tasks/apiv2models/issue.go
@@ -46,9 +46,9 @@ type Issue struct {
                        ID  uint64 `json:"id,string"`
                        Key string `json:"key"`
                } `json:"parent"`
-               Timespent     interface{} `json:"timespent"`
-               Sprint        *Sprint     `json:"sprint"`
-               ClosedSprints []Sprint    `json:"closedSprints"`
+               Timespent     *int64   `json:"timespent"`
+               Sprint        *Sprint  `json:"sprint"`
+               ClosedSprints []Sprint `json:"closedSprints"`
                Project       struct {
                        Self           string `json:"self"`
                        ID             uint64 `json:"id,string"`
@@ -205,6 +205,9 @@ func (i Issue) toToolLayer(connectionId uint64, epicField, 
storyPointField strin
                result.SprintId = i.Fields.Sprint.ID
                result.SprintName = i.Fields.Sprint.Name
        }
+       if i.Fields.Timespent != nil {
+               result.SpentMinutes = *i.Fields.Timespent / 60
+       }
        return result
 }
 
diff --git a/plugins/jira/tasks/issue_extractor.go 
b/plugins/jira/tasks/issue_extractor.go
index 17882df8..92d14687 100644
--- a/plugins/jira/tasks/issue_extractor.go
+++ b/plugins/jira/tasks/issue_extractor.go
@@ -20,9 +20,10 @@ package tasks
 import (
        "encoding/json"
        "fmt"
-       "github.com/apache/incubator-devlake/models/domainlayer/ticket"
        "strings"
 
+       "github.com/apache/incubator-devlake/models/domainlayer/ticket"
+
        "github.com/apache/incubator-devlake/plugins/core"
        "github.com/apache/incubator-devlake/plugins/helper"
        "github.com/apache/incubator-devlake/plugins/jira/models"
@@ -123,7 +124,6 @@ func ExtractIssues(taskCtx core.SubTaskContext) error {
                        issue.StdStoryPoint = uint(issue.StoryPoint)
                        issue.StdType = getStdType(issue.Type)
                        issue.StdStatus = getStdStatus(issue.StatusKey)
-                       issue.SpentMinutes = issue.AggregateEstimateMinutes - 
issue.RemainingEstimateMinutes
                        if len(changelogs) < 100 {
                                issue.ChangelogUpdated = &row.CreatedAt
                        }