タグ検索改善

ryuring · Mar 27, 2024 · 95f7061 · 95f7061
1 parent 917515f
commit 95f7061
Showing 1 changed file with 6 additions and 13 deletions.
diff --git a/plugins/bc-blog/src/Service/BlogPostsService.php b/plugins/bc-blog/src/Service/BlogPostsService.php
@@ -320,7 +320,7 @@ protected function createIndexConditions(Query $query, array $params)
         }
         // タグ名
         if ($params['tag']) {
-            $conditions = $this->createTagCondition($conditions, $params['tag']);
+            $query = $this->createTagCondition($query, $params['tag']);
         }
         // 年月日
         if ($params['year'] || $params['month'] || $params['day']) {
@@ -421,23 +421,16 @@ public function createCategoryCondition(
      * @noTodo
      * @unitTest
      */
-    public function createTagCondition($conditions, $tag)
+    public function createTagCondition($query, $tag)
     {
         if (!is_array($tag)) $tag = [$tag];
         foreach($tag as $key => $value) {
             $tag[$key] = rawurldecode($value);
         }
-        $tags = $this->BlogPosts->BlogTags->find()
-            ->where(['BlogTags.name IN' => $tag])
-            ->contain(['BlogPosts'])
-            ->all()->toArray();
-        $postIds = Hash::extract($tags, '{n}.blog_posts.{n}.id');
-        if ($postIds) {
-            $conditions['BlogPosts.id IN'] = $postIds;
-        } else {
-            $conditions['BlogPosts.id IS'] = null;
-        }
-        return $conditions;
+        $query->matching('BlogTags', function($q) use ($tag) {
+            return $q->where(['BlogTags.name IN' => $tag]);
+        });
+        return $query;
     }
 
     /**