Merge pull request #202 from dbarzin/dev

fix measures index
dbarzin · Oct 21, 2024 · 2cb16df · 2cb16df
2 parents e818c8b + 0b18686
commit 2cb16df
Showing 1 changed file with 9 additions and 10 deletions.
diff --git a/app/Http/Controllers/MeasureController.php b/app/Http/Controllers/MeasureController.php
@@ -49,19 +49,18 @@ public function index(Request $request)
                     'measures.domain_id',
                     'measures.clause',
                     'measures.name',
-                    DB::raw('count(control_id) as control_count'),
-                    'domains.title',
+                    'domains.title'
                 ]
             )
             ->join('domains', 'domains.id', '=', 'measures.domain_id')
-            ->leftjoin('control_measure', 'control_measure.measure_id', 'measures.id')
-            ->leftjoin('controls', 'control_measure.control_id', 'controls.id')
-            ->where(function ($query) {
-                $query
-                    ->whereIn('controls.status', [0,1])
-                    ->orWhere('controls.status', null);
-            })
-            ->groupBy('measures.id','domains.title');
+            ->addSelect(
+                ['control_count' => DB::table('controls')
+                        ->selectRaw('count(*) as controls_count')
+                        ->leftjoin('control_measure', 'control_measure.measure_id', 'measures.id')
+                        ->whereColumn('control_measure.control_id', 'controls.id')
+                        ->whereIn('controls.status', [0,1])
+                ]
+            );
 
         if ($domain !== null) {
             $measures->where('measures.domain_id', $domain);