process Relationship Queries

Author: fogelito

src/Database/Database.php

@@ -3376,7 +3376,10 @@ public function getDocument(string $collection, string $id, array $queries = [],
         [$selects, $permissionsAdded] = Query::addSelect($selects, Query::select('$permissions',  system: true));
 
         //$selects = $this->validateSelections($collection, $selects);
-        [$selects, $nestedSelections] = $this->processRelationshipQueries($relationships, $selects);
+
+        $result = $this->processRelationshipQueries($relationships, $selects);
+        $selects = $result['queries'];
+        $nestedSelections = $result['nestedSelections'];
 
         $validator = new Authorization(self::PERMISSION_READ);
         $documentSecurity = $collection->getAttribute('documentSecurity', false);
@@ -3474,6 +3477,10 @@ public function getDocument(string $collection, string $id, array $queries = [],
      */
     private function populateDocumentRelationships(Document $collection, Document $document, array $selects = []): Document
     {
+        if (empty($document->getId())){
+            throw new DatabaseException('$id is a required field');
+        }
+
         $attributes = $collection->getAttribute('attributes', []);
 
         $relationships = [];
@@ -3486,8 +3493,6 @@ private function populateDocumentRelationships(Document $collection, Document $d
             }
         }
 
-var_dump($relationships);
-
         foreach ($relationships as $relationship) {
             $key = $relationship['key'];
             $value = $document->getAttribute($key);
@@ -3603,7 +3608,12 @@ private function populateDocumentRelationships(Document $collection, Document $d
 
                     $this->relationshipFetchDepth++;
                     $this->relationshipFetchStack[] = $relationship;
-
+                    var_dump($relationships);
+                    var_dump($side);
+                    var_dump($document);
+                    /**
+                     * How to force $document->getId() , not to be empty?
+                     */
                     $relatedDocuments = $this->find($relatedCollection->getId(), [
                         Query::equal($twoWayKey, [$document->getId()]),
                         Query::limit(PHP_INT_MAX),
@@ -6329,7 +6339,10 @@ public function find(string $collection, array $queries = [], string $forPermiss
         $cursor = empty($cursor) ? [] : $this->encode($collection, $cursor)->getArrayCopy();
 
         //$selects = $this->validateSelections($collection, $selects);
-        [$selects, $nestedSelections] = $this->processRelationshipQueries($relationships, $selects);
+
+        $result = $this->processRelationshipQueries($relationships, $selects);
+        $selects = $result['queries'];
+        $nestedSelections = $result['nestedSelections'];
 
         $results = $this->adapter->find(
             $context,
@@ -7336,11 +7349,14 @@ private function processRelationshipQueries(
 
         $queries = array_values($queries);
 
-        if ($count > 0 && empty($queries)) {
-            //$queries[] = Query::select('*');
-        }
+//        if ($count > 0 && empty($queries)) {
+//            $queries[] = Query::select('*');
+//        }
 
-        return [$queries, $nestedSelections];
+        return [
+            'queries' => $queries,
+            'nestedSelections' => $nestedSelections,
+        ];
     }
 
     /**

tests/e2e/Adapter/Scopes/RelationshipTests.php

@@ -1340,23 +1340,21 @@ public function testSelectRelationshipAttributes(): void
         // Select some parent attributes, some child attributes
         $make = $database->findOne('make', [
             Query::select('name'),
-            //Query::select('*'),
             Query::select('models.name'),
         ]);
-var_dump($make);
+
         if ($make->isEmpty()) {
             throw new Exception('Make not found');
         }
 
+        var_dump($make);
         $this->assertEquals('Ford', $make['name']);
         $this->assertEquals(2, \count($make['models']));
-        $this->assertEquals('shmuel', 'fogel');
-
         $this->assertEquals('Fiesta', $make['models'][0]['name']);
         $this->assertEquals('Focus', $make['models'][1]['name']);
         $this->assertArrayNotHasKey('year', $make['models'][0]);
         $this->assertArrayNotHasKey('year', $make['models'][1]);
-        $this->assertArrayHasKey('$id', $make);
+        $this->assertArrayHasKey('$id', $make); // Was added by system in processRelationshipQueries
         $this->assertArrayHasKey('$sequence', $make);
         $this->assertArrayHasKey('$permissions', $make);
         $this->assertArrayHasKey('$collection', $make);