Patch negation filter

Author: binaryk

src/Http/Controllers/ProfileController.php

@@ -6,6 +6,7 @@
 use Binaryk\LaravelRestify\Http\Requests\RestifyRequest;
 use Binaryk\LaravelRestify\Repositories\Repository;
 use Binaryk\LaravelRestify\Services\Search\RepositorySearchService;
+use Illuminate\Support\Facades\Auth;
 
 class ProfileController extends RepositoryController
 {
@@ -28,7 +29,7 @@ public function __invoke(RestifyRequest $request)
         $meta = [];
 
         if (method_exists($user, 'profile')) {
-            $meta = (array) call_user_func([$user, 'profile'], $request);
+            $meta = (array)call_user_func([$user, 'profile'], $request);
         }
 
         return $this->response()
@@ -40,12 +41,12 @@ public function guessRepository(RestifyRequest $request): ?Repository
     {
         $repository = $request->repository('users');
 
-        if (! $repository) {
+        if (!$repository) {
             return null;
         }
 
         if (method_exists($repository, 'canUseForProfile')) {
-            if (! call_user_func([$repository, 'canUseForProfile'], $request)) {
+            if (!call_user_func([$repository, 'canUseForProfile'], $request)) {
                 return null;
             }
         }
@@ -54,7 +55,7 @@ public function guessRepository(RestifyRequest $request): ?Repository
             $request, $repository
         ), function ($query) use ($request, $repository) {
             $repository::indexQuery($request, $query);
-        })->firstOrFail();
+        })->whereKey(Auth::id())->firstOrFail();
 
         return $repository->withResource($user);
     }

src/Services/Search/RepositorySearchService.php

@@ -31,14 +31,17 @@ public function prepareMatchFields(RestifyRequest $request, $query, $extra = [])
         foreach ($this->repository->getMatchByFields() as $key => $type) {
             $negation = false;
 
-            if (! $request->has($key) && ! data_get($extra, "match.$key")) {
+            if ($request->has('-' . $key)) {
+                $negation = true;
+            }
+
+            if (!$request->has($negation ? '-' . $key : $key) && !data_get($extra, "match.$key")) {
                 continue;
             }
 
-            $match = $request->input($key, data_get($extra, "match.$key"));
+            $match = $request->input($negation ? '-' . $key : $key, data_get($extra, "match.$key"));
 
-            if (substr($key, 0, 1) === '-') {
-                $negation = true;
+            if ($negation) {
                 $key = Str::after($key, '-');
             }
 
@@ -49,7 +52,11 @@ public function prepareMatchFields(RestifyRequest $request, $query, $extra = [])
             $field = $model->qualifyColumn($key);
 
             if ($match === 'null') {
-                $query->whereNull($field);
+                if ($negation) {
+                    $query->whereNotNull($field);
+                } else {
+                    $query->whereNull($field);
+                }
             } else {
                 switch ($this->repository->getMatchByFields()[$key]) {
                     case RestifySearchable::MATCH_TEXT:
@@ -69,7 +76,7 @@ public function prepareMatchFields(RestifyRequest $request, $query, $extra = [])
                     case RestifySearchable::MATCH_INTEGER:
                     case 'number':
                     case 'int':
-                        $query->where($field, $negation ? '!=' : '=', (int) $match);
+                        $query->where($field, $negation ? '!=' : '=', (int)$match);
                         break;
                     case RestifySearchable::MATCH_DATETIME:
                         $query->whereDate($field, $negation ? '!=' : '=', $match);
@@ -107,7 +114,7 @@ public function prepareOrders(RestifyRequest $request, $query, $extra = [])
         }
 
         if (empty($params) === true) {
-            $this->setOrder($query, '+'.$this->repository->newModel()->getKeyName());
+            $this->setOrder($query, '+' . $this->repository->newModel()->getKeyName());
         }
 
         return $query;
@@ -151,7 +158,7 @@ public function prepareSearchFields(RestifyRequest $request, $query, $extra = []
             $likeOperator = $connectionType == 'pgsql' ? 'ilike' : 'like';
 
             foreach ($this->repository->getSearchableFields() as $column) {
-                $query->orWhere($model->qualifyColumn($column), $likeOperator, '%'.$search.'%');
+                $query->orWhere($model->qualifyColumn($column), $likeOperator, '%' . $search . '%');
             }
         });
 
@@ -204,12 +211,12 @@ public function setOrder($query, $param)
 
     protected function applyIndexQuery(RestifyRequest $request, Repository $repository)
     {
-        return fn ($query) => $repository::indexQuery($request, $query->with($repository::$with));
+        return fn($query) => $repository::indexQuery($request, $query->with($repository::$with));
     }
 
     protected function applyFilters(RestifyRequest $request, Repository $repository, $query)
     {
-        if (! empty($request->filters)) {
+        if (!empty($request->filters)) {
             $filters = json_decode(base64_decode($request->filters), true);
 
             collect($filters)
@@ -235,7 +242,7 @@ protected function applyFilters(RestifyRequest $request, Repository $repository,
                     return $matchingFilter;
                 })
                 ->filter()
-                ->each(fn (Filter $filter) => $filter->filter($request, $query, $filter->value));
+                ->each(fn(Filter $filter) => $filter->filter($request, $query, $filter->value));
         }
 
         return $query;