refactor: #81 use sdk to create issue

coding · Oct 25, 2021 · 0e20b8c · 0e20b8c
1 parent 2285baf
commit 0e20b8c
Show file tree

Hide file tree

Showing 8 changed files with 31 additions and 136 deletions.
diff --git a/app/Coding/Issue.php b/app/Coding/Issue.php
diff --git a/app/Commands/IssueCreateCommand.php b/app/Commands/IssueCreateCommand.php
@@ -2,7 +2,7 @@
 
 namespace App\Commands;
 
-use App\Coding\Issue;
+use Coding\Issue;
 use LaravelZero\Framework\Commands\Command;
 
 class IssueCreateCommand extends Command
@@ -37,8 +37,11 @@ class IssueCreateCommand extends Command
     public function handle(Issue $codingIssue): int
     {
         $this->setCodingApi();
+        $codingIssue->setToken($this->codingToken);
 
-        $data = [];
+        $data = [
+            'ProjectName' => $this->codingProjectUri,
+        ];
         $data['Type'] = $this->option('type') ?? $this->choice(
             '类型：',
             ['DEFECT', 'REQUIREMENT', 'MISSION', 'EPIC', 'SUB_TASK'],
@@ -52,7 +55,7 @@ public function handle(Issue $codingIssue): int
         );
 
         try {
-            $result = $codingIssue->create($this->codingToken, $this->codingProjectUri, $data);
+            $result = $codingIssue->create($data);
         } catch (\Exception $e) {
             $this->error('Error: ' . $e->getMessage());
             return 1;

diff --git a/app/Commands/IssueImportCommand.php b/app/Commands/IssueImportCommand.php
@@ -2,11 +2,10 @@
 
 namespace App\Commands;
 
-use App\Coding\Issue;
-use App\Coding\Iteration;
+use Coding\Issue;
+use Coding\Iteration;
 use App\Coding\ProjectSetting;
 use Exception;
-use Illuminate\Support\Arr;
 use LaravelZero\Framework\Commands\Command;
 use Rap2hpoutre\FastExcel\Facades\FastExcel;
 
@@ -45,6 +44,8 @@ class IssueImportCommand extends Command
     public function handle(Issue $codingIssue, ProjectSetting $projectSetting, Iteration $iteration): int
     {
         $this->setCodingApi();
+        $codingIssue->setToken($this->codingToken);
+        $iteration->setToken($this->codingToken);
 
         $filePath = $this->argument('file');
         if (!file_exists($filePath)) {
@@ -105,6 +106,7 @@ private function createIssueByRow(ProjectSetting $projectSetting, Issue $issue,
     {
         $this->getIssueTypes($projectSetting, $row);
         $data = [
+            'ProjectName' => $this->codingProjectUri,
             'Type' => $this->issueTypes[$row['事项类型']]['IssueType'],
             'IssueTypeId' => $this->issueTypes[$row['事项类型']]['Id'],
             'Name' => $row['标题'],
@@ -133,7 +135,7 @@ private function createIssueByRow(ProjectSetting $projectSetting, Issue $issue,
         if (!empty($row['状态'])) {
             $data['StatusId'] = $this->getStatusId($projectSetting, $row['事项类型'], $row['状态']);
         }
-        $result = $issue->create($this->codingToken, $this->codingProjectUri, $data);
+        $result = $issue->create($data);
         if (isset($row['ID'])) {
             $this->issueCodeMap[$row['ID']] = intval($result['Code']);
         }
@@ -143,7 +145,10 @@ private function createIssueByRow(ProjectSetting $projectSetting, Issue $issue,
     private function getIterationCode(Iteration $iteration, string $name)
     {
         if (!isset($this->iterationMap[$name])) {
-            $result = $iteration->create($this->codingToken, $this->codingProjectUri, ['name' => $name]);
+            $result = $iteration->create([
+                'ProjectName' => $this->codingProjectUri,
+                'Name' => $name,
+            ]);
             $this->iterationMap[$name] = $result['Code'];
         }
         return $this->iterationMap[$name];

diff --git a/composer.json b/composer.json
@@ -22,7 +22,7 @@
         "ext-json": "*",
         "ext-libxml": "*",
         "ext-zip": "*",
-        "coding/sdk": "^0.1.2",
+        "coding/sdk": "^0.2.0",
         "illuminate/log": "^8.0",
         "laravel-fans/confluence": "^0.1.1",
         "laravel-zero/framework": "^8.8",

diff --git a/composer.lock b/composer.lock
diff --git a/tests/Feature/IssueCreateCommandTest.php b/tests/Feature/IssueCreateCommandTest.php
@@ -2,7 +2,7 @@
 
 namespace Tests\Feature;
 
-use App\Coding\Issue;
+use Coding\Issue;
 use Tests\TestCase;
 
 class IssueCreateCommandTest extends TestCase

diff --git a/tests/Feature/IssueImportCommandTest.php b/tests/Feature/IssueImportCommandTest.php
@@ -2,8 +2,8 @@
 
 namespace Tests\Feature;
 
-use App\Coding\Issue;
-use App\Coding\Iteration;
+use Coding\Issue;
+use Coding\Iteration;
 use App\Coding\ProjectSetting;
 use Tests\TestCase;
 
@@ -109,9 +109,8 @@ public function testImportUserStorySuccess()
         )['Response']['Iteration']);
 
         $issueMock->shouldReceive('create')->times(1)->withArgs([
-            $this->token,
-            $this->projectUri,
             [
+                'ProjectName' => $this->projectUri,
                 'Type' => 'REQUIREMENT',
                 'IssueTypeId' => 213218,
                 'Name' => '用户可通过手机号注册账户',
@@ -154,9 +153,8 @@ public function testImportSubTask()
 
         $parentIssue = $response;
         $issueMock->shouldReceive('create')->times(1)->withArgs([
-            $this->token,
-            $this->projectUri,
             [
+                'ProjectName' => $this->projectUri,
                 'Type' => 'REQUIREMENT',
                 'IssueTypeId' => 213218,
                 'Name' => '用户可通过手机号注册账户',
@@ -169,9 +167,8 @@ public function testImportSubTask()
         $subTask1 = $response;
         $subTask1['Code'] = $this->faker->randomNumber();
         $issueMock->shouldReceive('create')->times(1)->withArgs([
-            $this->token,
-            $this->projectUri,
             [
+                'ProjectName' => $this->projectUri,
                 'Type' => 'SUB_TASK',
                 'IssueTypeId' => 213222,
                 'Name' => '完成手机号注册的短信验证码发送接口',
@@ -184,9 +181,8 @@ public function testImportSubTask()
         $subTask2 = $response;
         $subTask2['Code'] = $this->faker->randomNumber();
         $issueMock->shouldReceive('create')->times(1)->withArgs([
-            $this->token,
-            $this->projectUri,
             [
+                'ProjectName' => $this->projectUri,
                 'Type' => 'SUB_TASK',
                 'IssueTypeId' => 213222,
                 'Name' => '完成通过手机号注册用户的接口',

diff --git a/tests/Unit/CodingIssueTest.php b/tests/Unit/CodingIssueTest.php