feat: #72 desc, date and StoryPoint

coding · Oct 21, 2021 · 1a31bd8 · 1a31bd8
1 parent ccb1f34
commit 1a31bd8
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 15 deletions.
diff --git a/app/Commands/IssueImportCommand.php b/app/Commands/IssueImportCommand.php
@@ -70,7 +70,7 @@ public function handle(Issue $codingIssue, Project $codingProject, Iteration $it
         return 0;
     }
 
-    private function createIssueByRow(Project $codingProject, Issue $issue, Iteration $iteration, array $row)
+    private function getIssueTypes(Project $codingProject, $row): void
     {
         if (empty($this->issueTypes)) {
             $result = $codingProject->getIssueTypes($this->codingToken, $this->codingProjectUri);
@@ -81,14 +81,37 @@ private function createIssueByRow(Project $codingProject, Issue $issue, Iteratio
         if (!isset($this->issueTypes[$row['事项类型']])) {
             throw new Exception('「' . $row['事项类型'] . '」类型不存在，请在项目设置中添加');
         }
+    }
+
+    private function createIssueByRow(Project $codingProject, Issue $issue, Iteration $iteration, array $row)
+    {
+        $this->getIssueTypes($codingProject, $row);
         $data = [
             'Type' => $this->issueTypes[$row['事项类型']]['IssueType'],
             'IssueTypeId' => $this->issueTypes[$row['事项类型']]['Id'],
             'Name' => $row['标题'],
-            'Priority' => \App\Models\Issue::PRIORITY_MAP[$row['优先级']],
-            'IterationCode' => $row['所属迭代'] ? $this->getIterationCode($iteration, $row['所属迭代']) : null,
-            'ParentCode' => !empty($row['ParentCode']) ? $this->issueCodeMap[$row['ParentCode']] : null,
         ];
+        if (!empty($row['优先级'])) {
+            $data['Priority'] = \App\Models\Issue::PRIORITY_MAP[$row['优先级']];
+        }
+        if (!empty($row['所属迭代'])) {
+            $data['IterationCode'] = $this->getIterationCode($iteration, $row['所属迭代']);
+        }
+        if (!empty($row['ParentCode'])) {
+            $data['ParentCode'] = $this->issueCodeMap[$row['ParentCode']];
+        }
+        foreach (
+            [
+            'Description' => '描述',
+            'DueDate' => '截止日期',
+            'StartDate' => '开始日期',
+            'StoryPoint' => '故事点',
+            ] as $english => $chinese
+        ) {
+            if (!empty($row[$chinese])) {
+                $data[$english] = $row[$chinese];
+            }
+        }
         $result = $issue->create($this->codingToken, $this->codingProjectUri, $data);
         if (isset($row['ID'])) {
             $this->issueCodeMap[$row['ID']] = intval($result['Code']);

diff --git a/tests/Feature/IssueImportCommandTest.php b/tests/Feature/IssueImportCommandTest.php
@@ -99,7 +99,8 @@ public function testImportUserStorySuccess()
                 'Name' => '用户可通过手机号注册账户',
                 'Priority' => "1",
                 'IterationCode' => 2746,
-                'ParentCode' => null,
+                'DueDate' => '2021-10-21',
+                'StoryPoint' => '2',
             ]
         ])->andReturn($result);
 
@@ -136,9 +137,8 @@ public function testImportSubTask()
                 'Type' => 'REQUIREMENT',
                 'IssueTypeId' => 213218,
                 'Name' => '用户可通过手机号注册账户',
-                'Priority' => "1",
-                'IterationCode' => null,
-                'ParentCode' => null,
+                'DueDate' => '2021-10-21',
+                'StoryPoint' => '2',
             ]
         ])->andReturn($parentIssue);
 
@@ -151,8 +151,7 @@ public function testImportSubTask()
                 'Type' => 'SUB_TASK',
                 'IssueTypeId' => 213222,
                 'Name' => '完成手机号注册的短信验证码发送接口',
-                'Priority' => "1",
-                'IterationCode' => null,
+                'Priority' => "0",
                 'ParentCode' => 2742,
             ]
         ])->andReturn($subTask1);
@@ -167,7 +166,6 @@ public function testImportSubTask()
                 'IssueTypeId' => 213222,
                 'Name' => '完成通过手机号注册用户的接口',
                 'Priority' => "1",
-                'IterationCode' => null,
                 'ParentCode' => 2742,
             ]
         ])->andReturn($subTask2);

diff --git a/tests/data/coding/scrum-issues-5-6-7.csv b/tests/data/coding/scrum-issues-5-6-7.csv
@@ -1,4 +1,4 @@
-ID,ParentCode,事项类型,标题,描述,状态,创建时间,创建人,更新时间,所属迭代,故事点,处理人,缺陷类型,优先级,截止日期,模块,标签,关注人,开始日期
-7,5,子工作项,完成通过手机号注册用户的接口,,已完成,2021-10-19 11:26:38,sinkcup,2021-10-19 11:26:38,,,,,中,,,,,
-6,5,子工作项,完成手机号注册的短信验证码发送接口,,已完成,2021-10-19 11:26:38,sinkcup,2021-10-19 11:26:38,,,,,中,,,,,
-5,,用户故事,用户可通过手机号注册账户,,开发中,2021-10-19 11:26:37,sinkcup,2021-10-19 11:26:37,,2,sinkcup,,中,2021-10-21,,,,
+ID,ParentCode,事项类型,标题,描述,状态,创建时间,创建人,更新时间,所属迭代,故事点,处理人,缺陷类型,优先级,截止日期,模块,标签,关注人,开始日期
+7,5,子工作项,完成通过手机号注册用户的接口,,已完成,2021-10-19 11:26:38,sinkcup,2021-10-19 11:26:38,,,,,中,,,,,
+6,5,子工作项,完成手机号注册的短信验证码发送接口,,已完成,2021-10-19 11:26:38,sinkcup,2021-10-19 11:26:38,,,,,低,,,,,
+5,,用户故事,用户可通过手机号注册账户,,开发中,2021-10-19 11:26:37,sinkcup,2021-10-19 11:26:37,,2,sinkcup,,,2021-10-21,,,,