#26 => ok

src/Action/Search/SearchAction.php

@@ -19,8 +19,8 @@ use Psr\Http\Message\ResponseInterface as Response;
 
 use App\Utils\ActionTrait;
 use App\Utils\DBALConnectionFactory;
-use App\Search\SearchException;
-use App\Search\Operator\IOperatorFactory;
+use App\Utils\SearchException;
+use App\Utils\Operator\IOperatorFactory;
 use App\Entity\Dataset;
 use App\Entity\Attribute;
 
@@ -56,7 +56,7 @@ final class SearchAction
     private $dcf;
 
     /**
-     * 
+     *
      * @var IOperatorFactory
      */
     private $operatorFactory;
@@ -138,8 +138,10 @@ final class SearchAction
             $this->where($queryBuilder, $dataset, explode(';', $queryParams['c']));
         }
 
+        $listOfIds = explode(';', $queryParams['a']);
+
         if ($args['type'] === 'data') {
-            $this->select($queryBuilder, $dataset, explode(';', $queryParams['a']));
+            $this->select($queryBuilder, $dataset, $listOfIds);
 
             if (array_key_exists('o', $queryParams)) {
                 $this->order($queryBuilder, $dataset, explode(';', $queryParams['o']));
@@ -155,6 +157,15 @@ final class SearchAction
             $count = $this->fetchAll($queryBuilder);
             $result = array();
             $result['dataset_selected'] = $dataset->getLabel();
+            $attributesSelected = array();
+            foreach ($listOfIds as $id) {
+                $attribute = $this->getAttribute($dataset, (int) $id);
+                $attributesSelected[] = array(
+                    'name' => $attribute->getName(),
+                    'label' => $attribute->getLabel()
+                );
+            }
+            $result['attributes_selected'] = $attributesSelected;
             $result['total_items'] = $count[0]['nb'];
         } else {
             throw SearchException::typeOfSearchDoesNotExist($args['type']);

src/Search/Operator/Between.php → src/Utils/Operator/Between.php

@@ -8,7 +8,7 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
-namespace App\Search\Operator;
+namespace App\Utils\Operator;
 
 use Doctrine\DBAL\Query\Expression\ExpressionBuilder;
 use Doctrine\DBAL\Query\Expression\CompositeExpression;

src/Search/Operator/Equal.php → src/Utils/Operator/Equal.php

@@ -8,7 +8,7 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
-namespace App\Search\Operator;
+namespace App\Utils\Operator;
 
 use Doctrine\DBAL\Query\Expression\ExpressionBuilder;
 

src/Search/Operator/GreaterThan.php → src/Utils/Operator/GreaterThan.php

@@ -8,7 +8,7 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
-namespace App\Search\Operator;
+namespace App\Utils\Operator;
 
 use Doctrine\DBAL\Query\Expression\ExpressionBuilder;
 

src/Search/Operator/GreaterThanEqual.php → src/Utils/Operator/GreaterThanEqual.php

@@ -8,7 +8,7 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
-namespace App\Search\Operator;
+namespace App\Utils\Operator;
 
 use Doctrine\DBAL\Query\Expression\ExpressionBuilder;
 

src/Search/Operator/IOperator.php → src/Utils/Operator/IOperator.php

@@ -8,7 +8,7 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
-namespace App\Search\Operator;
+namespace App\Utils\Operator;
 
 interface IOperator
 {

src/Search/Operator/IOperatorFactory.php → src/Utils/Operator/IOperatorFactory.php

@@ -8,7 +8,7 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
-namespace App\Search\Operator;
+namespace App\Utils\Operator;
 
 use Doctrine\DBAL\Query\Expression\ExpressionBuilder;
 

src/Search/Operator/In.php → src/Utils/Operator/In.php

@@ -8,7 +8,7 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
-namespace App\Search\Operator;
+namespace App\Utils\Operator;
 
 use Doctrine\DBAL\Query\Expression\ExpressionBuilder;
 

src/Search/Operator/LessThan.php → src/Utils/Operator/LessThan.php

@@ -8,7 +8,7 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
-namespace App\Search\Operator;
+namespace App\Utils\Operator;
 
 use Doctrine\DBAL\Query\Expression\ExpressionBuilder;
 

src/Search/Operator/LessThanEqual.php → src/Utils/Operator/LessThanEqual.php

@@ -8,7 +8,7 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
-namespace App\Search\Operator;
+namespace App\Utils\Operator;
 
 use Doctrine\DBAL\Query\Expression\ExpressionBuilder;
 

src/Search/Operator/Like.php → src/Utils/Operator/Like.php

@@ -8,7 +8,7 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
-namespace App\Search\Operator;
+namespace App\Utils\Operator;
 
 use Doctrine\DBAL\Query\Expression\ExpressionBuilder;
 

src/Search/Operator/NotEqual.php → src/Utils/Operator/NotEqual.php

@@ -8,7 +8,7 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
-namespace App\Search\Operator;
+namespace App\Utils\Operator;
 
 use Doctrine\DBAL\Query\Expression\ExpressionBuilder;
 

src/Search/Operator/NotIn.php → src/Utils/Operator/NotIn.php

@@ -8,7 +8,7 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
-namespace App\Search\Operator;
+namespace App\Utils\Operator;
 
 use Doctrine\DBAL\Query\Expression\ExpressionBuilder;
 

src/Search/Operator/NotLike.php → src/Utils/Operator/NotLike.php

@@ -8,7 +8,7 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
-namespace App\Search\Operator;
+namespace App\Utils\Operator;
 
 use Doctrine\DBAL\Query\Expression\ExpressionBuilder;
 

src/Search/Operator/Operator.php → src/Utils/Operator/Operator.php

@@ -8,7 +8,7 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
-namespace App\Search\Operator;
+namespace App\Utils\Operator;
 
 use Doctrine\DBAL\Query\Expression\ExpressionBuilder;
 use Doctrine\DBAL\Types\Type;

src/Search/Operator/OperatorException.php → src/Utils/Operator/OperatorException.php

@@ -8,7 +8,7 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
-namespace App\Search\Operator;
+namespace App\Utils\Operator;
 
 use Exception;
 

src/Search/Operator/OperatorFactory.php → src/Utils/Operator/OperatorFactory.php

@@ -8,7 +8,7 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
-namespace App\Search\Operator;
+namespace App\Utils\Operator;
 
 use Doctrine\DBAL\Query\Expression\ExpressionBuilder;
 

src/Search/Operator/OperatorNotNull.php → src/Utils/Operator/OperatorNotNull.php

@@ -8,7 +8,7 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
-namespace App\Search\Operator;
+namespace App\Utils\Operator;
 
 use Doctrine\DBAL\Query\Expression\ExpressionBuilder;
 

src/Search/Operator/OperatorNull.php → src/Utils/Operator/OperatorNull.php

@@ -8,7 +8,7 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
-namespace App\Search\Operator;
+namespace App\Utils\Operator;
 
 use Doctrine\DBAL\Query\Expression\ExpressionBuilder;
 

src/Search/SearchException.php → src/Utils/SearchException.php

@@ -8,7 +8,7 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
-namespace App\Search;
+namespace App\Utils;
 
 use Exception;