Merge pull request #156 from vincent-chapron/fixbug/add-order-by-query

Fixbug/add order by query

Author: paulandrieux

Bundle/QueryBundle/Entity/Traits/QueryTrait.php

@@ -14,6 +14,13 @@ trait QueryTrait
      */
     protected $query;
 
+    /**
+     * @var string
+     *
+     * @ORM\Column(name="orderBy", type="text", nullable=true)
+     */
+    protected $orderBy;
+
     /**
      *  Auto list mode: businessentity type
      * @var string
@@ -42,6 +49,26 @@ public function setQuery($query)
         $this->query = $query;
     }
 
+    /**
+     * Get orderBy
+     *
+     * @return string
+     */
+    public function getOrderBy()
+    {
+        return $this->orderBy;
+    }
+
+    /**
+     * Set orderBy
+     *
+     * @param string $orderBy
+     */
+    public function setOrderBy($orderBy)
+    {
+        $this->orderBy = $orderBy;
+    }
+
     /**
      * Get businessEntity
      *

Bundle/QueryBundle/Helper/QueryHelper.php

@@ -125,6 +125,7 @@ public function buildWithSubQuery($containerEntity, QueryBuilder $itemsQueryBuil
 
         //get the query of the container entity
         $query = $containerEntity->getQuery();
+        $orderBy = json_decode($containerEntity->getOrderBy(), true);
         if ($query !== '' && $query !== null) {
 
             $subQuery = $this->entityManager->createQueryBuilder()
@@ -133,6 +134,11 @@ public function buildWithSubQuery($containerEntity, QueryBuilder $itemsQueryBuil
 
             $itemsQueryBuilder
                 ->andWhere('main_item.id IN ('.$subQuery->getQuery()->getDql().' '.$query.')');
+            if ($orderBy) {
+                foreach ($orderBy as $addOrderBy) {
+                    $itemsQueryBuilder->addOrderBy('main_item.' . $addOrderBy['by'], $addOrderBy['order']);
+                }
+            }
         }
         $currentView = $this->currentView;