Cleanup code

ethanhann · Jun 2, 2019 · 5b50877 · 5b50877
1 parent 90de0e2
commit 5b50877
Show file tree

Hide file tree

Showing 4 changed files with 95 additions and 105 deletions.
diff --git a/phpunit.xml b/phpunit.xml
@@ -9,7 +9,6 @@
          processIsolation="false"
          stopOnError="false"
          stopOnFailure="false"
-         syntaxCheck="true"
          verbose="true"
 >
     <testsuites>

diff --git a/src/Scout/Console/ImportCommand.php b/src/Scout/Console/ImportCommand.php
@@ -3,11 +3,9 @@
 namespace Ehann\LaravelRediSearch\Scout\Console;
 
 use DB;
-use Ehann\RediSearch\Fields\FieldFactory;
 use Ehann\RediSearch\Index;
 use Ehann\RedisRaw\RedisRawClientInterface;
 use Illuminate\Console\Command;
-use Ehann\RediSearch\Fields\TextField;
 use Ehann\RediSearch\Fields\NumericField;
 use Ehann\RediSearch\Fields\GeoField;
 use Ehann\RediSearch\Fields\TagField;
@@ -36,33 +34,33 @@ public function handle(RedisRawClientInterface $redisClient)
 
         if ($this->option('no-id') || $query === '') {
             $query = '*';
-		}
-		
+        }
+
         $records = $class::select(DB::raw($query))
-			->get();
-
-		// Define Schema
-		foreach ($model->searchableSchema() as $name => $value) {
-		
-			if ($name !== $model->getKeyName()) {
-				$value = $value ?? '';
-
-				if ($value === NumericField::class) {
-					$index->addNumericField($name);
-					continue;
-				}
-				if ($value === GeoField::class) {
-					$index->addGeoField($name);
-					continue;
-				}
-				if ($value === TagField::class) {
-					$index->addTagField($name);
-					continue;
-				}
-
-				$index->addTextField($name);
-		   }
-		}
+            ->get();
+
+        // Define Schema
+        foreach ($model->searchableSchema() as $name => $value) {
+
+            if ($name !== $model->getKeyName()) {
+                $value = $value ?? '';
+
+                if ($value === NumericField::class) {
+                    $index->addNumericField($name);
+                    continue;
+                }
+                if ($value === GeoField::class) {
+                    $index->addGeoField($name);
+                    continue;
+                }
+                if ($value === TagField::class) {
+                    $index->addTagField($name);
+                    continue;
+                }
+
+                $index->addTextField($name);
+            }
+        }
 
         if ($records->isEmpty()) {
             $this->warn('There are no models to import.');
@@ -74,27 +72,27 @@ public function handle(RedisRawClientInterface $redisClient)
 
         if (!$index->create()) {
             $this->warn('The index already exists. Use --recreate-index to recreate the index before importing.');
-		}
-		
-		if (!$this->option('no-import-models')) {			
-			$records
-				->each(function ($item) use ($index, $model) {
-					$document = $index->makeDocument(
-						$item->getKey()
-					);
-					foreach ($item->toSearchableArray() as $name => $value) {
-						if ($name !== $model->getKeyName()) {
-							$value = $value ?? '';
-							$document->$name->setValue($value);
-						}
-					}
-					
-					$index->add($document);
-					
-				});
-			$this->info("[$class] models imported created successfully");
-		}else{
-			$this->info("$class index created successfully");
-		}
+        }
+
+        if (!$this->option('no-import-models')) {
+            $records
+                ->each(function ($item) use ($index, $model) {
+                    $document = $index->makeDocument(
+                        $item->getKey()
+                    );
+                    foreach ($item->toSearchableArray() as $name => $value) {
+                        if ($name !== $model->getKeyName()) {
+                            $value = $value ?? '';
+                            $document->$name->setValue($value);
+                        }
+                    }
+
+                    $index->add($document);
+
+                });
+            $this->info("[$class] models imported created successfully");
+        } else {
+            $this->info("$class index created successfully");
+        }
     }
 }
diff --git a/src/Scout/Engines/RediSearchEngine.php b/src/Scout/Engines/RediSearchEngine.php
@@ -7,8 +7,6 @@
 use Illuminate\Database\Eloquent\Collection;
 use Laravel\Scout\Builder;
 use Laravel\Scout\Engines\Engine;
-use Ehann\RediSearch\Fields\FieldFactory;
-use Ehann\RediSearch\Fields\TextField;
 use Ehann\RediSearch\Fields\NumericField;
 use Ehann\RediSearch\Fields\GeoField;
 use Ehann\RediSearch\Fields\TagField;
@@ -37,54 +35,49 @@ public function __construct(RedisRawClientInterface $redisRawClient)
      */
     public function update($models)
     {
-		$model = $models->first();
+        $model = $models->first();
         $index = new Index($this->redisRawClient, $model->first()->searchableAs());
 
-		//$models->each(function ($item) use ($index, $model) {
-            foreach ($model->searchableSchema() as $name => $value) {
-
-                if ($name !== $model->getKeyName()) {
-					$value = $value ?? '';
-
-					if ($value === NumericField::class) {
-						$index->addNumericField($name);
-						continue;
-					}
-					if ($value === GeoField::class) {
-						$index->addGeoField($name);
-						continue;
-					}
-					if ($value === TagField::class) {
-						$index->addTagField($name);
-						continue;
-					}
-
-					$index->addTextField($name);
-               }
+        foreach ($model->searchableSchema() as $name => $value) {
+
+            if ($name !== $model->getKeyName()) {
+                $value = $value ?? '';
+
+                if ($value === NumericField::class) {
+                    $index->addNumericField($name);
+                    continue;
+                }
+                if ($value === GeoField::class) {
+                    $index->addGeoField($name);
+                    continue;
+                }
+                if ($value === TagField::class) {
+                    $index->addTagField($name);
+                    continue;
+                }
+
+                $index->addTextField($name);
             }
-		//});
-
-		$models
-			->each(function ($item) use ($index, $model) {
-				$document = $index->makeDocument(
-					$item->getKey()
-					// property_exists($item, $model->getKeyName()) ? $item->{$model->getKeyName()} : null
-				);
-				foreach ($item->toSearchableArray() as $name => $value) {
-					if ($name !== $model->getKeyName()) {
-						$value = $value ?? '';
-						$document->$name->setValue($value); //= FieldFactory::make($name, $value);
-					}
-				}
-				try {
-					$index->add($document);
-				} catch (\Throwable $th) {
-					if ($th->getMessage() == "Document already exists") {
-						$index->replace($document);
-					}
-				}
-
-			});
+        }
+
+        $models
+            ->each(function ($item) use ($index, $model) {
+                $document = $index->makeDocument($item->getKey());
+                foreach ($item->toSearchableArray() as $name => $value) {
+                    if ($name !== $model->getKeyName()) {
+                        $value = $value ?? '';
+                        $document->$name->setValue($value);
+                    }
+                }
+                try {
+                    $index->add($document);
+                } catch (\Throwable $th) {
+                    if ($th->getMessage() == "Document already exists") {
+                        $index->replace($document);
+                    }
+                }
+
+            });
     }
 
     /**
@@ -114,13 +107,13 @@ public function delete($models)
      */
     public function search(Builder $builder)
     {
-		$index = (new Index($this->redisRawClient, $builder->index ?? $builder->model->searchableAs()));
+        $index = (new Index($this->redisRawClient, $builder->index ?? $builder->model->searchableAs()));
 
-		if ($builder->callback) {
-			$advanced_search = (call_user_func($builder->callback, $index));
+        if ($builder->callback) {
+            $advanced_search = (call_user_func($builder->callback, $index));
 
-			return $advanced_search->search($builder->query);
-		}
+            return $advanced_search->search($builder->query);
+        }
 
         return $index
             ->search($builder->query);
@@ -155,7 +148,7 @@ public function mapIds($results)
 
     public function map(Builder $builder, $results, $model)
     {
-		$results = collect($results);
+        $results = collect($results);
 
         $count = $results->first();
         if ($count === 0) {

diff --git a/tests/bootstrap.php b/tests/bootstrap.php
@@ -1,6 +1,6 @@
 <?php
 
-require __DIR__.'/../vendor/autoload.php';
+require __DIR__ . '/../vendor/autoload.php';
 
 use Carbon\Carbon;