Add withRelations, withRelationsCount and withRelationsExistence to list

Author: Marius

src/Services/BaseResourceService.php

@@ -86,41 +86,35 @@ public function list(array $request): Builder
         foreach ($filters as $column => $value) {
             if (!\is_array($value)) {
                 $builder->where($column, '=', $value);
-
-                continue;
-            }
-
-            if ($column === 'withRelations') {
-                $builder->with($this->getValidRelations($value));
-
-                continue;
             }
+        }
 
-            if ($column === 'withRelationsCount') {
-                $validRelations = $this->getValidRelations($value);
-                $builder->withCount(\array_map(
-                    fn (string $relationName): string => $relationName . ' as ' . $relationName . static::COUNT_ALIAS_POSTFIX,
-                    $validRelations
-                ));
-                $possibleSortColumns = \array_merge($possibleSortColumns, \array_map(
-                    fn (string $relationName): string => $relationName . static::COUNT_ALIAS_POSTFIX,
-                    $validRelations
-                ));
+        if (\is_array($request['withRelations'] ?? null)) {
+            $builder->with($this->getValidRelations($request['withRelations']));
+        }
 
-                continue;
-            }
+        if (\is_array($request['withRelationsCount'] ?? null)) {
+            $validRelations = $this->getValidRelations($request['withRelationsCount']);
+            $builder->withCount(\array_map(
+                fn (string $relationName): string => $relationName . ' as ' . $relationName . static::COUNT_ALIAS_POSTFIX,
+                $validRelations
+            ));
+            $possibleSortColumns = \array_merge($possibleSortColumns, \array_map(
+                fn (string $relationName): string => $relationName . static::COUNT_ALIAS_POSTFIX,
+                $validRelations
+            ));
+        }
 
-            if ($column === 'withRelationsExistence') {
-                $validRelations = $this->getValidRelations($value);
-                $builder->withExists(\array_map(
-                    fn (string $relationName): string => $relationName . ' as ' . $relationName . static::EXIST_ALIAS_POSTFIX,
-                    $validRelations
-                ));
-                $possibleSortColumns = \array_merge($possibleSortColumns, \array_map(
-                    fn (string $relationName): string => $relationName . static::EXIST_ALIAS_POSTFIX,
-                    $validRelations
-                ));
-            }
+        if (\is_array($request['withRelationsExistence'] ?? null)) {
+            $validRelations = $this->getValidRelations($request['withRelationsExistence']);
+            $builder->withExists(\array_map(
+                fn (string $relationName): string => $relationName . ' as ' . $relationName . static::EXIST_ALIAS_POSTFIX,
+                $validRelations
+            ));
+            $possibleSortColumns = \array_merge($possibleSortColumns, \array_map(
+                fn (string $relationName): string => $relationName . static::EXIST_ALIAS_POSTFIX,
+                $validRelations
+            ));
         }
 
         if ($this->shouldIgnoreSort($possibleSortColumns)) {