From 7124133f884d20bb9437cce88e8e590cf5f72c4f Mon Sep 17 00:00:00 2001
From: Finn Stutzenstein <Finn Stutzenstein finn.stutzenstein@intevation.de>
Date: Sun, 6 Mar 2022 11:22:45 +0100
Subject: [PATCH] Fix SQL queries and order tables

---
 max/db/aliases.py          | 7 +++++--
 max/db/users.py            | 4 ++--
 max/routes/alias/create.py | 4 +---
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/max/db/aliases.py b/max/db/aliases.py
index c22a449..6378997 100644
--- a/max/db/aliases.py
+++ b/max/db/aliases.py
@@ -27,7 +27,10 @@ SELECT {select_fields} FROM aliases a INNER JOIN emails e ON a.source_email_id=e
 
 @with_cursor
 def get_aliases(cur, user_id):
-    cur.execute(f"{base_alias_query} WHERE a.destination_user_id=%s", [user_id])
+    cur.execute(
+        f"{base_alias_query} WHERE a.destination_user_id=%s ORDER BY e.email ASC",
+        [user_id],
+    )
     return [Alias(*row) for row in cur.fetchall()]
 
 
@@ -56,7 +59,7 @@ def create_alias(cur, email, user, enabled, note):
     cur.execute(
         """
         INSERT INTO aliases (source_email_id, destination_user_id, enabled, note)
-        VALUES (%s, %s, %s, %s, %s)""",
+        VALUES (%s, %s, %s, %s)""",
         [email_id, user.id, enabled, note],
     )
 
diff --git a/max/db/users.py b/max/db/users.py
index 0ce8c47..7fbb577 100644
--- a/max/db/users.py
+++ b/max/db/users.py
@@ -46,7 +46,7 @@ def get_user(cur, query, param):
 
 @with_cursor
 def get_users(cur):
-    cur.execute(base_user_query)
+    cur.execute(f"{base_user_query} ORDER BY e.email ASC")
     return [User(*row) for row in cur.fetchall()]
 
 
@@ -67,7 +67,7 @@ def create_user(cur, email, passwordhash, enabled, is_admin, note):
     cur.execute(
         """\
         INSERT INTO users (email_id, passwordhash, enabled, is_admin, note)
-        VALUES (%s, %s, %s, %s, %s, %s)""",
+        VALUES (%s, %s, %s, %s, %s)""",
         [email_id, passwordhash, enabled, is_admin, note],
     )
 
diff --git a/max/routes/alias/create.py b/max/routes/alias/create.py
index 398440d..c2bd87b 100644
--- a/max/routes/alias/create.py
+++ b/max/routes/alias/create.py
@@ -49,9 +49,7 @@ class AliasCreate(
             return  # force re-rendering
 
         try:
-            create_alias(
-                self.email, self.user, self.enabled, self.note
-            )
+            create_alias(self.email, self.user, self.enabled, self.note)
         except EmailAlreadyExists as e:
             if self.auth_user.is_admin:
                 flash(