Fix InArray filter for object items

Author: codeliner

src/PostgresDocumentStore.php

@@ -621,7 +621,7 @@ private function filterToWhereClause(Filter $filter, $argsCount = 0): array
             case DocumentStore\Filter\InArrayFilter::class:
                 /** @var DocumentStore\Filter\InArrayFilter $filter */
                 $prop = $this->propToJsonPath($filter->prop());
-                return ["$prop @> :a$argsCount", ["a$argsCount" => $this->prepareVal($filter->val(), $filter->prop())], ++$argsCount];
+                return ["$prop @> :a$argsCount", ["a$argsCount" => '[' . $this->prepareVal($filter->val(), $filter->prop()) . ']'], ++$argsCount];
             case DocumentStore\Filter\ExistsFilter::class:
                 /** @var DocumentStore\Filter\ExistsFilter $filter */
                 $prop = $this->propToJsonPath($filter->prop());

tests/PostgresDocumentStoreTest.php

@@ -14,6 +14,7 @@
 use EventEngine\DocumentStore\Filter\AnyOfDocIdFilter;
 use EventEngine\DocumentStore\Filter\AnyOfFilter;
 use EventEngine\DocumentStore\Filter\DocIdFilter;
+use EventEngine\DocumentStore\Filter\InArrayFilter;
 use EventEngine\DocumentStore\Filter\NotFilter;
 use PHPUnit\Framework\TestCase;
 use EventEngine\DocumentStore\FieldIndex;
@@ -305,6 +306,96 @@ public function it_handles_not_any_of_id_filter()
         $this->assertEquals(['bat'], $vals);
     }
 
+    /**
+     * @test
+     */
+    public function it_handles_in_array_filter()
+    {
+        $collectionName = 'test_in_array_filter';
+        $this->documentStore->addCollection($collectionName);
+
+        $firstDocId = Uuid::uuid4()->toString();
+        $secondDocId = Uuid::uuid4()->toString();
+        $thirdDocId = Uuid::uuid4()->toString();
+
+        $this->documentStore->addDoc($collectionName, $firstDocId, ['foo' => ['bar' => ['tag1', 'tag2'], 'ref' => $firstDocId]]);
+        $this->documentStore->addDoc($collectionName, $secondDocId, ['foo' => ['bar' => ['tag2', 'tag3'], 'ref' => $secondDocId]]);
+        $this->documentStore->addDoc($collectionName, $thirdDocId, ['foo' => ['bar' => ['tag3', 'tag4'], 'ref' => $thirdDocId]]);
+
+        $filteredDocs = \iterator_to_array($this->documentStore->filterDocs(
+            $collectionName,
+            new InArrayFilter('foo.bar', 'tag3')
+        ));
+
+        $this->assertCount(2, $filteredDocs);
+
+        $refs = array_map(function (array $doc) {
+            return $doc['foo']['ref'];
+        }, $filteredDocs);
+
+        $this->assertEquals([$secondDocId, $thirdDocId], $refs);
+    }
+
+    /**
+     * @test
+     */
+    public function it_handles_not_in_array_filter()
+    {
+        $collectionName = 'test_not_in_array_filter';
+        $this->documentStore->addCollection($collectionName);
+
+        $firstDocId = Uuid::uuid4()->toString();
+        $secondDocId = Uuid::uuid4()->toString();
+        $thirdDocId = Uuid::uuid4()->toString();
+
+        $this->documentStore->addDoc($collectionName, $firstDocId, ['foo' => ['bar' => ['tag1', 'tag2'], 'ref' => $firstDocId]]);
+        $this->documentStore->addDoc($collectionName, $secondDocId, ['foo' => ['bar' => ['tag2', 'tag3'], 'ref' => $secondDocId]]);
+        $this->documentStore->addDoc($collectionName, $thirdDocId, ['foo' => ['bar' => ['tag3', 'tag4'], 'ref' => $thirdDocId]]);
+
+        $filteredDocs = \iterator_to_array($this->documentStore->filterDocs(
+            $collectionName,
+            new NotFilter(new InArrayFilter('foo.bar', 'tag3'))
+        ));
+
+        $this->assertCount(1, $filteredDocs);
+
+        $refs = array_map(function (array $doc) {
+            return $doc['foo']['ref'];
+        }, $filteredDocs);
+
+        $this->assertEquals([$firstDocId], $refs);
+    }
+
+    /**
+     * @test
+     */
+    public function it_handles_in_array_filter_with_object_items()
+    {
+        $collectionName = 'test_in_array_with_object_filter';
+        $this->documentStore->addCollection($collectionName);
+
+        $firstDocId = Uuid::uuid4()->toString();
+        $secondDocId = Uuid::uuid4()->toString();
+        $thirdDocId = Uuid::uuid4()->toString();
+
+        $this->documentStore->addDoc($collectionName, $firstDocId, ['foo' => ['bar' => [['tag' => 'tag1', 'other' => 'data'], ['tag' => 'tag2']], 'ref' => $firstDocId]]);
+        $this->documentStore->addDoc($collectionName, $secondDocId, ['foo' => ['bar' => [['tag' => 'tag2', 'other' => 'data'], ['tag' => 'tag3']], 'ref' => $secondDocId]]);
+        $this->documentStore->addDoc($collectionName, $thirdDocId, ['foo' => ['bar' => [['tag' => 'tag3', 'other' => 'data'], ['tag' => 'tag4']], 'ref' => $thirdDocId]]);
+
+        $filteredDocs = \iterator_to_array($this->documentStore->filterDocs(
+            $collectionName,
+            new InArrayFilter('foo.bar', ['tag' => 'tag3'])
+        ));
+
+        $this->assertCount(2, $filteredDocs);
+
+        $refs = array_map(function (array $doc) {
+            return $doc['foo']['ref'];
+        }, $filteredDocs);
+
+        $this->assertEquals([$secondDocId, $thirdDocId], $refs);
+    }
+
     private function getIndexes(string $collectionName): array
     {
         return TestUtil::getIndexes($this->connection, self::TABLE_PREFIX.$collectionName);

tests/SchemedPostgresDocumentStoreTest.php

@@ -43,7 +43,7 @@ protected function setUp(): void
         $this->documentStore = new PostgresDocumentStore($this->connection, self::TABLE_PREFIX);
     }
 
-    public function tearDown(): void
+    protected function tearDown(): void
     {
         TestUtil::tearDownDatabase();
     }

tests/TestUtil.php

@@ -86,6 +86,7 @@ public static function tearDownDatabase(): void
         $connection = self::getConnection();
         $statement = $connection->prepare('SELECT table_name FROM information_schema.tables WHERE table_schema = \'public\';');
         $connection->exec('DROP SCHEMA IF EXISTS prooph CASCADE');
+        $connection->exec('DROP SCHEMA IF EXISTS test CASCADE');
 
         $statement->execute();
         $tables = $statement->fetchAll(PDO::FETCH_COLUMN);