Soft deletes check in find

Author: pdphilip

src/DSL/Bridge.php

@@ -213,30 +213,39 @@ public function processToDslForSearch($searchParams, $searchOptions, $wheres, $o
     /**
      * @throws QueryException
      */
-    public function processGetId($id, $columns)
+    public function processGetId($id, $columns, $softDeleteColumn): Results
     {
         $params = [
             'index' => $this->index,
             'id' => $id,
         ];
-        if ($columns && $columns != '*') {
-            $params['_source'] = $columns;
+        if (empty($columns)) {
+            $columns = ['*'];
         }
+        if (! is_array($columns)) {
+            $columns = [$columns];
+        }
+        $allColumns = $columns[0] == '*';
+
+        if ($softDeleteColumn && ! $allColumns && ! in_array($softDeleteColumn, $columns)) {
+            $columns[] = $softDeleteColumn;
+        }
+        $params['_source'] = $columns;
         $process = [];
         try {
             $process = $this->client->get($params);
         } catch (ClientResponseException $e) {
             //if the error is a 404 continue, else throw it
             if ($e->getCode() !== 404) {
-                return $this->_throwError($e, $params, $this->_queryTag(__FUNCTION__));
+                $this->_throwError($e, $params, $this->_queryTag(__FUNCTION__));
             }
 
         } catch (Exception $e) {
             //Something else went wrong, throw it
-            return $this->_throwError($e, $params, $this->_queryTag(__FUNCTION__));
+            $this->_throwError($e, $params, $this->_queryTag(__FUNCTION__));
         }
 
-        return $this->_sanitizeGetResponse($process, $params, $this->_queryTag(__FUNCTION__));
+        return $this->_sanitizeGetResponse($process, $params, $softDeleteColumn, $this->_queryTag(__FUNCTION__));
     }
 
     /**
@@ -1126,21 +1135,30 @@ private function _queryTag($function): string
         return str_replace('process', '', $function);
     }
 
-    public function _sanitizeGetResponse($response, $params, $queryTag)
+    public function _sanitizeGetResponse($response, $params, $softDeleteColumn, $queryTag)
     {
         $data['_id'] = $params['id'];
-        if (! $response) {
+        $softDeleted = false;
+        if ($softDeleteColumn) {
+            $softDeleted = ! empty($response['_source'][$softDeleteColumn]);
+        }
+
+        if (! $response || $softDeleted) {
             //Was not found
             $result = $this->_return($data, [], $params, $queryTag);
             $result->setError($data['_id'].' not found', 404);
 
             return $result;
         }
+
         if (! empty($response['_source'])) {
             foreach ($response['_source'] as $key => $value) {
                 $data[$key] = $value;
             }
         }
+        if ($softDeleteColumn) {
+            unset($data[$softDeleteColumn]);
+        }
 
         return $this->_return($data, [], $params, $queryTag);
     }

src/Eloquent/Builder.php

@@ -9,6 +9,7 @@
 use Illuminate\Database\ConnectionInterface;
 use Illuminate\Database\Eloquent\Builder as BaseEloquentBuilder;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
+use Illuminate\Database\Eloquent\SoftDeletingScope;
 use Illuminate\Pagination\Cursor;
 use Illuminate\Pagination\CursorPaginator;
 use Illuminate\Pagination\Paginator;
@@ -166,10 +167,20 @@ public function createWithoutRefresh(array $attributes = []): \Illuminate\Databa
 
     public function find($id, $columns = ['*']): ?Model
     {
-        $find = $this->query->find($id, $columns);
+        $softDeleteColumn = null;
+        if (method_exists($this->model, 'getQualifiedDeletedAtColumn')) {
+            $softDeleteColumn = $this->model->getQualifiedDeletedAtColumn();
+            if (in_array(SoftDeletingScope::class, $this->removedScopes)) {
+                $softDeleteColumn = null;
+            }
+        }
+        $find = $this->query->find($id, $columns, $softDeleteColumn);
         if ($find->isSuccessful()) {
-            $model = $this->newModelInstance($find->data);
+            $instance = $this->newModelInstance();
+            $model = $instance->newFromBuilder($find->data);
             $model->setMeta($find->getMetaDataAsArray());
+            $model->setRecordIndex($find->getMetaData()->getIndex());
+            $model->setIndex($find->getMetaData()->getIndex());
 
             return $model;
         }

src/Query/Builder.php

@@ -189,9 +189,9 @@ public function value($column)
     /**
      * {@inheritdoc}
      */
-    public function find($id, $columns = []): Results
+    public function find($id, $columns = [], $softDeleteColumn = null): Results
     {
-        return $this->connection->getId($id, $columns);
+        return $this->connection->getId($id, $columns, $softDeleteColumn);
     }
 
     /**