fix: ambiguous column aggregate

code4romania · Oct 24, 2024 · fa527ad · fa527ad
1 parent cd12a8a
commit fa527ad
Show file tree

Hide file tree

Showing 7 changed files with 38 additions and 3 deletions.
diff --git a/app/Jobs/GenerateReport/Standard/Nurse/GenerateStatisticReportJob.php b/app/Jobs/GenerateReport/Standard/Nurse/GenerateStatisticReportJob.php
@@ -22,9 +22,7 @@ public function generate(): void
 
                         return [
                             $indicator->label() => [
-                                $reportQuery::build($this->report)
-                                    ->distinct('id')
-                                    ->count('id'),
+                                $reportQuery::aggregate($this->report),
                             ],
                         ];
                     }),

diff --git a/app/Reports/Queries/Child/C21.php b/app/Reports/Queries/Child/C21.php
@@ -28,6 +28,11 @@ public static function dateColumn(): string
         return 'interventionable_individual_services.date';
     }
 
+    public static function aggregateByColumn(): string
+    {
+        return 'interventions.id';
+    }
+
     public static function columns(): array
     {
         return [

diff --git a/app/Reports/Queries/General/G11.php b/app/Reports/Queries/General/G11.php
@@ -29,6 +29,11 @@ public static function dateColumn(): string
         return 'interventionable_individual_services.date';
     }
 
+    public static function aggregateByColumn(): string
+    {
+        return 'interventions.id';
+    }
+
     public static function columns(): array
     {
         return [

diff --git a/app/Reports/Queries/General/G27.php b/app/Reports/Queries/General/G27.php
@@ -29,6 +29,11 @@ public static function dateColumn(): string
         return 'interventionable_individual_services.date';
     }
 
+    public static function aggregateByColumn(): string
+    {
+        return 'interventions.id';
+    }
+
     public static function columns(): array
     {
         return [

diff --git a/app/Reports/Queries/General/G28.php b/app/Reports/Queries/General/G28.php
@@ -29,6 +29,11 @@ public static function dateColumn(): string
         return 'interventionable_individual_services.date';
     }
 
+    public static function aggregateByColumn(): string
+    {
+        return 'interventions.id';
+    }
+
     public static function columns(): array
     {
         return [

diff --git a/app/Reports/Queries/Pregnant/P12.php b/app/Reports/Queries/Pregnant/P12.php
@@ -28,6 +28,11 @@ public static function dateColumn(): string
         return 'interventionable_individual_services.date';
     }
 
+    public static function aggregateByColumn(): string
+    {
+        return 'interventions.id';
+    }
+
     public static function columns(): array
     {
         return [

diff --git a/app/Reports/Queries/ReportQuery.php b/app/Reports/Queries/ReportQuery.php
@@ -18,6 +18,11 @@ public static function dateColumn(): string
         return 'beneficiaries.created_at';
     }
 
+    public static function aggregateByColumn(): string
+    {
+        return 'id';
+    }
+
     public static function columns(): array
     {
         return [
@@ -83,4 +88,11 @@ public static function build(Report $report): Builder
             ->whereDate(static::dateColumn(), '>=', $report->date_from)
             ->whereDate(static::dateColumn(), '<=', $report->date_until);
     }
+
+    public static function aggregate(Report $report): int
+    {
+        return static::build($report)
+            ->distinct(static::aggregateByColumn())
+            ->count(static::aggregateByColumn());
+    }
 }