Merge pull request #6 from event-engine/fix/nested_not_filter_not_working

Fix that nested NOT filter is not working properly

Author: Alexander Miertsch

src/PostgresDocumentStore.php

@@ -609,7 +609,7 @@ private function filterToWhereClause(Filter $filter, $argsCount = 0): array
                     throw new RuntimeException('Not filter cannot be combined with a non prop filter!');
                 }
 
-                [$innerFilterStr, $args, $argsCount] = $this->filterToWhereClause($innerFilter);
+                [$innerFilterStr, $args, $argsCount] = $this->filterToWhereClause($innerFilter, $argsCount);
 
                 if($innerFilter instanceof DocumentStore\Filter\AnyOfFilter || $innerFilter instanceof DocumentStore\Filter\AnyOfDocIdFilter) {
                     $inPos = strpos($innerFilterStr, ' IN(');

tests/PostgresDocumentStoreTest.php

@@ -11,9 +11,11 @@
 
 namespace EventEngine\DocumentStoreTest\Postgres;
 
+use EventEngine\DocumentStore\Filter\AndFilter;
 use EventEngine\DocumentStore\Filter\AnyOfDocIdFilter;
 use EventEngine\DocumentStore\Filter\AnyOfFilter;
 use EventEngine\DocumentStore\Filter\DocIdFilter;
+use EventEngine\DocumentStore\Filter\EqFilter;
 use EventEngine\DocumentStore\Filter\InArrayFilter;
 use EventEngine\DocumentStore\Filter\NotFilter;
 use PHPUnit\Framework\TestCase;
@@ -22,6 +24,7 @@
 use EventEngine\DocumentStore\MultiFieldIndex;
 use EventEngine\DocumentStore\Postgres\PostgresDocumentStore;
 use Ramsey\Uuid\Uuid;
+use function array_map;
 
 class PostgresDocumentStoreTest extends TestCase
 {
@@ -396,6 +399,41 @@ public function it_handles_in_array_filter_with_object_items()
         $this->assertEquals([$secondDocId, $thirdDocId], $refs);
     }
 
+    /**
+     * @test
+     */
+    public function it_handles_not_filter_nested_in_and_filter()
+    {
+        $collectionName = 'test_not_filter_nested_in_and_filter';
+        $this->documentStore->addCollection($collectionName);
+
+        $firstDocId = Uuid::uuid4()->toString();
+        $secondDocId = Uuid::uuid4()->toString();
+        $thirdDocId = Uuid::uuid4()->toString();
+
+        $this->documentStore->addDoc($collectionName, $firstDocId, ['foo' => ['bar' => 'bas'], 'ref' => $firstDocId]);
+        $this->documentStore->addDoc($collectionName, $secondDocId, ['foo' => ['bar' => 'bat'], 'ref' => $secondDocId]);
+        $this->documentStore->addDoc($collectionName, $thirdDocId, ['foo' => ['bar' => 'bat'], 'ref' => $thirdDocId]);
+
+        $filteredDocs = \iterator_to_array($this->documentStore->filterDocs(
+            $collectionName,
+            new AndFilter(
+                new EqFilter('foo.bar', 'bat'),
+                new NotFilter(
+                    new EqFilter('ref', $secondDocId)
+                )
+            )
+        ));
+
+        $this->assertCount(1, $filteredDocs);
+
+        $refs = array_map(function (array $doc) {
+            return $doc['ref'];
+        }, $filteredDocs);
+
+        $this->assertEquals([$thirdDocId], $refs);
+    }
+
     private function getIndexes(string $collectionName): array
     {
         return TestUtil::getIndexes($this->connection, self::TABLE_PREFIX.$collectionName);