refactor: #81 use coding sdk project setting

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

Hide file tree

Showing 8 changed files with 24 additions and 135 deletions.
diff --git a/app/Coding/ProjectSetting.php b/app/Coding/ProjectSetting.php
diff --git a/app/Commands/IssueImportCommand.php b/app/Commands/IssueImportCommand.php
@@ -4,7 +4,7 @@
 
 use Coding\Issue;
 use Coding\Iteration;
-use App\Coding\ProjectSetting;
+use Coding\ProjectSetting;
 use Exception;
 use LaravelZero\Framework\Commands\Command;
 use Rap2hpoutre\FastExcel\Facades\FastExcel;
@@ -46,6 +46,7 @@ public function handle(Issue $codingIssue, ProjectSetting $projectSetting, Itera
         $this->setCodingApi();
         $codingIssue->setToken($this->codingToken);
         $iteration->setToken($this->codingToken);
+        $projectSetting->setToken($this->codingToken);
 
         $filePath = $this->argument('file');
         if (!file_exists($filePath)) {
@@ -75,7 +76,7 @@ public function handle(Issue $codingIssue, ProjectSetting $projectSetting, Itera
     private function getIssueTypes(ProjectSetting $projectSetting, array $row): void
     {
         if (empty($this->issueTypes)) {
-            $result = $projectSetting->getIssueTypes($this->codingToken, $this->codingProjectUri);
+            $result = $projectSetting->getIssueTypes(['ProjectName' => $this->codingProjectUri]);
             foreach ($result as $item) {
                 $this->issueTypes[$item['Name']] = $item;
             }
@@ -90,7 +91,11 @@ private function getStatusId(ProjectSetting $projectSetting, string $issueTypeNa
         if (!isset($this->issueTypeStatus[$issueTypeName])) {
             $type = $this->issueTypes[$issueTypeName]['IssueType'];
             $typeId = $this->issueTypes[$issueTypeName]['Id'];
-            $result = $projectSetting->getIssueTypeStatus($this->codingToken, $this->codingProjectUri, $type, $typeId);
+            $result = $projectSetting->getIssueStatus([
+                'ProjectName' => $this->codingProjectUri,
+                'IssueType' => $type,
+                'IssueTypeId' => $typeId
+            ]);
             foreach ($result as $item) {
                 $tmp = $item['IssueStatus'];
                 $this->issueTypeStatus[$issueTypeName][$tmp['Name']] = $tmp['Id'];

diff --git a/app/Commands/ProjectGetIssueTypesCommand.php b/app/Commands/ProjectGetIssueTypesCommand.php
@@ -2,7 +2,7 @@
 
 namespace App\Commands;
 
-use App\Coding\ProjectSetting;
+use Coding\ProjectSetting;
 use LaravelZero\Framework\Commands\Command;
 
 class ProjectGetIssueTypesCommand extends Command
@@ -34,8 +34,9 @@ class ProjectGetIssueTypesCommand extends Command
     public function handle(ProjectSetting $projectSetting): int
     {
         $this->setCodingApi();
+        $projectSetting->setToken($this->codingToken);
 
-        $result = $projectSetting->getIssueTypes($this->codingToken, $this->codingProjectUri);
+        $result = $projectSetting->getIssueTypes(['ProjectName' => $this->codingProjectUri]);
 
         foreach ($result as $item) {
             $this->info($item['Id'] . ' ' . $item['Name']);

diff --git a/composer.json b/composer.json
@@ -22,7 +22,7 @@
         "ext-json": "*",
         "ext-libxml": "*",
         "ext-zip": "*",
-        "coding/sdk": "^0.2.0",
+        "coding/sdk": "^0.3.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/IssueImportCommandTest.php b/tests/Feature/IssueImportCommandTest.php
@@ -4,7 +4,7 @@
 
 use Coding\Issue;
 use Coding\Iteration;
-use App\Coding\ProjectSetting;
+use Coding\ProjectSetting;
 use Tests\TestCase;
 
 class IssueImportCommandTest extends TestCase
@@ -37,7 +37,7 @@ public function testImportSuccess()
             file_get_contents($this->dataDir . 'coding/' . 'DescribeProjectIssueStatusListResponse.json'),
             true
         )['Response']['ProjectIssueStatusList'];
-        $projectSettingMock->shouldReceive('getIssueTypeStatus')->times(5)->andReturn(
+        $projectSettingMock->shouldReceive('getIssueStatus')->times(5)->andReturn(
             $requirementStatus,
             $requirementStatus,
             $requirementStatus,
@@ -87,7 +87,7 @@ public function testImportUserStorySuccess()
             file_get_contents($this->dataDir . 'coding/' . 'DescribeProjectIssueTypeListResponse.json'),
             true
         )['Response']['IssueTypes']);
-        $projectSettingMock->shouldReceive('getIssueTypeStatus')->times(1)->andReturn(json_decode(
+        $projectSettingMock->shouldReceive('getIssueStatus')->times(1)->andReturn(json_decode(
             file_get_contents($this->dataDir . 'coding/' . 'DescribeProjectIssueStatusListResponse.json'),
             true
         )['Response']['ProjectIssueStatusList']);
@@ -138,7 +138,7 @@ public function testImportSubTask()
             file_get_contents($this->dataDir . 'coding/' . 'DescribeProjectIssueTypeListResponse.json'),
             true
         )['Response']['IssueTypes']);
-        $projectSettingMock->shouldReceive('getIssueTypeStatus')->times(2)->andReturn(json_decode(
+        $projectSettingMock->shouldReceive('getIssueStatus')->times(2)->andReturn(json_decode(
             file_get_contents($this->dataDir . 'coding/' . 'DescribeProjectIssueStatusListResponse.json'),
             true
         )['Response']['ProjectIssueStatusList']);

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

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