fix #1776 テーマファイルAPI 画像を表示 (#1787)

Author: HungDV2022

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

@@ -532,7 +532,11 @@ public function img(ThemeFilesAdminServiceInterface $service)
     {
         $this->disableAutoRender();
         $args = $this->parseArgs(func_get_args());
-        return $this->getResponse()->withStringBody($service->getImg($args));
+
+        $imgDetail = $service->getImg($args);
+        header("Content-Length: " . $imgDetail['size']);
+        header("Content-type: image/" . $imgDetail['type']);
+        return $this->getResponse()->withStringBody($imgDetail['img']);
     }
 
     /**

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

@@ -16,10 +16,12 @@
 use BaserCore\Annotation\UnitTest;
 use BaserCore\Controller\Api\BcApiController;
 use BaserCore\Error\BcFormFailedException;
+use BaserCore\View\Helper\BcBaserHelper;
 use BcThemeFile\Service\ThemeFilesServiceInterface;
 
 /**
  * テーマファイルコントローラー
+ * @property BcBaserHelper $BcBaser
  */
 class ThemeFilesController extends BcApiController
 {
@@ -212,10 +214,33 @@ public function view(ThemeFilesServiceInterface $service)
      * [API] テーマファイル 画像を表示
      *
      * @param ThemeFilesServiceInterface $service
+     * @checked
+     * @noTodo
+     * @unitTest
      */
     public function img(ThemeFilesServiceInterface $service)
     {
-        //todo テーマファイルAPI 画像を表示 #1776
+        $this->request->allowMethod(['get']);
+
+        try {
+            $data = $this->getRequest()->getQueryParams();
+            $data['fullpath'] = $service->getFullpath($data['theme'], $data['type'], $data['path']);
+            $imgDetail = $service->getImg($data);
+        } 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([
+            'img' => base64_encode($imgDetail['img']) ?? null,
+            'message' => $message ?? null,
+            'errors' => $errors ?? null
+        ]);
+        $this->viewBuilder()->setOption('serialize', ['img', 'message', 'errors']);
     }
 
     /**

plugins/bc-theme-file/src/Service/Admin/ThemeFilesAdminService.php

@@ -148,31 +148,6 @@ public function getViewVarsForView(ThemeFile $themeFile, ThemeFileForm $themeFil
         ];
     }
 
-    /**
-     * テーマ内のイメージデータを取得する
-     *
-     * @param $args
-     * @return false|string
-     */
-    public function getImg($args)
-    {
-        $contents = ['jpg' => 'jpeg', 'gif' => 'gif', 'png' => 'png'];
-        $pathinfo = pathinfo($args['fullpath']);
-
-        if (!BcThemeFileUtil::getTemplateTypeName($args['type']) || !isset($contents[$pathinfo['extension']]) || !file_exists($args['fullpath'])) {
-            throw new NotFoundException();
-        }
-
-        $file = new File($args['fullpath']);
-        if (!$file->open('r')) {
-            throw new NotFoundException();
-        }
-
-        header("Content-Length: " . $file->size());
-        header("Content-type: image/" . $contents[$pathinfo['extension']]);
-        return $file->read();
-    }
-
     /**
      * テーマ内の画像のサムネイルイメージのデータを取得する
      *

plugins/bc-theme-file/src/Service/ThemeFilesService.php

@@ -19,8 +19,11 @@
 use BaserCore\Utility\BcUtil;
 use BcThemeFile\Form\ThemeFileForm;
 use BcThemeFile\Model\Entity\ThemeFile;
+use BcThemeFile\Utility\BcThemeFileUtil;
 use Cake\Core\Plugin;
+use Cake\Filesystem\File;
 use Cake\Filesystem\Folder;
+use Cake\Http\Exception\NotFoundException;
 
 /**
  * ThemeFilesService
@@ -228,4 +231,36 @@ public function copyToTheme(array $params)
             return false;
         }
     }
+
+    /**
+     * テーマ内のイメージデータを取得する
+     *
+     * @param $args
+     * @return array
+     *
+     * @checked
+     * @noTodo
+     * @unitTest
+     */
+    public function getImg($args)
+    {
+        $contents = ['jpg' => 'jpeg', 'gif' => 'gif', 'png' => 'png'];
+        $pathinfo = pathinfo($args['fullpath']);
+
+        if (!BcThemeFileUtil::getTemplateTypeName($args['type']) || !isset($contents[$pathinfo['extension']]) || !file_exists($args['fullpath'])) {
+            throw new NotFoundException();
+        }
+
+        $file = new File($args['fullpath']);
+        if (!$file->open('r')) {
+            throw new NotFoundException();
+        }
+
+        return [
+            'img' => $file->read(),
+            'size' => $file->size(),
+            'type' => $contents[$pathinfo['extension']]
+        ];
+    }
+
 }

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

@@ -247,7 +247,21 @@ public function test_view()
      */
     public function test_img()
     {
-        $this->markTestIncomplete('このテストは未実装です。');
+        //POSTデータを生成
+        $data = [
+            'theme' => 'BcFront',
+            'type' => 'img',
+            'path' => 'logo.png',
+            'token' => $this->accessToken
+        ];
+        $query = http_build_query($data);
+        //APIをコール
+        $this->get('/baser/api/bc-theme-file/theme_files/img.json?' . $query);
+        //レスポンスコードを確認
+        $this->assertResponseSuccess();
+        //戻る値を確認
+        $result = json_decode((string)$this->_response->getBody());
+        $this->assertNotNull(base64_decode($result->img));
     }
 
     /**

plugins/bc-theme-file/tests/TestCase/Service/ThemeFilesServiceTest.php

@@ -12,19 +12,24 @@
 namespace BcThemeFile\Test\TestCase\Service;
 
 use BaserCore\TestSuite\BcTestCase;
+use BcThemeFile\Service\ThemeFilesService;
 
 /**
  * ThemeFilesServiceTest
  */
 class ThemeFilesServiceTest extends BcTestCase
 {
 
+    public $ThemeFileService = null;
+
     /**
      * set up
      */
     public function setUp(): void
     {
+        $this->setFixtureTruncate();
         parent::setUp();
+        $this->ThemeFileService = new ThemeFilesService();
     }
 
     /**
@@ -35,4 +40,19 @@ public function tearDown(): void
         parent::tearDown();
     }
 
+    /**
+     * test getImg
+     */
+    public function test_getImg()
+    {
+        $data = [
+            'theme' => 'BcFront',
+            'type' => 'img',
+            'path' => 'logo.png',
+            'fullpath' => '/var/www/html/plugins/bc-front/webroot/img/logo.png'
+        ];
+
+        $img = $this->ThemeFileService->getImg($data);
+        $this->assertNotNull($img);
+    }
 }