From 73d98be8d1c11c5eb8baaf60831d34da85cdcf99 Mon Sep 17 00:00:00 2001 From: sanix-darker Date: Sun, 20 Aug 2023 16:08:47 +0200 Subject: [PATCH] from create_connection to get_connection --- api/app/main/utils/database/search_projects.py | 6 +++--- api/app/main/utils/database/search_users.py | 11 ++++++----- api/app/main/utils/database/users.py | 1 + 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/api/app/main/utils/database/search_projects.py b/api/app/main/utils/database/search_projects.py index 3fadeeec..187d33ff 100644 --- a/api/app/main/utils/database/search_projects.py +++ b/api/app/main/utils/database/search_projects.py @@ -1,11 +1,11 @@ # database utils functions -from app.settings import create_connection +from app.settings import get_connection async def get_search_projects(query: str, count: int = 20, page: int = 1): offset = (page - 1) * count - conn = await create_connection() + conn = await get_connection() try: ret = conn.fetch( @@ -32,7 +32,7 @@ async def post_search_projects( page: int = 1 ): offset = (page - 1) * count - conn = await create_connection() + conn = await get_connection() try: if sort_type == 'alphabetic': diff --git a/api/app/main/utils/database/search_users.py b/api/app/main/utils/database/search_users.py index 4b35a562..f8e9cbd8 100644 --- a/api/app/main/utils/database/search_users.py +++ b/api/app/main/utils/database/search_users.py @@ -1,10 +1,10 @@ # database utils functions -from app.settings import create_connection, get_connection +from app.settings import get_connection async def get_user(username: str) -> dict: - conn = await create_connection() + conn = await get_connection() try: ret = await conn.fetch( @@ -19,8 +19,9 @@ async def get_user(username: str) -> dict: return ret async def get_users(count: int) -> dict: + conn = await get_connection() try: - ret = await get_connection().fetch( + ret = conn.fetch( 'SELECT * FROM users LIMIT $1', count ) finally: @@ -34,7 +35,7 @@ async def get_users(count: int) -> dict: async def get_search_users(query: str, count: int = 20, page: int = 1): offset = (page - 1) * count - conn = await create_connection() + conn = await get_connection() try: ret = await conn.fetch( @@ -57,7 +58,7 @@ async def post_search_users( page: int = 1 ): offset = (page - 1) * count - conn = await create_connection() + conn = await get_connection() try: if sort_type == 'alphabetic': diff --git a/api/app/main/utils/database/users.py b/api/app/main/utils/database/users.py index e0f46ad4..78e37ef8 100644 --- a/api/app/main/utils/database/users.py +++ b/api/app/main/utils/database/users.py @@ -2,6 +2,7 @@ from app.main.utils import converters + def sanitize_user_data(data): """ sanitize_user_data [prepare user data format]