Improve aggregation count

Author: nealarec

src/JsonQueryServiceProvider.php

@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types=1);
+declare (strict_types = 1);
 
 namespace Asseco\JsonQueryBuilder;
 
@@ -21,6 +21,8 @@ public function register()
      */
     public function boot()
     {
-        $this->publishes([__DIR__ . '/../config/asseco-json-query-builder.php' => config_path('asseco-json-query-builder.php')]);
+        $this->publishes([
+            __DIR__ . '/../config/asseco-json-query-builder.php' => app()->configPath('asseco-json-query-builder.php'),
+        ]);
     }
 }

src/Traits/DatabaseFunctions.php

@@ -33,7 +33,7 @@ private function applyAggregation(array $params): string
             $column,
             $functions
         ) {
-            $stat = $query ?? $column;
+            $stat = $query ?? ("*" !== $column ? "\"$column\"" : $column);
             return $functions::$param($stat);
         });
     }
@@ -46,7 +46,7 @@ protected function prepareArguments(): void
             }
             $split = explode(":", $argument);
             $apply = $this->applyAggregation($split);
-            $alias = join("_", $split);
+            $alias = join("_", array_filter($split, fn($s) => "*" !== $s));
 
             return DB::raw("{$apply} as {$alias}");
         }, $this->arguments);

tests/Unit/RequestParameters/ReturnsParameterTest.php

@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types=1);
+declare (strict_types = 1);
 
 namespace Asseco\JsonQueryBuilder\Tests\Unit\RequestParameters;
 
@@ -63,4 +63,16 @@ public function produces_query()
 
         $this->assertEquals($query, $this->builder->toSql());
     }
+
+    /** @test */
+    public function produces_aggregation_query()
+    {
+        $returnsParameter = new ReturnsParameter(
+            ['count:attribute1', 'count:attribute2'], $this->builder, $this->modelConfig);
+        $returnsParameter->run();
+
+        $query = 'select count("attribute1") as count_attribute1, count("attribute2") as count_attribute2';
+
+        $this->assertEquals($query, $this->builder->toSql());
+    }
 }

tests/Unit/Traits/DatabaseFunctionsTest.php

@@ -39,7 +39,13 @@ public function setUp(): void
 
     public function test_it_not_throw_with_regular_parameters()
     {
-        $parameter = new TestParameterClass(["column_a", "column_b", "column_c", "column_d"], $this->builder, $this->modelConfig);
+        $parameter = new TestParameterClass([
+            "column_a",
+            "column_b",
+            "column_c",
+            "column_d",
+        ], $this->builder, $this->modelConfig);
+
         $this->assertNull($parameter->run());
         $this->assertEquals('select "column_a", "column_b", "column_c", "column_d"', $parameter->builder->toSql());
     }
@@ -50,7 +56,7 @@ public function test_it_apply_aggregation_functions()
             $builder   = $this->builder->clone();
             $parameter = new TestParameterClass(["$fn:column"], $builder, $this->modelConfig);
             $this->assertNull($parameter->run());
-            $this->assertEquals("select $fn(column) as {$fn}_column", $builder->toSql());
+            $this->assertEquals("select $fn(\"column\") as {$fn}_column", $builder->toSql());
         }
 
     }
@@ -59,15 +65,22 @@ public function test_it_apply_nested_aggregation_functions()
     {
         $parameter = new TestParameterClass(["avg:day:column"], $this->builder, $this->modelConfig);
         $this->assertNull($parameter->run());
-        $this->assertEquals("select avg(day(column)) as avg_day_column", $this->builder->toSql());
+        $this->assertEquals('select avg(day("column")) as avg_day_column', $this->builder->toSql());
     }
 
     public function test_it_uses_pgsql_syntax()
     {
         app("config")->set("database.default", "pgsql");
         $parameter = new TestParameterClass(["avg:day:column"], $this->builder, $this->modelConfig);
         $this->assertNull($parameter->run());
-        $this->assertEquals("select avg(EXTRACT(DAY FROM column)) as avg_day_column", $this->builder->toSql());
+        $this->assertEquals('select avg(EXTRACT(DAY FROM "column")) as avg_day_column', $this->builder->toSql());
+    }
+
+    public function test_it_parses_right_count_all_query()
+    {
+        $parameter = new TestParameterClass(["count:*"], $this->builder, $this->modelConfig);
+        $this->assertNull($parameter->run());
+        $this->assertEquals('select count(*) as count', $this->builder->toSql());
     }
 
 }