Allow searching by translated slugs

croogo · Nov 5, 2020 · ec2053a · ec2053a
1 parent 1a94b8e
commit ec2053a
Show file tree

Hide file tree

Showing 6 changed files with 54 additions and 27 deletions.
diff --git a/Core/src/Croogo.php b/Core/src/Croogo.php
@@ -10,6 +10,7 @@
 use Cake\Http\ServerRequest;
 use Cake\Utility\Hash;
 use Cake\Utility\Inflector;
+use Croogo\Core\Routing\Router;
 
 /**
  * Croogo

diff --git a/Core/src/Model/Behavior/SluggableBehavior.php b/Core/src/Model/Behavior/SluggableBehavior.php
@@ -0,0 +1,34 @@
+<?php
+declare(strict_types=1);
+
+namespace Croogo\Core\Model\Behavior;
+
+use Cake\ORM\Behavior;
+use Cake\ORM\Query;
+
+class SluggableBehavior extends Behavior
+{
+
+    protected $_defaultConfig = [
+        'slugField' => 'slug',
+    ];
+
+    public function findBySlug(Query $query, array $options = [])
+    {
+        $slugField = $this->_config['slugField'];
+        if ($this->_table->behaviors()->has('Translate')) {
+            $query->where([
+                'OR' => [
+                    $this->_table->aliasField('slug') . ' LIKE'=> '%' . $options['search']['slug'] . '%',
+                    $this->_table->translationField($slugField) . ' LIKE'=> '%' . $options['search']['slug'] . '%',
+                ],
+            ]);
+        } else {
+            $query->where([
+                $this->_table->aliasField($slugField) . ' LIKE' => '%' . $options['search']['slug'] . '%',
+            ]);
+        }
+        return $query;
+    }
+
+}
diff --git a/Nodes/src/Model/Table/NodesTable.php b/Nodes/src/Model/Table/NodesTable.php
@@ -27,6 +27,7 @@ public function initialize(array $config): void
             ],
         ]);
         $this->addBehavior('Croogo/Core.Publishable');
+        $this->addBehavior('Croogo/Core.Sluggable');
         $this->addBehavior('Croogo/Core.Url', [
             'url' => [
                 'plugin' => 'Croogo/Nodes',
@@ -82,10 +83,8 @@ public function searchManager()
                 'before' => true,
                 'after' => true
             ])
-            ->add('slug', 'Search.Like', [
-                'fields' => $this->aliasField('slug'),
-                'before' => true,
-                'after' => true
+            ->add('slug', 'Search.Finder', [
+                'finder' => 'bySlug',
             ])
             ->add('type', 'Search.Like', [
                 'fields' => $this->aliasField('type'),

diff --git a/Taxonomy/src/Model/Behavior/TaxonomizableBehavior.php b/Taxonomy/src/Model/Behavior/TaxonomizableBehavior.php
@@ -4,6 +4,7 @@
 namespace Croogo\Taxonomy\Model\Behavior;
 
 use ArrayObject;
+use Cake\Core\Plugin;
 use Cake\Datasource\Exception\RecordNotFoundException;
 use Cake\Event\EventInterface;
 use Cake\I18n\I18n;
@@ -325,9 +326,10 @@ public function findWithTerm(Query $query, array $options)
             $locale = I18n::getLocale();
             $cacheKeys = ['term', $locale, $term];
             $cacheKey = implode('_', $cacheKeys);
-            $entity = $this->_table->Taxonomies->Terms->find()
-                ->where([
-                    'Terms.slug' => $term
+            $entity = $this->_table->Taxonomies->Terms->find('bySlug', [
+                    'options' => [
+                        'search' => $term,
+                    ],
                 ])
                 ->cache($cacheKey, 'nodes_term')
                 ->first();
@@ -365,9 +367,10 @@ public function findWithVocabulary(Query $query, array $options)
             $locale = I18n::getLocale();
             $cacheKeys = ['term', $locale, $vocab];
             $cacheKey = implode('_', $cacheKeys);
-            $entity = $this->_table->Taxonomies->Vocabularies->find()
-                ->where([
-                    'Vocabularies.alias' => $vocab
+            $entity = $this->_table->Taxonomies->Vocabularies->find('bySlug', [
+                    'options' => [
+                        'slug' => $vocab,
+                    ],
                 ])
                 ->cache($cacheKey, 'croogo_vocabularies')
                 ->first();

diff --git a/Taxonomy/src/Model/Table/TermsTable.php b/Taxonomy/src/Model/Table/TermsTable.php
@@ -35,6 +35,7 @@ public function initialize(array $config): void
         $this->addBehavior('Search.Search');
         $this->addBehavior('Timestamp');
         $this->addBehavior('Croogo/Core.Trackable');
+        $this->addBehavior('Croogo/Core.Sluggable');
 
         $this->belongsToMany('Croogo/Taxonomy.Vocabularies', [
             'through' => 'Croogo/Taxonomy.Taxonomies',
@@ -53,7 +54,9 @@ public function initialize(array $config): void
                     });
                 },
             ])
-            ->value('slug');
+            ->add('slug', 'Search.Finder', [
+                'finder' => 'bySlug',
+            ]);
     }
 
     protected function _initializeSchema(TableSchemaInterface $table): TableSchemaInterface
@@ -212,22 +215,6 @@ public function findByVocabulary(Query $query, array $options)
         return $query;
     }
 
-    public function findBySlug(Query $query, array $options)
-    {
-        $defaults = ['slug' => null];
-        $options += $defaults;
-
-        if ($this->hasBehavior('Translate')) {
-            $conditions['OR'] = [
-                $this->aliasField('slug') => $options['slug'],
-                $this->translationField('slug') => $options['slug'],
-            ];
-        } else {
-            $conditions[$this->aliasField('slug')] = $options['slug'];
-        }
-
-        return $query->where($conditions);
-    }
 
     /**
      * Save new/updated term data

diff --git a/Taxonomy/src/Model/Table/VocabulariesTable.php b/Taxonomy/src/Model/Table/VocabulariesTable.php
@@ -21,6 +21,9 @@ public function initialize(array $config): void
 
         $this->addBehavior('Timestamp');
         $this->addBehavior('Search.Search');
+        $this->addBehavior('Croogo/Core.Sluggable', [
+            'slugField' => 'alias',
+        ]);
         $this->addBehavior('Croogo/Core.Trackable');
         $this->addBehavior('Croogo/Core.Cached', [
             'groups' => ['taxonomy']