refactoring

MothScientist · Dec 12, 2024 · 6c0a78e · 6c0a78e
1 parent 11d7deb
commit 6c0a78e
Show file tree

Hide file tree

Showing 6 changed files with 37 additions and 36 deletions.
diff --git a/budget_graph/db_manager.py b/budget_graph/db_manager.py
@@ -116,14 +116,8 @@ def get_username_by_telegram_id(self, telegram_id: int) -> str:
                 # TypeError occurs in this block if the database connection returned null
                 with conn.cursor() as cur:
                     # Cursors can be used as context managers: leaving the context will close the cursor
-
                     # AttributeError occurs in this block if the database connection returned null
-                    cur.execute("""SELECT
-                                     "username"
-                                   FROM
-                                     "budget_graph"."users"
-                                   WHERE
-                                     "telegram_id" = %s::bigint""", (telegram_id,))  # DO NOT REMOVE commas
+                    cur.execute(read_sql_file('get_username_by_telegram_id'), {'telegram_id': telegram_id})
                     return res[0] if (res := cur.fetchone()) else ''
 
         except (DatabaseError, TypeError) as err:
@@ -142,12 +136,7 @@ def get_telegram_id_by_username(self, username: str) -> int:
         try:
             with self.__conn as conn:
                 with conn.cursor() as cur:
-                    cur.execute("""SELECT
-                                     "telegram_id"
-                                   FROM
-                                     "budget_graph"."users"
-                                   WHERE
-                                     "username" = %s::text""", (username,))
+                    cur.execute(read_sql_file('get_telegram_id_by_username'), {'username': username})
                     return res[0] if (res := cur.fetchone()) else 0
 
         except (DatabaseError, TypeError) as err:
@@ -162,12 +151,7 @@ def get_group_id_by_token(self, token: str) -> int:
         try:
             with self.__conn as conn:
                 with conn.cursor() as cur:
-                    cur.execute("""SELECT
-                                     "id"
-                                   FROM
-                                     "budget_graph"."groups"
-                                   WHERE
-                                     "token" = %s::text""", (token,))
+                    cur.execute(read_sql_file('get_group_id_by_token'), {'token': token})
                     return res[0] if (res := cur.fetchone()) else 0
 
         except (DatabaseError, TypeError) as err:
@@ -182,12 +166,7 @@ def get_group_id_by_telegram_id(self, telegram_id: int) -> int:
         try:
             with self.__conn as conn:
                 with conn.cursor() as cur:
-                    cur.execute("""SELECT
-                                     "group_id"
-                                   FROM
-                                     "budget_graph"."users_groups"
-                                   WHERE
-                                     "telegram_id" = %s::bigint""", (telegram_id,))
+                    cur.execute(read_sql_file('get_group_id_by_telegram_id'), {'telegram_id': telegram_id})
                     return res[0] if (res := cur.fetchone()) else 0
 
         except (DatabaseError, TypeError) as err:
@@ -214,16 +193,7 @@ def get_token_by_telegram_id(self, telegram_id: int) -> str:
         try:
             with self.__conn as conn:
                 with conn.cursor() as cur:
-                    cur.execute("""SELECT
-                                     g."token"
-                                   FROM
-                                     "budget_graph"."groups" g
-                                   JOIN
-                                     "budget_graph"."users_groups" u_g
-                                   ON
-                                     g."id" = u_g."group_id"
-                                   WHERE
-                                     u_g."telegram_id" = %s::bigint""", (telegram_id,))
+                    cur.execute(read_sql_file('get_token_by_telegram_id'), {'telegram_id': telegram_id})
                     return res[0] if (res := cur.fetchone()) else ''
 
         except (DatabaseError, TypeError) as err:
@@ -239,7 +209,7 @@ def get_salt_by_username(self, username: str) -> str:
             with self.__conn as conn:
                 with conn.cursor() as cur:
                     cur.execute(read_sql_file('get_salt_by_username'), {'username': username})
-                    return str(res[0]) if (res := cur.fetchone()) else ''
+                    return res[0] if (res := cur.fetchone()) else ''
 
         except (DatabaseError, TypeError) as err:
             logger_database.error(f"[DB_QUERY] {str(err)}, "

diff --git a/budget_graph/sql/get_group_id_by_telegram_id.sql b/budget_graph/sql/get_group_id_by_telegram_id.sql
@@ -0,0 +1,6 @@
+SELECT
+    "group_id"
+FROM
+    "budget_graph"."users_groups"
+WHERE
+    "telegram_id" = %(telegram_id)s::bigint
diff --git a/budget_graph/sql/get_group_id_by_token.sql b/budget_graph/sql/get_group_id_by_token.sql
@@ -0,0 +1,6 @@
+SELECT
+    "id"
+FROM
+    "budget_graph"."groups"
+WHERE
+    "token" = %(token)s::text
diff --git a/budget_graph/sql/get_telegram_id_by_username.sql b/budget_graph/sql/get_telegram_id_by_username.sql
@@ -0,0 +1,6 @@
+SELECT
+    "telegram_id"
+FROM
+    "budget_graph"."users"
+WHERE
+    "username" = %(username)s::text
diff --git a/budget_graph/sql/get_token_by_telegram_id.sql b/budget_graph/sql/get_token_by_telegram_id.sql
@@ -0,0 +1,7 @@
+SELECT
+    g."token"
+FROM
+    "budget_graph"."groups" g
+    JOIN "budget_graph"."users_groups" u_g ON g."id" = u_g."group_id"
+WHERE
+    u_g."telegram_id" = %(telegram_id)s::bigint
diff --git a/budget_graph/sql/get_username_by_telegram_id.sql b/budget_graph/sql/get_username_by_telegram_id.sql
@@ -0,0 +1,6 @@
+SELECT
+    "username"
+FROM
+    "budget_graph"."users"
+WHERE
+    "telegram_id" = %(telegram_id)s::bigint