Relation update #minor (#27)

* Updated chained relations

* Apply fixes from StyleCI

Author: Norgul

src/RequestParameters/SearchParameter.php

@@ -9,7 +9,6 @@
 use Asseco\JsonQueryBuilder\SearchCallbacks\AbstractCallback;
 use Asseco\JsonQueryBuilder\SearchParser;
 use Illuminate\Database\Eloquent\Builder;
-use Illuminate\Support\Str;
 
 class SearchParameter extends AbstractParameter
 {
@@ -51,8 +50,6 @@ protected function appendQuery(): void
     protected function makeQuery(Builder $builder, array $arguments, string $boolOperator = self:: AND): void
     {
         foreach ($arguments as $key => $value) {
-            $key = $this->forceCamelCaseOnRelationKeys($key);
-
             if ($this->isBoolOperator($key)) {
                 // Recursion for keys which are &&/||
                 $this->makeQuery($builder, $value, $key);
@@ -73,21 +70,6 @@ protected function makeQuery(Builder $builder, array $arguments, string $boolOpe
         }
     }
 
-    protected function forceCamelCaseOnRelationKeys($key)
-    {
-        if (!is_string($key)) {
-            return $key;
-        }
-
-        $exploded = explode('.', $key);
-
-        if (count($exploded) < 2) {
-            return $key;
-        }
-
-        return implode('.', [Str::camel($exploded[0]), $exploded[1]]);
-    }
-
     protected function isBoolOperator($key): bool
     {
         return in_array($key, [self:: OR, self:: AND], true);
@@ -143,6 +125,7 @@ protected function applyArguments(Builder $builder, OperatorsConfig $operatorsCo
             $builder->orWhere(function ($builder) use ($splitArgument, $operatorsConfig, $column) {
                 foreach ($splitArgument as $argument) {
                     $searchModel = new SearchParser($this->modelConfig, $operatorsConfig, $column, $argument);
+
                     $this->appendSingle($builder, $operatorsConfig, $searchModel);
                 }
             });

src/SearchCallbacks/AbstractCallback.php

@@ -8,6 +8,7 @@
 use Asseco\JsonQueryBuilder\Exceptions\JsonQueryBuilderException;
 use Asseco\JsonQueryBuilder\SearchParser;
 use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Support\Str;
 
 abstract class AbstractCallback
 {
@@ -25,7 +26,6 @@ public function __construct(Builder $builder, SearchParser $searchParser)
     {
         $this->builder = $builder;
         $this->searchParser = $searchParser;
-
         $this->categorizedValues = new CategorizedValues($this->searchParser);
 
         $this->builder->when(
@@ -57,12 +57,20 @@ abstract public static function operator(): string;
      */
     abstract public function execute(Builder $builder, string $column, CategorizedValues $values): void;
 
-    protected function appendRelations(Builder $builder, string $column, CategorizedValues $values): void
+    protected function appendRelations(Builder $builder, string $column, CategorizedValues $values, string $method = 'orWhereHas'): void
     {
-        [$relationName, $relatedColumn] = explode('.', $column);
+        [$relationName, $relatedColumns] = explode('.', $column, 2);
+
+        $builder->{$method}(Str::camel($relationName), function (Builder $builder) use ($relatedColumns, $values) {
+
+            // Support for inner relation calls like model.relation.relation2.relation2_attribute
+            if (str_contains($relatedColumns, '.')) {
+                $this->appendRelations($builder, $relatedColumns, $values, 'whereHas');
+
+                return;
+            }
 
-        $builder->orWhereHas($relationName, function (Builder $builder) use ($relatedColumn, $values) {
-            $this->execute($builder, $relatedColumn, $values);
+            $this->execute($builder, $relatedColumns, $values);
         });
     }