Add rudimentary fuzzy/ngram search (#8)

HackTheDinos · Nov 22, 2015 · 632f17f · 632f17f
1 parent f76c510
commit 632f17f
Show file tree

Hide file tree

Showing 4 changed files with 87 additions and 16 deletions.
diff --git a/.env.example b/.env.example
@@ -19,4 +19,4 @@ MAIL_PASSWORD=null
 MAIL_ENCRYPTION=null
 
 ES_HOST=localhost
-ES_INDEX=dino
+ES_INDEX=dinos
diff --git a/app/Console/Commands/CreateIndexCommand.php b/app/Console/Commands/CreateIndexCommand.php
@@ -44,5 +44,6 @@ public function handle()
     {
         $this->info("Creating elasticsearch index");
         $this->search->createIndex();
+        $this->search->insertDocument(array());
     }
 }
diff --git a/app/Http/Controllers/Api/SearchController.php b/app/Http/Controllers/Api/SearchController.php
@@ -18,20 +18,43 @@ public function __construct(Search $search)
     {
         $this->search = $search;
     }
+
     /**
      * Display a listing of the resource.
      *
      * @return \Illuminate\Http\Response
      */
     public function getIndex(Request $request)
     {
+        $terms = [];
+
         foreach ($request->all() as $key => $value) {
-            if ('q' === $key) {
-                // Fuzzy search.
-            }
-            else {
-                // Faceted search
-            }
+                if ('q' === $key) {
+                        $terms['keyword'] = $value;
+                } else {
+                        // Faceted search
+                }
         }
+
+        $results = $this->search->search($terms);
+        return ApiResponseFactory::MakeEnvelope($this->parseResultsToResponse($results));
+    }
+
+    protected function parseResultsToResponse(array $results)
+    {
+        $data = [];
+
+        if (empty($results['hits'])) {
+            return [];
+        }
+
+        foreach ($results['hits']['hits'] as $result) {
+            $data[] = [
+                'id' => $result['_id'],
+                'source' => $result['_source']
+            ];
+        }
+
+        return $data;
     }
 }
diff --git a/app/Search/Search.php b/app/Search/Search.php
@@ -9,6 +9,7 @@ class Search
 {
     /** @var Client */
     private $client;
+    private $type = "dinos";
 
     public function __construct()
     {
@@ -23,24 +24,51 @@ public function __construct()
      */
     public function createIndex()
     {
-//        $this->client->indices()->delete(['index' => env('ES_INDEX')]);
+        // Try to delete the index if it already exists.
+        try {
+            $this->client->indices()->delete(['index' => env('ES_INDEX')]);
+        }
+        catch (\Exception $e) {
+
+        }
+
+        // Create the mapping
         $params = [
             'index' => env('ES_INDEX'),
             'body' => [
                 'settings' => [
                     'number_of_shards' => 1,
                     'number_of_replicas' => 0,
+                    'analysis' => [
+                        'filter' => [
+                            'autocomplete_filter' => [
+                                'type' => 'ngram',
+                                'min_gram' => 3,
+                                'max_gram' => 20,
+                            ],
+                        ],
+                        'analyzer' => [
+                            'autocomplete' => [
+                                'type' => 'custom',
+                                'tokenizer' => 'standard',
+                                'filter' => [
+                                    'lowercase',
+                                    'autocomplete_filter',
+                                ]
+                            ]
+                        ]
+                    ]
                 ],
                 'mappings' => [
-                    'dino' => [
+                    $this->type => [
                         'properties' => [
                             'speciesCommonName' => [
                                 'type' => 'string',
-                                'analyzer' => 'standard',
+                                'analyzer' => 'autocomplete',
                             ],
                             'speciesScientificName' => [
                                 'type' => 'string',
-                                'analyzer' => 'standard',
+                                'analyzer' => 'autocomplete',
                             ],
                             'scanId' => [
                                 'type' => 'string',
@@ -98,9 +126,8 @@ public function createIndex()
                 ]
             ]
         ];
-
-        $this->client->indices()->create($params);
 
+        $this->client->indices()->create($params);
     }
 
     /**
@@ -115,13 +142,26 @@ public function getSchema()
     }
 
     /**
-     * Faceted search
+     * @param array $terms
      *
-     * @param array $params
+     * @return array
      */
-    public function search(array $params)
+    public function search(array $terms)
     {
+        $params = [
+            'index' => env('ES_INDEX'),
+            'type' => $this->type,
+            'body' => [
+                'query' => [
+                    'multi_match' => [
+                        'query' => $terms['keyword'],
+                        'fields' => ["speciesCommonName", "speciesScientificName"]
+                    ]
+                ]
+            ]
+        ];
 
+        return $this->client->search($params);
     }
 
     /**
@@ -141,7 +181,14 @@ public function searchAutocomplete($text)
      */
     public function insertDocument(array $doc)
     {
+        $params = [
+            'index' => env('ES_INDEX'),
+            'type' => $this->type,
+            'body' => [ 'speciesCommonName' => 'Oviraptorid', 'speciesScientificName' => 'Citipati osmolskae']
+        ];
 
+        // Document will be indexed to my_index/my_type/<autogenerated ID>
+        $result = $this->client->index($params);
     }
 
     /**