fix #1803 テーマフォルダAPI フォルダ削除 (#1816)

Author: HungDV2022

plugins/bc-theme-file/src/Controller/Api/ThemeFilesController.php

@@ -108,6 +108,7 @@ public function delete(ThemeFilesServiceInterface $service)
         try {
             $data = $this->getRequest()->getData();
             $data['fullpath'] = $service->getFullpath($data['theme'], $data['type'], $data['path']);
+            $themeFile = $service->get($data['fullpath']);
             if ($service->delete($data['fullpath'])) {
                 $message = __d('baser', 'ファイル「{0}」を削除しました。', $data['path']);
             } else {
@@ -123,11 +124,11 @@ public function delete(ThemeFilesServiceInterface $service)
         }
 
         $this->set([
+            'themeFile' => $themeFile ?? null,
             'message' => $message,
-            'entity' => $entity ?? null,
             'errors' => $errors ?? null
         ]);
-        $this->viewBuilder()->setOption('serialize', ['message', 'entity', 'errors']);
+        $this->viewBuilder()->setOption('serialize', ['themeFile', 'message', 'errors']);
     }
 
     /**

plugins/bc-theme-file/src/Controller/Api/ThemeFoldersController.php

@@ -186,10 +186,38 @@ public function edit(ThemeFoldersServiceInterface $service)
      *
      * @param ThemeFoldersServiceInterface $service
      * @return void
+     *
+     * @checked
+     * @noTodo
+     * @unitTest
      */
     public function delete(ThemeFoldersServiceInterface $service)
     {
-        //todo テーマフォルダAPI テーマフォルダ削除
+        $this->request->allowMethod(['post', 'put']);
+        try {
+            $data = $this->getRequest()->getData();
+            $data['fullpath'] = $service->getFullpath($data['theme'], $data['type'], $data['path']);
+            $themeFolder = $service->get($data['fullpath']);
+            if ($service->delete($data['fullpath'])) {
+                $message = __d('baser', 'フォルダ「{0}」を削除しました。', $data['path']);
+            } else {
+                $message = __d('baser', 'フォルダ「{0}」の削除に失敗しました。', $data['path']);
+            }
+        } catch (BcFormFailedException $e) {
+            $this->setResponse($this->response->withStatus(400));
+            $errors = $e->getForm()->getErrors();
+            $message = __d('baser', '入力エラーです。内容を修正してください。' . $e->getMessage());
+        } catch (\Throwable $e) {
+            $this->setResponse($this->response->withStatus(400));
+            $message = __d('baser', '処理中にエラーが発生しました。');
+        }
+
+        $this->set([
+            'themeFolder' => $themeFolder ?? null,
+            'message' => $message,
+            'errors' => $errors ?? null
+        ]);
+        $this->viewBuilder()->setOption('serialize', ['themeFolder', 'message', 'errors']);
     }
 
     /**

plugins/bc-theme-file/tests/TestCase/Controller/Api/ThemeFoldersControllerTest.php

@@ -150,7 +150,33 @@ public function test_edit()
      */
     public function test_delete()
     {
-        $this->markTestIncomplete('このテストは未実装です。');
+        //テストテーマフォルダを作成
+        $fullpath = BASER_PLUGINS . 'BcThemeSample' . '/templates/layout/';
+        mkdir($fullpath . 'delete_folder');
+        //Postデータを生成
+        $data = [
+            'theme' => 'BcThemeSample',
+            'type' => 'layout',
+            'path' => 'delete_folder',
+        ];
+        //APIをコール
+        $this->post('/baser/api/bc-theme-file/theme_folders/delete.json?token=' . $this->accessToken, $data);
+        //レスポンスコードを確認
+        $this->assertResponseSuccess();
+        //戻る値を確認
+        $result = json_decode((string)$this->_response->getBody());
+        $this->assertEquals('フォルダ「delete_folder」を削除しました。', $result->message);
+        $this->assertNotNull($result->themeFolder);
+        //実際にフォルダが削除されいてるか確認すること
+        $this->assertFalse(file_exists($fullpath . 'delete_folder'));
+
+        //もう一度APIをコールする場合、エラーを出る
+        $this->post('/baser/api/bc-theme-file/theme_folders/delete.json?token=' . $this->accessToken, $data);
+        //レスポンスコードを確認
+        $this->assertResponseSuccess();
+        //戻る値を確認
+        $result = json_decode((string)$this->_response->getBody());
+        $this->assertEquals('フォルダ「delete_folder」の削除に失敗しました。', $result->message);
     }
 
     /**