Add table with custom Adapter, giving full return and using propery paths to rsolve the value

Author: shades684

src/Adapter/Doctrine/ORMAdapter.php

@@ -197,6 +197,7 @@ protected function getResults(AdapterQuery $query): \Traversable
             ;
         }
 
+        //!$this->query->getHint(self::HINT_DISTINCT) || isset($this->selectedClasses[$joinedDqlAlias])
         foreach ($builder->getQuery()->iterate([], $this->hydrationMode) as $result) {
             yield $entity = array_values($result)[0];
             if (Query::HYDRATE_OBJECT === $this->hydrationMode) {

tests/Fixtures/AppBundle/Controller/GroupedController.php

@@ -15,6 +15,7 @@
 use Omines\DataTablesBundle\Controller\DataTablesTrait;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\HttpFoundation\Request;
+use Tests\Fixtures\AppBundle\DataTable\Type\Grouped2TableType;
 use Tests\Fixtures\AppBundle\DataTable\Type\GroupedTableType;
 
 /**
@@ -35,4 +36,14 @@ public function tableAction(Request $request)
 
         return $datatable->handleRequest($request)->getResponse();
     }
+
+    public function table2Action(Request $request)
+    {
+        $datatable = $this->createDataTableFromType(Grouped2TableType::class)
+            ->setName('companies2')
+            ->setMethod(Request::METHOD_GET)
+        ;
+
+        return $datatable->handleRequest($request)->getResponse();
+    }
 }

tests/Fixtures/AppBundle/DataTable/Adapter/CustomORMAdapter.php

@@ -0,0 +1,62 @@
+<?php
+
+namespace Tests\Fixtures\AppBundle\DataTable\Adapter;
+
+use Doctrine\ORM\Query;
+use Doctrine\ORM\Query\Expr\GroupBy;
+use Doctrine\ORM\QueryBuilder;
+use Omines\DataTablesBundle\Adapter\AdapterQuery;
+use Omines\DataTablesBundle\Adapter\Doctrine\ORMAdapter;
+use Omines\DataTablesBundle\Column\AbstractColumn;
+
+class CustomORMAdapter extends ORMAdapter
+{
+    protected $hydrationMode;
+
+    public function configure(array $options)
+    {
+        parent::configure($options);
+
+        $this->hydrationMode = isset($options['hydrate']) ? $options['hydrate'] : Query::HYDRATE_OBJECT;
+    }
+
+    protected function prepareQuery(AdapterQuery $query)
+    {
+        parent::prepareQuery($query);
+        $query->setIdentifierPropertyPath(null);
+    }
+
+    /**
+     * @param AdapterQuery $query
+     * @return \Traversable
+     */
+    protected function getResults(AdapterQuery $query): \Traversable
+    {
+        /** @var QueryBuilder $builder */
+        $builder = $query->get('qb');
+        $state = $query->getState();
+
+        // Apply definitive view state for current 'page' of the table
+        foreach ($state->getOrderBy() as list($column, $direction)) {
+            /** @var AbstractColumn $column */
+            if ($column->isOrderable()) {
+                $builder->addOrderBy($column->getOrderField(), $direction);
+            }
+        }
+        if ($state->getLength() > 0) {
+            $builder
+                ->setFirstResult($state->getStart())
+                ->setMaxResults($state->getLength());
+        }
+
+        /**
+         * Use foreach instead of iterate to prevent group by from crashing
+         */
+        foreach ($builder->getQuery()->getResult($this->hydrationMode) as $result) {
+            /**
+             * Return everything instead of first element
+             */
+            yield $result;
+        }
+    }
+}

tests/Fixtures/AppBundle/DataTable/Type/Grouped2TableType.php

@@ -0,0 +1,53 @@
+<?php
+
+/*
+ * Symfony DataTables Bundle
+ * (c) Omines Internetbureau B.V. - https://omines.nl/
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Tests\Fixtures\AppBundle\DataTable\Type;
+
+use Doctrine\ORM\Query;
+use Doctrine\ORM\QueryBuilder;
+use Omines\DataTablesBundle\Column\TextColumn;
+use Omines\DataTablesBundle\DataTable;
+use Omines\DataTablesBundle\DataTableTypeInterface;
+use Tests\Fixtures\AppBundle\DataTable\Adapter\CustomORMAdapter;
+use Tests\Fixtures\AppBundle\Entity\Company;
+
+/**
+ * GroupedTableType.
+ *
+ * @author Niels Keurentjes <[email protected]>
+ */
+class Grouped2TableType implements DataTableTypeInterface
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function configure(DataTable $dataTable, array $options)
+    {
+        $dataTable
+            ->add('company', TextColumn::class, ['propertyPath' => '[0][name]'])
+            ->add('employeeCount', TextColumn::class, ['propertyPath' => '[employeeCount]'])
+            ->createAdapter(CustomORMAdapter::class, [
+                'entity' => Company::class,
+                'hydrate' => Query::HYDRATE_ARRAY,
+                'query' => function (QueryBuilder $builder) {
+                    $builder
+                        ->select('c')
+                        ->addSelect('count(e) AS employeeCount')
+                        ->from(Company::class, 'c')
+                        ->leftJoin('c.employees', 'e')
+                        ->groupBy('c.id')
+                    ;
+                },
+            ])
+        ;
+    }
+}

tests/Fixtures/routing.yml

@@ -22,6 +22,10 @@ grouped:
     path:       /grouped
     controller: Tests\Fixtures\AppBundle\Controller\GroupedController::tableAction
 
+grouped2:
+    path:       /grouped2
+    controller: Tests\Fixtures\AppBundle\Controller\GroupedController::table2Action
+
 employee.edit:
     path:       /employee/{id}
 

tests/Fixtures/services.yml

@@ -2,3 +2,6 @@ services:
     Tests\Fixtures\AppBundle\DataTable\Type\ServicePersonTableType:
         autowire: true
         autoconfigure: true
+    Tests\Fixtures\AppBundle\DataTable\Adapter\CustomORMAdapter:
+        autowire: true
+        autoconfigure: true

tests/Functional/FunctionalTest.php

@@ -116,6 +116,13 @@ public function testGroupedDataTable()
         $this->assertStringStartsWith('Company ', $json->data[0]->company);
     }
 
+    public function testGrouped2DataTable()
+    {
+        $json = $this->callDataTableUrl('/grouped2?_dt=companies2&draw=2');
+
+        $this->assertStringStartsWith('Company ', $json->data[0]->company);
+    }
+
     private function callDataTableUrl(string $url)
     {
         $this->client->enableProfiler();