refactor: #13 confluence html zip to CODING

Author: shaunthegeek

app/Coding.php

@@ -148,4 +148,19 @@ public function getImportJobStatus(string $token, string $projectName, string $j
             return new \Exception('failed');
         }
     }
+
+    public function createWikiByUploadZip(string $token, string $projectName, string $zipFileFullPath)
+    {
+        $zipFilename = basename($zipFileFullPath);
+        $uploadToken = $this->createUploadToken(
+            $token,
+            $projectName,
+            $zipFilename
+        );
+        $this->upload($uploadToken, $zipFileFullPath);
+        return $this->createWikiByZip($token, $projectName, $uploadToken, [
+            'ParentIid' => 0,
+            'FileName' => $zipFilename,
+        ]);
+    }
 }

app/Commands/WikiImportCommand.php

@@ -4,13 +4,14 @@
 
 use App\Coding;
 use Confluence\Content;
-use Illuminate\Support\Facades\Storage;
 use Illuminate\Support\Str;
 use LaravelFans\Confluence\Facades\Confluence;
 use LaravelZero\Framework\Commands\Command;
 
 class WikiImportCommand extends Command
 {
+    use WithCoding;
+
     /**
      * The signature of the command.
      *
@@ -35,10 +36,6 @@ class WikiImportCommand extends Command
      */
     protected $description = 'import wiki from confluence and so on';
 
-    private string $codingProjectUri;
-    private string $codingTeamDomain;
-    private string $codingToken;
-    private Coding $coding;
     private \App\Confluence $confluence;
     private \DOMDocument $document;
 
@@ -195,18 +192,12 @@ private function handleConfluenceHtml(): int
                 $this->info('标题：' . $title);
                 $markdown = $this->confluence->htmlFile2Markdown($dataPath . $page);
                 $mdFilename = substr($page, 0, -5) . '.md';
-                $zipFileFullPath = $this->coding->createMarkdownZip($markdown, $dataPath, $mdFilename);
-                $zipFilename = basename($zipFileFullPath);
-                $uploadToken = $this->coding->createUploadToken(
+                $zipFilePath = $this->coding->createMarkdownZip($markdown, $dataPath, $mdFilename);
+                $result = $this->coding->createWikiByUploadZip(
                     $this->codingToken,
                     $this->codingProjectUri,
-                    $zipFilename
+                    $zipFilePath
                 );
-                $this->coding->upload($uploadToken, $zipFileFullPath);
-                $result = $this->coding->createWikiByZip($this->codingToken, $this->codingProjectUri, $uploadToken, [
-                    'ParentIid' => 0,
-                    'FileName' => $zipFilename,
-                ]);
                 $this->info('上传成功，正在处理，任务 ID：' . $result['JobId']);
             }
         } catch (\ErrorException $e) {
@@ -216,26 +207,4 @@ private function handleConfluenceHtml(): int
 
         return 0;
     }
-
-    private function setCodingApi(): void
-    {
-        if ($this->option('coding_team_domain')) {
-            $codingTeamDomain = $this->option('coding_team_domain');
-        } else {
-            $codingTeamDomain = config('coding.team_domain') ?? $this->ask('CODING 团队域名：');
-        }
-        $this->codingTeamDomain = str_replace('.coding.net', '', $codingTeamDomain);
-
-        if ($this->option('coding_project_uri')) {
-            $this->codingProjectUri = $this->option('coding_project_uri');
-        } else {
-            $this->codingProjectUri = config('coding.project_uri') ?? $this->ask('CODING 项目标识：');
-        }
-
-        if ($this->option('coding_token')) {
-            $this->codingToken = $this->option('coding_token');
-        } else {
-            $this->codingToken = config('coding.token') ?? $this->ask('CODING Token：');
-        }
-    }
 }

app/Commands/WithCoding.php

@@ -0,0 +1,35 @@
+<?php
+
+namespace App\Commands;
+
+use App\Coding;
+
+trait WithCoding
+{
+    protected string $codingProjectUri;
+    protected string $codingTeamDomain;
+    protected string $codingToken;
+    protected Coding $coding;
+
+    private function setCodingApi(): void
+    {
+        if ($this->option('coding_team_domain')) {
+            $codingTeamDomain = $this->option('coding_team_domain');
+        } else {
+            $codingTeamDomain = config('coding.team_domain') ?? $this->ask('CODING 团队域名：');
+        }
+        $this->codingTeamDomain = str_replace('.coding.net', '', $codingTeamDomain);
+
+        if ($this->option('coding_project_uri')) {
+            $this->codingProjectUri = $this->option('coding_project_uri');
+        } else {
+            $this->codingProjectUri = config('coding.project_uri') ?? $this->ask('CODING 项目标识：');
+        }
+
+        if ($this->option('coding_token')) {
+            $this->codingToken = $this->option('coding_token');
+        } else {
+            $this->codingToken = config('coding.token') ?? $this->ask('CODING Token：');
+        }
+    }
+}

tests/Feature/WikiImportCommandTest.php

@@ -5,7 +5,6 @@
 use App\Coding;
 use Confluence\Content;
 use LaravelFans\Confluence\Facades\Confluence;
-use Mockery\Mock;
 use Mockery\MockInterface;
 use Tests\TestCase;
 use Tests\Unit\CodingTest;
@@ -155,16 +154,13 @@ public function testHandleConfluenceHtmlSuccess()
         $codingProjectUri = $this->faker->slug;
         config(['coding.project_uri' => $codingProjectUri]);
 
-        $codingPath = $this->dataDir . 'coding/';
         // 注意：不能使用 partialMock
         // https://laracasts.com/discuss/channels/testing/this-partialmock-doesnt-call-the-constructor
         $mock = \Mockery::mock(Coding::class, [])->makePartial();
         $this->instance(Coding::class, $mock);
 
-        $mock->shouldReceive('createUploadToken')->times(2)->andReturn(CodingTest::$uploadToken);
-        $mock->shouldReceive('upload')->times(2)->andReturn(true);
-        $mock->shouldReceive('createWikiByZip')->times(2)->andReturn(json_decode(
-            file_get_contents($codingPath . 'CreateWikiByZipResponse.json'),
+        $mock->shouldReceive('createWikiByUploadZip')->times(2)->andReturn(json_decode(
+            file_get_contents($this->dataDir . 'coding/' . 'CreateWikiByZipResponse.json'),
             true
         )['Response']);
 

tests/Unit/CodingTest.php

@@ -23,6 +23,17 @@ class CodingTest extends TestCase
         'Region' => 'ap-shanghai',
     ];
 
+    protected function setUp(): void
+    {
+        parent::setUp();
+        $codingToken = $this->faker->md5;
+        config(['coding.token' => $codingToken]);
+        $codingTeamDomain =  $this->faker->domainWord;
+        config(['coding.team_domain' => $codingTeamDomain]);
+        $codingProjectUri = $this->faker->slug;
+        config(['coding.project_uri' => $codingProjectUri]);
+    }
+
     public function testCreateWiki()
     {
         $responseBody = file_get_contents($this->dataDir . 'coding/createWikiResponse.json');
@@ -188,4 +199,21 @@ public function testCreateWikiByZip()
         $result = $coding->createWikiByZip($codingToken, $codingProjectUri, self::$uploadToken, $data);
         $this->assertArrayHasKey('JobId', $result);
     }
+
+    public function testCreateWikiByUploadZip()
+    {
+        $mock = \Mockery::mock(Coding::class, [])->makePartial();
+        $this->instance(Coding::class, $mock);
+
+        $mock->shouldReceive('createUploadToken')->times(1)->andReturn(CodingTest::$uploadToken);
+        $mock->shouldReceive('upload')->times(1)->andReturn(true);
+        $mock->shouldReceive('createWikiByZip')->times(1)->andReturn(json_decode(
+            file_get_contents($this->dataDir . 'coding/' . 'CreateWikiByZipResponse.json'),
+            true
+        )['Response']);
+
+        $filePath = $this->faker->filePath();
+        $result = $mock->createWikiByUploadZip('token', 'project', $filePath);
+        $this->assertArrayHasKey('JobId', $result);
+    }
 }