fix #2403 アップロードファイルのAPIについてフルパスを取得する仕組み

baserproject · Sep 28, 2023 · 9047087 · 9047087
1 parent 4bc5658
commit 9047087
Show file tree

Hide file tree

Showing 4 changed files with 96 additions and 5 deletions.
diff --git a/plugins/baser-core/src/Utility/BcFileUploader.php b/plugins/baser-core/src/Utility/BcFileUploader.php
@@ -909,12 +909,12 @@ public function getUniqueFileName(array $setting, array $file, EntityInterface $
      * 保存先のフォルダを設定し、取得する
      * @param bool $isTheme
      * @param bool $limited
-     * @return string
+     * @return string|bool
      * @checked
      * @noTodo
      * @unitTest
      */
-    public function getSaveDir(bool $isTheme = false, bool $limited = false): string
+    public function getSaveDir(bool $isTheme = false, bool $limited = false): bool|string
     {
         if (!$isTheme) {
             $basePath = WWW_ROOT . 'files' . DS;

diff --git a/plugins/baser-core/src/Utility/BcUtil.php b/plugins/baser-core/src/Utility/BcUtil.php
@@ -1175,8 +1175,14 @@ public static function getCurrentTheme()
         $theme = Inflector::camelize(Inflector::underscore(Configure::read('BcApp.coreFrontTheme')));
         if (!BcUtil::isInstalled()) return $theme;
         $request = Router::getRequest();
-        /** @var Site $site */
-        $site = $request->getAttribute('currentSite');
+
+        if (is_null($request))
+            $site = null;
+        else{
+            /** @var Site $site */
+            $site = $request->getAttribute('currentSite');
+        }
+
         if ($site) {
             if($site->theme) {
                 return $site->theme;

diff --git a/plugins/bc-blog/src/Model/Entity/BlogPost.php b/plugins/bc-blog/src/Model/Entity/BlogPost.php
@@ -55,8 +55,18 @@ class BlogPost extends Entity
         'id' => false
     ];
 
-
+    /**
+     * アイキャッチのフルパス
+     */
     protected $_virtual = ['_eyecatch'];
+
+    /**
+     * アイキャッチのフルパスを取得
+     * @return string
+     * @checked
+     * @noTodo
+     * @unitTest
+     */
     protected function _get_eyecatch(){
         $BlogHelper = new BlogHelper(new View());
         return $BlogHelper->getEyeCatch($this, ['output' => 'url']);

diff --git a/plugins/bc-blog/tests/TestCase/Model/Entity/BlogPostTest.php b/plugins/bc-blog/tests/TestCase/Model/Entity/BlogPostTest.php
@@ -0,0 +1,75 @@
+<?php
+/**
+ * baserCMS :  Based Website Development Project <https://basercms.net>
+ * Copyright (c) NPO baser foundation <https://baserfoundation.org/>
+ *
+ * @copyright     Copyright (c) NPO baser foundation
+ * @link          https://basercms.net baserCMS Project
+ * @since         5.0.0
+ * @license       https://basercms.net/license/index.html MIT License
+ */
+
+namespace BcBlog\Test\TestCase\Model\Entity;
+
+use BaserCore\Test\Factory\ContentFactory;
+use BaserCore\TestSuite\BcTestCase;
+use BcBlog\Model\Entity\BlogPost;
+use BcBlog\Test\Scenario\BlogContentScenario;
+use CakephpFixtureFactories\Scenario\ScenarioAwareTrait;
+
+/**
+ * Class BlogPostTest
+ */
+class BlogPostTest extends BcTestCase
+{
+    /**
+     * Trait
+     */
+    use ScenarioAwareTrait;
+
+    /**
+     * @var BlogPost
+     */
+    public $BlogPost;
+
+    /**
+     * Set Up
+     *
+     * @return void
+     */
+    public function setUp(): void
+    {
+        parent::setUp();
+        $this->BlogPost = $this->getTableLocator()->get('BlogPost.BlogPosts');
+    }
+
+    /**
+     * Tear Down
+     *
+     * @return void
+     */
+    public function tearDown(): void
+    {
+        unset($this->BlogPost);
+        parent::tearDown();
+    }
+
+    /**
+     * test _get_eyecatch
+     */
+    public function test_get_eyecatch()
+    {
+        $this->loadFixtureScenario(BlogContentScenario::class, 1, 1, null, 'test', '/test');
+        $blogPost = new BlogPost([
+            'id' => 1,
+            'blog_content_id' => 1,
+            'no' => 1,
+            'title' => 'blog post title',
+            'status' => true,
+            'eye_catch' => 'test.png'
+        ]);
+        $_eyecatch = $this->execPrivateMethod($blogPost, '_get_eyecatch', []);
+        $this->assertTextContains('/files/blog/1/blog_posts/test.png', $_eyecatch);
+    }
+
+}