Move util-related files into separated folder + refactor imports

handlers/admin/admin_coupons.py

@@ -6,7 +6,7 @@ from aiogram.fsm.state import State, StatesGroup
 from aiogram.types import InlineKeyboardButton
 from aiogram.utils.keyboard import InlineKeyboardBuilder
 
-from database import create_coupon, delete_coupon_from_db, get_all_coupons
+from utils.database import create_coupon, delete_coupon_from_db, get_all_coupons
 from filters.admin import IsAdminFilter
 from logger import logger
 

handlers/admin/admin_panel.py

@@ -10,7 +10,7 @@ from aiogram.fsm.state import State, StatesGroup
 from aiogram.types import BufferedInputFile, CallbackQuery, InlineKeyboardButton
 from aiogram.utils.keyboard import InlineKeyboardBuilder
 
-from backup import backup_database
+from utils.backup import backup_database
 from bot import bot
 from filters.admin import IsAdminFilter
 from logger import logger

handlers/admin/admin_servers.py

@@ -6,9 +6,9 @@ from aiogram.utils.keyboard import InlineKeyboardBuilder
 import asyncpg
 from py3xui import AsyncApi
 
-from backup import create_backup_and_send_to_admins
+from utils.backup import create_backup_and_send_to_admins
 from config import ADMIN_PASSWORD, ADMIN_USERNAME, DATABASE_URL
-from database import check_unique_server_name, get_servers_from_db
+from utils.database import check_unique_server_name, get_servers_from_db
 from filters.admin import IsAdminFilter
 
 router = Router()

handlers/admin/admin_user_editor.py

@@ -9,7 +9,7 @@ from aiogram.types import CallbackQuery, InlineKeyboardButton
 from aiogram.utils.keyboard import InlineKeyboardBuilder
 
 from config import TOTAL_GB
-from database import get_client_id_by_email, get_servers_from_db, restore_trial, update_key_expiry
+from utils.database import get_client_id_by_email, get_servers_from_db, restore_trial, update_key_expiry
 from filters.admin import IsAdminFilter
 from handlers.keys.key_utils import delete_key_from_cluster, delete_key_from_db, renew_key_in_cluster
 from handlers.utils import sanitize_key_name

handlers/coupons.py

@@ -7,7 +7,7 @@ from aiogram.fsm.state import State, StatesGroup
 from aiogram.types import InlineKeyboardButton
 from aiogram.utils.keyboard import InlineKeyboardBuilder
 
-from database import update_balance
+from utils.database import update_balance
 
 
 class CouponActivationState(StatesGroup):

handlers/keys/key_management.py

@@ -15,14 +15,13 @@ from config import (
     DOWNLOAD_ANDROID,
     DOWNLOAD_IOS,
     PUBLIC_LINK,
-    RENEWAL_PLANS,
     RENEWAL_PRICES,
     SUPPORT_CHAT_URL,
     TRIAL_TIME,
 )
-from database import get_balance, get_trial, store_key, update_balance
+from utils.database import get_balance, get_trial, store_key, update_balance
 from handlers.keys.key_utils import create_key_on_cluster
-from handlers.texts import DISCOUNTS, KEY, NULL_BALANCE, key_message_success
+from handlers.texts import DISCOUNTS, KEY, key_message_success
 from handlers.utils import generate_random_email, get_least_loaded_cluster
 from logger import logger
 

handlers/keys/key_utils.py

@@ -3,9 +3,9 @@ import asyncio
 import asyncpg
 from py3xui import AsyncApi
 
-from client import add_client, delete_client, extend_client_key
+from utils.client import add_client, delete_client, extend_client_key
 from config import ADMIN_PASSWORD, ADMIN_USERNAME, DATABASE_URL, TOTAL_GB
-from database import get_servers_from_db
+from utils.database import get_servers_from_db
 from logger import logger
 
 

handlers/keys/keys.py

@@ -9,7 +9,7 @@ from aiogram.types import BufferedInputFile, InlineKeyboardButton
 from aiogram.utils.keyboard import InlineKeyboardBuilder
 
 from config import CONNECT_ANDROID, CONNECT_IOS, DOWNLOAD_ANDROID, DOWNLOAD_IOS, PUBLIC_LINK, RENEWAL_PLANS, TOTAL_GB
-from database import delete_key, get_balance, get_servers_from_db, store_key, update_balance, update_key_expiry
+from utils.database import delete_key, get_balance, get_servers_from_db, store_key, update_balance, update_key_expiry
 from handlers.keys.key_utils import (
     delete_key_from_cluster,
     delete_key_from_db,

handlers/keys/subscriptions.py

@@ -6,7 +6,7 @@ from aiohttp import web
 import asyncpg
 
 from config import DATABASE_URL, TRANSITION_DATE_STR
-from database import get_servers_from_db
+from utils.database import get_servers_from_db
 from logger import logger
 
 

handlers/keys/trial_key.py

@@ -5,9 +5,9 @@ import uuid
 
 from py3xui import AsyncApi
 
-from client import add_client
+from utils.client import add_client
 from config import ADMIN_PASSWORD, ADMIN_USERNAME, PUBLIC_LINK, TOTAL_GB, TRIAL_TIME
-from database import get_servers_from_db, store_key, use_trial
+from utils.database import get_servers_from_db, store_key, use_trial
 from handlers.texts import INSTRUCTIONS
 from handlers.utils import generate_random_email, get_least_loaded_cluster
 

handlers/notifications.py

@@ -7,7 +7,7 @@ import asyncpg
 from py3xui import AsyncApi
 
 from config import ADMIN_PASSWORD, ADMIN_USERNAME, DATABASE_URL, DEV_MODE, RENEWAL_PLANS, TOTAL_GB, TRIAL_TIME
-from database import (
+from utils.database import (
     add_notification,
     check_notification_time,
     delete_key,

handlers/payments/cryprobot_pay.py

@@ -9,7 +9,7 @@ from aiogram.utils.keyboard import InlineKeyboardBuilder
 from aiohttp import web
 
 from config import CRYPTO_BOT_ENABLE, CRYPTO_BOT_TOKEN, RUB_TO_USDT
-from database import add_connection, add_payment, check_connection_exists, get_key_count, update_balance
+from utils.database import add_connection, add_payment, check_connection_exists, get_key_count, update_balance
 from handlers.payments.utils import send_payment_success_notification
 from handlers.texts import PAYMENT_OPTIONS
 from logger import logger

handlers/payments/freekassa_pay.py

@@ -13,7 +13,7 @@ from aiohttp import web
 import requests
 
 from config import FREEKASSA_API_KEY, FREEKASSA_SHOP_ID
-from database import add_payment, update_balance
+from utils.database import add_payment, update_balance
 from handlers.payments.utils import send_payment_success_notification
 from handlers.texts import PAYMENT_OPTIONS
 

handlers/payments/robokassa_pay.py

@@ -10,7 +10,7 @@ from aiohttp import web
 from robokassa import HashAlgorithm, Robokassa
 
 from config import ROBOKASSA_ENABLE, ROBOKASSA_LOGIN, ROBOKASSA_PASSWORD1, ROBOKASSA_PASSWORD2, ROBOKASSA_TEST_MODE
-from database import add_connection, add_payment, check_connection_exists, get_key_count, update_balance
+from utils.database import add_connection, add_payment, check_connection_exists, get_key_count, update_balance
 from handlers.payments.utils import send_payment_success_notification
 from handlers.texts import PAYMENT_OPTIONS
 from logger import logger

handlers/payments/stars_pay.py

@@ -7,7 +7,7 @@ from aiogram.types import InlineKeyboardButton, LabeledPrice, PreCheckoutQuery
 from aiogram.utils.keyboard import InlineKeyboardBuilder
 
 from config import RUB_TO_XTR
-from database import add_connection, add_payment, check_connection_exists, get_key_count, update_balance
+from utils.database import add_connection, add_payment, check_connection_exists, get_key_count, update_balance
 from handlers.payments.utils import send_payment_success_notification
 from handlers.texts import PAYMENT_OPTIONS
 from logger import logger

handlers/payments/yookassa_pay.py

@@ -10,7 +10,7 @@ from aiohttp import web
 from yookassa import Configuration, Payment
 
 from config import YOOKASSA_ENABLE, YOOKASSA_SECRET_KEY, YOOKASSA_SHOP_ID
-from database import add_connection, add_payment, check_connection_exists, get_key_count, update_balance
+from utils.database import add_connection, add_payment, check_connection_exists, get_key_count, update_balance
 from handlers.payments.utils import send_payment_success_notification
 from handlers.texts import PAYMENT_OPTIONS
 from logger import logger

handlers/profile.py

@@ -6,7 +6,7 @@ from aiogram.types import BufferedInputFile, InlineKeyboardButton
 from aiogram.utils.keyboard import InlineKeyboardBuilder
 
 from config import NEWS_MESSAGE, RENEWAL_PLANS
-from database import get_balance, get_key_count, get_referral_stats
+from utils.database import get_balance, get_key_count, get_referral_stats
 from handlers.texts import get_referral_link, invite_message_send, profile_message_send
 
 router = Router()

handlers/start.py

@@ -8,7 +8,7 @@ from aiogram.types import BufferedInputFile, CallbackQuery, InlineKeyboardButton
 from aiogram.utils.keyboard import InlineKeyboardBuilder
 
 from config import CHANNEL_URL, CONNECT_ANDROID, CONNECT_IOS, DOWNLOAD_ANDROID, DOWNLOAD_IOS, SUPPORT_CHAT_URL
-from database import add_connection, add_referral, check_connection_exists, get_trial, use_trial
+from utils.database import add_connection, add_referral, check_connection_exists, get_trial, use_trial
 from handlers.keys.trial_key import create_trial_key
 from handlers.texts import INSTRUCTIONS_TRIAL, WELCOME_TEXT, get_about_vpn
 

handlers/utils.py

@@ -6,7 +6,7 @@ import asyncpg
 
 from bot import bot
 from config import DATABASE_URL
-from database import get_servers_from_db
+from utils.database import get_servers_from_db
 from logger import logger