Added relations to QueryActionBase

RyanNerd · Aug 2, 2019 · d5cccc1 · d5cccc1
1 parent 71888b1
commit d5cccc1
Showing 1 changed file with 37 additions and 3 deletions.
diff --git a/app/Controllers/QueryActionBase.php b/app/Controllers/QueryActionBase.php
@@ -21,6 +21,11 @@ class QueryActionBase extends ActionBase
      */
     protected $allowAll = false;
 
+    /**
+     * @var array | null
+     */
+    protected $relations = null;
+
     /**
      * Handle GET query request
      *
@@ -37,13 +42,25 @@ public function __invoke(Request $request, Response $response, array $args): Res
 
         $value = $args['value'];
         $models = null;
+        $relations = $this->relations;
 
         switch ($value) {
             // SELECT *
             case '*':
                 {
                     if ($this->allowAll) {
-                        $models = $this->model->get()->all();
+                        if ($relations === null) {
+                            $models = $this
+                                ->model
+                                ->get()
+                                ->all();
+                        } else {
+                            $models = $this
+                                ->model
+                                ->with($relations)
+                                ->get()
+                                ->all();
+                        }
                     }
                     break;
                 }
@@ -58,8 +75,14 @@ public function __invoke(Request $request, Response $response, array $args): Res
                             $model = $model->where($columnName, '=', $value);
                         }
                     }
-                    $models = $model->get();
 
+                    if ($relations === null) {
+                        $models = $model->get();
+                    } else {
+                        $models = $model
+                            ->with($relations)
+                            ->get();
+                    }
                     break;
                 }
 
@@ -68,7 +91,18 @@ public function __invoke(Request $request, Response $response, array $args): Res
                 {
                     $columnName = $parsedRequest['column_name'];
                     $operator = $parsedRequest['operator'] ?? '=';
-                    $models = $this->model->where($columnName, $operator, $value)->get();
+                    if ($relations === null) {
+                        $models = $this
+                            ->model
+                            ->where($columnName, $operator, $value)
+                            ->get();
+                    } else {
+                        $models = $this
+                            ->model
+                            ->with($relations)
+                            ->where($columnName, $operator, $value)
+                            ->get();
+                    }
                 }
         }