refactor: #72 rename to project setting

shaunthegeek · shaunthegeek · commit 27bf9be93361 · 2021-10-22T16:58:17.000+08:00
diff --git a/app/Coding/ProjectSetting.php b/app/Coding/ProjectSetting.php
@@ -2,7 +2,7 @@
 
 namespace App\Coding;
 
-class Project extends Base
+class ProjectSetting extends Base
 {
     public function getIssueTypes($token, $projectName)
     {
diff --git a/app/Commands/IssueImportCommand.php b/app/Commands/IssueImportCommand.php
@@ -4,7 +4,7 @@
 
 use App\Coding\Issue;
 use App\Coding\Iteration;
-use App\Coding\Project;
+use App\Coding\ProjectSetting;
 use Exception;
 use LaravelZero\Framework\Commands\Command;
 use Rap2hpoutre\FastExcel\Facades\FastExcel;
@@ -41,7 +41,7 @@ class IssueImportCommand extends Command
      * Execute the console command.
      *
      */
-    public function handle(Issue $codingIssue, Project $codingProject, Iteration $iteration): int
+    public function handle(Issue $codingIssue, ProjectSetting $projectSetting, Iteration $iteration): int
     {
         $this->setCodingApi();
 
@@ -57,7 +57,7 @@ public function handle(Issue $codingIssue, Project $codingProject, Iteration $it
         }
         foreach ($rows as $row) {
             try {
-                $issueResult = $this->createIssueByRow($codingProject, $codingIssue, $iteration, $row);
+                $issueResult = $this->createIssueByRow($projectSetting, $codingIssue, $iteration, $row);
             } catch (Exception $e) {
                 $this->error('Error: ' . $e->getMessage());
                 return 1;
@@ -70,10 +70,10 @@ public function handle(Issue $codingIssue, Project $codingProject, Iteration $it
         return 0;
     }
 
-    private function getIssueTypes(Project $codingProject, $row): void
+    private function getIssueTypes(ProjectSetting $projectSetting, array $row): void
     {
         if (empty($this->issueTypes)) {
-            $result = $codingProject->getIssueTypes($this->codingToken, $this->codingProjectUri);
+            $result = $projectSetting->getIssueTypes($this->codingToken, $this->codingProjectUri);
             foreach ($result as $item) {
                 $this->issueTypes[$item['Name']] = $item;
             }
@@ -83,9 +83,9 @@ private function getIssueTypes(Project $codingProject, $row): void
         }
     }
 
-    private function createIssueByRow(Project $codingProject, Issue $issue, Iteration $iteration, array $row)
+    private function createIssueByRow(ProjectSetting $projectSetting, Issue $issue, Iteration $iteration, array $row)
     {
-        $this->getIssueTypes($codingProject, $row);
+        $this->getIssueTypes($projectSetting, $row);
         $data = [
             'Type' => $this->issueTypes[$row['事项类型']]['IssueType'],
             'IssueTypeId' => $this->issueTypes[$row['事项类型']]['Id'],
diff --git a/app/Commands/ProjectGetIssueTypesCommand.php b/app/Commands/ProjectGetIssueTypesCommand.php
@@ -3,7 +3,7 @@
 namespace App\Commands;
 
 use App\Coding\Issue;
-use App\Coding\Project;
+use App\Coding\ProjectSetting;
 use LaravelZero\Framework\Commands\Command;
 
 class ProjectGetIssueTypesCommand extends Command
@@ -32,11 +32,11 @@ class ProjectGetIssueTypesCommand extends Command
      * Execute the console command.
      *
      */
-    public function handle(Project $codingProject): int
+    public function handle(ProjectSetting $projectSetting): int
     {
         $this->setCodingApi();
 
-        $result = $codingProject->getIssueTypes($this->codingToken, $this->codingProjectUri);
+        $result = $projectSetting->getIssueTypes($this->codingToken, $this->codingProjectUri);
 
         foreach ($result as $item) {
             $this->info($item['Id'] . ' ' . $item['Name']);
diff --git a/tests/Feature/IssueImportCommandTest.php b/tests/Feature/IssueImportCommandTest.php
@@ -4,7 +4,7 @@
 
 use App\Coding\Issue;
 use App\Coding\Iteration;
-use App\Coding\Project;
+use App\Coding\ProjectSetting;
 use Tests\TestCase;
 
 class IssueImportCommandTest extends TestCase
@@ -26,8 +26,8 @@ protected function setUp(): void
 
     public function testImportSuccess()
     {
-        $mock = \Mockery::mock(Project::class, [])->makePartial();
-        $this->instance(Project::class, $mock);
+        $mock = \Mockery::mock(ProjectSetting::class, [])->makePartial();
+        $this->instance(ProjectSetting::class, $mock);
 
         $mock->shouldReceive('getIssueTypes')->times(1)->andReturn(json_decode(
             file_get_contents($this->dataDir . 'coding/' . 'DescribeProjectIssueTypeListResponse.json'),
@@ -66,8 +66,8 @@ public function testImportSuccess()
 
     public function testImportUserStorySuccess()
     {
-        $mock = \Mockery::mock(Project::class, [])->makePartial();
-        $this->instance(Project::class, $mock);
+        $mock = \Mockery::mock(ProjectSetting::class, [])->makePartial();
+        $this->instance(ProjectSetting::class, $mock);
 
         $mock->shouldReceive('getIssueTypes')->times(1)->andReturn(json_decode(
             file_get_contents($this->dataDir . 'coding/' . 'DescribeProjectIssueTypeListResponse.json'),
@@ -113,8 +113,8 @@ public function testImportUserStorySuccess()
 
     public function testImportSubTask()
     {
-        $mock = \Mockery::mock(Project::class, [])->makePartial();
-        $this->instance(Project::class, $mock);
+        $mock = \Mockery::mock(ProjectSetting::class, [])->makePartial();
+        $this->instance(ProjectSetting::class, $mock);
 
         $mock->shouldReceive('getIssueTypes')->times(1)->andReturn(json_decode(
             file_get_contents($this->dataDir . 'coding/' . 'DescribeProjectIssueTypeListResponse.json'),
@@ -179,8 +179,8 @@ public function testImportSubTask()
 
     public function testImportFailedIssueTypeNotExists()
     {
-        $mock = \Mockery::mock(Project::class, [])->makePartial();
-        $this->instance(Project::class, $mock);
+        $mock = \Mockery::mock(ProjectSetting::class, [])->makePartial();
+        $this->instance(ProjectSetting::class, $mock);
         $mock->shouldReceive('getIssueTypes')->times(1)->andReturn([]);
 
         $this->artisan('issue:import', ['file' => $this->dataDir . 'coding/scrum-issues.csv'])
diff --git a/tests/Feature/ProjectGetIssueTypesCommandTest.php b/tests/Feature/ProjectGetIssueTypesCommandTest.php
@@ -2,7 +2,7 @@
 
 namespace Tests\Feature;
 
-use App\Coding\Project;
+use App\Coding\ProjectSetting;
 use Tests\TestCase;
 
 class ProjectGetIssueTypesCommandTest extends TestCase
@@ -20,8 +20,8 @@ protected function setUp(): void
 
     public function testCreateSuccess()
     {
-        $mock = \Mockery::mock(Project::class, [])->makePartial();
-        $this->instance(Project::class, $mock);
+        $mock = \Mockery::mock(ProjectSetting::class, [])->makePartial();
+        $this->instance(ProjectSetting::class, $mock);
 
         $mock->shouldReceive('getIssueTypes')->times(1)->andReturn(json_decode(
             file_get_contents($this->dataDir . 'coding/' . 'DescribeProjectIssueTypeListResponse.json'),
diff --git a/tests/Unit/CodingProjectTest.php b/tests/Unit/CodingProjectTest.php
@@ -2,7 +2,7 @@
 
 namespace Tests\Unit;
 
-use App\Coding\Project;
+use App\Coding\ProjectSetting;
 use GuzzleHttp\Client;
 use GuzzleHttp\Psr7\Response;
 use Tests\TestCase;
@@ -34,7 +34,7 @@ public function testCreateSuccess()
                 ]
             )
             ->willReturn(new Response(200, [], $responseBody));
-        $coding = new Project($clientMock);
+        $coding = new ProjectSetting($clientMock);
         $result = $coding->getIssueTypes($codingToken, $codingProjectUri);
         $this->assertEquals(json_decode($responseBody, true)['Response']['IssueTypes'], $result);
     }

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`
`3`	`3`	`namespace App\Coding;`
`4`	`4`
`5`		`-class Project extends Base`
	`5`	`+class ProjectSetting extends Base`
`6`	`6`	`{`
`7`	`7`	`public function getIssueTypes($token, $projectName)`
`8`	`8`	`{`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`
`5`	`5`	`use App\Coding\Issue;`
`6`	`6`	`use App\Coding\Iteration;`
`7`		`-use App\Coding\Project;`
	`7`	`+use App\Coding\ProjectSetting;`
`8`	`8`	`use Exception;`
`9`	`9`	`use LaravelZero\Framework\Commands\Command;`
`10`	`10`	`use Rap2hpoutre\FastExcel\Facades\FastExcel;`
`@@ -41,7 +41,7 @@ class IssueImportCommand extends Command`
`41`	`41`	`* Execute the console command.`
`42`	`42`	`*`
`43`	`43`	`*/`
`44`		`- public function handle(Issue $codingIssue, Project $codingProject, Iteration $iteration): int`
	`44`	`+ public function handle(Issue $codingIssue, ProjectSetting $projectSetting, Iteration $iteration): int`
`45`	`45`	`{`
`46`	`46`	`$this->setCodingApi();`
`47`	`47`
`@@ -57,7 +57,7 @@ public function handle(Issue $codingIssue, Project $codingProject, Iteration $it`
`57`	`57`	`}`
`58`	`58`	`foreach ($rows as $row) {`
`59`	`59`	`try {`
`60`		`- $issueResult = $this->createIssueByRow($codingProject, $codingIssue, $iteration, $row);`
	`60`	`+ $issueResult = $this->createIssueByRow($projectSetting, $codingIssue, $iteration, $row);`
`61`	`61`	`} catch (Exception $e) {`
`62`	`62`	`$this->error('Error: ' . $e->getMessage());`
`63`	`63`	`return 1;`
`@@ -70,10 +70,10 @@ public function handle(Issue $codingIssue, Project $codingProject, Iteration $it`
`70`	`70`	`return 0;`
`71`	`71`	`}`
`72`	`72`
`73`		`- private function getIssueTypes(Project $codingProject, $row): void`
	`73`	`+ private function getIssueTypes(ProjectSetting $projectSetting, array $row): void`
`74`	`74`	`{`
`75`	`75`	`if (empty($this->issueTypes)) {`
`76`		`- $result = $codingProject->getIssueTypes($this->codingToken, $this->codingProjectUri);`
	`76`	`+ $result = $projectSetting->getIssueTypes($this->codingToken, $this->codingProjectUri);`
`77`	`77`	`foreach ($result as $item) {`
`78`	`78`	`$this->issueTypes[$item['Name']] = $item;`
`79`	`79`	`}`
`@@ -83,9 +83,9 @@ private function getIssueTypes(Project $codingProject, $row): void`
`83`	`83`	`}`
`84`	`84`	`}`
`85`	`85`
`86`		`- private function createIssueByRow(Project $codingProject, Issue $issue, Iteration $iteration, array $row)`
	`86`	`+ private function createIssueByRow(ProjectSetting $projectSetting, Issue $issue, Iteration $iteration, array $row)`
`87`	`87`	`{`
`88`		`- $this->getIssueTypes($codingProject, $row);`
	`88`	`+ $this->getIssueTypes($projectSetting, $row);`
`89`	`89`	`$data = [`
`90`	`90`	`'Type' => $this->issueTypes[$row['事项类型']]['IssueType'],`
`91`	`91`	`'IssueTypeId' => $this->issueTypes[$row['事项类型']]['Id'],`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`
`3`	`3`	`namespace Tests\Unit;`
`4`	`4`
`5`		`-use App\Coding\Project;`
	`5`	`+use App\Coding\ProjectSetting;`
`6`	`6`	`use GuzzleHttp\Client;`
`7`	`7`	`use GuzzleHttp\Psr7\Response;`
`8`	`8`	`use Tests\TestCase;`
`@@ -34,7 +34,7 @@ public function testCreateSuccess()`
`34`	`34`	`]`
`35`	`35`	`)`
`36`	`36`	`->willReturn(new Response(200, [], $responseBody));`
`37`		`- $coding = new Project($clientMock);`
	`37`	`+ $coding = new ProjectSetting($clientMock);`
`38`	`38`	`$result = $coding->getIssueTypes($codingToken, $codingProjectUri);`
`39`	`39`	`$this->assertEquals(json_decode($responseBody, true)['Response']['IssueTypes'], $result);`
`40`	`40`	`}`