fixes (#331)

* fix: Undefined array key "suffix" * fix: ambiguous column aggregate * fix: data truncated for column 'initiator'
code4romania · Oct 24, 2024 · e8af181 · e8af181
1 parent 6f6eaad
commit e8af181
Show file tree

Hide file tree

Showing 9 changed files with 59 additions and 4 deletions.
diff --git a/app/Exports/Sheets/ReportStatisticSheet.php b/app/Exports/Sheets/ReportStatisticSheet.php
@@ -42,7 +42,7 @@ public function headings(): array
             ->map(function (array $column) {
                 $label = $column['label'];
 
-                if (filled($column['suffix'])) {
+                if (filled(data_get($column, 'suffix'))) {
                     $label .= "\n({$column['suffix']})";
                 }
 

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());
+    }
 }
diff --git a/...ations/2024_10_24_074306_change_initiator_column_type_in_interventionable_cases_table.php b/...ations/2024_10_24_074306_change_initiator_column_type_in_interventionable_cases_table.php
@@ -0,0 +1,20 @@
+<?php
+
+declare(strict_types=1);
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::table('interventionable_cases', function (Blueprint $table) {
+            $table->string('initiator')->nullable()->change();
+        });
+    }
+};