added tests for distance and not distance

Author: ArnabChatterjee20k

src/Database/Validator/Query/Filter.php

@@ -263,6 +263,8 @@ public function isValid($value): bool
             case Query::TYPE_NOT_DISTANCE:
             case Query::TYPE_DISTANCE_GREATER_THAN:
             case Query::TYPE_DISTANCE_LESS_THAN:
+            case Query::TYPE_NOT_DISTANCE_GREATER_THAN:
+            case Query::TYPE_NOT_DISTANCE_LESS_THAN:
                 if (count($value->getValues()) !== 1 || !is_array($value->getValues()[0]) || count($value->getValues()[0]) !== 2) {
                     $this->message = 'Distance query requires [[geometry, distance]] parameters';
                     return false;

tests/e2e/Adapter/Scopes/SpatialTests.php

@@ -453,6 +453,19 @@ public function testSpatialOneToMany(): void
             ], Database::PERMISSION_READ);
             $this->assertCount(2, $notFarSmall);
 
+            // Equal-distance semantics: distance (<=) and notDistance (>), threshold exactly at 0
+            $equalZero = $database->find($child, [
+                Query::distance('coord', [[[10.0, 10.0], 0.0]])
+            ], Database::PERMISSION_READ);
+            $this->assertNotEmpty($equalZero);
+            $this->assertEquals('p1', $equalZero[0]->getId());
+
+            $notEqualZero = $database->find($child, [
+                Query::notDistance('coord', [[[10.0, 10.0], 0.0]])
+            ], Database::PERMISSION_READ);
+            $this->assertNotEmpty($notEqualZero);
+            $this->assertEquals('p2', $notEqualZero[0]->getId());
+
             $region = $database->getDocument($parent, 'r1');
             $this->assertArrayHasKey('places', $region);
             $this->assertEquals(2, \count($region['places']));
@@ -572,6 +585,19 @@ public function testSpatialManyToOne(): void
             ], Database::PERMISSION_READ);
             $this->assertCount(2, $notFarSmall);
 
+            // Equal-distance semantics: distance (<=) and notDistance (>), threshold exactly at 0
+            $equalZero = $database->find($child, [
+                Query::distance('coord', [[[20.0, 20.0], 0.0]])
+            ], Database::PERMISSION_READ);
+            $this->assertNotEmpty($equalZero);
+            $this->assertEquals('s1', $equalZero[0]->getId());
+
+            $notEqualZero = $database->find($child, [
+                Query::notDistance('coord', [[[20.0, 20.0], 0.0]])
+            ], Database::PERMISSION_READ);
+            $this->assertNotEmpty($notEqualZero);
+            $this->assertEquals('s2', $notEqualZero[0]->getId());
+
             $city = $database->getDocument($parent, 'c1');
             $this->assertArrayHasKey('stops', $city);
             $this->assertEquals(2, \count($city['stops']));
@@ -691,6 +717,18 @@ public function testSpatialManyToMany(): void
             $this->assertNotEmpty($notFarSmall);
             $this->assertEquals('d1', $notFarSmall[0]->getId());
 
+            // Equal-distance semantics: distance (<=) and notDistance (>), threshold exactly at 0
+            $equalZero = $database->find($a, [
+                Query::distance('home', [[[30.0, 30.0], 0.0]])
+            ], Database::PERMISSION_READ);
+            $this->assertNotEmpty($equalZero);
+            $this->assertEquals('d1', $equalZero[0]->getId());
+
+            $notEqualZero = $database->find($a, [
+                Query::notDistance('home', [[[30.0, 30.0], 0.0]])
+            ], Database::PERMISSION_READ);
+            $this->assertEmpty($notEqualZero);
+
             // Ensure relationship present
             $d1 = $database->getDocument($a, 'd1');
             $this->assertArrayHasKey('routes', $d1);
@@ -1291,6 +1329,20 @@ public function testComplexGeometricShapes(): void
             ], Database::PERMISSION_READ);
             $this->assertCount(2, $notFarHuge);
 
+            // Equal-distance semantics for circle_center
+            // rect1 is exactly at [10,5], so distance 0
+            $equalZero = $database->find($collectionName, [
+                Query::distance('circle_center', [[[10, 5], 0.0]])
+            ], Database::PERMISSION_READ);
+            $this->assertNotEmpty($equalZero);
+            $this->assertEquals('rect1', $equalZero[0]->getId());
+
+            $notEqualZero = $database->find($collectionName, [
+                Query::notDistance('circle_center', [[[10, 5], 0.0]])
+            ], Database::PERMISSION_READ);
+            $this->assertNotEmpty($notEqualZero);
+            $this->assertEquals('rect2', $notEqualZero[0]->getId());
+
         } finally {
             $database->deleteCollection($collectionName);
         }