From 20c90dce38f9db39debdbc8834c76e5982ff69d4 Mon Sep 17 00:00:00 2001
From: Matteo Gheza <matteo.gheza07@gmail.com>
Date: Fri, 1 Sep 2023 15:14:12 +0200
Subject: [PATCH] Update user list order

---
 backend/app/Http/Controllers/UserController.php |  3 ++-
 backend/app/Telegram/WebhookController.php      | 10 +++++++++-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/backend/app/Http/Controllers/UserController.php b/backend/app/Http/Controllers/UserController.php
index b320887..9e07305 100644
--- a/backend/app/Http/Controllers/UserController.php
+++ b/backend/app/Http/Controllers/UserController.php
@@ -22,9 +22,10 @@ class UserController extends Controller
             ->select($requestedCols)
             ->orderBy('available', 'desc')
             ->orderBy('chief', 'desc')
+            ->orderBy('driver', 'desc')
             ->orderBy('services', 'asc')
             ->orderBy('trainings', 'desc')
-            ->orderBy('availability_minutes', 'asc')
+            ->orderBy('availability_minutes', 'desc')
             ->orderBy('name', 'asc')
             ->get();
     }
diff --git a/backend/app/Telegram/WebhookController.php b/backend/app/Telegram/WebhookController.php
index 5f07ef1..8060d8f 100644
--- a/backend/app/Telegram/WebhookController.php
+++ b/backend/app/Telegram/WebhookController.php
@@ -167,7 +167,15 @@ class WebhookController extends
             return;
         }
         //Get all users with availability true
-        $users = User::where('available', true)->where('hidden', false)->get();
+        $users = User::where('available', true)
+          ->where('hidden', false)
+          ->orderBy('chief', 'desc')
+          ->orderBy('driver', 'desc')
+          ->orderBy('services', 'asc')
+          ->orderBy('trainings', 'desc')
+          ->orderBy('availability_minutes', 'desc')
+          ->orderBy('name', 'asc')
+          ->get();
         if(count($users) == 0) {
             $text = "⚠️ Nessun vigile attualmente disponibile.";
         } else {