Recursively replace .id with ._id

Author: GromNaN

src/Query/Builder.php

@@ -298,6 +298,7 @@ public function toMql(): array
         }
 
         $wheres = $this->compileWheres();
+        $wheres = $this->aliasIdForQuery($wheres);
 
         // Use MongoDB's aggregation framework when using grouping or aggregation functions.
         if ($this->groups || $this->aggregate) {
@@ -1629,18 +1630,38 @@ public function orWhereIntegerNotInRaw($column, $values, $boolean = 'and')
 
     private function aliasIdForQuery(array $values): array
     {
-        if (isset($values['id'])) {
+        if (array_key_exists('id', $values)) {
             $values['_id'] = $values['id'];
             unset($values['id']);
         }
 
+        foreach ($values as $key => $value) {
+            if (is_string($key) && str_ends_with($key, '.id')) {
+                $values[substr($key, 0, -3) . '._id'] = $value;
+                unset($values[$key]);
+            }
+        }
+
+        foreach ($values as &$value) {
+            if (is_array($value)) {
+                $value = $this->aliasIdForQuery($value);
+            }
+        }
+
         return $values;
     }
 
     private function aliasIdForResult(array $values): array
     {
-        if (isset($values['_id'])) {
+        if (array_key_exists('_id', $values) && ! array_key_exists('id', $values)) {
             $values['id'] = $values['_id'];
+            //unset($values['_id']);
+        }
+
+        foreach ($values as $key => $value) {
+            if (is_array($value)) {
+                $values[$key] = $this->aliasIdForResult($value);
+            }
         }
 
         return $values;

tests/Query/BuilderTest.php

@@ -124,10 +124,9 @@ public static function provideQueryBuilderToMql(): iterable
         ];
 
         // Nested array are not flattened like in the Eloquent builder. MongoDB can compare objects.
-        $array = [['issue' => 45582], ['id' => 2], [3]];
         yield 'whereIn nested array' => [
-            ['find' => [['_id' => ['$in' => $array]], []]],
-            fn (Builder $builder) => $builder->whereIn('id', $array),
+            ['find' => [['_id' => ['$in' => [['issue' => 45582], ['_id' => 2], [3]]]], []]],
+            fn (Builder $builder) => $builder->whereIn('id', [['issue' => 45582], ['id' => 2], [3]]),
         ];
 
         yield 'orWhereIn' => [

tests/QueryBuilderTest.php

@@ -1058,7 +1058,7 @@ public function testIdAlias($insertId, $queryId): void
         DB::collection('items')->insert([$insertId => 'abc', 'name' => 'Karting']);
         $item = DB::collection('items')->where($queryId, '=', 'abc')->first();
         $this->assertNotNull($item);
-        $this->assertSame('abc', $item['_id']);
+        $this->assertSame('abc', $item['id']);
         $this->assertSame('Karting', $item['name']);
 
         DB::collection('items')->where($insertId, '=', 'abc')->update(['name' => 'Bike']);

tests/Ticket/GH2489Test.php

@@ -0,0 +1,49 @@
+<?php
+
+declare(strict_types=1);
+
+namespace MongoDB\Laravel\Tests\Ticket;
+
+use MongoDB\Laravel\Tests\Models\Location;
+use MongoDB\Laravel\Tests\TestCase;
+
+/** @see https://github.com/mongodb/laravel-mongodb/issues/2783 */
+class GH2489Test extends TestCase
+{
+    public function tearDown(): void
+    {
+        Location::truncate();
+    }
+
+    public function testQuerySubdocumentsUsingWhereInId()
+    {
+        Location::insert([
+            [
+                'name' => 'Location 1',
+                'images' => [
+                    ['_id' => 1, 'uri' => 'image1.jpg'],
+                    ['_id' => 2, 'uri' => 'image2.jpg'],
+                ],
+            ],
+            [
+                'name' => 'Location 2',
+                'images' => [
+                    ['_id' => 3, 'uri' => 'image3.jpg'],
+                    ['_id' => 4, 'uri' => 'image4.jpg'],
+                ],
+            ],
+        ]);
+
+        // With _id
+        $results = Location::whereIn('images._id', [1])->get();
+
+        $this->assertCount(1, $results);
+        $this->assertSame('Location 1', $results->first()->name);
+
+        // With id
+        $results = Location::whereIn('images.id', [1])->get();
+
+        $this->assertCount(1, $results);
+        $this->assertSame('Location 1', $results->first()->name);
+    }
+}