Deep relations

Author: Martin-4Spaces

Includes/QueryInclude.php

@@ -22,6 +22,7 @@ public static function parse($line) {
             $item->queryParser = QueryParser::parse($parser);
         } else {
             $item->property = $line;
+            $item->queryParser = new QueryParser();
         }
         return $item;
     }

ResourceBaseModelInterface.php

@@ -47,4 +47,9 @@ public function applyOrder(QueryOrder $order);
      */
     public function applyRestGetOneRelations($item);
 
+    /**
+     * @return string[]
+     */
+    public function ignoredRestGetOnRelations();
+
 }

ResourceModelTrait.php

@@ -35,7 +35,9 @@ public function restGet($id, $queryParser) {
                 $this->preRestGet($queryParser, $id);
 
                 if($queryParser->isCount()) {
-                    return $this->countAllResults();
+                    $count = $this->distinct('id')->countAllResults();
+                    Data::lastQuery();
+                    return $count;
                 }
 
                 if($queryParser->hasLimit()) $this->limit($queryParser->getLimit());
@@ -47,7 +49,7 @@ public function restGet($id, $queryParser) {
                     ->groupBy('id')
                     ->find();
 
-                //Data::lastQuery();
+                Data::lastQuery();
 
                 if($items->exists()) {
                     if($id) {
@@ -210,8 +212,11 @@ public function applyFilter(QueryFilter $filter) {
      * @param Entity $item
      */
     public function applyRestGetOneRelations($item) {
+        $ignored = $this->ignoredRestGetOnRelations();
         /** @var RelationDef $relation */
         foreach($this->getRelations() as $relation) {
+            if(in_array($relation->getName(), $ignored)) continue;
+            Data::debug(get_class($this), "running", $relation->getName());
             switch($relation->getType()) {
                 case RelationDef::HasOne:
                     $relationName = $relation->getSimpleName();
@@ -237,4 +242,8 @@ public function applyRestGetOneRelations($item) {
         }
     }
 
+    public function ignoredRestGetOnRelations() {
+        return [];
+    }
+
 }