Sub search for relations added #minor (#29)

* Sub search for relations added

* Apply fixes from StyleCI

* Minor

Author: Norgul

README.md

@@ -143,6 +143,22 @@ Will perform ``SELECT * FROM some_table WHERE first_name IN
 Note that logical operators are using standard bool logic precedence,
 therefore ``x AND y OR z AND q`` is the same as `(x AND y) OR (z AND q)`.
 
+#### Nested relation searches
+
+You can nest another search object if the key used is a relation name which
+will execute a ``whereHas()`` query builder method.
+
+I.e.
+```
+{
+    "search": {
+        "some_relation": {
+            "search": { ... }
+        },
+    }
+}
+```
+
 ### Returns
 
 Using a ``returns`` key will effectively only return the fields given within it.

src/RequestParameters/SearchParameter.php

@@ -6,9 +6,11 @@
 
 use Asseco\JsonQueryBuilder\Config\OperatorsConfig;
 use Asseco\JsonQueryBuilder\Exceptions\JsonQueryBuilderException;
+use Asseco\JsonQueryBuilder\JsonQuery;
 use Asseco\JsonQueryBuilder\SearchCallbacks\AbstractCallback;
 use Asseco\JsonQueryBuilder\SearchParser;
 use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Support\Str;
 
 class SearchParameter extends AbstractParameter
 {
@@ -31,6 +33,7 @@ public static function getParameterName(): string
     protected function appendQuery(): void
     {
         $arguments = $this->arguments;
+
         $this->operatorsConfig = new OperatorsConfig();
 
         // Wrapped within a where clause to protect from orWhere "exploits".
@@ -50,27 +53,35 @@ protected function appendQuery(): void
     protected function makeQuery(Builder $builder, array $arguments, string $boolOperator = self:: AND): void
     {
         foreach ($arguments as $key => $value) {
-            if ($this->isBoolOperator($key)) {
-                // Recursion for keys which are &&/||
+            if ($this->isTopLevelBoolOperator($key)) {
                 $this->makeQuery($builder, $value, $key);
                 continue;
             }
 
             $functionName = $this->getQueryFunctionName($boolOperator);
 
-            if ($this->shouldSplitQueries($value)) {
+            if ($this->queryInitiatedByTopLevelBool($key, $value)) {
                 $builder->{$functionName}(function ($queryBuilder) use ($value) {
                     // Recursion for inner keys which are &&/||
                     $this->makeQuery($queryBuilder, $value);
                 });
                 continue;
             }
 
+            if ($this->hasSubSearch($key, $value)) {
+                // If query has sub-search, it is a relation for sure.
+                $builder->whereHas(Str::camel($key), function ($query) use ($value) {
+                    $jsonQuery = new JsonQuery($query, $value);
+                    $jsonQuery->search();
+                });
+                continue;
+            }
+
             $this->makeSingleQuery($functionName, $builder, $key, $value);
         }
     }
 
-    protected function isBoolOperator($key): bool
+    protected function isTopLevelBoolOperator($key): bool
     {
         return in_array($key, [self:: OR, self:: AND], true);
     }
@@ -91,9 +102,16 @@ protected function getQueryFunctionName(string $boolOperator): string
         throw new JsonQueryBuilderException('Invalid bool operator provided');
     }
 
-    protected function shouldSplitQueries($value): bool
+    protected function queryInitiatedByTopLevelBool($key, $value): bool
+    {
+        // Since this will be triggered by recursion, key will be numeric
+        // and not the actual key.
+        return !is_string($key) && is_array($value);
+    }
+
+    protected function hasSubSearch($key, $value): bool
     {
-        return is_array($value);
+        return is_string($key) && is_array($value);
     }
 
     /**