finn/max
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix SQL queries and order tables

Browse Source
This commit is contained in:
Finn Stutzenstein 2022-03-06 11:22:45 +01:00
parent 818a43202a
commit 7124133f88
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
max/db/aliases.py
View File

@ -27,7 +27,10 @@ SELECT {select_fields} FROM aliases a INNER JOIN emails e ON a.source_email_id=e
@with_cursor @with_cursor
def get_aliases(cur, user_id): 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()] return [Alias(*row) for row in cur.fetchall()]
@ -56,7 +59,7 @@ def create_alias(cur, email, user, enabled, note):
cur.execute( cur.execute(
""" """
INSERT INTO aliases (source_email_id, destination_user_id, enabled, note) 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], [email_id, user.id, enabled, note],
) )

4
max/db/users.py
View File

@ -46,7 +46,7 @@ def get_user(cur, query, param):
@with_cursor @with_cursor
def get_users(cur): 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()] return [User(*row) for row in cur.fetchall()]
@ -67,7 +67,7 @@ def create_user(cur, email, passwordhash, enabled, is_admin, note):
cur.execute( cur.execute(
"""\ """\
INSERT INTO users (email_id, passwordhash, enabled, is_admin, note) 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], [email_id, passwordhash, enabled, is_admin, note],
) )

4
max/routes/alias/create.py
View File

@ -49,9 +49,7 @@ class AliasCreate(
return # force re-rendering return # force re-rendering
try: try:
create_alias( create_alias(self.email, self.user, self.enabled, self.note)
self.email, self.user, self.enabled, self.note
)
except EmailAlreadyExists as e: except EmailAlreadyExists as e:
if self.auth_user.is_admin: if self.auth_user.is_admin:
flash( flash(