[incubator-devlake] branch main updated: fix: fix typemapping (#5426)

[abeizn]

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

abeizn 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 8ca63751d fix: fix typemapping (#5426)
8ca63751d is described below

commit 8ca63751ddfb500f66dce48416aad19c4b7608fc
Author: mappjzc <zhicheng.ji...@merico.dev>
AuthorDate: Mon Jun 12 15:52:35 2023 +0800

    fix: fix typemapping (#5426)
    
    Fix story typemapping.
    Fix story statusmapping.
    Fix task typemapping.
    
    Nddtfjiang <zhicheng.ji...@merico.dev>
---
 backend/plugins/zentao/tasks/story_extractor.go | 4 ++--
 backend/plugins/zentao/tasks/task_extractor.go  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/backend/plugins/zentao/tasks/story_extractor.go 
b/backend/plugins/zentao/tasks/story_extractor.go
index 46674fdd0..b8ec78ae9 100644
--- a/backend/plugins/zentao/tasks/story_extractor.go
+++ b/backend/plugins/zentao/tasks/story_extractor.go
@@ -123,13 +123,13 @@ func ExtractStory(taskCtx plugin.SubTaskContext) 
errors.Error {
                                Url:              row.Url,
                        }
 
-                       story.StdType = stdTypeMappings[story.Type]
+                       story.StdType = 
stdTypeMappings[story.Type+"."+story.Category]
                        if story.StdType == "" {
                                story.StdType = ticket.REQUIREMENT
                        }
 
                        if len(statusMappings) != 0 {
-                               story.StdStatus = statusMappings[story.Stage]
+                               story.StdStatus = 
statusMappings[story.Status+"-"+story.Stage]
                        } else {
                                story.StdStatus = 
ticket.GetStatus(&ticket.StatusRule{
                                        Done:    []string{"closed"},
diff --git a/backend/plugins/zentao/tasks/task_extractor.go 
b/backend/plugins/zentao/tasks/task_extractor.go
index c1935f7e9..070327743 100644
--- a/backend/plugins/zentao/tasks/task_extractor.go
+++ b/backend/plugins/zentao/tasks/task_extractor.go
@@ -135,7 +135,7 @@ func ExtractTask(taskCtx plugin.SubTaskContext) 
errors.Error {
                                Url:      row.Url,
                        }
 
-                       task.StdType = stdTypeMappings[task.Type]
+                       task.StdType = stdTypeMappings[task.Type+"."+task.Mode]
                        if task.StdType == "" {
                                task.StdType = ticket.TASK
                        }