From 63a6cecbb08f79d0bf91d02f7bb04b89302c2b78 Mon Sep 17 00:00:00 2001
From: Torsten Schulz <tsschulz@gmx.net>
Date: Wed, 7 May 2025 12:28:57 +0200
Subject: [PATCH] Added sorting for events

---
 controllers/eventController.js | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/controllers/eventController.js b/controllers/eventController.js
index c1e9a94..3078e1a 100644
--- a/controllers/eventController.js
+++ b/controllers/eventController.js
@@ -36,6 +36,10 @@ const filterEvents = async (req, res) => {
         { dayOfWeek: { [Op.gte]: 0 } }
       ]
     };
+    const order = [
+      ['date', 'ASC'],
+      ['time', 'ASC']
+    ];
 
     if (request.id === 'all') {
       const events = await Event.findAll({
@@ -46,6 +50,7 @@ const filterEvents = async (req, res) => {
           { model: EventType, as: 'eventType' },
           { model: ContactPerson, as: 'contactPersons', through: { attributes: [] } }
         ],
+        order: order,
         logging: console.log  // Log the generated SQL query
       });
       return res.json({ events });
@@ -63,7 +68,7 @@ const filterEvents = async (req, res) => {
           { model: EventType, as: 'eventType' },
           { model: ContactPerson, as: 'contactPersons', through: { attributes: [] } },
         ],
-        order: ['name', 'date', 'time']
+        order: order,
       });
       return res.json({ events });
     }
@@ -96,7 +101,7 @@ const filterEvents = async (req, res) => {
         { model: EventType, as: 'eventType' },
         { model: ContactPerson, as: 'contactPersons', through: { attributes: [] } }
       ],
-      logging: console.log  // Log the generated SQL query
+      order: order,
     });
     const displayFields = request.display ? request.display : [];