Merge branch 'dev-5.1' into unitTest_MailAdminAppView_initalize

baserproject · Apr 23, 2024 · ae5db96 · ae5db96
2 parents b3daa6f + d3db48f
commit ae5db96
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 3 deletions.
diff --git a/plugins/bc-blog/src/Model/Table/BlogPostsTable.php b/plugins/bc-blog/src/Model/Table/BlogPostsTable.php
@@ -234,6 +234,7 @@ public function beforeSave(EventInterface $event, EntityInterface $entity, Array
         if (!Plugin::isLoaded('BcSearchIndex') || !$this->searchIndexSaving) {
             return;
         }
+        $this->unsetExcluded();
         // 検索用テーブルに登録
         if ($entity->exclude_search
             || empty($entity->blog_content->content)

diff --git a/plugins/bc-blog/tests/Scenario/MultiSiteBlogPostScenario.php b/plugins/bc-blog/tests/Scenario/MultiSiteBlogPostScenario.php
@@ -116,12 +116,14 @@ protected function createBlogPosts()
     {
         BlogPostFactory::make([
             'id' => 1,
+            'user_id' => 1,
             'blog_content_id' => 6,
             'blog_category_id' => 6,
             'no' => 3,
             'name' => 'release',
             'title' => 'プレスリリース',
             'status' => 1,
+            'exclude_search' => 0,
             'posted' => '2015-01-27 12:57:59',
         ])->persist();
         BlogPostFactory::make([
@@ -131,6 +133,7 @@ protected function createBlogPosts()
             'name' => 'smartphone_release',
             'title' => 'スマホサイトリリース',
             'status' => 1,
+            'exclude_search' => 0,
             'posted' => '2016-02-10 12:57:59',
         ])->persist();
         BlogPostFactory::make([
@@ -140,6 +143,7 @@ protected function createBlogPosts()
             'name' => 'english_release',
             'title' => '英語サイトリリース',
             'status' => 1,
+            'exclude_search' => 0,
         ])->persist();
         BlogPostFactory::make([
             'id' => 4,
@@ -148,6 +152,7 @@ protected function createBlogPosts()
             'name' => 'another_domain_release',
             'title' => '別サイトリリース',
             'status' => 1,
+            'exclude_search' => 0,
         ])->persist();
         BlogPostFactory::make([
             'id' => 5,
@@ -156,6 +161,7 @@ protected function createBlogPosts()
             'name' => 'sub_domain_release',
             'title' => '別サイトリリース',
             'status' => 1,
+            'exclude_search' => 0,
         ])->persist();
         BlogPostFactory::make([
             'id' => 6,
@@ -164,6 +170,7 @@ protected function createBlogPosts()
             'name' => 'release',
             'title' => 'プレスリリース',
             'status' => 1,
+            'exclude_search' => 0,
         ])->persist();
         return null;
     }

diff --git a/plugins/bc-blog/tests/TestCase/Model/BlogPostsTableTest.php b/plugins/bc-blog/tests/TestCase/Model/BlogPostsTableTest.php
@@ -22,10 +22,8 @@
 use BcBlog\Test\Factory\BlogCategoryFactory;
 use BcBlog\Test\Factory\BlogContentFactory;
 use BcBlog\Test\Factory\BlogPostFactory;
-use BcBlog\Test\Scenario\BlogPostsScenario;
 use BcBlog\Test\Scenario\MultiSiteBlogPostScenario;
 use Cake\Event\Event;
-use Cake\I18n\FrozenTime;
 use CakephpFixtureFactories\Scenario\ScenarioAwareTrait;
 use ArrayObject;
 /**
@@ -770,6 +768,7 @@ public function test_beforeSave()
         $this->loadFixtureScenario(MultiSiteBlogPostScenario::class);
 
         $blogPost = $BlogPostsService->get(1);
+        $blogPost->exclude_search = 1;
         $this->BlogPostsTable->beforeSave(new Event("beforeSave"), $blogPost, new ArrayObject());
         $this->assertTrue($this->BlogPostsTable->isExcluded());
 

diff --git a/plugins/bc-blog/tests/TestCase/Service/Front/BlogFrontServiceTest.php b/plugins/bc-blog/tests/TestCase/Service/Front/BlogFrontServiceTest.php
@@ -702,7 +702,7 @@ public function test_getViewVarsForBlogAuthorArchivesWidget()
         // データを生成
         $this->loadFixtureScenario(MultiSiteBlogPostScenario::class);
         UserFactory::make([
-            'id' => BlogPostFactory::get(1)->user_id,
+            'id' => 1,
             'name' => 'name_test',
             'real_name_1' => 'real_name_1_test',
             'real_name_2' => 'real_name_2_test',