fixes softDeletes with applying scopes ref #226

laravel-enso · Dec 8, 2020 · 83a8a54 · 83a8a54
1 parent f2537a6
commit 83a8a54
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 15 deletions.
diff --git a/src/Services/Data/Builders/Meta.php b/src/Services/Data/Builders/Meta.php
@@ -8,6 +8,7 @@
 use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Facades\Config as ConfigFacade;
+use LaravelEnso\Companies\Models\Company;
 use LaravelEnso\Tables\Contracts\CustomCount;
 use LaravelEnso\Tables\Contracts\CustomCountCacheKey;
 use LaravelEnso\Tables\Contracts\Table;
@@ -67,9 +68,9 @@ public function count($filtered = false): int
         }
 
         return $this->query
-            ->when($this->config->get('softDeletes'), fn ($query) => $query
-                ->whereNull($this->deletedAt()))
-            ->getQuery()->getCountForPagination();
+            ->applyScopes()
+            ->getQuery()
+            ->getCountForPagination();
     }
 
     public function filter(): self

diff --git a/src/Services/Data/Config.php b/src/Services/Data/Config.php
@@ -12,7 +12,7 @@ class Config
 {
     private const TemplateProxy = [
         'appends', 'comparisonOperator', 'countCache', 'flatten', 'fullInfoRecordLimit',
-        'name', 'strip', 'softDeletes', 'table',
+        'name', 'strip', 'table',
     ];
 
     private const RequestMeta = [

diff --git a/src/Services/Template.php b/src/Services/Template.php
@@ -3,7 +3,6 @@
 namespace LaravelEnso\Tables\Services;
 
 use Illuminate\Database\Eloquent\Model;
-use Illuminate\Database\Eloquent\SoftDeletes;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\App;
 use Illuminate\Support\Facades\Config;
@@ -101,8 +100,7 @@ private function template()
             $this->setModel($template, $model);
         }
 
-        $this->setTable($template, $model)
-            ->setSoftDeletes($template, $model);
+        $this->setTable($template, $model);
 
         return $template;
     }
@@ -121,14 +119,6 @@ private function setTable(Obj $template, Model $model): self
         return $this;
     }
 
-    private function setSoftDeletes(Obj $template, Model $model)
-    {
-        $traits = (new ReflectionClass($model))->getTraitNames();
-        $template->set('softDeletes', in_array(SoftDeletes::class, $traits));
-
-        return $this;
-    }
-
     private function readJson($path)
     {
         $template = new Obj(