Merge branch '5.1.x' into 5.2.x

Author: ryuring

.gitignore

@@ -118,6 +118,8 @@ node_modules
 /webroot/bc_custom_content
 /webroot/bc_spa_sample
 /webroot/debug_kit
+/webroot/.gitignore
+
 # key
 /config/*.key
 /config/*.pem

config/.env.example

@@ -38,6 +38,7 @@ export TRUST_PROXY="false"
 # export HASH_TYPE="sha1"
 # export SECURITY_SALT=""
 
+
 # Uncomment these to define cache configuration via environment variables.
 #export CACHE_DURATION="+2 minutes"
 #export CACHE_DEFAULT_URL="file://tmp/cache/?prefix=${APP_NAME}_default&duration=${CACHE_DURATION}"

plugins/baser-core/src/Controller/ContentFoldersController.php

@@ -16,6 +16,8 @@
 use BaserCore\Annotation\Checked;
 use BaserCore\Annotation\UnitTest;
 use BaserCore\Service\Front\ContentFoldersFrontServiceInterface;
+use BaserCore\Service\SiteConfigsService;
+use BaserCore\Service\SiteConfigsServiceInterface;
 
 /**
  * Class ContentFoldersController
@@ -48,6 +50,12 @@ public function initialize(): void
      */
     public function view(ContentFoldersFrontServiceInterface $service)
     {
+        // コンテンツフォルダのindex機能を使用しないときは403にする
+        $siteConfigsService = $this->getService(SiteConfigsServiceInterface::class);
+        $siteConfig = $siteConfigsService->get();
+        if (!empty($siteConfig->use_contents_folder_forbidden)) {
+            throw new \Cake\Http\Exception\ForbiddenException(__d('baser_core', 'indexページが見つかりませんでした。'));
+        }
         $contentFolder = $service->get(
             $this->getRequest()->getAttribute('currentContent')->entity_id,
             ['status' => 'publish']

plugins/bc-admin-third/templates/Admin/SiteConfigs/index.php

@@ -421,6 +421,25 @@ class="bca-collapse__btn"
         </td>
       </tr>
 
+      <tr>
+        <th class="col-head bca-form-table__label">
+          <?php echo $this->BcAdminForm->label('use_contents_folder_forbidden', __d('baser_core', 'コンテンツフォルダ')) ?>
+        </th>
+        <td class="col-input bca-form-table__input">
+          <?php
+            echo $this->BcAdminForm->control('use_contents_folder_forbidden', [
+              'type' => 'checkbox',
+              'label' => __d('baser_core', 'コンテンツフォルダの一覧機能を利用しない')
+            ]);
+          ?>
+          <i class="bca-icon--question-circle bca-help"></i>
+          <div class="bca-helptext">
+            <?php echo __d('baser_core', 'indexページの無いコンテツフォルダにアクセスした際に、<br>一覧機能を使わずに403を返します。') ?>
+          </div>
+          <?php echo $this->BcAdminForm->error('use_contents_folder_forbidden') ?>
+        </td>
+      </tr>
+
       <?php echo $this->BcAdminForm->dispatchAfterForm('Site') ?>
 
     </table>

plugins/bc-custom-content/src/Model/Table/CustomContentsTable.php

@@ -119,4 +119,31 @@ public function createSearchIndex($entity)
         ];
     }
 
+    /**
+     * 関連するエントリーの検索インデックスを作成する
+     *
+     * @param EntityInterface $entity
+     * @return void
+     */
+    public function createRelatedSearchIndexes(EntityInterface $entity)
+    {
+        if (!$entity || !isset($entity->custom_table_id)) {
+            return;
+        }
+        $customEntriyTable = $this->CustomTables->getTableLocator()->get('BcCustomContent.CustomEntries');
+        $customEntriyTable->setUp($entity->custom_table_id);
+
+        $entries = $customEntriyTable->find()
+            ->all();
+        if (!$entries->count()) {
+            return;
+        }
+
+        foreach ($entries as $entry) {
+            // 入れ子になっているとエラーになるため、一旦配列に変換してから再度patchEntityする
+            $entry = $entry->toArray();
+            $entity = $customEntriyTable->patchEntity($customEntriyTable->newEmptyEntity(), $entry);
+            $customEntriyTable->save($entity);
+        }
+    }
 }

plugins/bc-custom-content/src/Model/Table/CustomEntriesTable.php

@@ -96,6 +96,44 @@ public function createSearchIndex(CustomEntry $entry)
         /** @var Content $content */
         if (!$customContent) return false;
         $content = $customContent->content;
+
+        $status = $entry->status;
+        $publishBegin = $entry->publish_begin;
+        $publishEnd = $entry->publish_end;
+        // コンテンツのステータスを優先する
+        if (!$content->status) {
+            $status = false;
+        }
+
+        if ($publishBegin) {
+            if ((!empty($content->publish_begin) && $content->publish_begin > $publishBegin)) {
+                // コンテンツの公開開始の方が遅い場合
+                $publishBegin = $content->publish_begin;
+            } elseif (!empty($content->publish_end) && $content->publish_end < $publishBegin) {
+                // 記事の公開開始より、コンテンツの公開終了が早い場合
+                $publishBegin = $content->publish_end;
+            }
+        } else {
+            if (!empty($content->publish_begin)) {
+                // 記事の公開開始が定められていない
+                $publishBegin = $content->publish_begin;
+            }
+        }
+        if ($publishEnd) {
+            if (!empty($content->publish_end) && $content->publish_end < $publishEnd) {
+                // コンテンツの公開終了の方が早い場合
+                $publishEnd = $content->publish_end;
+            } elseif (!empty($content->publish_begin) && $content->publish_begin < $publishEnd) {
+                // 記事の公開終了より、コンテンツの公開開始が早い場合
+                $publishEnd = $content->publish_begin;
+            }
+        } else {
+            if (!empty($content->publish_end)) {
+                // 記事の公開終了が定められていない
+                $publishEnd = $content->publish_end;
+            }
+        }
+
         return [
             'type' => __d('baser_core', 'カスタムコンテンツ'),
             'model_id' => $entry->id,
@@ -104,9 +142,9 @@ public function createSearchIndex(CustomEntry $entry)
             'title' => $entry->title,
             'detail' => $this->createSearchDetail($entry),
             'url' => $content->url . 'view/' . ($entry->name?: $entry->id),
-            'status' => $content->status,
-            'publish_begin' => $content->publish_begin,
-            'publish_end' => $content->publish_end
+            'status' => $status,
+            'publish_begin' => $publishBegin,
+            'publish_end' => $publishEnd
         ];
     }
 

plugins/bc-custom-content/tests/TestCase/Model/Table/CustomContentsTableTest.php

@@ -12,14 +12,18 @@
 namespace BcCustomContent\Test\TestCase\Model\Table;
 
 use ArrayObject;
+use BaserCore\Service\BcDatabaseServiceInterface;
 use BaserCore\Service\PluginsServiceInterface;
 use BaserCore\TestSuite\BcTestCase;
+use BaserCore\Utility\BcContainerTrait;
 use BcCustomContent\Model\Table\CustomContentsTable;
 use BcCustomContent\Service\CustomContentsService;
 use BcCustomContent\Test\Factory\CustomContentFactory;
 use BcCustomContent\Test\Scenario\CustomContentsScenario;
 use CakephpFixtureFactories\Scenario\ScenarioAwareTrait;
 use BcCustomContent\Service\CustomContentsServiceInterface;
+use BcCustomContent\Service\CustomEntriesServiceInterface;
+use BcCustomContent\Test\Scenario\CustomTablesScenario;
 use Cake\Event\Event;
 
 /**
@@ -33,6 +37,7 @@ class CustomContentsTableTest extends BcTestCase
      * ScenarioAwareTrait
      */
     use ScenarioAwareTrait;
+    use BcContainerTrait;
 
     /**
      * Set up
@@ -131,6 +136,43 @@ public function test_createSearchIndex()
         $this->assertEquals($rs['publish_end'], '2021-12-31 23:59:59');
     }
 
+    /**
+     * test createRelatedSearchIndexes
+     */
+    public function test_createRelatedSearchIndexes()
+    {
+        $this->loadFixtureScenario(CustomContentsScenario::class);
+        $this->loadFixtureScenario(CustomTablesScenario::class);
+        $customEntriesService = $this->getService(CustomEntriesServiceInterface::class);
+        $dataBaseService = $this->getService(BcDatabaseServiceInterface::class);
+        $customEntriesService->setUp(2);
+
+        $customEntriesService->create([
+            'custom_table_id' => 2,
+            'name' => 'テスト職種1',
+            'title' => 'テスト職種1',
+            'status' => 1,
+            'creator_id' => 1
+        ]);
+        $customEntriesService->create([
+            'custom_table_id' => 2,
+            'name' => 'テスト職種2',
+            'title' => 'テスト職種2',
+            'status' => 1,
+            'creator_id' => 1
+        ]);
+
+        $customContentService = new CustomContentsService();
+        $customContent = $customContentService->get(2);
+
+        $this->CustomContentsTable->createRelatedSearchIndexes($customContent);
+
+        $searchIndexesTable = $this->getTableLocator()->get('BcSearchIndex.SearchIndexes');
+        $this->assertEquals(2, $searchIndexesTable->find()->count());
+
+        $dataBaseService->dropTable('custom_entry_2_occupations');
+    }
+
     /**
      * test beforeSave
      */