Move multiselect to separate class MultiSelecy

Author: compositephp

src/AbstractTable.php

@@ -3,6 +3,7 @@
 namespace Composite\DB;
 
 use Composite\DB\MultiQuery\MultiInsert;
+use Composite\DB\MultiQuery\MultiSelect;
 use Composite\Entity\Helpers\DateTimeHelper;
 use Composite\Entity\AbstractEntity;
 use Composite\DB\Exceptions\DbException;
@@ -225,52 +226,15 @@ protected function findOneInternal(array $where): ?array
      * @param array<int|string|array<string,mixed>> $pkList
      * @return array<array<string, mixed>>
      * @throws DbException
-     * @throws EntityException
      * @throws \Doctrine\DBAL\Exception
      */
     protected function findMultiInternal(array $pkList): array
     {
         if (!$pkList) {
             return [];
         }
-        /** @var class-string<AbstractEntity> $class */
-        $class = $this->config->entityClass;
-
-        $pkColumns = [];
-        foreach ($this->config->primaryKeys as $primaryKeyName) {
-            $pkColumns[$primaryKeyName] = $class::schema()->getColumn($primaryKeyName);
-        }
-        if (count($pkColumns) === 1) {
-            if (!array_is_list($pkList)) {
-                throw new DbException('Input argument $pkList must be list');
-            }
-            /** @var \Composite\Entity\Columns\AbstractColumn $pkColumn */
-            $pkColumn = reset($pkColumns);
-            $preparedPkValues = array_map(fn ($pk) => $pkColumn->uncast($pk), $pkList);
-            $query = $this->select();
-            $this->buildWhere($query, [$pkColumn->name => $preparedPkValues]);
-        } else {
-            $query = $this->select();
-            $expressions = [];
-            foreach ($pkList as $i => $pkArray) {
-                if (!is_array($pkArray)) {
-                    throw new DbException('For tables with composite keys, input array must consist associative arrays');
-                }
-                $pkOrExpr = [];
-                foreach ($pkArray as $pkName => $pkValue) {
-                    if (is_string($pkName) && isset($pkColumns[$pkName])) {
-                        $preparedPkValue = $pkColumns[$pkName]->cast($pkValue);
-                        $pkOrExpr[] = $query->expr()->eq($pkName, ':' . $pkName . $i);
-                        $query->setParameter($pkName . $i, $preparedPkValue);
-                    }
-                }
-                if ($pkOrExpr) {
-                    $expressions[] = $query->expr()->and(...$pkOrExpr);
-                }
-            }
-            $query->where($query->expr()->or(...$expressions));
-        }
-        return $query->executeQuery()->fetchAllAssociative();
+        $multiSelect = new MultiSelect($this->getConnection(), $this->config, $pkList);
+        return $multiSelect->getQueryBuilder()->executeQuery()->fetchAllAssociative();
     }
 
     /**
@@ -395,7 +359,7 @@ protected function select(string $select = '*'): QueryBuilder
     /**
      * @param array<string, mixed> $where
      */
-    private function buildWhere(QueryBuilder $query, array $where): void
+    private function buildWhere(\Doctrine\DBAL\Query\QueryBuilder $query, array $where): void
     {
         foreach ($where as $column => $value) {
             if ($value === null) {

src/MultiQuery/MultiSelect.php

@@ -0,0 +1,64 @@
+<?php declare(strict_types=1);
+
+namespace Composite\DB\MultiQuery;
+
+use Composite\DB\Exceptions\DbException;
+use Composite\DB\TableConfig;
+use Composite\Entity\AbstractEntity;
+use Doctrine\DBAL\Connection;
+use Doctrine\DBAL\Query\QueryBuilder;
+
+class MultiSelect
+{
+    private readonly QueryBuilder $queryBuilder;
+
+    public function __construct(
+        Connection $connection,
+        TableConfig $tableConfig,
+        array $condition,
+    ) {
+        $query = $connection->createQueryBuilder()->select('*')->from($tableConfig->tableName);
+        /** @var class-string<AbstractEntity> $class */
+        $class = $tableConfig->entityClass;
+
+        $pkColumns = [];
+        foreach ($tableConfig->primaryKeys as $primaryKeyName) {
+            $pkColumns[$primaryKeyName] = $class::schema()->getColumn($primaryKeyName);
+        }
+
+        if (count($pkColumns) === 1) {
+            if (!array_is_list($condition)) {
+                throw new DbException('Input argument $pkList must be list');
+            }
+            /** @var \Composite\Entity\Columns\AbstractColumn $pkColumn */
+            $pkColumn = reset($pkColumns);
+            $preparedPkValues = array_map(fn ($pk) => $pkColumn->uncast($pk), $condition);
+            $query->andWhere($query->expr()->in($pkColumn->name, $preparedPkValues));
+        } else {
+            $expressions = [];
+            foreach ($condition as $i => $pkArray) {
+                if (!is_array($pkArray)) {
+                    throw new DbException('For tables with composite keys, input array must consist associative arrays');
+                }
+                $pkOrExpr = [];
+                foreach ($pkArray as $pkName => $pkValue) {
+                    if (is_string($pkName) && isset($pkColumns[$pkName])) {
+                        $preparedPkValue = $pkColumns[$pkName]->cast($pkValue);
+                        $pkOrExpr[] = $query->expr()->eq($pkName, ':' . $pkName . $i);
+                        $query->setParameter($pkName . $i, $preparedPkValue);
+                    }
+                }
+                if ($pkOrExpr) {
+                    $expressions[] = $query->expr()->and(...$pkOrExpr);
+                }
+            }
+            $query->where($query->expr()->or(...$expressions));
+        }
+        $this->queryBuilder = $query;
+    }
+
+    public function getQueryBuilder(): QueryBuilder
+    {
+        return $this->queryBuilder;
+    }
+}

tests/Table/AbstractTableTest.php

@@ -101,4 +101,48 @@ public function test_illegalCreateEntity(): void
         $empty = $table->buildEntities(['abc']);
         $this->assertEmpty($empty);
     }
+
+    /**
+     * @dataProvider buildWhere_dataProvider
+     */
+    public function test_buildWhere($where, $expectedSQL, $expectedParams)
+    {
+        $table = new Tables\TestStrictTable();
+
+        $selectReflection = new \ReflectionMethod($table, 'select');
+        $selectReflection->setAccessible(true);
+
+        $queryBuilder = $selectReflection->invoke($table);
+
+        $buildWhereReflection = new \ReflectionMethod($table, 'buildWhere');
+        $buildWhereReflection->setAccessible(true);
+
+        $buildWhereReflection->invokeArgs($table, [$queryBuilder, $where]);
+
+        $this->assertEquals($expectedSQL, $queryBuilder->getSQL());
+    }
+
+    public static function buildWhere_dataProvider(): array
+    {
+        return [
+            // Test when value is null
+            [
+                ['column1' => null],
+                'SELECT * FROM Strict WHERE column1 IS NULL',
+                []
+            ],
+            // Test when value is an array
+            [
+                ['column1' => [1, 2, 3]],
+                'SELECT * FROM Strict WHERE column1 IN (1, 2, 3)',
+                [1, 2, 3]
+            ],
+            // Test when value is a single value
+            [
+                ['column1' => 'value1'],
+                'SELECT * FROM Strict WHERE column1 = :column1',
+                ['value1']
+            ],
+        ];
+    }
 }