From d82d152fef30e9cca73d9b9d19f75adf938b6a55 Mon Sep 17 00:00:00 2001 From: StNicolay Date: Tue, 6 Dec 2022 14:16:03 +0300 Subject: [PATCH] Added ordering by name for accounts --- src/database/get.py | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/src/database/get.py b/src/database/get.py index 7e857ec..f18f028 100644 --- a/src/database/get.py +++ b/src/database/get.py @@ -24,8 +24,12 @@ def get_master_pass( def get_accounts(engine: Engine, user_id: int) -> list[str]: """Gets list of account names""" - statement = sqlmodel.select(models.Account).where( - models.Account.user_id == user_id, + statement = ( + sqlmodel.select(models.Account) + .where( + models.Account.user_id == user_id, + ) + .order_by(models.Account.name) ) with sqlmodel.Session(engine) as session: result = session.exec(statement) @@ -37,8 +41,12 @@ def get_all_accounts( ) -> Iterator[tuple[str, bytes, bytes, bytes]]: """Returns an iterator of tuples, where values represent account's name, salt, encrypted login and encrypted password""" - statement = sqlmodel.select(models.Account).where( - models.Account.user_id == user_id, + statement = ( + sqlmodel.select(models.Account) + .where( + models.Account.user_id == user_id, + ) + .order_by(models.Account.name) ) with sqlmodel.Session(engine) as session: result = session.exec(statement)