Add leaders to dashboard

app/Membership/AgeGroupCountBlock.php

@@ -11,7 +11,7 @@ class AgeGroupCountBlock extends Block
     /**
      * @return Builder<Membership>
      */
-    public function query(): Builder
+    public function memberQuery(): Builder
     {
         return Membership::select('subactivities.slug', 'subactivities.name')
             ->selectRaw('COUNT(member_id) AS count')
@@ -23,10 +23,24 @@ class AgeGroupCountBlock extends Block
             ->orderBy('subactivity_id');
     }
 
+    /**
+     * @return Builder<Membership>
+     */
+    public function leaderQuery(): Builder
+    {
+        return Membership::selectRaw('"leiter" AS slug, "Leiter" AS name, COUNT(member_id) AS count')
+            ->join('activities', 'memberships.activity_id', 'activities.id')
+            ->join('subactivities', 'memberships.subactivity_id', 'subactivities.id')
+            ->isLeader();
+    }
+
     protected function data(): array
     {
         return [
-            'groups' => $this->query()->get()->toArray(),
+            'groups' => [
+                ...$this->memberQuery()->get()->toArray(),
+                ...$this->leaderQuery()->get()->toArray(),
+            ],
         ];
     }
 

tests/Feature/Membership/AgeGroupCountBlockTest.php

@@ -23,7 +23,10 @@ class AgeGroupCountBlockTest extends TestCase
             ->has(Membership::factory()->in('€ Mitglied', 1, 'Wölfling', 3))
             ->defaults()
             ->create();
-        Member::factory()->has(Membership::factory()->in('€ LeiterIn', 2, 'Wölfling', 3))
+        Member::factory()->count(2)->has(Membership::factory()->in('€ LeiterIn', 2, 'Wölfling', 3))
+            ->defaults()
+            ->create();
+        Member::factory()->count(2)->has(Membership::factory()->in('€ LeiterIn', 2, 'Jungpfadfinder', 3))
             ->defaults()
             ->create();
 
@@ -33,6 +36,7 @@ class AgeGroupCountBlockTest extends TestCase
             'groups' => [
                 ['slug' => 'biber', 'name' => 'Biber', 'count' => 3],
                 ['slug' => 'woelfling', 'name' => 'Wölfling', 'count' => 4],
+                ['slug' => 'leiter', 'name' => 'Leiter', 'count' => 4],
             ],
         ], $data);
     }