Merge pull request #17 from typesense/15-review-fixes

Fix soft delete check, null check
typesense · Dec 3, 2021 · cf1c1de · cf1c1de
2 parents acb1bcd + 02227e0
commit cf1c1de
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 18 deletions.
diff --git a/src/Engines/TypesenseEngine.php b/src/Engines/TypesenseEngine.php
@@ -11,9 +11,10 @@
 use Illuminate\Support\Str;
 use Laravel\Scout\Builder;
 use Laravel\Scout\Engines\Engine;
+use Illuminate\Support\Facades\Config;
 
 /**
- * Class TypesenseSearchEngine.
+ * Class TypesenseEngine.
  *
  * @date    4/5/20
  *
@@ -22,7 +23,7 @@
 class TypesenseEngine extends Engine
 {
     /**
-     * @var \Typesense\LaravelTypesense\Typesense
+     * @var Typesense
      */
     private Typesense $typesense;
 
@@ -57,9 +58,9 @@ class TypesenseEngine extends Engine
     private array $locationOrderBy = [];
 
     /**
-     * TypesenseSearchEngine constructor.
+     * TypesenseEngine constructor.
      *
-     * @param \Typesense\LaravelTypesense\Typesense $typesense
+     * @param Typesense $typesense
      */
     public function __construct(Typesense $typesense)
     {
@@ -78,7 +79,7 @@ public function update($models): void
     {
         $collection = $this->typesense->getCollectionIndex($models->first());
 
-        if ($this->usesSoftDelete($models->first()) && $models->first()->softDelete) {
+        if ($this->usesSoftDelete($models->first()) && config('scout.soft_delete', false)) {
             $models->each->pushSoftDeleteMetadata();
         }
 

diff --git a/src/Typesense.php b/src/Typesense.php
@@ -94,10 +94,7 @@ public function upsertDocument(Collection $collectionIndex, $array): TypesenseDo
         /**
          * @var $document Document
          */
-        $document = $collectionIndex->getDocuments()[$array['id']] ?? null;
-        if ($document === null) {
-            throw new ObjectNotFound();
-        }
+        $document = $collectionIndex->getDocuments()[$array['id']];
 
         try {
             $document->retrieve();
@@ -126,10 +123,7 @@ public function deleteDocument(Collection $collectionIndex, $modelId): array
         /**
          * @var $document Document
          */
-        $document = $collectionIndex->getDocuments()[(string) $modelId] ?? null;
-        if ($document === null) {
-            throw new ObjectNotFound();
-        }
+        $document = $collectionIndex->getDocuments()[(string) $modelId];
 
         return $document->delete();
     }
@@ -188,11 +182,7 @@ public function importDocuments(Collection $collectionIndex, $documents, string
      */
     public function deleteCollection(string $collectionName): array
     {
-        $index = $this->client->getCollections()->{$collectionName} ?? null;
-        if ($index === null) {
-            throw new ObjectNotFound();
-        }
-
+        $index = $this->client->getCollections()->{$collectionName};
         return $index->delete();
     }
 }