feat: #23 confluence page tree

Author: shaunthegeek

app/Coding.php

@@ -145,15 +145,15 @@ public function getImportJobStatus(string $token, string $projectName, string $j
             ],
         ]);
         $result = json_decode($response->getBody(), true);
-        if (isset($result['Response']['Data']['Status'])) {
-            return $result['Response']['Data']['Status'];
+        if (isset($result['Response']['Data'])) {
+            return $result['Response']['Data'];
         } else {
             // TODO exception message
             return new \Exception('failed');
         }
     }
 
-    public function createWikiByUploadZip(string $token, string $projectName, string $zipFileFullPath)
+    public function createWikiByUploadZip(string $token, string $projectName, string $zipFileFullPath, int $parentId)
     {
         $zipFilename = basename($zipFileFullPath);
         $uploadToken = $this->createUploadToken(
@@ -163,7 +163,7 @@ public function createWikiByUploadZip(string $token, string $projectName, string
         );
         $this->upload($uploadToken, $zipFileFullPath);
         return $this->createWikiByZip($token, $projectName, $uploadToken, [
-            'ParentIid' => 0,
+            'ParentIid' => $parentId,
             'FileName' => $zipFilename,
         ]);
     }

app/Commands/WikiImportCommand.php

@@ -180,7 +180,7 @@ private function handleConfluenceHtml(): int
         return 0;
     }
 
-    private function uploadConfluencePages(string $dataPath, array $tree, array $titles): void
+    private function uploadConfluencePages(string $dataPath, array $tree, array $titles, int $parentId = 0): void
     {
         foreach ($tree as $page => $subPages) {
             $this->info('标题：' . $titles[$page]);
@@ -190,13 +190,35 @@ private function uploadConfluencePages(string $dataPath, array $tree, array $tit
             $result = $this->coding->createWikiByUploadZip(
                 $this->codingToken,
                 $this->codingProjectUri,
-                $zipFilePath
+                $zipFilePath,
+                $parentId,
             );
             $this->info('上传成功，正在处理，任务 ID：' . $result['JobId']);
-            // TODO 指定 parent
+            $wikiId = null;
+            $waiting_times = 0;
+            while (true) {
+                $jobStatus = $this->coding->getImportJobStatus(
+                    $this->codingToken,
+                    $this->codingProjectUri,
+                    $result['JobId']
+                );
+                if (in_array($jobStatus['Status'], ['wait_process', 'processing']) && $waiting_times < 10) {
+                    $waiting_times++;
+                    sleep(1);
+                    continue;
+                }
+                if ($jobStatus['Status'] == 'success') {
+                    $wikiId = intval($jobStatus['Iids'][0]);
+                }
+                break;
+            }
+            if (empty($wikiId)) {
+                $this->warn('导入失败，跳过');
+                continue;
+            }
             if (!empty($subPages)) {
                 $this->info('发现 ' . count($subPages) . ' 个子页面');
-                $this->uploadConfluencePages($dataPath, $subPages, $titles);
+                $this->uploadConfluencePages($dataPath, $subPages, $titles, $parentId);
             }
         }
     }

app/Commands/WikiUploadCommand.php

@@ -16,6 +16,7 @@ class WikiUploadCommand extends Command
      */
     protected $signature = 'wiki:upload
         {file : Zip 文件需包含 1 个 Markdown 文件及全部引用图片，Markdown 文件名将作为文档标题，图片使用相对路径}
+        {--parent_id=0 : 父页面 ID}
         {--coding_token= : CODING 令牌}
         {--coding_team_domain= : CODING 团队域名，如 xxx.coding.net 即填写 xxx}
         {--coding_project_uri= : CODING 项目标识，如 xxx.coding.net/p/yyy 即填写 yyy}
@@ -42,7 +43,13 @@ public function handle(Coding $coding): int
             $this->error("文件不存在：$filePath");
             return 1;
         }
-        $result = $this->coding->createWikiByUploadZip($this->codingToken, $this->codingProjectUri, $filePath);
+        $parentId = intval($this->option('parent_id'));
+        $result = $this->coding->createWikiByUploadZip(
+            $this->codingToken,
+            $this->codingProjectUri,
+            $filePath,
+            $parentId
+        );
         $this->info('上传成功，正在处理，任务 ID：' . $result['JobId']);
 
         return 0;

tests/Feature/WikiImportCommandTest.php

@@ -162,6 +162,10 @@ public function testHandleConfluenceHtmlSuccess()
             file_get_contents($this->dataDir . 'coding/' . 'CreateWikiByZipResponse.json'),
             true
         )['Response']);
+        $mock->shouldReceive('getImportJobStatus')->times(4)->andReturn(json_decode(
+            file_get_contents($this->dataDir . 'coding/' . 'DescribeImportJobStatusResponse.json'),
+            true
+        )['Response']['Data']);
 
         $this->artisan('wiki:import')
             ->expectsQuestion('数据来源？', 'Confluence')

tests/Unit/CodingTest.php

@@ -148,7 +148,8 @@ public function testGetImportJobStatus()
             ->willReturn(new Response(200, [], $responseBody));
         $coding = new Coding($clientMock);
         $result = $coding->getImportJobStatus($codingToken, $codingProjectUri, $jobId);
-        $this->assertEquals('success', $result);
+        $this->assertEquals('success', $result['Status']);
+        $this->assertEquals([27], $result['Iids']);
     }
 
     public function testCreateWikiByZip()
@@ -158,7 +159,7 @@ public function testCreateWikiByZip()
         $codingProjectUri = $this->faker->slug;
 
         $data = [
-            'ParentIid' => 0,
+            'ParentIid' => $this->faker->randomNumber(),
             'FileName' => $this->faker->word,
         ];
         $clientMock = $this->getMockBuilder(Client::class)->getMock();
@@ -203,7 +204,7 @@ public function testCreateWikiByUploadZip()
         )['Response']);
 
         $filePath = $this->faker->filePath();
-        $result = $mock->createWikiByUploadZip('token', 'project', $filePath);
+        $result = $mock->createWikiByUploadZip('token', 'project', $filePath, $this->faker->randomNumber());
         $this->assertArrayHasKey('JobId', $result);
     }
 }

tests/data/coding/DescribeImportJobStatusResponse.json

@@ -2,7 +2,8 @@
   "Response" : {
     "Data": {
       "JobId": "123456ad-f123-4ac2-9586-42ebe5d1234d",
-      "Status": "success"
+      "Status": "success",
+      "Iids": [27]
     },
     "RequestId": "78d6ecf8-9123-574f-8da9-23bb44c467f1"
   }