metrics: Added vouchers and tshirts

2 files changed, 50 insertions, 3 deletions

diff --git a/src/Controllers/Metrics/Controller.php b/src/Controllers/Metrics/Controller.php
index 0fd26396..86c21562 100644
--- a/src/Controllers/Metrics/Controller.php
+++ b/src/Controllers/Metrics/Controller.php
@@ -55,6 +55,17 @@ class Controller extends BaseController
         $now = microtime(true);
         $this->checkAuth();
 
+        $tshirtSizes = [];
+        $userSizes = $this->stats->tshirtSizes();
+
+        foreach ($this->config->get('tshirt_sizes') as $name => $description) {
+            $size = $userSizes->where('shirt_size', '=', $name)->sum('count');
+            $tshirtSizes[] = [
+                'labels' => ['size' => $name],
+                $size,
+            ];
+        }
+
         $data = [
             $this->config->get('app_name') . ' stats',
             'users'                => [
@@ -84,6 +95,9 @@ class Controller extends BaseController
                 ['labels' => ['state' => 'freeloaded'], 'value' => $this->stats->workSeconds(null, true)],
             ],
             'worklog_seconds'      => ['type' => 'gauge', $this->stats->worklogSeconds()],
+            'vouchers'             => ['type' => 'counter', $this->stats->vouchers()],
+            'tshirts_issued'       => ['type' => 'counter', 'help' => 'Issued T-Shirts', $this->stats->tshirts()],
+            'tshirt_sizes'         => ['type' => 'gauge', 'help' => 'The sizes users have configured'] + $tshirtSizes,
             'shifts'               => ['type' => 'gauge', $this->stats->shifts()],
             'announcements'        => [
                 'type' => 'gauge',
@@ -92,8 +106,8 @@ class Controller extends BaseController
             ],
             'questions'            => [
                 'type' => 'gauge',
-                ['labels' => ['answered' => true], 'value' => $this->stats->questions(true)],
-                ['labels' => ['answered' => false], 'value' => $this->stats->questions(false)],
+                ['labels' => ['state' => 'answered'], 'value' => $this->stats->questions(true)],
+                ['labels' => ['state' => 'pending'], 'value' => $this->stats->questions(false)],
             ],
             'messages'             => ['type' => 'gauge', $this->stats->messages()],
             'password_resets'      => ['type' => 'gauge', $this->stats->passwordResets()],
diff --git a/src/Controllers/Metrics/Stats.php b/src/Controllers/Metrics/Stats.php
index 838411d1..11643e46 100644
--- a/src/Controllers/Metrics/Stats.php
+++ b/src/Controllers/Metrics/Stats.php
@@ -97,6 +97,40 @@ class Stats
     }
 
     /**
+     * @return int
+     */
+    public function vouchers(): int
+    {
+        return $this
+            ->getQuery('users_state')
+            ->sum('got_voucher');
+    }
+
+    /**
+     * @return int
+     */
+    public function tshirts(): int
+    {
+        return $this
+            ->getQuery('users_state')
+            ->where('got_shirt', '=', true)
+            ->count();
+    }
+
+    /**
+     * @return \Illuminate\Support\Collection
+     */
+    public function tshirtSizes()
+    {
+        return $this
+            ->getQuery('users_personal_data')
+            ->select(['shirt_size', $this->raw('COUNT(shirt_size) AS count')])
+            ->whereNotNull('shirt_size')
+            ->groupBy('shirt_size')
+            ->get();
+    }
+
+    /**
      * @param string $vehicle
      * @return int
      * @codeCoverageIgnore
@@ -267,7 +301,6 @@ class Stats
     /**
      * @param mixed $value
      * @return QueryExpression
-     * @codeCoverageIgnore
      */
     protected function raw($value)
     {