custom search interface SearcherInterface.php

black-lamp · May 10, 2017 · 3ccbe76 · 3ccbe76
1 parent 8a43999
commit 3ccbe76
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 7 deletions.
diff --git a/src/SearchComponent.php b/src/SearchComponent.php
@@ -15,6 +15,7 @@
 
 use bl\search\data\SearchResult;
 use bl\search\interfaces\SearchInterface;
+use bl\search\interfaces\SearcherInterface;
 
 /**
  * Component for search on site in Active Record models
@@ -65,10 +66,13 @@ class SearchComponent extends Component
      */
     public function search($query) {
         foreach($this->models as $model) {
-            /** @var ActiveRecordInterface|SearchInterface $ar */
+            /** @var ActiveRecordInterface|SearchInterface|SearcherInterface $ar */
             $ar = Yii::createObject($model['class']);
 
-            if($ar instanceof SearchInterface && $ar instanceof ActiveRecordInterface) {
+            if($ar instanceof SearcherInterface && $ar instanceof ActiveRecordInterface) {
+                $activeQuery = $ar->search($query);
+            }
+            else if($ar instanceof SearchInterface && $ar instanceof ActiveRecordInterface) {
                 $searchFields = $ar->getSearchFields();
                 $activeQuery = $ar::find();
 
@@ -82,16 +86,17 @@ public function search($query) {
                     }
                 }
 
-                $modelObjects = $activeQuery->all();
-                if($modelObjects != null) {
-                    $this->_currentModel = $ar;
-                    $this->addToResult($modelObjects);
-                }
             }
             else {
                 $message = sprintf("%s should be instance of `%s` and `%s`", $ar, SearchInterface::class, ActiveRecordInterface::class);
                 throw new InvalidConfigException($message);
             }
+
+            $modelObjects = $activeQuery->all();
+            if($modelObjects != null) {
+                $this->_currentModel = $ar;
+                $this->addToResult($modelObjects);
+            }
         }
 
         return $this->_result;

diff --git a/src/interfaces/SearcherInterface.php b/src/interfaces/SearcherInterface.php
@@ -0,0 +1,17 @@
+<?php
+namespace bl\search\interfaces;
+use yii\db\ActiveQueryInterface;
+
+/**
+ * Interface for searching
+ *
+ * @author Gutsulyak Vadim <guts.vadim@gmail.com>
+ */
+interface SearcherInterface extends SearchInterface
+{
+    /**
+     * @param string $query  keyword for search
+     * @return ActiveQueryInterface
+     */
+    public function search($query);
+}