Add ability to sort multiple

Author: LIQRGV

src/RequestParser.php

@@ -133,21 +133,27 @@ private function parseFilter(array $filterQuery = []): array
         return $filters;
     }
 
-    private function parseSorter(?string $sortQuery): ?SortStruct
+    private function parseSorter(?string $sortQuery): ?array
     {
         if(is_null($sortQuery)) {
-            return null;
+            return [];
         }
 
+        $sortStructs = [];
+
         $fieldPattern = "/^\-?([a-zA-z\_]+)$/";
-        if(preg_match($fieldPattern, $sortQuery, $match)) {
-            $fieldName = $match[1];
-            $direction = $sortQuery[0] == "-" ? "DESC" : "ASC";
+        $splitedSortQuery = explode(",", $sortQuery);
+
+        foreach ($splitedSortQuery as $singleSortQuery) {
+            if(preg_match($fieldPattern, $singleSortQuery, $match)) {
+                $fieldName = $match[1];
+                $direction = $singleSortQuery[0] == "-" ? "DESC" : "ASC";
 
-            return new SortStruct($fieldName, $direction);
+                $sortStructs[] = new SortStruct($fieldName, $direction);
+            }
         }
 
-        return null;
+        return $sortStructs;
     }
 
     private function getModelFromNamespaces(string $modelName, array $modelNamespaces)
@@ -174,13 +180,17 @@ private function applyFilter(Builder $builder, array $filters): Builder
         return $builder;
     }
 
-    private function applySorter(Builder $builder, ?SortStruct $sorter)
+    private function applySorter(Builder $builder, array $sorter)
     {
-        if(is_null($sorter)) {
+        if(empty($sorter)) {
             return $builder;
         }
 
-        return $builder->orderBy($sorter->fieldName, $sorter->direction);
+        foreach ($sorter as $sort) {
+            $builder = $builder->orderBy($sort->fieldName, $sort->direction);
+        }
+
+        return $builder;
     }
 
     private function createModel(string $baseModelName)

src/Struct/ModelBuilderStruct.php

@@ -17,7 +17,7 @@ class ModelBuilderStruct {
      */
     public $sorter;
 
-    public function __construct(string $baseModelName, array $filters, ?SortStruct $sorter) {
+    public function __construct(string $baseModelName, array $filters, array $sorter) {
         $this->baseModelName = $baseModelName;
         $this->filters = $filters;
         $this->sorter = $sorter;

tests/RequestParserTest.php

@@ -87,6 +87,32 @@ function testSortBy()
         $this->assertEquals("desc", strtolower($builder->getQuery()->orders[0]['direction']));
     }
 
+    function testSortByMultiple()
+    {
+        $uri = 'some_model';
+        $controllerClass = MockModelController::class;
+        $query = new ParameterBag([
+            "sort" => "-name,id",
+        ]);
+        $requestParserOptions = [
+            'model_namespaces' => [
+                'LIQRGV\QueryFilter\Mocks',
+            ]
+        ];
+
+        $request = $this->createControllerRequest($uri, $controllerClass, $query, $requestParserOptions);
+
+        $requestParser = new RequestParser($request);
+        $builder = $requestParser->getBuilder();
+
+        $query = $builder->getQuery();
+        $this->assertEquals("mock_models", $query->from);
+        $this->assertEquals("name", $builder->getQuery()->orders[0]['column']);
+        $this->assertEquals("desc", strtolower($builder->getQuery()->orders[0]['direction']));
+        $this->assertEquals("id", $builder->getQuery()->orders[1]['column']);
+        $this->assertEquals("asc", strtolower($builder->getQuery()->orders[1]['direction']));
+    }
+
     function testSortByWithInvalidField()
     {
         $uri = 'some_model';