Add resetScope() after applyScope() for some methods

Author: bryanadamloh

src/Eloquent/BaseRepository.php

@@ -149,6 +149,7 @@ public function first($columns = ['*']): mixed
         $result = $this->model->first($columns);
 
         $this->resetModel();
+        $this->resetScope();
 
         return $result;
     }
@@ -163,6 +164,7 @@ public function firstWhere(array $where, $columns = ['*']): mixed
         $result = $this->model->first($columns);
 
         $this->resetModel();
+        $this->resetScope();
 
         return $result;
     }
@@ -175,6 +177,7 @@ public function firstOrNew(array $attributes, array $values = []): mixed
         $model = $this->model->firstOrNew($attributes, $values);
 
         $this->resetModel();
+        $this->resetScope();
 
         return $model;
     }
@@ -186,12 +189,15 @@ public function firstOrCreate(array $attributes, array $values = [], bool $witho
 
         if (!is_null($model = $this->model->where($attributes)->first())) {
             $this->resetModel();
+            $this->resetScope();
             return $model;
         }
 
         $method = $withoutEvents ? 'saveQuietly' : 'save';
         $model = tap($this->model->newModelInstance([...$attributes, ...$values]), fn ($instance) => $instance->{$method}());
+
         $this->resetModel();
+        $this->resetScope();
 
         event(new RepositoryEntityCreated($this, $model));
 
@@ -216,6 +222,7 @@ public function paginate($limit = null, $columns = ['*'], $method = "paginate"):
         $results->appends(app('request')->query());
 
         $this->resetModel();
+        $this->resetScope();
 
         return $results;
     }
@@ -229,8 +236,11 @@ public function find(mixed $id, $columns = ['*']): mixed
     {
         $this->applyCriteria();
         $this->applyScope();
+
         $model = $this->model->findOrFail($id, $columns);
+
         $this->resetModel();
+        $this->resetScope();
 
         return $model;
     }
@@ -239,8 +249,11 @@ public function findByField(string $field, $value = null, $columns = ['*']): mix
     {
         $this->applyCriteria();
         $this->applyScope();
+
         $model = $this->model->where($field, '=', $value)->get($columns);
+
         $this->resetModel();
+        $this->resetScope();
 
         return $model;
     }
@@ -253,7 +266,9 @@ public function findWhere(array $where, $columns = ['*']): mixed
         $this->applyConditions($where);
 
         $model = $this->model->get($columns);
+
         $this->resetModel();
+        $this->resetScope();
 
         return $model;
     }
@@ -262,8 +277,11 @@ public function findWhereIn($field, array $values, $columns = ['*']): mixed
     {
         $this->applyCriteria();
         $this->applyScope();
+
         $model = $this->model->whereIn($field, $values)->get($columns);
+
         $this->resetModel();
+        $this->resetScope();
 
         return $model;
     }
@@ -272,8 +290,11 @@ public function findWhereNotIn($field, array $values, $columns = ['*']): mixed
     {
         $this->applyCriteria();
         $this->applyScope();
+
         $model = $this->model->whereNotIn($field, $values)->get($columns);
+
         $this->resetModel();
+        $this->resetScope();
 
         return $model;
     }
@@ -282,8 +303,11 @@ public function findWhereBetween($field, array $values, $columns = ['*']): mixed
     {
         $this->applyCriteria();
         $this->applyScope();
+
         $model = $this->model->whereBetween($field, $values)->get($columns);
+
         $this->resetModel();
+        $this->resetScope();
 
         return $model;
     }
@@ -325,6 +349,7 @@ public function update(array $attributes, int $id, bool $withoutEvents = false):
         $model->{$method}();
 
         $this->resetModel();
+        $this->resetScope();
 
         event(new RepositoryEntityUpdated($this, $model));
 
@@ -342,6 +367,7 @@ public function updateWhere(array $where, array $attributes, bool $withoutEvents
         event(new RepositoryEntityUpdated($this, $this->model->getModel()));
 
         $this->resetModel();
+        $this->resetScope();
 
         return $updated;
     }
@@ -352,7 +378,9 @@ public function updateOrCreate(array $attributes, array $values = [], bool $with
 
         $method = $withoutEvents ? 'saveQuietly' : 'save';
         $model = tap($this->model->firstOrNew($attributes), fn ($instance) => $instance->fill($values)->{$method}());
+
         $this->resetModel();
+        $this->resetScope();
 
         event(new RepositoryEntityUpdated($this, $model));
 
@@ -366,6 +394,7 @@ public function upsert(array $values, array|string $uniqueBy, ?array $update = n
         event(new RepositoryEntityCreated($this, $this->model->getModel()));
 
         $this->resetModel();
+        $this->resetScope();
 
         return $upserted;
     }
@@ -386,6 +415,7 @@ public function deleteWhere(array $where, bool $forceDelete = false): ?bool
         event(new RepositoryEntityDeleted($this, $this->model->getModel()));
 
         $this->resetModel();
+        $this->resetScope();
 
         return $deleted;
     }
@@ -399,6 +429,7 @@ public function massDelete(): ?bool
         event(new RepositoryEntityDeleted($this, $this->model->getModel()));
 
         $this->resetModel();
+        $this->resetScope();
 
         return $deleted;
     }
@@ -556,6 +587,8 @@ public function getBaseQuery(): QueryBuilder
         $query = $this->model->toBase();
 
         $this->resetModel();
+        $this->resetScope();
+
         return $query;
     }
 
@@ -591,6 +624,7 @@ protected function manageDeletes(int $id, string $method)
         $originalModel = clone $model;
 
         $this->resetModel();
+        $this->resetScope();
 
         $model->{$method}();